thunderbolt: Add support for Intel Raptor Lake

[ Upstream commit 7ec58378a985618909ffae18e4ac0de2ae625f33 ]

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>
Stable-dep-of: 8644b48714dc ("thunderbolt: Add support for Intel Panther Lake-M/P")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index b038e530d6cb09ffcff6bd433d95e5ad4f745683..eab5199ccc5b7366feca43b4b133de9a5a6071c4 100644 (file)
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -2292,6 +2292,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 1e732d2d15adae4a69e1bf05823ed47fd33aeee6..d41ff5e0f9cad6ddf47d57c63fe94df6110ebdd9 100644 (file)
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -1353,6 +1353,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 5091677b3f4ba40ab4b12845862d54883eb384ec..01190d9ced166c014c7e390a2b557ee32a20e7a1 100644 (file)
--- a/drivers/thunderbolt/nhi.h
+++ b/drivers/thunderbolt/nhi.h
@@ -81,6 +81,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