Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fd8bdc5 authored by Stefan Assmann's avatar Stefan Assmann Committed by Jesse Barnes
Browse files

PCI: avoid boot interrupt quirk for AMD 813x B1 devices 

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: default avatarStefan Assmann <sassmann@redhat.com>
Tested-by: default avatarGabriele Giorgetti <g.giorgetti@teamsystem.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 58c08628

drivers/pci/quirks.c

+7 −3
Original line number Diff line number Diff line
@@ -1680,6 +1680,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			0x13



static void quirk_disable_amd_813x_boot_interrupt(struct pci_dev *dev)
@@ -1688,7 +1689,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);
@@ -1699,6 +1701,8 @@ static void quirk_disable_amd_813x_boot_interrupt(struct pci_dev *dev) 
		 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_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