| Message ID | 20160726164038.1481-2-andreas.noever@gmail.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On Wed, Jul 27, 2016 at 10:11 AM, Xavier Gnata <xavier.gnata@gmail.com> wrote: > > > On 26/07/2016 18:40, Andreas Noever wrote: >> >> From: Xavier Gnata <xavier.gnata@gmail.com> >> >> 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: Andreas Noever <andreas.noever@gmail.com> >> --- >> drivers/pci/quirks.c | 4 ++++ >> drivers/thunderbolt/nhi.c | 6 ++++++ >> 2 files changed, 10 insertions(+) >> >> Rebased version of Xavier's patch. >> >> Xavier, could you verify that this still works on your system? >> > It does work on my system. > > Thanks, > Xavier Cool. Greg, can we still get these into the current merge window? Andreas > >> Thanks, >> Andreas >> >> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c >> index 75b2105..981f17d 100644 >> --- a/drivers/pci/quirks.c >> +++ b/drivers/pci/quirks.c >> @@ -3325,6 +3325,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; >> @@ -3341,6 +3342,9 @@ 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); >> #endif >> diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c >> index 9c15344..a8c2041 100644 >> --- a/drivers/thunderbolt/nhi.c >> +++ b/drivers/thunderbolt/nhi.c >> @@ -651,6 +651,12 @@ static struct pci_device_id nhi_ids[] = { >> { >> .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, >> .device = PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_NHI, >> .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, >> }, >> > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jul 28, 2016 at 12:08:42AM +0200, Andreas Noever wrote: > On Wed, Jul 27, 2016 at 10:11 AM, Xavier Gnata <xavier.gnata@gmail.com> wrote: > > > > > > On 26/07/2016 18:40, Andreas Noever wrote: > >> > >> From: Xavier Gnata <xavier.gnata@gmail.com> > >> > >> 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: Andreas Noever <andreas.noever@gmail.com> > >> --- > >> drivers/pci/quirks.c | 4 ++++ > >> drivers/thunderbolt/nhi.c | 6 ++++++ > >> 2 files changed, 10 insertions(+) > >> > >> Rebased version of Xavier's patch. > >> > >> Xavier, could you verify that this still works on your system? > >> > > It does work on my system. > > > > Thanks, > > Xavier > > Cool. > > Greg, can we still get these into the current merge window? Hah, no, trees closed a week or so ago. This is all for 4.9, sorry. My trees will open up after 4.8-rc1 is out and I'll start working on reviewing patches then. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 75b2105..981f17d 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -3325,6 +3325,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; @@ -3341,6 +3342,9 @@ 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); #endif diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c index 9c15344..a8c2041 100644 --- a/drivers/thunderbolt/nhi.c +++ b/drivers/thunderbolt/nhi.c @@ -651,6 +651,12 @@ static struct pci_device_id nhi_ids[] = { { .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, .device = PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_NHI, .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, },