From deb316f7d986281203ec833afdf7f15084b1f85c Mon Sep 17 00:00:00 2001
From: LeoLiu-oc <leoliu-oc@zhaoxin.com>
Date: Tue, 3 Dec 2024 15:43:07 +0800
Subject: [PATCH] perf/x86/zhaoxin/uncore: fix pci_driver conflict issue

Some PCI drivers in the PMU uncore conflict with the inbox pcieport
driver, which may lead to pcieport failure.

Signed-off-by: LeoLiu-oc <leoliu-oc@zhaoxin.com>
---
 arch/x86/events/zhaoxin/uncore.c | 135 -------------------------------
 1 file changed, 135 deletions(-)

diff --git a/arch/x86/events/zhaoxin/uncore.c b/arch/x86/events/zhaoxin/uncore.c
index a5a8a60ef529..b5c715e796c9 100644
--- a/arch/x86/events/zhaoxin/uncore.c
+++ b/arch/x86/events/zhaoxin/uncore.c
@@ -933,56 +933,6 @@ static const struct pci_device_id kh40000_uncore_pci_ids[] = {
 		.driver_data = UNCORE_PCI_DEV_DATA(KH40000_PCI_UNCORE_MC0, 0),
 	},
 
-	{ /* PCIE D2F0 */
-		PCI_DEVICE(0x1D17, 0x0717),
-		.driver_data = UNCORE_PCI_DEV_DATA(KH40000_PCI_UNCORE_PCI, 0),
-	},
-
-	{ /* PCIE D2F1 */
-		PCI_DEVICE(0x1D17, 0x0718),
-		.driver_data = UNCORE_PCI_DEV_DATA(KH40000_PCI_UNCORE_PCI, 1),
-	},
-
-	{ /* PCIE D3F0 */
-		PCI_DEVICE(0x1D17, 0x0719),
-		.driver_data = UNCORE_PCI_DEV_DATA(KH40000_PCI_UNCORE_PCI, 2),
-	},
-
-	{ /* PCIE D3F1 */
-		PCI_DEVICE(0x1D17, 0x071A),
-		.driver_data = UNCORE_PCI_DEV_DATA(KH40000_PCI_UNCORE_PCI, 3),
-	},
-
-	{ /* PCIE D3F2 */
-		PCI_DEVICE(0x1D17, 0x071B),
-		.driver_data = UNCORE_PCI_DEV_DATA(KH40000_PCI_UNCORE_PCI, 4),
-	},
-
-	{ /* PCIE D4F0 */
-		PCI_DEVICE(0x1D17, 0x071C),
-		.driver_data = UNCORE_PCI_DEV_DATA(KH40000_PCI_UNCORE_PCI, 5),
-	},
-
-	{ /* PCIE D4F1 */
-		PCI_DEVICE(0x1D17, 0x071D),
-		.driver_data = UNCORE_PCI_DEV_DATA(KH40000_PCI_UNCORE_PCI, 6),
-	},
-
-	{ /* PCIE D5F0 */
-		PCI_DEVICE(0x1D17, 0x071E),
-		.driver_data = UNCORE_PCI_DEV_DATA(KH40000_PCI_UNCORE_PCI, 7),
-	},
-
-	{ /* PCIE D5F1 */
-		PCI_DEVICE(0x1D17, 0x0731),
-		.driver_data = UNCORE_PCI_DEV_DATA(KH40000_PCI_UNCORE_PCI, 8),
-	},
-
-	{ /* PCIE D5F2 */
-		PCI_DEVICE(0x1D17, 0x0732),
-		.driver_data = UNCORE_PCI_DEV_DATA(KH40000_PCI_UNCORE_PCI, 9),
-	},
-
 	{ /* ZPI_DLL */
 		PCI_DEVICE(0x1D17, 0x91c1),
 		.driver_data = UNCORE_PCI_DEV_DATA(KH40000_PCI_UNCORE_ZPI_DLL, 0),
@@ -1273,91 +1223,6 @@ static const struct pci_device_id kx7000_uncore_pci_ids[] = {
 		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_MC_A0, 0),
 	},
 
-	{ /* PCIE D2F0 */
-		PCI_DEVICE(0x1D17, 0x0717),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 0),
-	},
-
-	{ /* PCIE D2F1 */
-		PCI_DEVICE(0x1D17, 0x0718),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 1),
-	},
-
-	{ /* PCIE D2F2 */
-		PCI_DEVICE(0x1D17, 0x0733),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 2),
-	},
-
-	{ /* PCIE D2F3 */
-		PCI_DEVICE(0x1D17, 0x0734),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 3),
-	},
-
-	{ /* PCIE D3F0 */
-		PCI_DEVICE(0x1D17, 0x0719),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 4),
-	},
-
-	{ /* PCIE D3F1 */
-		PCI_DEVICE(0x1D17, 0x0735),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 5),
-	},
-
-	{ /* PCIE D3F2 */
-		PCI_DEVICE(0x1D17, 0x0739),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 6),
-	},
-
-	{ /* PCIE D3F3 */
-		PCI_DEVICE(0x1D17, 0x073A),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 7),
-	},
-
-	{ /* PCIE D4F0 */
-		PCI_DEVICE(0x1D17, 0x071B),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 8),
-	},
-
-	{ /* PCIE D4F1 */
-		PCI_DEVICE(0x1D17, 0x071C),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 9),
-	},
-
-	{ /* PCIE D4F2 */
-		PCI_DEVICE(0x1D17, 0x0736),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 10),
-	},
-
-	{ /* PCIE D4F3 */
-		PCI_DEVICE(0x1D17, 0x0737),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 11),
-	},
-
-	{ /* PCIE D4F4 */
-		PCI_DEVICE(0x1D17, 0x0738),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 12),
-	},
-
-	{ /* PCIE D5F0 */
-		PCI_DEVICE(0x1D17, 0x071D),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 13),
-	},
-
-	{ /* PCIE D5F1 */
-		PCI_DEVICE(0x1D17, 0x071E),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 14),
-	},
-
-	{ /* PCIE D5F2 */
-		PCI_DEVICE(0x1D17, 0x0732),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 15),
-	},
-
-	{ /* PCIE D5F3 */
-		PCI_DEVICE(0x1D17, 0x073B),
-		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PCI, 16),
-	},
-
 	{ /* PXPTRF */
 		PCI_DEVICE(0x1D17, 0x31B4),
 		.driver_data = UNCORE_PCI_DEV_DATA(KX7000_PCI_UNCORE_PXPTRF, 0),
-- 
Gitee