thunderbolt: Add comment where Thunderbolt 4 PCI IDs start
Subsystems (2)
PATCH 1/2 thunderbolt: Add comment where Thunderbolt 4 PCI IDs start
This makes it consistent with the previous generations. No functional impact.
Signed-off-by Mika Westerberg <[email protected]>
--- drivers/thunderbolt/nhi.c | 1 + 1 file changed, 1 insertion(+)
drivers/thunderbolt/nhi.c +1 -0
@@ -1398,6 +1398,7 @@ static struct pci_device_id nhi_ids[] = { .driver_data = (kernel_ulong_t)&icl_nhi_ops }, { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICL_NHI1), .driver_data = (kernel_ulong_t)&icl_nhi_ops }, +/* Thunderbolt 4 */ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL_NHI0), .driver_data = (kernel_ulong_t)&icl_nhi_ops }, { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL_NHI1),
Signature · 1 line
2.35.1
PATCH 2/2 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 <[email protected]>
--- drivers/thunderbolt/icm.c | 3 +++ drivers/thunderbolt/nhi.c | 6 ++++++ drivers/thunderbolt/nhi.h | 3 +++ 3 files changed, 12 insertions(+)
drivers/thunderbolt/icm.c +3 -0
@@ -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;
drivers/thunderbolt/nhi.c +6 -0
@@ -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) },
drivers/thunderbolt/nhi.h +3 -0
@@ -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
Signature · 1 line
2.35.1
Quoted 4 lines · Mika Westerberg
This makes it consistent with the previous generations. No functional impact.
Signed-off-by Mika Westerberg <[email protected]>
Both applied to thunderbolt.git/next.