PCI: Apply Cavium ThunderX ACS quirk to more Root Ports

Extend the Cavium ThunderX ACS quirk to cover more device IDs and restrict
it to only Root Ports.

Signed-off-by: Vadim Lomovtsev <Vadim.Lomovtsev@cavium.com>
[bhelgaas: changelog, stable tag]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org	# v4.12+

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index c23650cfd5a19440dd93a62fbc9ce128eac9ffd1..0e22cce05742ab21484323f1345bcdb05cfcd4a7 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -4211,6 +4211,19 @@ static int pci_quirk_amd_sb_acs(struct pci_dev *dev, u16 acs_flags)
 #endif
 }
 
+static bool pci_quirk_cavium_acs_match(struct pci_dev *dev)
+{
+       /*
+        * Effectively selects all downstream ports for whole ThunderX 1
+        * family by 0xf800 mask (which represents 8 SoCs), while the lower
+        * bits of device ID are used to indicate which subdevice is used
+        * within the SoC.
+        */
+       return (pci_is_pcie(dev) &&
+               (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT) &&
+               ((dev->device & 0xf800) == 0xa000));
+}
+
 static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags)
 {
        /*
@@ -4223,7 +4236,7 @@ static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags)
         */
        acs_flags &= ~(PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_SV | PCI_ACS_UF);
 
-       if (!((dev->device >= 0xa000) && (dev->device <= 0xa0ff)))
+       if (!pci_quirk_cavium_acs_match(dev))
                return -ENOTTY;
 
        return acs_flags ? 0 : 1;