2022-01-21 16:58:28

by Puma Hsu

Subject: [PATCH v5] xhci: re-initialize the HC during resume if HCE was set

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: [email protected]
Signed-off-by: Puma Hsu <[email protected]>
---
v2: Follow Sergey Shtylyov <[email protected]>'s comment.
v3: Add [email protected] for stable release.
v4: Refine the commit message.
v5: Add a debug log. Follow Mathias Nyman <[email protected]>'s comment.

drivers/usb/host/xhci.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index dc357cabb265..41f594f0f73f 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1146,8 +1146,10 @@ 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) {
+ xhci_warn(xhci, "re-initialize HC during resume, USBSTS:%s\n",
+ xhci_decode_usbsts(str, temp));

if ((xhci->quirks & XHCI_COMP_MODE_QUIRK) &&
!(xhci_all_ports_seen_u0(xhci))) {
--
2.34.1.703.g22d0c6ccf7-goog

2022-01-28 02:57:30

by Mathias Nyman

Subject: Re: [PATCH v5] xhci: re-initialize the HC during resume if HCE was set

On 19.1.2022 8.40, 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: [email protected]
> Signed-off-by: Puma Hsu <[email protected]>
> ---
> v2: Follow Sergey Shtylyov <[email protected]>'s comment.
> v3: Add [email protected] for stable release.
> v4: Refine the commit message.
> v5: Add a debug log. Follow Mathias Nyman <[email protected]>'s comment.
>
> drivers/usb/host/xhci.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index dc357cabb265..41f594f0f73f 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -1146,8 +1146,10 @@ 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) {
> + xhci_warn(xhci, "re-initialize HC during resume, USBSTS:%s\n",
> + xhci_decode_usbsts(str, temp));
>
> if ((xhci->quirks & XHCI_COMP_MODE_QUIRK) &&
> !(xhci_all_ports_seen_u0(xhci))) {
>

Tried to compile, something is missing in this patch:

drivers/usb/host/xhci.c:1152:25: error: ‘str’ undeclared (first use in this function); did you mean ‘qstr’?

-Mathias

2022-02-01 01:19:08

by Puma Hsu

Subject: Re: [PATCH v5] xhci: re-initialize the HC during resume if HCE was set

On Thu, Jan 27, 2022 at 9:43 PM Mathias Nyman
<[email protected]> wrote:
>
> On 19.1.2022 8.40, 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: [email protected]
> > Signed-off-by: Puma Hsu <[email protected]>
> > ---
> > v2: Follow Sergey Shtylyov <[email protected]>'s comment.
> > v3: Add [email protected] for stable release.
> > v4: Refine the commit message.
> > v5: Add a debug log. Follow Mathias Nyman <[email protected]>'s comment.
> >
> > drivers/usb/host/xhci.c | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> > index dc357cabb265..41f594f0f73f 100644
> > --- a/drivers/usb/host/xhci.c
> > +++ b/drivers/usb/host/xhci.c
> > @@ -1146,8 +1146,10 @@ 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) {
> > + xhci_warn(xhci, "re-initialize HC during resume, USBSTS:%s\n",
> > + xhci_decode_usbsts(str, temp));
> >
> > if ((xhci->quirks & XHCI_COMP_MODE_QUIRK) &&
> > !(xhci_all_ports_seen_u0(xhci))) {
> >
>
> Tried to compile, something is missing in this patch:
>
> drivers/usb/host/xhci.c:1152:25: error: ‘str’ undeclared (first use in this function); did you mean ‘qstr’?

Sorry for missing the declaration, I will fix it.

> -Mathias