From: Mathias Nyman <mathias.nyman@linux.intel.com>
To: <gregkh@linuxfoundation.org>
Cc: <linux-usb@vger.kernel.org>,
linux-bluetooth@vger.kernel.org, mario.limonciello@amd.com,
regressions@lists.linux.dev, regressions@leemhuis.info,
Basavaraj.Natikar@amd.com, pmenzel@molgen.mpg.de,
bugs-a21@moonlit-rail.com,
Mathias Nyman <mathias.nyman@linux.intel.com>,
stable@vger.kernel.org
Subject: [PATCH 1/2] Revert "xhci: Enable RPM on controllers that support low-power states"
Date: Mon, 4 Dec 2023 12:08:58 +0200 [thread overview]
Message-ID: <20231204100859.1332772-1-mathias.nyman@linux.intel.com> (raw)
In-Reply-To: <3d3b8fd3-a1b9-9793-b709-eda447ebd1ab@linux.intel.com>
This reverts commit a5d6264b638efeca35eff72177fd28d149e0764b.
This patch was an attempt to solve issues seen when enabling runtime PM
as default for all AMD 1.1 xHC hosts. see commit 4baf12181509
("xhci: Loosen RPM as default policy to cover for AMD xHC 1.1")
This was not enough, regressions are still seen, so start from a clean
slate and revert both of them.
This patch went to stable and should be reverted from there as well
Fixes: a5d6264b638e ("xhci: Enable RPM on controllers that support low-power states")
Cc: stable@vger.kernel.org
Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
---
drivers/usb/host/xhci-pci.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 95ed9404f6f8..bde43cef8846 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -695,9 +695,7 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
/* USB-2 and USB-3 roothubs initialized, allow runtime pm suspend */
pm_runtime_put_noidle(&dev->dev);
- if (pci_choose_state(dev, PMSG_SUSPEND) == PCI_D0)
- pm_runtime_forbid(&dev->dev);
- else if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)
+ if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)
pm_runtime_allow(&dev->dev);
dma_set_max_seg_size(&dev->dev, UINT_MAX);
--
2.25.1
next prev parent reply other threads:[~2023-12-04 10:07 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <ee109942-ef8e-45b9-8cb9-a98a787fe094@moonlit-rail.com>
2023-12-01 6:33 ` Regression: Inoperative bluetooth, Intel chipset, mainline kernel 6.6.2+ Thorsten Leemhuis
2023-12-01 8:15 ` Greg KH
2023-12-02 6:43 ` Kris Karas (Bug Reporting)
2023-12-02 7:23 ` Paul Menzel
2023-12-02 7:50 ` Greg KH
2023-12-02 7:58 ` Kris Karas (Bug Reporting)
2023-12-02 8:15 ` Greg KH
2023-12-03 8:32 ` Kris Karas (Bug Reporting)
2023-12-03 8:38 ` Greg KH
2023-12-03 16:16 ` Basavaraj Natikar
2023-12-03 16:24 ` Basavaraj Natikar
2023-12-03 19:52 ` Oleksandr Natalenko
2023-12-04 9:12 ` Mathias Nyman
2023-12-04 10:08 ` Mathias Nyman [this message]
2023-12-04 10:08 ` [PATCH 2/2] Revert "xhci: Loosen RPM as default policy to cover for AMD xHC 1.1" Mathias Nyman
2023-12-04 10:49 ` [PATCH 1/2] Revert "xhci: Enable RPM on controllers that support low-power states" Basavaraj Natikar
2023-12-04 14:22 ` Mathias Nyman
2023-12-04 14:49 ` Basavaraj Natikar
2023-12-04 15:06 ` Mathias Nyman
2023-12-04 15:29 ` Basavaraj Natikar
2023-12-04 23:55 ` Greg KH
2023-12-05 9:05 ` [PATCH v2] Revert "xhci: Loosen RPM as default policy to cover for AMD xHC 1.1" Mathias Nyman
2023-12-05 18:36 ` Mario Limonciello
2023-12-15 16:53 ` patchwork-bot+bluetooth
2023-12-15 16:53 ` [PATCH 1/2] Revert "xhci: Enable RPM on controllers that support low-power states" patchwork-bot+bluetooth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231204100859.1332772-1-mathias.nyman@linux.intel.com \
--to=mathias.nyman@linux.intel.com \
--cc=Basavaraj.Natikar@amd.com \
--cc=bugs-a21@moonlit-rail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mario.limonciello@amd.com \
--cc=pmenzel@molgen.mpg.de \
--cc=regressions@leemhuis.info \
--cc=regressions@lists.linux.dev \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).