PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3

Enhance the ACS quirk for Cavium Processors. Add the root port vendor IDs
for ThunderX2 and ThunderX3 series of processors.

[bhelgaas: add Fixes: and stable tag]
Fixes: f2ddaf8dfd4a ("PCI: Apply Cavium ThunderX ACS quirk to more Root Ports")
Link: https://lore.kernel.org/r/20191111024243.GA11408@dc5-eodlnx05.marvell.com
Signed-off-by: George Cherian <george.cherian@marvell.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Robert Richter <rrichter@marvell.com>
Cc: stable@vger.kernel.org	# v4.12+

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index d5d57cd91a5e72e0fc40aea4be3ca854fabcdfc9..2544e210b98402fe7f84d2e0e9b052b7bf447c71 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -4347,15 +4347,21 @@ static int pci_quirk_amd_sb_acs(struct pci_dev *dev, u16 acs_flags)
 
 static bool pci_quirk_cavium_acs_match(struct pci_dev *dev)
 {
+       if (!pci_is_pcie(dev) || pci_pcie_type(dev) != PCI_EXP_TYPE_ROOT_PORT)
+               return false;
+
+       switch (dev->device) {
        /*
-        * 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.
+        * Effectively selects all downstream ports for whole ThunderX1
+        * (which represents 8 SoCs).
         */
-       return (pci_is_pcie(dev) &&
-               (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT) &&
-               ((dev->device & 0xf800) == 0xa000));
+       case 0xa000 ... 0xa7ff: /* ThunderX1 */
+       case 0xaf84:  /* ThunderX2 */
+       case 0xb884:  /* ThunderX3 */
+               return true;
+       default:
+               return false;
+       }
 }
 
 static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags)