* [PATCH v4] xhci: re-initialize the HC during resume if HCE was set
@ 2022-01-17 5:39 Puma Hsu
2022-01-17 12:24 ` Mathias Nyman
0 siblings, 1 reply; 2+ messages in thread
From: Puma Hsu @ 2022-01-17 5:39 UTC (permalink / raw)
To: mathias.nyman, gregkh
Cc: s.shtylyov, albertccwang, linux-usb, linux-kernel, Puma Hsu, stable
When HCE(Host Controller Error) is set, it means an internal
error condition has been detected. Software needs to re-initialize
the HC, so add this check in xhci resume.
Cc: stable@vger.kernel.org
Signed-off-by: Puma Hsu <pumahsu@google.com>
---
v2: Follow Sergey Shtylyov <s.shtylyov@omp.ru>'s comment.
v3: Add stable@vger.kernel.org for stable release.
v4: Refine the commit message.
drivers/usb/host/xhci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index dc357cabb265..ab440ce8420f 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1146,8 +1146,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
temp = readl(&xhci->op_regs->status);
}
- /* If restore operation fails, re-initialize the HC during resume */
- if ((temp & STS_SRE) || hibernated) {
+ /* If restore operation fails or HC error is detected, re-initialize the HC during resume */
+ if ((temp & (STS_SRE | STS_HCE)) || hibernated) {
if ((xhci->quirks & XHCI_COMP_MODE_QUIRK) &&
!(xhci_all_ports_seen_u0(xhci))) {
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v4] xhci: re-initialize the HC during resume if HCE was set
2022-01-17 5:39 [PATCH v4] xhci: re-initialize the HC during resume if HCE was set Puma Hsu
@ 2022-01-17 12:24 ` Mathias Nyman
0 siblings, 0 replies; 2+ messages in thread
From: Mathias Nyman @ 2022-01-17 12:24 UTC (permalink / raw)
To: Puma Hsu, mathias.nyman, gregkh
Cc: s.shtylyov, albertccwang, linux-usb, linux-kernel, stable
On 17.1.2022 7.39, Puma Hsu wrote:
> When HCE(Host Controller Error) is set, it means an internal
> error condition has been detected. Software needs to re-initialize
> the HC, so add this check in xhci resume.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Puma Hsu <pumahsu@google.com>
> ---
> v2: Follow Sergey Shtylyov <s.shtylyov@omp.ru>'s comment.
> v3: Add stable@vger.kernel.org for stable release.
> v4: Refine the commit message.
>
> drivers/usb/host/xhci.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index dc357cabb265..ab440ce8420f 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -1146,8 +1146,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
> temp = readl(&xhci->op_regs->status);
> }
>
> - /* If restore operation fails, re-initialize the HC during resume */
> - if ((temp & STS_SRE) || hibernated) {
> + /* If restore operation fails or HC error is detected, re-initialize the HC during resume */
> + if ((temp & (STS_SRE | STS_HCE)) || hibernated) {
Add a debug message in case we reset due to HCE
-Mathias
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-17 12:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-17 5:39 [PATCH v4] xhci: re-initialize the HC during resume if HCE was set Puma Hsu
2022-01-17 12:24 ` Mathias Nyman
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).