lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 553/862] xhci: Dont show warning for reinit on known broken suspend
    Date
    From: Mario Limonciello <mario.limonciello@amd.com>

    [ Upstream commit 484d6f7aa3283d082c87654b7fe7a7f725423dfb ]

    commit 8b328f8002bc ("xhci: re-initialize the HC during resume if HCE was
    set") introduced a new warning message when the host controller error
    was set and re-initializing.

    This is expected behavior on some designs which already set
    `xhci->broken_suspend` so the new warning is alarming to some users.

    Modify the code to only show the warning if this was a surprising behavior
    to the XHCI driver.

    Link: https://bugzilla.kernel.org/show_bug.cgi?id=216470
    Fixes: 8b328f8002bc ("xhci: re-initialize the HC during resume if HCE was set")
    Reported-by: Artem S. Tashkinov <aros@gmx.com>
    Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
    Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
    Link: https://lore.kernel.org/r/20220921123450.671459-4-mathias.nyman@linux.intel.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/host/xhci.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
    index 38649284ff88..a7ef675f00fd 100644
    --- a/drivers/usb/host/xhci.c
    +++ b/drivers/usb/host/xhci.c
    @@ -1183,7 +1183,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
    /* re-initialize the HC on Restore Error, or Host Controller Error */
    if (temp & (STS_SRE | STS_HCE)) {
    reinit_xhc = true;
    - xhci_warn(xhci, "xHC error in resume, USBSTS 0x%x, Reinit\n", temp);
    + if (!xhci->broken_suspend)
    + xhci_warn(xhci, "xHC error in resume, USBSTS 0x%x, Reinit\n", temp);
    }

    if (reinit_xhc) {
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 14:19    [W:3.756 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site