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

Commit 2cc31879 authored by David Miller's avatar David Miller Committed by Greg Kroah-Hartman
Browse files

PCI: Revert "PCI: disable MSI by default on systems with Serverworks HT1000 chips" 



This reverts commit e3008ded.

The real bug was an INTX issue in the tg3 ethernet chip, and
cured by commit c129d962a66c76964954a98b38586ada82cf9381

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarJeff Garzik <jgarzik@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c11eef21

drivers/pci/quirks.c

+0 −1
Original line number Diff line number Diff line
@@ -1621,7 +1621,6 @@ static void __init quirk_disable_all_msi(struct pci_dev *dev) 
	printk(KERN_WARNING "PCI: MSI quirk detected. MSI deactivated.\n");

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_GCNB_LE, quirk_disable_all_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000_PCIX, quirk_disable_all_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS400_200, quirk_disable_all_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS480, quirk_disable_all_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RD580, quirk_disable_all_msi);

include/linux/pci_ids.h

+0 −1
Original line number Diff line number Diff line
@@ -1437,7 +1437,6 @@ 
#define PCI_DEVICE_ID_SERVERWORKS_LE	  0x0009

#define PCI_DEVICE_ID_SERVERWORKS_GCNB_LE 0x0017

#define PCI_DEVICE_ID_SERVERWORKS_EPB	  0x0103

#define PCI_DEVICE_ID_SERVERWORKS_HT1000_PCIX	0x0104

#define PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE	0x0132

#define PCI_DEVICE_ID_SERVERWORKS_OSB4	  0x0200

#define PCI_DEVICE_ID_SERVERWORKS_CSB5	  0x0201