renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 03:33:59 +08:00
Code

PCI quirk: RS780/RS880: disable MSI behind the PCI bridge

Browse Source 
The missing initialization of the nb_cntl.strap_msi_enable does not
seem to be the only problem that prevents MSI, so that quirk is not
sufficient to enable MSI on all machines.  To be safe, disable MSI
unconditionally for the internal graphics and HDMI audio on these
chipsets.

[rjw: Added the PCI_VENDOR_ID_AI quirk.]

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Clemens Ladisch 2010-04-02 18:46:06 +02:00 committed by Linus Torvalds
parent 5e123e5d9b
commit 5193d7a7f5
1 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/pci/quirks.c
View File

@ -2123,6 +2123,9 @@ static void __devinit quirk_disable_msi(struct pci_dev *dev)
} }
} }
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_disable_msi); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_disable_msi);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x9602, quirk_disable_msi);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASUSTEK, 0x9602, quirk_disable_msi);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AI, 0x9602, quirk_disable_msi);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, 0xa238, quirk_disable_msi); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, 0xa238, quirk_disable_msi);
/* Go through the list of Hypertransport capabilities and /* Go through the list of Hypertransport capabilities and
@ -2495,39 +2498,6 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4374,
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4375, DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4375,
quirk_msi_intx_disable_bug); quirk_msi_intx_disable_bug);
/*
* MSI does not work with the AMD RS780/RS880 internal graphics and HDMI audio
* devices unless the BIOS has initialized the nb_cntl.strap_msi_enable bit.
*/
static void __init rs780_int_gfx_disable_msi(struct pci_dev *int_gfx_bridge)
{
u32 nb_cntl;
if (!int_gfx_bridge->subordinate)
return;
pci_bus_write_config_dword(int_gfx_bridge->bus, PCI_DEVFN(0, 0),
0x60, 0);
pci_bus_read_config_dword(int_gfx_bridge->bus, PCI_DEVFN(0, 0),
0x64, &nb_cntl);
if (!(nb_cntl & BIT(10))) {
dev_warn(&int_gfx_bridge->dev,
FW_WARN "RS780: MSI for internal graphics disabled\n");
int_gfx_bridge->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI;
}
}
#define PCI_DEVICE_ID_AMD_RS780_P2P_INT_GFX 0x9602
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD,
PCI_DEVICE_ID_AMD_RS780_P2P_INT_GFX,
rs780_int_gfx_disable_msi);
/* wrong vendor ID on M4A785TD motherboard: */
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASUSTEK,
PCI_DEVICE_ID_AMD_RS780_P2P_INT_GFX,
rs780_int_gfx_disable_msi);
#endif /* CONFIG_PCI_MSI */ #endif /* CONFIG_PCI_MSI */
#ifdef CONFIG_PCI_IOV #ifdef CONFIG_PCI_IOV