Unverified Commit 59d2afe4 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14022 [OLK-6.6] perf/x86/zhaoxin/uncore: fix pci_driver conflict issue 

Merge Pull Request from: @leoliu-oc 
 
Some PCI drivers in the PMU uncore conflict with the inbox pcieport
driver, which may lead to pcieport failure.

### Issue
https://gitee.com/openeuler/kernel/issues/IB8LNO

### Default Config Change
N/A

### Test
Pass. 
 
Link:https://gitee.com/openeuler/kernel/pulls/14022

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 4672b15e fe49db57

arch/x86/events/zhaoxin/uncore.c

+0 −135
Original line number Diff line number Diff line
@@ -932,56 +932,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),
@@ -1272,91 +1222,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),