narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[intelxl] Defer fetching MAC address until after opening admin queue 

Allow for the MAC address to be fetched using an admin queue command,
instead of reading the PRTPM_SA[HL] registers directly.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/697/head^2
Michael Brown 2022-03-17 12:37:45 +00:00
parent d6e36a2d73
commit 06467ee70f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/drivers/net/intelxl.c
View File

@ -1688,10 +1688,6 @@ static int intelxl_probe ( struct pci_device *pci ) {
intelxl, intelxl->pf, intelxl->port, intelxl->base, intelxl, intelxl->pf, intelxl->port, intelxl->base,
INTELXL_PFLAN_QALLOC_LASTQ ( pflan_qalloc ) ); INTELXL_PFLAN_QALLOC_LASTQ ( pflan_qalloc ) );
/* Fetch MAC address and maximum frame size */
if ( ( rc = intelxl_fetch_mac ( intelxl, netdev ) ) != 0 )
goto err_fetch_mac;
/* Enable MSI-X dummy interrupt */ /* Enable MSI-X dummy interrupt */
if ( ( rc = intelxl_msix_enable ( intelxl, pci, if ( ( rc = intelxl_msix_enable ( intelxl, pci,
INTELXL_MSIX_VECTOR ) ) != 0 ) INTELXL_MSIX_VECTOR ) ) != 0 )
@ -1725,6 +1721,10 @@ static int intelxl_probe ( struct pci_device *pci ) {
if ( ( rc = intelxl_admin_promisc ( intelxl ) ) != 0 ) if ( ( rc = intelxl_admin_promisc ( intelxl ) ) != 0 )
goto err_admin_promisc; goto err_admin_promisc;
/* Fetch MAC address and maximum frame size */
if ( ( rc = intelxl_fetch_mac ( intelxl, netdev ) ) != 0 )
goto err_fetch_mac;
/* Configure queue register addresses */ /* Configure queue register addresses */
intelxl->tx.reg = INTELXL_QTX ( intelxl->queue ); intelxl->tx.reg = INTELXL_QTX ( intelxl->queue );
intelxl->tx.tail = ( intelxl->tx.reg + INTELXL_QXX_TAIL ); intelxl->tx.tail = ( intelxl->tx.reg + INTELXL_QXX_TAIL );
@ -1756,6 +1756,7 @@ static int intelxl_probe ( struct pci_device *pci ) {
unregister_netdev ( netdev ); unregister_netdev ( netdev );
err_register_netdev: err_register_netdev:
err_fetch_mac:
err_admin_promisc: err_admin_promisc:
err_admin_vsi: err_admin_vsi:
err_admin_switch: err_admin_switch:
@ -1766,7 +1767,6 @@ static int intelxl_probe ( struct pci_device *pci ) {
err_open_admin: err_open_admin:
intelxl_msix_disable ( intelxl, pci, INTELXL_MSIX_VECTOR ); intelxl_msix_disable ( intelxl, pci, INTELXL_MSIX_VECTOR );
err_msix: err_msix:
err_fetch_mac:
pci_reset ( pci, intelxl->exp ); pci_reset ( pci, intelxl->exp );
err_exp: err_exp:
iounmap ( intelxl->regs ); iounmap ( intelxl->regs );