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

[pci] Allow PCI config space backup to be limited by maximum offset 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/801/head
Michael Brown 2022-11-13 20:42:09 +00:00
parent 688646fe6d
commit ca2be7e094
5 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/drivers/bus/pcibackup.c
View File

@ -61,14 +61,15 @@ pci_backup_excluded ( struct pci_device *pci, unsigned int offset,
* *
* @v pci PCI device * @v pci PCI device
* @v backup PCI configuration space backup * @v backup PCI configuration space backup
* @v limit Maximum offset in PCI configuration space
* @v exclude PCI configuration space backup exclusion list, or NULL * @v exclude PCI configuration space backup exclusion list, or NULL
*/ */
void pci_backup ( struct pci_device *pci, struct pci_config_backup *backup, void pci_backup ( struct pci_device *pci, struct pci_config_backup *backup,
const uint8_t *exclude ) { unsigned int limit, const uint8_t *exclude ) {
unsigned int offset; unsigned int offset;
uint32_t *dword; uint32_t *dword;
for ( offset = 0, dword = backup->dwords ; offset < 0x100 ; for ( offset = 0, dword = backup->dwords ; offset < limit ;
offset += sizeof ( *dword ) , dword++ ) { offset += sizeof ( *dword ) , dword++ ) {
if ( ! pci_backup_excluded ( pci, offset, exclude ) ) if ( ! pci_backup_excluded ( pci, offset, exclude ) )
pci_read_config_dword ( pci, offset, dword ); pci_read_config_dword ( pci, offset, dword );
@ -80,14 +81,15 @@ void pci_backup ( struct pci_device *pci, struct pci_config_backup *backup,
* *
* @v pci PCI device * @v pci PCI device
* @v backup PCI configuration space backup * @v backup PCI configuration space backup
* @v limit Maximum offset in PCI configuration space
* @v exclude PCI configuration space backup exclusion list, or NULL * @v exclude PCI configuration space backup exclusion list, or NULL
*/ */
void pci_restore ( struct pci_device *pci, struct pci_config_backup *backup, void pci_restore ( struct pci_device *pci, struct pci_config_backup *backup,
const uint8_t *exclude ) { unsigned int limit, const uint8_t *exclude ) {
unsigned int offset; unsigned int offset;
uint32_t *dword; uint32_t *dword;
for ( offset = 0, dword = backup->dwords ; offset < 0x100 ; for ( offset = 0, dword = backup->dwords ; offset < limit ;
offset += sizeof ( *dword ) , dword++ ) { offset += sizeof ( *dword ) , dword++ ) {
if ( ! pci_backup_excluded ( pci, offset, exclude ) ) if ( ! pci_backup_excluded ( pci, offset, exclude ) )
pci_write_config_dword ( pci, offset, *dword ); pci_write_config_dword ( pci, offset, *dword );

4
src/drivers/infiniband/arbel.c
View File

@ -2561,7 +2561,7 @@ static void arbel_reset ( struct arbel *arbel ) {
unsigned int i; unsigned int i;
/* Perform device reset and preserve PCI configuration */ /* Perform device reset and preserve PCI configuration */
pci_backup ( pci, &backup, backup_exclude ); pci_backup ( pci, &backup, PCI_CONFIG_BACKUP_ALL, backup_exclude );
writel ( ARBEL_RESET_MAGIC, writel ( ARBEL_RESET_MAGIC,
( arbel->config + ARBEL_RESET_OFFSET ) ); ( arbel->config + ARBEL_RESET_OFFSET ) );
for ( i = 0 ; i < ARBEL_RESET_WAIT_TIME_MS ; i++ ) { for ( i = 0 ; i < ARBEL_RESET_WAIT_TIME_MS ; i++ ) {
@ -2570,7 +2570,7 @@ static void arbel_reset ( struct arbel *arbel ) {
if ( vendor != 0xffff ) if ( vendor != 0xffff )
break; break;
} }
pci_restore ( pci, &backup, backup_exclude ); pci_restore ( pci, &backup, PCI_CONFIG_BACKUP_ALL, backup_exclude );
} }
/** /**

5
src/drivers/infiniband/hermon.c
View File

@ -2840,7 +2840,7 @@ static int hermon_reset ( struct hermon *hermon ) {
hermon->toggle = 0; hermon->toggle = 0;
/* Perform device reset and preserve PCI configuration */ /* Perform device reset and preserve PCI configuration */
pci_backup ( pci, &backup, backup_exclude ); pci_backup ( pci, &backup, PCI_CONFIG_BACKUP_ALL, backup_exclude );
writel ( HERMON_RESET_MAGIC, writel ( HERMON_RESET_MAGIC,
( hermon->config + HERMON_RESET_OFFSET ) ); ( hermon->config + HERMON_RESET_OFFSET ) );
@ -2852,7 +2852,8 @@ static int hermon_reset ( struct hermon *hermon ) {
if ( vendor == pci->vendor ) { if ( vendor == pci->vendor ) {
/* Restore PCI configuration */ /* Restore PCI configuration */
pci_restore ( pci, &backup, backup_exclude ); pci_restore ( pci, &backup, PCI_CONFIG_BACKUP_ALL,
backup_exclude );
DBGC ( hermon, "Hermon %p reset after %dms\n", DBGC ( hermon, "Hermon %p reset after %dms\n",
hermon, i ); hermon, i );

4
src/drivers/infiniband/qib7322.c
View File

@ -2256,7 +2256,7 @@ static void qib7322_reset ( struct qib7322 *qib7322, struct pci_device *pci ) {
struct pci_config_backup backup; struct pci_config_backup backup;
/* Back up PCI configuration space */ /* Back up PCI configuration space */
pci_backup ( pci, &backup, NULL ); pci_backup ( pci, &backup, PCI_CONFIG_BACKUP_ALL, NULL );
/* Assert reset */ /* Assert reset */
memset ( &control, 0, sizeof ( control ) ); memset ( &control, 0, sizeof ( control ) );
@ -2267,7 +2267,7 @@ static void qib7322_reset ( struct qib7322 *qib7322, struct pci_device *pci ) {
mdelay ( 1000 ); mdelay ( 1000 );
/* Restore PCI configuration space */ /* Restore PCI configuration space */
pci_restore ( pci, &backup, NULL ); pci_restore ( pci, &backup, PCI_CONFIG_BACKUP_ALL, NULL );
} }
/** /**

12
src/include/ipxe/pcibackup.h
View File

@ -11,9 +11,15 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include <stdint.h> #include <stdint.h>
/** Limit of PCI configuration space */
#define PCI_CONFIG_BACKUP_ALL 0x100
/** Limit of standard PCI configuration space */
#define PCI_CONFIG_BACKUP_STANDARD 0x40
/** A PCI configuration space backup */ /** A PCI configuration space backup */
struct pci_config_backup { struct pci_config_backup {
uint32_t dwords[64]; uint32_t dwords[ PCI_CONFIG_BACKUP_ALL / sizeof ( uint32_t ) ];
}; };
/** PCI configuration space backup exclusion list end marker */ /** PCI configuration space backup exclusion list end marker */
@ -25,9 +31,9 @@ struct pci_config_backup {
extern void pci_backup ( struct pci_device *pci, extern void pci_backup ( struct pci_device *pci,
struct pci_config_backup *backup, struct pci_config_backup *backup,
const uint8_t *exclude ); unsigned int limit, const uint8_t *exclude );
extern void pci_restore ( struct pci_device *pci, extern void pci_restore ( struct pci_device *pci,
struct pci_config_backup *backup, struct pci_config_backup *backup,
const uint8_t *exclude ); unsigned int limit, const uint8_t *exclude );
#endif /* _IPXE_PCIBACKUP_H */ #endif /* _IPXE_PCIBACKUP_H */