Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     linux-pci@vger.kernel.org
Cc:     Bjorn Helgaas <bhelgaas@google.com>, linux-kernel@vger.kernel.org,
        Wasim Khan <wasim.khan@nxp.com>, Wei Fang <wei.fang@nxp.com>,
        Clark Wang <xiaoning.wang@nxp.com>
Subject: [PATCH pci] PCI: remove the PCI_VENDOR_ID_NXP alias
Date:   Wed, 22 Nov 2023 17:42:41 +0200
Message-Id: <20231122154241.1371647-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ui3gMjrN3hwclry/PXVNBRt1euOz6ksrDaMbdjaYongjjuJVaD1e15BHokY5?=
 =?us-ascii?Q?JVbESlzgGCGdFjxQ1Cug2b985wrtLQV19pKVSn5W6FO33O3J+qqohrmTwg4k?=
 =?us-ascii?Q?pJ3m9ksECYIZm/YRWvK3GylRrsPpu3zV/qEuqY9oYL+cvhHiqF4Lg8f6yHn1?=
 =?us-ascii?Q?F4hY5UkzS+/Fp5n0ILeVGQDMFQNLmjXenYbj2/84fJlm44xAoUzXIegz2kKp?=
 =?us-ascii?Q?3zx45uVknFl1qYKeQClrHFS+m2G/9Hc5ny0FWlVe8ocC5xn+VP2HxLyvvu9U?=
 =?us-ascii?Q?dTeDuJf7r6zc8mH6J6jxCmGUN45Ruljo/D7DsijBbvWhHZ8rmVYXcGXGWoBX?=
 =?us-ascii?Q?jUJt+prFrAR23RR2yDhLqZTbM6MZBzMNDITuX+q+lBBNXpJMl0j6HX2XbYxT?=
 =?us-ascii?Q?RpsgDCmjNPPWMO3EmjiUANCONkGiaYXaNnpdKm3rplM+eC4s8lcbrYSbofE8?=
 =?us-ascii?Q?tVjAbAqrbGUc/k6mGsFJ9XzQnFoNLIVEqb8Oeee875xSNp5KMZoDKCREfRTY?=
 =?us-ascii?Q?+tAWbEEeiEkbAZ0yrE3Sc9m8VQLVOWu/4JTZXrMMcBj9ivqoLKOMWB+jCx9o?=
 =?us-ascii?Q?lX7EDdvDh1pCPgKvrwKig/4RZXA7f46cVz7O/8Iypr0oxsPe+E7XaaSzL+Dt?=
 =?us-ascii?Q?AAzfaRl2jPP0Ftlfiv+ix75NYMJdsi/sYHRCMRPawXeO+gssPf5zkz3pI3px?=
 =?us-ascii?Q?3s4Aw0mk6yGYrFbbN1YvB7ZeexFVOq6nv+oCHDUjTTDZ0LN+UbqiZpTrE0m7?=
 =?us-ascii?Q?Ren8lQvy9cN2xAVf/BoxPoqh6hKD5JVDbCuvhVbOAVSgeLZN16YfUiWwhkNO?=
 =?us-ascii?Q?N5mvt2WIuyrQy44nV1Ax2hIg1IZOIF9Wvc9MxPjhXlWUv++TLC4raAdKsEiN?=
 =?us-ascii?Q?WzkXRLCFyrpiLApITZ1NGeG+cpSrobnFY018H3UNGdmvokTOLZJV/8nGziKs?=
 =?us-ascii?Q?KR6ccRk1mwArLHFi2ZXOYyWMNuDvhdAA38+ZpS1/UU2msKO7dP1QTUdQcpNd?=
 =?us-ascii?Q?2wsrHcUr1DNJ0aq0GC/6GvwGSUJob0Ggqx7k/sYx22iM1b9/lfl+YLe16h5a?=
 =?us-ascii?Q?NFg2lqrSSl7VG7EzTW0sjgyHzGofvE7lbW1pXPlZ8fArFp6dNssUAiL3VGGH?=
 =?us-ascii?Q?6o+dZtGWmj9Ctzuc2BD4y8CUsWqtpjorLLiojP4SF01NtxRKBpszulpawL9y?=
 =?us-ascii?Q?e0j0ntVBOa54uwCGD1367wZTlCLGQ0EpgYUxULgCfpp04HHRoGv1RC+FoIvc?=
 =?us-ascii?Q?gtbk8+V4PB+jts30hMLQd3rmgjBKQ/537b/Gn4ByFyoJMeM+TeUs3DiZ3Zub?=
 =?us-ascii?Q?k/JrNFY2BP34Ji+hFyCKJfdzjoe6lKX8NnUEpKDbCB8e8LmDyqNAn1ldrfho?=
 =?us-ascii?Q?O4tfjyj3UjyIOZnHjMuv43ERRim3h68VItEU3QUnjlubSmIubu6BCuaUdowa?=
 =?us-ascii?Q?3GqPBpmD/lkJEh67KNTZ7YFkCKtR46ILjAwRBTY786UP2WTjXTUw3Q2lxOGV?=
 =?us-ascii?Q?UAQtwvxNm274FPDSMaT0J48bkQUttrOb0SGTOlfDCPxIdc643yRy0/mBBZMO?=
 =?us-ascii?Q?zC85rEKAq6B65femLxj/uVSbXNpPUcVJT4OAeUcShtMp+Ey0W0TKVU35VqBc?=
 =?us-ascii?Q?WA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f4afead0-58d2-46a4-69c3-08dbeb71afc7
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2023 15:42:51.7753
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 9EQPh2dxYlSgVI88YuxWpP2wgsyz4/4kFLV9wwHxwb54OwlCQS/Z2vaOS9tsYoUqtQZDtny87OwidFbpgD2+YQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9389
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 22 Nov 2023 07:46:34 -0800 (PST)

