deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 10:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ID: 3608765 - Fix printing in ipmi_ek_display_amc_p2p_record()

Browse Source 
Change the amc channel descriptor ports to be displayed in decimal
instead of hex. This matches the 'fru -v' output in ipmitool.

Add decimal value of Link Asymetric Match values. So people don't have to
look up the value in the source or in the PIGMG spec.

Commit for Dan Gora
This commit is contained in:
Zdenek Styblik 2013-04-22 10:05:53 +00:00
parent 3b77db9a86
commit e1728327f6
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ipmitool/lib/ipmi_ekanalyzer.c
View File

@ -2124,21 +2124,24 @@ ipmi_ek_display_link_descriptor( int file_type, unsigned char rsc_id,
printf(" - Link Type extension: %s\n",
val2str (link_desc.type_ext, ipmi_ekanalyzer_extension_PCIE) );
printf(" - Link Group ID: %d || ", link_desc.group_id );
printf("Link Asym. Match: %s\n",
printf("Link Asym. Match: %d - %s\n",
link_desc.asym_match,
val2str (link_desc.asym_match, ipmi_ekanalyzer_asym_PCIE) );
break;
case FRU_PICMGEXT_AMC_LINK_TYPE_ETHERNET:
printf(" - Link Type extension: %s\n",
val2str (link_desc.type_ext, ipmi_ekanalyzer_extension_ETHERNET) );
printf(" - Link Group ID: %d || ", link_desc.group_id );
printf("Link Asym. Match: %s\n",
printf("Link Asym. Match: %d - %s\n",
link_desc.asym_match,
val2str (link_desc.asym_match, ipmi_ekanalyzer_asym_PCIE) );
break;
case FRU_PICMGEXT_AMC_LINK_TYPE_STORAGE:
printf(" - Link Type extension: %s\n",
val2str (link_desc.type_ext, ipmi_ekanalyzer_extension_STORAGE) );
printf(" - Link Group ID: %d || ", link_desc.group_id );
printf("Link Asym. Match: %s\n",
printf("Link Asym. Match: %d - %s\n",
link_desc.asym_match,
val2str (link_desc.asym_match, ipmi_ekanalyzer_asym_STORAGE) );
break;
default:
@ -3653,12 +3656,11 @@ ipmi_ek_display_amc_p2p_record( struct ipmi_ek_multi_header * record )
data = record->data[index_data] |
(record->data[index_data + 1] << 8) |
(record->data[index_data + 2] << 16);
/*Warning: For gcc version between 4.0 and 4.3 this code doesnt work*/
ch_desc = ( struct fru_picmgext_amc_channel_desc_record * ) &data;
printf(" Lane 0 Port: 0x%02x\n", ch_desc->lane0port);
printf(" Lane 1 Port: 0x%02x\n", ch_desc->lane1port);
printf(" Lane 2 Port: 0x%02x\n", ch_desc->lane2port);
printf(" Lane 3 Port: 0x%02x\n\n", ch_desc->lane3port);
printf(" Lane 0 Port: %d\n", ch_desc->lane0port);
printf(" Lane 1 Port: %d\n", ch_desc->lane1port);
printf(" Lane 2 Port: %d\n", ch_desc->lane2port);
printf(" Lane 3 Port: %d\n\n", ch_desc->lane3port);
index_data += FRU_PICMGEXT_AMC_CHANNEL_DESC_RECORD_SIZE;
}
}
@ -3685,7 +3687,8 @@ ipmi_ek_display_amc_p2p_record( struct ipmi_ek_multi_header * record )
printf("\t- Link Type extension: %s\n",
val2str (link_desc->type_ext, ipmi_ekanalyzer_extension_PCIE));
printf("\t- Link Group ID: %d\n ", link_desc->group_id );
printf("\t- Link Asym. Match: %s\n",
printf("\t- Link Asym. Match: %d - %s\n",
link_desc->asym_match,
val2str (link_desc->asym_match, ipmi_ekanalyzer_asym_PCIE));
break;
case FRU_PICMGEXT_AMC_LINK_TYPE_ETHERNET:
@ -3693,7 +3696,8 @@ ipmi_ek_display_amc_p2p_record( struct ipmi_ek_multi_header * record )
val2str (link_desc->type_ext,
ipmi_ekanalyzer_extension_ETHERNET));
printf("\t- Link Group ID: %d \n", link_desc->group_id );
printf("\t- Link Asym. Match: %s\n",
printf("\t- Link Asym. Match: %d - %s\n",
link_desc->asym_match,
val2str (link_desc->asym_match, ipmi_ekanalyzer_asym_PCIE));
break;
case FRU_PICMGEXT_AMC_LINK_TYPE_STORAGE:
@ -3701,11 +3705,12 @@ ipmi_ek_display_amc_p2p_record( struct ipmi_ek_multi_header * record )
val2str (link_desc->type_ext,
ipmi_ekanalyzer_extension_STORAGE));
printf("\t- Link Group ID: %d \n", link_desc->group_id );
printf("\t- Link Asym. Match: %s\n",
printf("\t- Link Asym. Match: %d - %s\n",
link_desc->asym_match,
val2str (link_desc->asym_match, ipmi_ekanalyzer_asym_STORAGE));
break;
default:
printf("\t- Link Type extension: %i\n", link_desc->type_ext );
printf("\t- Link Type extension: %i (Unknown)\n", link_desc->type_ext );
printf("\t- Link Group ID: %d \n", link_desc->group_id );
printf("\t- Link Asym. Match: %i\n", link_desc->asym_match);
break;