thunderbolt: Add support for Intel Raptor Lake

Intel Raptor Lake has the same integrated Thunderbolt/USB4 controller as
Intel Alder Lake. By default it is still using firmware based connection
manager so we can use most of the Alder Lake flows.

Signed-off-by: George D Sworo <george.d.sworo@intel.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index fff0c740c8f336a95b91a613ece4da4d508a706d..ae38f0d25a8d4b410b4d549c615a6796a009f629 100644 (file)
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -2516,6 +2516,8 @@ struct tb *icm_probe(struct tb_nhi *nhi)
        case PCI_DEVICE_ID_INTEL_TGL_H_NHI1:
        case PCI_DEVICE_ID_INTEL_ADL_NHI0:
        case PCI_DEVICE_ID_INTEL_ADL_NHI1:
+       case PCI_DEVICE_ID_INTEL_RPL_NHI0:
+       case PCI_DEVICE_ID_INTEL_RPL_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 1333b158a95eb138d167a7ff3dee02a2cc1f5d02..cb8c9c4ae93a26f1dccffeb19f6cacc070a5b06e 100644 (file)
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -1410,6 +1410,10 @@ static struct pci_device_id nhi_ids[] = {
          .driver_data = (kernel_ulong_t)&icl_nhi_ops },
        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADL_NHI1),
          .driver_data = (kernel_ulong_t)&icl_nhi_ops },
+       { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_RPL_NHI0),
+         .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 },
 
        /* 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 69083aab2736cc4145fd2e95a27d68cfe874d995..f09da5b62233b1204c807e2bd53e0f10326d94d3 100644 (file)
--- a/drivers/thunderbolt/nhi.h
+++ b/drivers/thunderbolt/nhi.h
@@ -80,6 +80,8 @@ extern const struct tb_nhi_ops icl_nhi_ops;
 #define PCI_DEVICE_ID_INTEL_TGL_NHI1                   0x9a1d
 #define PCI_DEVICE_ID_INTEL_TGL_H_NHI0                 0x9a1f
 #define PCI_DEVICE_ID_INTEL_TGL_H_NHI1                 0x9a21
+#define PCI_DEVICE_ID_INTEL_RPL_NHI0                   0xa73e
+#define PCI_DEVICE_ID_INTEL_RPL_NHI1                   0xa76d
 
 #define PCI_CLASS_SERIAL_USB_USB4                      0x0c0340