What is today NXP is the result of some mergers (with Freescale) and
spin-offs (from Philips).

New NXP hardware (for example NETC version 4.1 of the NXP i.MX95
SoC) uses PCI_VENDOR_ID_PHILIPS. And some older hardware uses
PCI_VENDOR_ID_FREESCALE.

If we have PCI_VENDOR_ID_NXP as an alias for PCI_VENDOR_ID_FREESCALE,
we end up needing something like a PCI_VENDOR_ID_NXP2 alias for
PCI_VENDOR_ID_PHILIPS. I think this is more confusing than just spelling
out the vendor ID of the original company that claimed it.

FWIW, the pci.ids repository as of today has:
1131  Philips Semiconductors
1957  Freescale Semiconductor Inc

so this makes the kernel code consistent with that, and with what
"lspci" prints.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/pci/quirks.c    | 50 ++++++++++++++++++++---------------------
 include/linux/pci_ids.h |  1 -
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index d208047d1b8f..c95701e36d58 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -5092,39 +5092,39 @@ static const struct pci_dev_acs_enabled {
 	{ PCI_VENDOR_ID_ZHAOXIN, 0x3038, pci_quirk_mf_endpoint_acs },
 	{ PCI_VENDOR_ID_ZHAOXIN, 0x3104, pci_quirk_mf_endpoint_acs },
 	{ PCI_VENDOR_ID_ZHAOXIN, 0x9083, pci_quirk_mf_endpoint_acs },
-	/* NXP root ports, xx=16, 12, or 08 cores */
+	/* Freescale/NXP root ports, xx=16, 12, or 08 cores */
 	/* LX2xx0A : without security features + CAN-FD */
-	{ PCI_VENDOR_ID_NXP, 0x8d81, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8da1, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8d83, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d81, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8da1, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d83, pci_quirk_nxp_rp_acs },
 	/* LX2xx0C : security features + CAN-FD */
-	{ PCI_VENDOR_ID_NXP, 0x8d80, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8da0, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8d82, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d80, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8da0, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d82, pci_quirk_nxp_rp_acs },
 	/* LX2xx0E : security features + CAN */
-	{ PCI_VENDOR_ID_NXP, 0x8d90, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8db0, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8d92, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d90, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8db0, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d92, pci_quirk_nxp_rp_acs },
 	/* LX2xx0N : without security features + CAN */
-	{ PCI_VENDOR_ID_NXP, 0x8d91, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8db1, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8d93, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d91, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8db1, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d93, pci_quirk_nxp_rp_acs },
 	/* LX2xx2A : without security features + CAN-FD */
-	{ PCI_VENDOR_ID_NXP, 0x8d89, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8da9, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8d8b, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d89, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8da9, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d8b, pci_quirk_nxp_rp_acs },
 	/* LX2xx2C : security features + CAN-FD */
-	{ PCI_VENDOR_ID_NXP, 0x8d88, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8da8, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8d8a, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d88, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8da8, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d8a, pci_quirk_nxp_rp_acs },
 	/* LX2xx2E : security features + CAN */
-	{ PCI_VENDOR_ID_NXP, 0x8d98, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8db8, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8d9a, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d98, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8db8, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d9a, pci_quirk_nxp_rp_acs },
 	/* LX2xx2N : without security features + CAN */
-	{ PCI_VENDOR_ID_NXP, 0x8d99, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8db9, pci_quirk_nxp_rp_acs },
-	{ PCI_VENDOR_ID_NXP, 0x8d9b, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d99, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8db9, pci_quirk_nxp_rp_acs },
+	{ PCI_VENDOR_ID_FREESCALE, 0x8d9b, pci_quirk_nxp_rp_acs },
 	/* Zhaoxin Root/Downstream Ports */
 	{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
 	/* Wangxun nics */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 275799b5f535..f837ff427b85 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2469,7 +2469,6 @@
 #define PCI_DEVICE_ID_TDI_EHCI          0x0101
 
 #define PCI_VENDOR_ID_FREESCALE		0x1957	/* duplicate: NXP */
-#define PCI_VENDOR_ID_NXP		0x1957	/* duplicate: FREESCALE */
 #define PCI_DEVICE_ID_MPC8308		0xc006
 #define PCI_DEVICE_ID_MPC8315E		0x00b4
 #define PCI_DEVICE_ID_MPC8315		0x00b5
-- 
2.34.1