PCI: fix for quirk_e100_interrupt()
PATCH 1/1 PCI: fix for quirk_e100_interrupt()
Check that the e100 is in the D0 power state. If it's not, it won't respond to MMIO accesses and we end up with master-abort machine checks on some platforms.
--- drivers/pci/quirks.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)
drivers/pci/quirks.c +13 -1
@@ -1406,9 +1406,10 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NETMOS, PCI_ANY_ID, quirk_netmos);static void __devinit quirk_e100_interrupt (struct pci_dev *dev) { -u16 command; +u16 command, pmcsr;u8 __iomem *csr;u8 cmd_hi; +int pm;switch (dev->device) {/* PCI IDs taken from drivers/net/e100.c */
@@ -1442,6 +1443,17 @@ static void __devinit quirk_e100_interrupt(struct pci_dev *dev)if (!(command &PCI_COMMAND_MEMORY ) || !pci_resource_start (dev,0 ))return ; +/* +* Check that the device is in the D0 power state. If it's not, +* there is no point to look any further. +*/ + pm =pci_find_capability (dev,PCI_CAP_ID_PM ); +if (pm) { +pci_read_config_word (dev, pm +PCI_PM_CTRL , &pmcsr); +if ((pmcsr &PCI_PM_CTRL_STATE_MASK ) !=PCI_D0 ) +return ; + } +/* Convert from PCI bus to resource space. */ csr =ioremap (pci_resource_start (dev,0 ),8 );if (!csr) {
Quoted 5 lines · Ivan Kokshaysky
Check that the e100 is in the D0 power state. If it's not, it won't respond to MMIO accesses and we end up with master-abort machine checks on some platforms.
Signed-off-by Ivan Kokshaysky <[email protected]>
what kind of platform actually is doing this? It almost seems like something is wrong with that platform's BIOS and I wonder if this workaround should not be more general (IOW is it not just e100 that is affected but other components as well?)
Auke
Quoted 43 lines
--- drivers/pci/quirks.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)drivers/pci/quirks.c +13
-2@@ -1406,9 +1406,10 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NETMOS, PCI_ANY_ID, quirk_netmos);static void __devinit quirk_e100_interrupt (struct pci_dev *dev) { -u16 command; +u16 command, pmcsr;u8 __iomem *csr;u8 cmd_hi; +int pm;switch (dev->device) {/* PCI IDs taken from drivers/net/e100.c */ @@ -1442,6 +1443,17 @@ static void __devinit quirk_e100_interrupt(struct pci_dev *dev)if (!(command &PCI_COMMAND_MEMORY ) || !pci_resource_start (dev,0 ))return ; +/* +* Check that the device is in the D0 power state. If it's not, +* there is no point to look any further. +*/ + pm =pci_find_capability (dev,PCI_CAP_ID_PM ); +if (pm) { +pci_read_config_word (dev, pm +PCI_PM_CTRL , &pmcsr); +if ((pmcsr &PCI_PM_CTRL_STATE_MASK ) !=PCI_D0 ) +return ; + } +/* Convert from PCI bus to resource space. */ csr =ioremap (pci_resource_start (dev,0 ),8 );if (!csr) { --To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Quoted 3 lines · Auke
what kind of platform actually is doing this? It almost seems like something is wrong with that platform's BIOS and I wonder if this workaround should not be more general (IOW is it not just e100 that is affected but other components as well?)
It's alpha sx164. But I don't think the firmware does anything wrong here, it just put e100 in "sleep" or "soft off" state.
I think a general rule is that you cannot access device MEM or IO registers without pci_enable_device first (or making sure that the device is actually enabled in other ways).
Ivan.