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

[pci] Generalise function-level reset mechanism 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/697/head^2
Michael Brown 2022-08-08 16:39:40 +01:00
parent 9dfcdc04c8
commit 0965cec53c
3 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/drivers/bus/pciextra.c
View File

@ -1,6 +1,7 @@
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include <stdint.h> #include <stdint.h>
#include <ipxe/timer.h>
#include <ipxe/pci.h> #include <ipxe/pci.h>
static int pci_find_capability_common ( struct pci_device *pci, static int pci_find_capability_common ( struct pci_device *pci,
@ -112,3 +113,24 @@ unsigned long pci_bar_size ( struct pci_device *pci, unsigned int reg ) {
size = size & ~( size - 1 ); size = size & ~( size - 1 );
return size; return size;
} }
/**
* Perform PCI Express function-level reset (FLR)
*
* @v pci PCI device
* @v exp PCI Express Capability address
*/
void pci_reset ( struct pci_device *pci, unsigned int exp ) {
uint16_t control;
/* Perform a PCIe function-level reset */
pci_read_config_word ( pci, ( exp + PCI_EXP_DEVCTL ), &control );
control |= PCI_EXP_DEVCTL_FLR;
pci_write_config_word ( pci, ( exp + PCI_EXP_DEVCTL ), control );
/* Allow time for reset to complete */
mdelay ( PCI_EXP_FLR_DELAY_MS );
/* Re-enable device */
adjust_pci_device ( pci );
}

23
src/drivers/net/intelxlvf.c
View File

@ -45,23 +45,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
****************************************************************************** ******************************************************************************
*/ */
/**
* Reset hardware via PCIe function-level reset
*
* @v intelxl Intel device
*/
static void intelxlvf_reset_flr ( struct intelxl_nic *intelxl,
struct pci_device *pci ) {
uint16_t control;
/* Perform a PCIe function-level reset */
pci_read_config_word ( pci, ( intelxl->exp + PCI_EXP_DEVCTL ),
&control );
pci_write_config_word ( pci, ( intelxl->exp + PCI_EXP_DEVCTL ),
( control | PCI_EXP_DEVCTL_FLR ) );
mdelay ( INTELXL_RESET_DELAY_MS );
}
/** /**
* Wait for admin event queue to be torn down * Wait for admin event queue to be torn down
* *
@ -637,7 +620,7 @@ static int intelxlvf_probe ( struct pci_device *pci ) {
} }
/* Reset the function via PCIe FLR */ /* Reset the function via PCIe FLR */
intelxlvf_reset_flr ( intelxl, pci ); pci_reset ( pci, intelxl->exp );
/* Enable MSI-X dummy interrupt */ /* Enable MSI-X dummy interrupt */
if ( ( rc = intelxl_msix_enable ( intelxl, pci ) ) != 0 ) if ( ( rc = intelxl_msix_enable ( intelxl, pci ) ) != 0 )
@ -669,7 +652,7 @@ static int intelxlvf_probe ( struct pci_device *pci ) {
err_open_admin: err_open_admin:
intelxl_msix_disable ( intelxl, pci ); intelxl_msix_disable ( intelxl, pci );
err_msix: err_msix:
intelxlvf_reset_flr ( intelxl, pci ); pci_reset ( pci, intelxl->exp );
err_exp: err_exp:
iounmap ( intelxl->regs ); iounmap ( intelxl->regs );
err_ioremap: err_ioremap:
@ -701,7 +684,7 @@ static void intelxlvf_remove ( struct pci_device *pci ) {
intelxl_msix_disable ( intelxl, pci ); intelxl_msix_disable ( intelxl, pci );
/* Reset the function via PCIe FLR */ /* Reset the function via PCIe FLR */
intelxlvf_reset_flr ( intelxl, pci ); pci_reset ( pci, intelxl->exp );
/* Free network device */ /* Free network device */
iounmap ( intelxl->regs ); iounmap ( intelxl->regs );

1
src/include/ipxe/pci.h
View File

@ -309,6 +309,7 @@ extern int pci_find_capability ( struct pci_device *pci, int capability );
extern int pci_find_next_capability ( struct pci_device *pci, extern int pci_find_next_capability ( struct pci_device *pci,
int pos, int capability ); int pos, int capability );
extern unsigned long pci_bar_size ( struct pci_device *pci, unsigned int reg ); extern unsigned long pci_bar_size ( struct pci_device *pci, unsigned int reg );
extern void pci_reset ( struct pci_device *pci, unsigned int exp );
/** /**
* Initialise PCI device * Initialise PCI device