Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[linux-6.6.y] perf/x86/zhaoxin/uncore: fix pci_driver conflict issue #511

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 0 additions & 135 deletions arch/x86/events/zhaoxin/uncore.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down
Loading