PCI: avoid boot interrupt quirk for AMD 813x B1 devices
PATCH 1/1 PCI: avoid boot interrupt quirk for AMD 813x B1 devices
From: Stefan Assmann <[email protected]>
AMD 813x rev. B1 (like rev. B2) devices generate no interrupts if quirk_disable_amd_813x_boot_interrupt is executed, add an exception.
http://bugzilla.kernel.org/show_bug.cgi?id=14159
Patch also adds missing cases for DECLARE_PCI_FIXUP_RESUME and DECLARE_PCI_FIXUP_FINAL calls to quirk_disable_amd_813x_boot_interrupt.
Signed-off-by Stefan Assmann <[email protected]>
Tested-by Gabriele Giorgetti <[email protected]>
--- drivers/pci/quirks.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
drivers/pci/quirks.c +7 -3
@@ -1661,6 +1661,7 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_*/ #define AMD_813X_MISC 0x40#define AMD_813X_NOIOAMODE (1<<0) +#define AMD_813X_REV_B1 0x12#define AMD_813X_REV_B2 0x13static void quirk_disable_amd_813x_boot_interrupt (struct pci_dev *dev)
@@ -1669,7 +1670,8 @@ static void quirk_disable_amd_813x_boot_interrupt(struct pci_dev *dev)if (noioapicquirk)return ; -if (dev->revision ==AMD_813X_REV_B2 ) +if ((dev->revision ==AMD_813X_REV_B1 ) || + (dev->revision ==AMD_813X_REV_B2 ))return ;pci_read_config_dword (dev,AMD_813X_MISC , &pci_config_dword);
@@ -1679,8 +1681,10 @@ static void quirk_disable_amd_813x_boot_interrupt(struct pci_dev *dev)printk (KERN_INFO "disabled boot interrupts on PCI device " "0x%04x:0x%04x\n" , dev->vendor, dev->device); } -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_8131_BRIDGE , quirk_disable_amd_813x_boot_interrupt); -DECLARE_PCI_FIXUP_RESUME (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_8132_BRIDGE , quirk_disable_amd_813x_boot_interrupt); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_8131_BRIDGE , quirk_disable_amd_813x_boot_interrupt); +DECLARE_PCI_FIXUP_RESUME (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_8131_BRIDGE , quirk_disable_amd_813x_boot_interrupt); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_8132_BRIDGE , quirk_disable_amd_813x_boot_interrupt); +DECLARE_PCI_FIXUP_RESUME (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_8132_BRIDGE , quirk_disable_amd_813x_boot_interrupt);#define AMD_8111_PCI_IRQ_ROUTING 0x56