thunderbolt: Add support for Intel Meteor Lake

Intel Meteor Lake has the same integrated Thunderbolt/USB4 controller as
Intel Alder Lake. Add the Intel Meteor Lake PCI IDs to the driver list
of supported devices.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index ae38f0d25a8d4b410b4d549c615a6796a009f629..c01f2c3052c37ceb61cbba6de88fc0b259d0704b 100644 (file)
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -2518,6 +2518,9 @@ struct tb *icm_probe(struct tb_nhi *nhi)
        case PCI_DEVICE_ID_INTEL_ADL_NHI1:
        case PCI_DEVICE_ID_INTEL_RPL_NHI0:
        case PCI_DEVICE_ID_INTEL_RPL_NHI1:
+       case PCI_DEVICE_ID_INTEL_MTL_M_NHI0:
+       case PCI_DEVICE_ID_INTEL_MTL_P_NHI0:
+       case PCI_DEVICE_ID_INTEL_MTL_P_NHI1:
                icm->is_supported = icm_tgl_is_supported;
                icm->driver_ready = icm_icl_driver_ready;
                icm->set_uuid = icm_icl_set_uuid;

diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
index 8b8b5a8bd9b2225c2638ee81318c7b67a519afa8..75c8bfdeb1fe3c7b8357246668a2e4de00e49d1c 100644 (file)
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -1415,6 +1415,12 @@ static struct pci_device_id nhi_ids[] = {
          .driver_data = (kernel_ulong_t)&icl_nhi_ops },
        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_RPL_NHI1),
          .driver_data = (kernel_ulong_t)&icl_nhi_ops },
+       { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTL_M_NHI0),
+         .driver_data = (kernel_ulong_t)&icl_nhi_ops },
+       { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTL_P_NHI0),
+         .driver_data = (kernel_ulong_t)&icl_nhi_ops },
+       { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTL_P_NHI1),
+         .driver_data = (kernel_ulong_t)&icl_nhi_ops },
 
        /* Any USB4 compliant host */
        { PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_USB4, ~0) },

diff --git a/drivers/thunderbolt/nhi.h b/drivers/thunderbolt/nhi.h
index f09da5b62233b1204c807e2bd53e0f10326d94d3..c64e1641ac8dce01e0cf25cb6287df4dea28ec68 100644 (file)
--- a/drivers/thunderbolt/nhi.h
+++ b/drivers/thunderbolt/nhi.h
@@ -74,6 +74,9 @@ extern const struct tb_nhi_ops icl_nhi_ops;
 #define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_BRIDGE      0x15ef
 #define PCI_DEVICE_ID_INTEL_ADL_NHI0                   0x463e
 #define PCI_DEVICE_ID_INTEL_ADL_NHI1                   0x466d
+#define PCI_DEVICE_ID_INTEL_MTL_M_NHI0                 0x7eb2
+#define PCI_DEVICE_ID_INTEL_MTL_P_NHI0                 0x7ec2
+#define PCI_DEVICE_ID_INTEL_MTL_P_NHI1                 0x7ec3
 #define PCI_DEVICE_ID_INTEL_ICL_NHI1                   0x8a0d
 #define PCI_DEVICE_ID_INTEL_ICL_NHI0                   0x8a17
 #define PCI_DEVICE_ID_INTEL_TGL_NHI0                   0x9a1b