From patchwork Mon Oct 24 11:30:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8617 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp420142wru; Mon, 24 Oct 2022 05:17:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Txv39eC4XGKDnLXKiieVXPQLMCPr+ueCxsiLlfraCsdloK8vrmr3sVRns5VsndsQr2Ech X-Received: by 2002:a17:907:b15:b0:7a7:19a3:e9e7 with SMTP id h21-20020a1709070b1500b007a719a3e9e7mr4759162ejl.361.1666613859109; Mon, 24 Oct 2022 05:17:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666613859; cv=none; d=google.com; s=arc-20160816; b=fiTHJ8Ah4/q51oyOo/CZY3D0Ftc+LM4QtDpin7q0u6yP+0ugvOqOWsn2GtdusfVF3T vd4G9+B60R/Sz0Z91E6Mmuu+c00MRCeyBojJdaObBhg03upCW4AO/9drbwLDmTb9MBcp wMqi9qi7tJUgci6XPUiW1eZBXggszI0m7ZTdUwMaKoVfI1HhQpgX05q/Z3PK2vbBuIes vopa3t7DFqCpa0dLzUNrpl2uUSr3XAsbKtBQMlz3NyQqGBCU148IA11xlJCio/SRoMX9 D93GychNXT0H+kCPag99aEHW7BYSa6K3ei+reRKk3Olk3yTC4KzZrQRJ41C1//zHZEZH iVEw== 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=7QoW3QoR7NaOlZSqC2NtiT6NuB51Yf5Y5Ar3bpXJPrU=; b=Mn3J6/eSuWztks+ow/2aApNqFkOg8NVUVuQ4Ao4CUnt1V4H8EO5q2t9L1gdkHEvYE5 LfIZEULaEED44pzSpCqJ2M2vy+xA+wygcx2EXhYOSG3qkRz1b6lWccw9Zpz83yhBSbM1 qugp0eJ5seIXKz5xDpoGCPoKT/KtSvxFdclhxYmoL88KysSOuoTue06RG53tupipgzZo hh/e5jj0l//gHerw+70MR78xSzF/e9rTZCHn2sQF8IKIGd4GNkeR5apeGX6scUXp71b+ eHRz9GG3CAmU989dYsZU8Ju/6/ctggg3DFt8/FAjqiL+GNe317jJf5ZjT9f4xHfsjPZK WV1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BETrhagQ; 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 l8-20020a170906644800b0078315844537si25009799ejn.378.2022.10.24.05.17.15; Mon, 24 Oct 2022 05:17:39 -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=BETrhagQ; 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 S232855AbiJXMLW (ORCPT + 99 others); Mon, 24 Oct 2022 08:11:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233207AbiJXMJ5 (ORCPT ); Mon, 24 Oct 2022 08:09:57 -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 7E3597FE45; Mon, 24 Oct 2022 04:53:17 -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 00F5FB811BE; Mon, 24 Oct 2022 11:52:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 522B4C433C1; Mon, 24 Oct 2022 11:51:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612318; bh=wK+jnoO9VRmlYg/cydAggE/JknkiKXKsyEkHJKl9iJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BETrhagQvKOmBCokw12nWP2tV4Yj6/MD5nqS2EPbMKkKx22vvRmg1pbbvX4IMvuY0 8FOperXki7Swz9ydPlVt4Ax74M18mKy+7kgkMOqIlkIRr0o9okPgU6OGVdtwl+2I4q JKWaw7jCvXoKbVPZLqjoRAlL2lkpxe6fM0wRv0wg= 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 4.14 135/210] xhci: Dont show warning for reinit on known broken suspend Date: Mon, 24 Oct 2022 13:30:52 +0200 Message-Id: <20221024113001.377705871@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 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?1747571293899601468?= X-GMAIL-MSGID: =?utf-8?q?1747571293899601468?= 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 c41548f08c54..0f2b67f38d2e 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1094,7 +1094,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) {