| Message ID | 20231205090548.1377667-1-mathias.nyman@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 24be0b3c40594a14b65141ced486ae327398faf8 |
| Headers | show |
| Series | [v2] Revert "xhci: Loosen RPM as default policy to cover for AMD xHC 1.1" | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | fail | error: patch failed: drivers/usb/host/xhci-pci.c:535 error: drivers/usb/host/xhci-pci.c: patch does not apply hint: Use 'git am --show-current-patch' to see the failed patch |
This is an automated email and please do not reply to this email. Dear Submitter, Thank you for submitting the patches to the linux bluetooth mailing list. While preparing the CI tests, the patches you submitted couldn't be applied to the current HEAD of the repository. ----- Output ----- error: patch failed: drivers/usb/host/xhci-pci.c:535 error: drivers/usb/host/xhci-pci.c: patch does not apply hint: Use 'git am --show-current-patch' to see the failed patch Please resolve the issue and submit the patches again. --- Regards, Linux Bluetooth
On 12/5/2023 03:05, Mathias Nyman wrote: > This reverts commit 4baf1218150985ee3ab0a27220456a1f027ea0ac. > > Enabling runtime pm as default for all AMD xHC 1.1 controllers caused > regression. An initial attempt to fix those was done in commit a5d6264b638e > ("xhci: Enable RPM on controllers that support low-power states") but new > issues are still seen. > > Revert this to get those AMD xHC 1.1 systems working > > This patch went to stable an needs to be reverted from there as well. > > Fixes: 4baf12181509 ("xhci: Loosen RPM as default policy to cover for AMD xHC 1.1") > Link: https://lore.kernel.org/linux-usb/55c50bf5-bffb-454e-906e-4408c591cb63@molgen.mpg.de > Cc: Mario Limonciello <mario.limonciello@amd.com> > Cc: Basavaraj Natikar <Basavaraj.Natikar@amd.com> > Cc: stable@vger.kernel.org > Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Reviewed-by: Mario Limonciello <mario.limonciello@amd.com> This presumes that Basavaraj is going to send up another patch for the ID it for sure improves, works and is needed. > --- > v1 -> v2 > Revert only one patch, keep commit a5d6264b638 > Minor commit message changes > > drivers/usb/host/xhci-pci.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c > index 95ed9404f6f8..d6fc08e5db8f 100644 > --- a/drivers/usb/host/xhci-pci.c > +++ b/drivers/usb/host/xhci-pci.c > @@ -535,8 +535,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) > /* xHC spec requires PCI devices to support D3hot and D3cold */ > if (xhci->hci_version >= 0x120) > xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW; > - else if (pdev->vendor == PCI_VENDOR_ID_AMD && xhci->hci_version >= 0x110) > - xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW; > > if (xhci->quirks & XHCI_RESET_ON_RESUME) > xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
Hello: This patch was applied to bluetooth/bluetooth-next.git (master) by Greg Kroah-Hartman <gregkh@linuxfoundation.org>: On Tue, 5 Dec 2023 11:05:48 +0200 you wrote: > This reverts commit 4baf1218150985ee3ab0a27220456a1f027ea0ac. > > Enabling runtime pm as default for all AMD xHC 1.1 controllers caused > regression. An initial attempt to fix those was done in commit a5d6264b638e > ("xhci: Enable RPM on controllers that support low-power states") but new > issues are still seen. > > [...] Here is the summary with links: - [v2] Revert "xhci: Loosen RPM as default policy to cover for AMD xHC 1.1" https://git.kernel.org/bluetooth/bluetooth-next/c/24be0b3c4059 You are awesome, thank you!
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 95ed9404f6f8..d6fc08e5db8f 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -535,8 +535,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) /* xHC spec requires PCI devices to support D3hot and D3cold */ if (xhci->hci_version >= 0x120) xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW; - else if (pdev->vendor == PCI_VENDOR_ID_AMD && xhci->hci_version >= 0x110) - xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW; if (xhci->quirks & XHCI_RESET_ON_RESUME) xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
This reverts commit 4baf1218150985ee3ab0a27220456a1f027ea0ac. Enabling runtime pm as default for all AMD xHC 1.1 controllers caused regression. An initial attempt to fix those was done in commit a5d6264b638e ("xhci: Enable RPM on controllers that support low-power states") but new issues are still seen. Revert this to get those AMD xHC 1.1 systems working This patch went to stable an needs to be reverted from there as well. Fixes: 4baf12181509 ("xhci: Loosen RPM as default policy to cover for AMD xHC 1.1") Link: https://lore.kernel.org/linux-usb/55c50bf5-bffb-454e-906e-4408c591cb63@molgen.mpg.de Cc: Mario Limonciello <mario.limonciello@amd.com> Cc: Basavaraj Natikar <Basavaraj.Natikar@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> --- v1 -> v2 Revert only one patch, keep commit a5d6264b638 Minor commit message changes drivers/usb/host/xhci-pci.c | 2 -- 1 file changed, 2 deletions(-)