@@ -487,11 +487,10 @@ def __init__(self):
487487
488488 def savePCIConfigurationSpace (self , devAddr ):
489489 confSpaceList = []
490- for addr in range (0 , 0xfff , 4 ):
491- if self .isMellanoxDevice (devAddr ):
492- if (addr == 0x58 or addr == 0x5c ):
493- confSpaceList .append (0 )
494- continue
490+ for addr in range (0 , 0xff , 4 ):
491+ if (addr == 0x58 or addr == 0x5c ):
492+ confSpaceList .append (0 )
493+ continue
495494 val = self .read (devAddr , addr )
496495 confSpaceList .append (val )
497496 self .pciConfSpaceMap [devAddr ] = confSpaceList
@@ -503,13 +502,12 @@ def loadPCIConfigurationSpace(self, devAddr):
503502 pciConfSpaceList = self .pciConfSpaceMap [devAddr ]
504503 except KeyError as ke :
505504 raise RuntimeError ("PCI configuration space for device %s was not saved please reboot server" % devAddr )
506- if len (pciConfSpaceList ) != 0x400 :
505+ if len (pciConfSpaceList ) != 64 :
507506 raise RuntimeError ("PCI configuration space for device %s was not saved properly please reboot server" % devAddr )
508- for i in range (0 , 0x400 ):
507+ for i in range (0 , 64 ):
509508 addr = i * 4
510- if self .isMellanoxDevice (devAddr ):
511- if (addr == 0x58 or addr == 0x5c ):
512- continue
509+ if (addr == 0x58 or addr == 0x5c ):
510+ continue
513511 self .write (devAddr , addr , pciConfSpaceList [i ])
514512 return
515513
@@ -593,10 +591,9 @@ def getMFDeviceList(self, mstDev,devAddr):
593591 def savePCIConfigurationSpace (self , devAddr ):
594592 confSpaceList = []
595593 for addr in range (0 , 0xff , 4 ):
596- if self .isMellanoxDevice (devAddr ):
597- if (addr == 0x58 or addr == 0x5c ):
598- confSpaceList .append (0 )
599- continue
594+ if (addr == 0x58 or addr == 0x5c ):
595+ confSpaceList .append (0 )
596+ continue
600597 val = self .read (devAddr , addr )
601598 confSpaceList .append (val )
602599 self .pciConfSpaceMap [devAddr ] = confSpaceList
@@ -612,9 +609,8 @@ def loadPCIConfigurationSpace(self, devAddr):
612609 raise RuntimeError ("PCI configuration space for device %s was not saved properly please reboot server" % devAddr )
613610 for i in range (0 , 64 ):
614611 addr = i * 4
615- if self .isMellanoxDevice (devAddr ):
616- if (addr == 0x58 or addr == 0x5c ):
617- continue
612+ if (addr == 0x58 or addr == 0x5c ):
613+ continue
618614 self .write (devAddr , addr , pciConfSpaceList [i ])
619615 return
620616
0 commit comments