summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-10-06 09:58:37 -0600
committerBjorn Helgaas <bhelgaas@google.com>2014-10-06 09:58:37 -0600
commit55dd4175a4bc10d943c159dabef552baaf459a59 (patch)
tree90a8a35762904a9bcc2cfb18ba301e41168e11f7 /drivers/pci
parentb9c9c2558ba366d59dc242872da883a879b8ffc6 (diff)
parent3587e625fe24a2d1cd1891fc660c3313151a368c (diff)
downloadop-kernel-dev-55dd4175a4bc10d943c159dabef552baaf459a59.zip
op-kernel-dev-55dd4175a4bc10d943c159dabef552baaf459a59.tar.gz
Merge branch 'pci/virtualization' into next
* pci/virtualization: PCI: Add ACS quirk for AMD A88X southbridge devices
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/quirks.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index b6c6500..90acb32 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -3553,6 +3553,11 @@ DECLARE_PCI_FIXUP_HEADER(0x8086, 0x244e, quirk_use_pcie_bridge_dma_alias);
* 1002:439d SB7x0/SB8x0/SB9x0 LPC host controller
* 1002:4384 SBx00 PCI to PCI Bridge
* 1002:4399 SB7x0/SB8x0/SB9x0 USB OHCI2 Controller
+ *
+ * https://bugzilla.kernel.org/show_bug.cgi?id=81841#c15
+ *
+ * 1022:780f [AMD] FCH PCI Bridge
+ * 1022:7809 [AMD] FCH USB OHCI Controller
*/
static int pci_quirk_amd_sb_acs(struct pci_dev *dev, u16 acs_flags)
{
@@ -3663,6 +3668,8 @@ static const struct pci_dev_acs_enabled {
{ PCI_VENDOR_ID_ATI, 0x439d, pci_quirk_amd_sb_acs },
{ PCI_VENDOR_ID_ATI, 0x4384, pci_quirk_amd_sb_acs },
{ PCI_VENDOR_ID_ATI, 0x4399, pci_quirk_amd_sb_acs },
+ { PCI_VENDOR_ID_AMD, 0x780f, pci_quirk_amd_sb_acs },
+ { PCI_VENDOR_ID_AMD, 0x7809, pci_quirk_amd_sb_acs },
{ PCI_VENDOR_ID_SOLARFLARE, 0x0903, pci_quirk_mf_endpoint_acs },
{ PCI_VENDOR_ID_SOLARFLARE, 0x0923, pci_quirk_mf_endpoint_acs },
{ PCI_VENDOR_ID_INTEL, 0x10C6, pci_quirk_mf_endpoint_acs },
OpenPOWER on IntegriCloud