From patchwork Wed Oct 19 08:30:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5355 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp297276wrs; Wed, 19 Oct 2022 05:28:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7I4pCieDuHxrSKMoSbzELMyMJhqIhYI9SwQ52/1gbHV05zBZ//4ZkCiAnSo6uPrIL3lxbK X-Received: by 2002:a17:906:8a66:b0:78b:da52:b752 with SMTP id hy6-20020a1709068a6600b0078bda52b752mr6440752ejc.365.1666182523388; Wed, 19 Oct 2022 05:28:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666182523; cv=none; d=google.com; s=arc-20160816; b=HGs5syfoEwDHDy7tRNQo57kC61/I7+A16nqxfrvs8MO3xoezejDPwWvqb1z3JWNj1b n7Npd572DHA+E9DRPq7EW2zJQOzliBovuJ2iFhi0gEyClNhV2uLqBlYjH8/lwwHA5kD4 1an3123uou6DbIqsqSXKc9JIg/2FNaFS2khvQPfB7RoojhuwOZI7wmIOoMOlB6rTTL7Y 19erxGumI37vddH2OKhgygzR0XXqtRqOWa/VrqHKSOlZrYhBX/fUSonvkekar6MwpmID QM3CfDgT+yFL0E3PFdg2DliW3NxvORrxGgHsR14PS3fooZmXb50T3nV0+yPgvCRuckEa dMBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UQT/RBcMwYsllz3NtL9eyvzMx1/o4/tLqDof4NbQ7EA=; b=gRMINsIGqkOQqKDGPsy8dNcWDL/HYxYvWTomMGWaNsPQfic5oXSIXWg/NNc+NY8iX1 vpCgE6CLSzSOCq3cEwWh0UjSJDyveNenHpbnKqIEbYKOy4UYbmPbL7aWR883bSeXEQc1 hnllFOOTPra9gJGJGCzKh+CT1ChOGCye/5kUvotwdUhgPuf+tysB4y+VterA0YHEegjt 8QYR6DH9TPqHUru24aVFPuK5xadqPuY8mw57nrbccb5vElFNob6T/Yo5jrra8hWVJJKn WF4t02Wvt+JSgFnAy1an1kdUe+WU8kD3ulQEiDrmVeDvVlbP0wYfVg4wHbHsiYUveIQ2 M3aA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VQNu23nu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w10-20020a50d78a000000b004539b045326si14213785edi.417.2022.10.19.05.28.15; Wed, 19 Oct 2022 05:28:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VQNu23nu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232988AbiJSMSW (ORCPT + 99 others); Wed, 19 Oct 2022 08:18:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232850AbiJSMRn (ORCPT ); Wed, 19 Oct 2022 08:17:43 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C3B117425; Wed, 19 Oct 2022 04:53:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A0C47B8246B; Wed, 19 Oct 2022 09:02:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 174DAC433C1; Wed, 19 Oct 2022 09:02:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170172; bh=aRoHgLT18h88Rn43em+coJfcbxqhuSaOBcPrfYQ//0Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VQNu23nuUfbrsSUPFuhHAJQNdhPAj76eIFhtPmkb5WLGv7kKAJ1kqkHarW829DXCZ zowfUp40Zw92NskT2Oxpdh9wU7ZXe2HauupsozmnLsiQKdrKsMXXJIzfMsQntdmmkm cBW15+dm4rxpoHVCLybmBjPWhHDzCEM/f2KPdjNI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Artem S. Tashkinov" , Mario Limonciello , Mathias Nyman , Sasha Levin Subject: [PATCH 6.0 553/862] xhci: Dont show warning for reinit on known broken suspend Date: Wed, 19 Oct 2022 10:30:40 +0200 Message-Id: <20221019083314.412569380@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747119005388471773?= X-GMAIL-MSGID: =?utf-8?q?1747119005388471773?= From: Mario Limonciello [ 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 Signed-off-by: Mario Limonciello Signed-off-by: Mathias Nyman Link: https://lore.kernel.org/r/20220921123450.671459-4-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- 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) {