Merge tag 'vfio-v5.13-rc1' of git://github.com/awilliam/linux-vfio

[linux-2.6-microblaze.git] / drivers / hwtracing / intel_th / pci.c

diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c
index 251e75c..7da4f29 100644 (file)
--- a/drivers/hwtracing/intel_th/pci.c
+++ b/drivers/hwtracing/intel_th/pci.c
@@ -71,7 +71,7 @@ static void intel_th_pci_deactivate(struct intel_th *th)
 static int intel_th_pci_probe(struct pci_dev *pdev,
                              const struct pci_device_id *id)
 {
-       struct intel_th_drvdata *drvdata = (void *)id->driver_data;
+       const struct intel_th_drvdata *drvdata = (void *)id->driver_data;
        struct resource resource[TH_MMIO_END + TH_NVEC_MAX] = {
                [TH_MMIO_CONFIG]        = pdev->resource[TH_PCI_CONFIG_BAR],
                [TH_MMIO_SW]            = pdev->resource[TH_PCI_STH_SW_BAR],
@@ -273,11 +273,21 @@ static const struct pci_device_id intel_th_pci_id_table[] = {
                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x51a6),
                .driver_data = (kernel_ulong_t)&intel_th_2x,
        },
+       {
+               /* Alder Lake-M */
+               PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x54a6),
+               .driver_data = (kernel_ulong_t)&intel_th_2x,
+       },
        {
                /* Alder Lake CPU */
                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x466f),
                .driver_data = (kernel_ulong_t)&intel_th_2x,
        },
+       {
+               /* Rocket Lake CPU */
+               PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4c19),
+               .driver_data = (kernel_ulong_t)&intel_th_2x,
+       },
        { 0 },
 };