Skip to contentSkip to conversation

Thunderbolt 2 driver for recent Apple MacBooks

PATCH In review Knuth Posern 2 participants 2 messages Sep 20, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Thunderbolt 2 driver for recent Apple MacBooks

Hi,

This patch is submitted for upstream inclusion.
This is a first for me, so I hope the format of this mail is convenient.

Thanks to Greg and Andreas the attached patch (diff -up) fixes the bug:
https://bugzilla.kernel.org/show_bug.cgi?id=100191

The pci device ids listed in the tb driver are to restrictive, which prevents the driver from being loaded. We have had a similar issue with the new Mac mini.

Changing the subvendor and subdevice to PCI_ANY_ID in
drivers/thunderbolt/nhi.c
the thunderbolt driver loads and binds to the pci device 07:00.0 System peripheral: Intel Corporation Device 156c which is the thunderbolt 2 controller.

Cheers,

Knuth.

drivers/thunderbolt/nhi.c renamed from drivers/thunderbolt/nhi.c.orig +1 -1
@@ -643,7 +643,7 @@ static struct pci_device_id nhi_ids[] =
 	{
 		.class = PCI_CLASS_SYSTEM_OTHER << 8, .class_mask = ~0,
 		.vendor = PCI_VENDOR_ID_INTEL, .device = 0x156c,
-		.subvendor = 0x2222, .subdevice = 0x1111,
+		.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID,
 	},
 	{ 0,}
 };
#1 lore raw
Quoted 29 lines · Knuth Posern

Hi,

This patch is submitted for upstream inclusion.
This is a first for me, so I hope the format of this mail is convenient.

Thanks to Greg and Andreas the attached patch (diff -up) fixes the bug:
https://bugzilla.kernel.org/show_bug.cgi?id=100191

The pci device ids listed in the tb driver are to restrictive, which prevents the driver from being loaded. We have had a similar issue with the new Mac mini.

Changing the subvendor and subdevice to PCI_ANY_ID in
drivers/thunderbolt/nhi.c
the thunderbolt driver loads and binds to the pci device 07:00.0 System peripheral: Intel Corporation Device 156c which is the thunderbolt 2 controller.

Cheers,

Knuth.

drivers/thunderbolt/nhi.c static struct pci_device_id nhi_ids[] = · line 649

Quoted 8 lines
drivers/thunderbolt/nhi.c renamed from drivers/thunderbolt/nhi.c.orig +1 -1
@@ -643,7 +643,7 @@ static struct pci_device_id nhi_ids[] =
 	{
 		.class = PCI_CLASS_SYSTEM_OTHER << 8, .class_mask = ~0,
 		.vendor = PCI_VENDOR_ID_INTEL, .device = 0x156c,
-		.subvendor = 0x2222, .subdevice = 0x1111,
+		.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID,
 	},
 	{ 0,}
 };

This looks good, but can you resend it in the format described in Documentation/SubmittingPatches so that I can apply it (i.e. a cleaned up changelog comment and a signed-off-by: line?)

thanks,

greg k-h