Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Shannon Zhao <shenglong.zsl@alibaba-inc.com>
To:     linux-kernel@vger.kernel.org, jnair@marvell.com,
        bhelgaas@google.com, linux-pci@vger.kernel.org, gduan@marvell.com
Subject: [PATCH] PCI: Add ACS quirk for Cavium ThunderX 2 root port devices
Date:   Fri, 19 Jul 2019 21:10:35 +0800
Message-Id: <1563541835-141011-1-git-send-email-shenglong.zsl@alibaba-inc.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

From: Shannon Zhao <shannon.zhao@linux.alibaba.com>

Like commit f2ddaf8(PCI: Apply Cavium ThunderX ACS quirk to more Root
Ports), it should apply ACS quirk to ThunderX 2 root port devices.

Signed-off-by: Shannon Zhao <shannon.zhao@linux.alibaba.com>
---
 drivers/pci/quirks.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 28c64f8..ea7848b 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -4224,10 +4224,12 @@ static bool pci_quirk_cavium_acs_match(struct pci_dev *dev)
 	 * 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 the ThunderX 2 root ports whose device ID
+	 * is 0xaf84.
 	 */
 	return (pci_is_pcie(dev) &&
 		(pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT) &&
-		((dev->device & 0xf800) == 0xa000));
+		((dev->device & 0xf800) == 0xa000 || dev->device == 0xaf84));
 }
 
 static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags)
-- 
1.8.3.1