| Message ID | 20200109094615.28843-2-kai.heng.feng@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [B/OEM-B] UBUNTU: SAUCE: PCI: Avoid ASMedia XHCI USB PME# from D0 defect | expand |
On 09.01.20 10:46, Kai-Heng Feng wrote: > BugLink: https://bugs.launchpad.net/bugs/1858988 > > The ASMedia USB XHCI Controller claims to support generating PME# while > in D0: > > 01:00.0 USB controller: ASMedia Technology Inc. Device 2142 (prog-if 30 [XHCI]) > Subsystem: SUNIX Co., Ltd. Device 312b > Capabilities: [78] Power Management version 3 > Flags: PMEClk- DSI- D1- D2- AuxCurrent=55mA PME(D0+,D1-,D2-,D3hot-,D3cold-) > Status: D0 NoSoftRst+ PME-Enable+ DSel=0 DScale=0 PME- > > However PME# only gets asserted when plugging USB 2.0 or USB 1.1 > devices, but not for USB 3.0 devices. > > So remove PCI_PM_CAP_PME_D0 to avoid using PME under D0. > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=205919 > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- Looks simple enough. So ok, for Bionic. I am ignoring the request for OEM-B, and E/F on purpose because your bug report does not contain any tasks for those. -Stefan > drivers/pci/quirks.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index 23d7fa167a36..d21e511333ef 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -4953,3 +4953,14 @@ DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, > PCI_BASE_CLASS_DISPLAY, 16, quirk_nvidia_hda); > DECLARE_PCI_FIXUP_CLASS_RESUME_EARLY(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, > PCI_BASE_CLASS_DISPLAY, 16, quirk_nvidia_hda); > + > +/* > + * Device [1b21:2142] > + * When in D0, PME# doesn't get asserted when plugging USB 3.0 device. > + */ > +static void pci_fixup_no_d0_pme(struct pci_dev *dev) > +{ > + pci_info(dev, "PME# does not work under D0, disabling it\n"); > + dev->pme_support &= ~(PCI_PM_CAP_PME_D0 >> PCI_PM_CAP_PME_SHIFT); > +} > +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x2142, pci_fixup_no_d0_pme); >
On 1/9/20 1:46 AM, Kai-Heng Feng wrote: > BugLink: https://bugs.launchpad.net/bugs/1858988 > > The ASMedia USB XHCI Controller claims to support generating PME# while > in D0: > > 01:00.0 USB controller: ASMedia Technology Inc. Device 2142 (prog-if 30 [XHCI]) > Subsystem: SUNIX Co., Ltd. Device 312b > Capabilities: [78] Power Management version 3 > Flags: PMEClk- DSI- D1- D2- AuxCurrent=55mA PME(D0+,D1-,D2-,D3hot-,D3cold-) > Status: D0 NoSoftRst+ PME-Enable+ DSel=0 DScale=0 PME- > > However PME# only gets asserted when plugging USB 2.0 or USB 1.1 > devices, but not for USB 3.0 devices. > > So remove PCI_PM_CAP_PME_D0 to avoid using PME under D0. > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=205919 > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> > --- > drivers/pci/quirks.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index 23d7fa167a36..d21e511333ef 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -4953,3 +4953,14 @@ DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, > PCI_BASE_CLASS_DISPLAY, 16, quirk_nvidia_hda); > DECLARE_PCI_FIXUP_CLASS_RESUME_EARLY(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, > PCI_BASE_CLASS_DISPLAY, 16, quirk_nvidia_hda); > + > +/* > + * Device [1b21:2142] > + * When in D0, PME# doesn't get asserted when plugging USB 3.0 device. > + */ > +static void pci_fixup_no_d0_pme(struct pci_dev *dev) > +{ > + pci_info(dev, "PME# does not work under D0, disabling it\n"); > + dev->pme_support &= ~(PCI_PM_CAP_PME_D0 >> PCI_PM_CAP_PME_SHIFT); > +} > +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x2142, pci_fixup_no_d0_pme); > Acked-by: Connor Kuehl <connor.kuehl@canonical.com>
Applied to Bionic. I did not apply to the other series since the ACKs appear to be specific to Bionic. As a side note, I really don't see how this patch fixes a bug by just defining a new function. I'm just curious ... On 2020-01-09 17:46:14 , Kai-Heng Feng wrote: > BugLink: https://bugs.launchpad.net/bugs/1858988 > > The ASMedia USB XHCI Controller claims to support generating PME# while > in D0: > > 01:00.0 USB controller: ASMedia Technology Inc. Device 2142 (prog-if 30 [XHCI]) > Subsystem: SUNIX Co., Ltd. Device 312b > Capabilities: [78] Power Management version 3 > Flags: PMEClk- DSI- D1- D2- AuxCurrent=55mA PME(D0+,D1-,D2-,D3hot-,D3cold-) > Status: D0 NoSoftRst+ PME-Enable+ DSel=0 DScale=0 PME- > > However PME# only gets asserted when plugging USB 2.0 or USB 1.1 > devices, but not for USB 3.0 devices. > > So remove PCI_PM_CAP_PME_D0 to avoid using PME under D0. > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=205919 > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> > --- > drivers/pci/quirks.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index 23d7fa167a36..d21e511333ef 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -4953,3 +4953,14 @@ DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, > PCI_BASE_CLASS_DISPLAY, 16, quirk_nvidia_hda); > DECLARE_PCI_FIXUP_CLASS_RESUME_EARLY(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, > PCI_BASE_CLASS_DISPLAY, 16, quirk_nvidia_hda); > + > +/* > + * Device [1b21:2142] > + * When in D0, PME# doesn't get asserted when plugging USB 3.0 device. > + */ > +static void pci_fixup_no_d0_pme(struct pci_dev *dev) > +{ > + pci_info(dev, "PME# does not work under D0, disabling it\n"); > + dev->pme_support &= ~(PCI_PM_CAP_PME_D0 >> PCI_PM_CAP_PME_SHIFT); > +} > +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x2142, pci_fixup_no_d0_pme); > -- > 2.17.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 23d7fa167a36..d21e511333ef 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4953,3 +4953,14 @@ DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY, 16, quirk_nvidia_hda); DECLARE_PCI_FIXUP_CLASS_RESUME_EARLY(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY, 16, quirk_nvidia_hda); + +/* + * Device [1b21:2142] + * When in D0, PME# doesn't get asserted when plugging USB 3.0 device. + */ +static void pci_fixup_no_d0_pme(struct pci_dev *dev) +{ + pci_info(dev, "PME# does not work under D0, disabling it\n"); + dev->pme_support &= ~(PCI_PM_CAP_PME_D0 >> PCI_PM_CAP_PME_SHIFT); +} +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x2142, pci_fixup_no_d0_pme);
BugLink: https://bugs.launchpad.net/bugs/1858988 The ASMedia USB XHCI Controller claims to support generating PME# while in D0: 01:00.0 USB controller: ASMedia Technology Inc. Device 2142 (prog-if 30 [XHCI]) Subsystem: SUNIX Co., Ltd. Device 312b Capabilities: [78] Power Management version 3 Flags: PMEClk- DSI- D1- D2- AuxCurrent=55mA PME(D0+,D1-,D2-,D3hot-,D3cold-) Status: D0 NoSoftRst+ PME-Enable+ DSel=0 DScale=0 PME- However PME# only gets asserted when plugging USB 2.0 or USB 1.1 devices, but not for USB 3.0 devices. So remove PCI_PM_CAP_PME_D0 to avoid using PME under D0. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=205919 Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> --- drivers/pci/quirks.c | 11 +++++++++++ 1 file changed, 11 insertions(+)