pci/mrst: Detect loops when reading fixed BAR cap.
The mrst logic introduced in 2.6.33-rc8 in commit a712ffbc199849364c46e9112b93b66de08e2c26 causes boot to hang on at least this platform:
Intel E5405 CPU
System Information
Manufacturer: Supermicro
Product Name: X7DBU
The cause of the hang is that pci_cap points to itself as the next capability, putting the fixed_bar_cap into an endless loop.
This patch detects the loop, prints a warning, and continues on with useful work. This strategy was suggested by Robert Hancock <[email protected]>
This should be a candidate for 2.6.34.y as well.
---
:100644 100644 1cdc02c... 9535ba9... M arch/x86/pci/mrst.c
arch/x86/pci/mrst.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
arch/x86/pci/mrst.c +11 -0
@@ -76,6 +76,17 @@ static int fixed_bar_cap(struct pci_bus *bus, unsigned int devfn)return pos; } +if ((pcie_cap >>20 ) ==0 ) +break ; + +if ((pcie_cap >>20 ) <= pos) { +printk (KERN_WARNING "WARNING: mrst: detected loop" +" when searching for fixed BAR cap, previous" +" position: 0x%x new position: 0x%x" +" bus-number: %i devfn: %i\n" , + pos, pcie_cap >>20 , bus->number, devfn); +break ; + } pos = pcie_cap >>20 ; }
Signature · 1 line
1.6.2.5
Quoted 32 lines · Ben Greear
The mrst logic introduced in 2.6.33-rc8 in commit
a712ffbc199849364c46e9112b93b66de08e2c26causes boot to hang on at least this platform:Intel E5405 CPU
System Information
Manufacturer: Supermicro
Product Name: X7DBUThe cause of the hang is that
pci_cappoints to itself as the next capability, putting thefixed_bar_capinto an endless loop.This patch detects the loop, prints a warning, and continues on with useful work. This strategy was suggested by Robert Hancock <[email protected]>
This should be a candidate for 2.6.34.y as well.
Signed-off-by Ben Greear <[email protected]>---
:100644 100644 1cdc02c... 9535ba9... March/x86/pci/mrst.carch/x86/pci/mrst.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)arch/x86/pci/mrst.c +0
-0@@ -76,6 +76,17 @@ static int fixed_bar_cap(struct pci_bus *bus, unsigned int devfn)return pos; }
arch/x86/pci/mrst.c static int fixed_bar_cap(struct pci_bus *bus, unsigned int devfn) · line 87
Quoted 10 lines
arch/x86/pci/mrst.c +9
-0+if ((pcie_cap >>20 ) ==0 ) +break ; + +if ((pcie_cap >>20 ) <= pos) { +printk (KERN_WARNING "WARNING: mrst: detected loop" +" when searching for fixed BAR cap, previous" +" position: 0x%x new position: 0x%x" +" bus-number: %i devfn: %i\n" , + pos, pcie_cap >>20 , bus->number, devfn);
Can you use dev_warn() here to print the device info in the standard way?
Bjorn
Quoted 34 lines · Bjorn Helgaas
Quoted 33 lines · Ben Greear
The mrst logic introduced in 2.6.33-rc8 in commit
a712ffbc199849364c46e9112b93b66de08e2c26causes boot to hang on at least this platform:Intel E5405 CPU
System Information
Manufacturer: Supermicro
Product Name: X7DBUThe cause of the hang is that
pci_cappoints to itself as the next capability, putting thefixed_bar_capinto an endless loop.This patch detects the loop, prints a warning, and continues on with useful work. This strategy was suggested by Robert Hancock<[email protected]>
This should be a candidate for 2.6.34.y as well.
Signed-off-by Ben Greear<[email protected]>---
:100644 100644 1cdc02c... 9535ba9... March/x86/pci/mrst.carch/x86/pci/mrst.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)arch/x86/pci/mrst.c +0
-0@@ -76,6 +76,17 @@ static int fixed_bar_cap(struct pci_bus *bus, unsigned int devfn)return pos; }
Quoted 12 lines
arch/x86/pci/mrst.c static int fixed_bar_cap(struct pci_bus *bus, unsigned int devfn)
Quoted 9 lines
arch/x86/pci/mrst.c +9
-0+if ((pcie_cap>>20 ) ==0 ) +break ; + +if ((pcie_cap>>20 )<= pos) { +printk (KERN_WARNING "WARNING: mrst: detected loop" +" when searching for fixed BAR cap, previous" +" position: 0x%x new position: 0x%x" +" bus-number: %i devfn: %i\n" , + pos, pcie_cap>>20 , bus->number, devfn);Can you use
dev_warn()here to print the device info in the standard way?
There seems to be a different way to do this. Some of the folks who understand this better are working on a patch (I tested something based on HPA's suggestions and it fixed my problem at least.)
Thanks,
Ben
Signature · 2 lines
Ben Greear <[email protected]> Candela Technologies Inc http://www.candelatech.com