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:   George Cherian <george.cherian@marvell.com>
To:     "linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     "bhelgaas@google.com" <bhelgaas@google.com>,
        "shannon.zhao@linux.alibaba.com" <shannon.zhao@linux.alibaba.com>,
        "Robert Richter" <rrichter@marvell.com>,
        George Cherian <gcherian@marvell.com>
Subject: [PATCH v2] PCI: Enhance the ACS quirk for Cavium devices
Thread-Topic: [PATCH v2] PCI: Enhance the ACS quirk for Cavium devices
Thread-Index: AQHVmDm9y6YD3yvz7kuOKWt2CLfuww==
Date:   Mon, 11 Nov 2019 02:43:03 +0000
Message-ID: <20191111024243.GA11408@dc5-eodlnx05.marvell.com>
Accept-Language: en-IN, en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-originating-ip: [199.233.59.128]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: ab0009eb-db5a-4fda-3fe5-08d76650e000
x-ms-traffictypediagnostic: DM6PR18MB3372:
x-ms-exchange-transport-forked: True
x-microsoft-antispam-prvs: <DM6PR18MB337247BFC418089EDA38A94DC5740@DM6PR18MB3372.namprd18.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:4502;
x-forefront-prvs: 0218A015FA
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(376002)(396003)(346002)(39850400004)(366004)(136003)(199004)(189003)(5660300002)(6116002)(14454004)(6486002)(2501003)(478600001)(6436002)(25786009)(107886003)(4326008)(66476007)(6512007)(3846002)(66946007)(66556008)(64756008)(66446008)(1076003)(486006)(256004)(71190400001)(71200400001)(66066001)(44832011)(81166006)(110136005)(99286004)(8936002)(476003)(81156014)(8676002)(186003)(386003)(6506007)(33656002)(102836004)(2906002)(7736002)(305945005)(316002)(54906003)(52116002)(26005);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR18MB3372;H:DM6PR18MB2940.namprd18.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1;
received-spf: None (protection.outlook.com: marvell.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam: BCL:0;
x-microsoft-antispam-message-info: PCaQ8UpkOPhI15QRv8a6IMyl/JaTt7D7+hH9rcluR1/SCK1T/CFmEX6BQhhCgeGa1M07VneySluAB10W/3bkE7zYuSsk4VLCYJ/pwiBZS5z74lmgVusLAVO6PxVdQzejHXc3VFkJpFOmWdTR5Lb2Q03H35ykB8I2BOjNQfFloCfIE+/WYbTCnjK9bcDNagPlTh+ATYUc4Rsyyx8cTeJvMJN4dd07jHSgfHkLU9jXYr5aFAbQgcsANUS77z67B/fxFy5LT7O2yvhDnJO0fjioox6tuhF2rYdbOpjwN+R+UhVypZguQefOwkjAkK6f/lGjA2MKHAKh/qjgiOKTQcr/hzxiAHEXiY4BftycrQHmxH0MaGeroatRXqQZluOjePrNIDHzwE7LCAyg9zihWsbAJxtm7te5AZfp21PcAjLRQeP/H5i3Cr7Ky7KRhUmfTvGQ
Content-Type: text/plain; charset="us-ascii"
Content-ID: <08B0A7A5A3079A40906B8F8A5D0B9EBA@namprd18.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: ab0009eb-db5a-4fda-3fe5-08d76650e000
X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Nov 2019 02:43:03.9343
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: QYRC7APJUEalLLYscUHUq6LGyxqbfH6+B3yla700Ckrgu98Aa4RosxiFEX+DQ/FnYO5Ut5emCzpmgnJb5ZruCA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR18MB3372
X-OriginatorOrg: marvell.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572
 definitions=2019-11-10_08:2019-11-08,2019-11-10 signatures=0
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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

Signed-off-by: George Cherian <george.cherian@marvell.com>
Reviewed-by: Robert Richter <rrichter@marvell.com>

---
 drivers/pci/quirks.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 44c4ae1abd00..19821d5d0ef3 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -4243,15 +4243,21 @@ static int pci_quirk_amd_sb_acs(struct pci_dev *dev=
, u16 acs_flags)
=20
 static bool pci_quirk_cavium_acs_match(struct pci_dev *dev)
 {
+	if (!pci_is_pcie(dev) || pci_pcie_type(dev) !=3D 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) =3D=3D PCI_EXP_TYPE_ROOT_PORT) &&
-		((dev->device & 0xf800) =3D=3D 0xa000));
+	case 0xa000 ... 0xa7ff: /* ThunderX1 */
+	case 0xaf84:  /* ThunderX2 */
+	case 0xb884:  /* ThunderX3 */
+		return true;
+	default:
+		return false;
+	}
 }
=20
 static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags)
--=20
2.17.1