thunderbolt: Add support for Intel Tiger Lake-H

Intel Tiger Lake-H has the same Thunderbolt/USB4 controller as Tiger
Lake-LP. Add the Tiger Lake-H 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 b51fc3f62b1fbfe8949f3bc5d6219e94bbf301c4..977ba91f4d0ec93a9f301a3155ec9e8b1d84c7c7 100644 (file)
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -2284,6 +2284,8 @@ struct tb *icm_probe(struct tb_nhi *nhi)
 
        case PCI_DEVICE_ID_INTEL_TGL_NHI0:
        case PCI_DEVICE_ID_INTEL_TGL_NHI1:
+       case PCI_DEVICE_ID_INTEL_TGL_H_NHI0:
+       case PCI_DEVICE_ID_INTEL_TGL_H_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 e29ac3e3aa1eabcaa8a17d9a4cf29c94bb1ac167..db80dc5dfebaefdce3fd5da2f8acfc50f83f30ca 100644 (file)
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -1345,6 +1345,10 @@ static struct pci_device_id nhi_ids[] = {
          .driver_data = (kernel_ulong_t)&icl_nhi_ops },
        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL_NHI1),
          .driver_data = (kernel_ulong_t)&icl_nhi_ops },
+       { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL_H_NHI0),
+         .driver_data = (kernel_ulong_t)&icl_nhi_ops },
+       { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL_H_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 80162e4b013fc25b59e594383e4184c86ad3b427..4e0861d7507208e9171b0264fcdb27030da3de02 100644 (file)
--- a/drivers/thunderbolt/nhi.h
+++ b/drivers/thunderbolt/nhi.h
@@ -75,6 +75,8 @@ extern const struct tb_nhi_ops icl_nhi_ops;
 #define PCI_DEVICE_ID_INTEL_ICL_NHI0                   0x8a17
 #define PCI_DEVICE_ID_INTEL_TGL_NHI0                   0x9a1b
 #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_CLASS_SERIAL_USB_USB4                      0x0c0340
 

diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h
index a9995e21b9165e6a367697248c51e40cb4435bf3..8ea360b0ff7736581a44aa9b8be82462c59205e4 100644 (file)
--- a/drivers/thunderbolt/tb.h
+++ b/drivers/thunderbolt/tb.h
@@ -784,6 +784,8 @@ static inline bool tb_switch_is_tiger_lake(const struct tb_switch *sw)
                switch (sw->config.device_id) {
                case PCI_DEVICE_ID_INTEL_TGL_NHI0:
                case PCI_DEVICE_ID_INTEL_TGL_NHI1:
+               case PCI_DEVICE_ID_INTEL_TGL_H_NHI0:
+               case PCI_DEVICE_ID_INTEL_TGL_H_NHI1:
                        return true;
                }
        }