On Thu, Jan 27, 2022 at 9:43 PM Mathias Nyman mathias.nyman@linux.intel.com 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: 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. v5: Add a debug log. Follow Mathias Nyman mathias.nyman@linux.intel.com'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