Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82a6a81c authored by Xavier Gnata's avatar Xavier Gnata Committed by Greg Kroah-Hartman
Browse files

thunderbolt: Add support for INTEL_FALCON_RIDGE_2C controller. 



From: Xavier Gnata <xavier.gnata@gmail.com>

Add support to INTEL_FALCON_RIDGE_2C controller and corresponding quirk
to support suspend/resume.
Tested against 4.7 master on a MacBook Air 11" 2015.

Signed-off-by: default avatarAndreas Noever <andreas.noever@gmail.com>
Reviewed-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 25eb7e5c

drivers/pci/quirks.c

+4 −0
Original line number Diff line number Diff line
@@ -3327,6 +3327,7 @@ static void quirk_apple_wait_for_thunderbolt(struct pci_dev *dev) 
	if (nhi->vendor != PCI_VENDOR_ID_INTEL

		    || (nhi->device != PCI_DEVICE_ID_INTEL_LIGHT_RIDGE &&

			nhi->device != PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C &&

			nhi->device != PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_NHI &&

			nhi->device != PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_NHI)

		    || nhi->class != PCI_CLASS_SYSTEM_OTHER << 8)

		goto out;
@@ -3342,6 +3343,9 @@ DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL, 
DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,

			       PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C,

			       quirk_apple_wait_for_thunderbolt);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,

			       PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_BRIDGE,

			       quirk_apple_wait_for_thunderbolt);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,

			       PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_BRIDGE,

			       quirk_apple_wait_for_thunderbolt);

drivers/thunderbolt/nhi.c

+6 −0
Original line number Diff line number Diff line
@@ -648,6 +648,12 @@ static struct pci_device_id nhi_ids[] = { 
		.device = PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C,

		.subvendor = 0x2222, .subdevice = 0x1111,

	},

	{

		.class = PCI_CLASS_SYSTEM_OTHER << 8, .class_mask = ~0,

		.vendor = PCI_VENDOR_ID_INTEL,

		.device = PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_NHI,

		.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID,

	},

	{

		.class = PCI_CLASS_SYSTEM_OTHER << 8, .class_mask = ~0,

		.vendor = PCI_VENDOR_ID_INTEL,