sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-12 14:32:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

[thunderx] Use ThunderxConfigProtocol to obtain board configuration

Browse Source 
Following changes were introduced:
 - added GetBgxProp and GetLmacProp methods to ThunderxConfigProtocol
 - replaced direct BOARD_CFG access with usage of introduced methods
 - removed redundant BOARD_CFG
 - changed GUID of ThunderxConfigProtocol, as this is not compatible
   with previous version
 - changed UINTN* to UINT64* buffer type to fix issue on 32-bit
   platforms with MAC address

This change allows us to avoid alignment of BOARD_CFG definitions
every time it changes in UEFI.

Signed-off-by: Konrad Adamczyk <konrad.adamczyk@cavium.com>
Modified-by: Michael Brown <mcb30@ipxe.org>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Adamczyk, Konrad
2017-03-30 13:54:59 +00:00
committed by Michael Brown
parent a66ac07165
commit fd6d1f4660
2 changed files with 60 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/drivers/net/thunderx.c
View File

@@ -1494,18 +1494,24 @@ static void txnic_bgx_init ( struct txnic_bgx *bgx, unsigned int type ) {
*/
static void txnic_bgx_mac ( struct txnic_lmac *lmac ) {
struct txnic_bgx *bgx = lmac->bgx;
BOARD_CFG *boardcfg;
NODE_CFG *nodecfg;
BGX_CFG *bgxcfg;
LMAC_CFG *lmaccfg;
unsigned int lmac_idx = TXNIC_LMAC_IDX ( lmac->idx );
uint64_t mac;
EFI_STATUS efirc;
int rc;
/* Extract MAC from Board Configuration protocol, if available */
if ( txcfg ) {
boardcfg = txcfg->BoardConfig;
nodecfg = &boardcfg->Node[ bgx->node % MAX_NODES ];
bgxcfg = &nodecfg->BgxCfg[ bgx->idx % BGX_PER_NODE_COUNT ];
lmaccfg = &bgxcfg->Lmacs[ lmac->idx % LMAC_PER_BGX_COUNT ];
lmac->mac.be64 = cpu_to_be64 ( lmaccfg->MacAddress );
if ( ( efirc = txcfg->GetLmacProp ( txcfg, bgx->node, bgx->idx,
lmac_idx, MAC_ADDRESS,
sizeof ( mac ),
&mac ) ) == 0 ) {
lmac->mac.be64 = cpu_to_be64 ( mac );
} else {
rc = -EEFI ( efirc );
DBGC ( TXNICCOL ( bgx ), "TXNIC %d/%d/%d could not get "
"MAC address: %s\n", bgx->node, bgx->idx,
lmac->idx, strerror ( rc ) );
}
} else {
DBGC ( TXNICCOL ( bgx ), "TXNIC %d/%d/%d has no board "
"configuration protocol\n", bgx->node, bgx->idx,