From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9FE04C7EE23 for ; Tue, 23 May 2023 16:42:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229815AbjEWQmg (ORCPT ); Tue, 23 May 2023 12:42:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237681AbjEWQm3 (ORCPT ); Tue, 23 May 2023 12:42:29 -0400 Received: from mx01.omp.ru (mx01.omp.ru [90.154.21.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1E9A130; Tue, 23 May 2023 09:42:24 -0700 (PDT) Received: from [192.168.1.103] (178.176.77.201) by msexch01.omp.ru (10.188.4.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.986.14; Tue, 23 May 2023 19:42:16 +0300 Subject: Re: [PATCH] usb: host: xhci: Do not re-initialize the XHCI HC if being removed To: Greg KH CC: Wesley Cheng , , , , References: <20230523015354.18497-1-quic_wcheng@quicinc.com> <2023052303-dreaded-professed-d259@gregkh> From: Sergey Shtylyov Organization: Open Mobile Platform Message-ID: Date: Tue, 23 May 2023 19:42:15 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <2023052303-dreaded-professed-d259@gregkh> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [178.176.77.201] X-ClientProxiedBy: msexch01.omp.ru (10.188.4.12) To msexch01.omp.ru (10.188.4.12) X-KSE-ServerInfo: msexch01.omp.ru, 9 X-KSE-AntiSpam-Interceptor-Info: scan successful X-KSE-AntiSpam-Version: 5.9.59, Database issued on: 05/23/2023 16:24:40 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 59 X-KSE-AntiSpam-Info: Lua profiles 177559 [May 23 2023] X-KSE-AntiSpam-Info: Version: 5.9.59.0 X-KSE-AntiSpam-Info: Envelope from: s.shtylyov@omp.ru X-KSE-AntiSpam-Info: LuaCore: 513 513 41a024eb192917672f8141390381bc9a34ec945f X-KSE-AntiSpam-Info: {rep_avail} X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: {relay has no DNS name} X-KSE-AntiSpam-Info: {SMTP from is not routable} X-KSE-AntiSpam-Info: 178.176.77.201:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;omp.ru:7.1.1;127.0.0.199:7.1.2 X-KSE-AntiSpam-Info: ApMailHostAddress: 178.176.77.201 X-KSE-AntiSpam-Info: {DNS response errors} X-KSE-AntiSpam-Info: Rate: 59 X-KSE-AntiSpam-Info: Status: not_detected X-KSE-AntiSpam-Info: Method: none X-KSE-AntiSpam-Info: Auth:dmarc=temperror header.from=omp.ru;spf=temperror smtp.mailfrom=omp.ru;dkim=none X-KSE-Antiphishing-Info: Clean X-KSE-Antiphishing-ScanningType: Heuristic X-KSE-Antiphishing-Method: None X-KSE-Antiphishing-Bases: 05/23/2023 16:29:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 5/23/2023 2:01:00 PM X-KSE-Attachment-Filter-Triggered-Rules: Clean X-KSE-Attachment-Filter-Triggered-Filters: Clean X-KSE-BulkMessagesFiltering-Scan-Result: InTheLimit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 5/23/23 7:33 PM, Greg KH wrote: >>> During XHCI resume, if there was a host controller error detected the >>> routine will attempt to re-initialize the XHCI HC, so that it can return >>> back to an operational state. If the XHCI host controller is being >>> removed, this sequence would be already handled within the XHCI halt path, >>> leading to a duplicate set of reg ops/calls. In addition, since the XHCI >>> bus is being removed, the overhead added in restarting the HCD is >>> unnecessary. Check for the XHC state before setting the reinit_xhc >>> parameter, which is responsible for triggering the restart. >>> >>> Signed-off-by: Wesley Cheng >>> --- >>> 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 b81313ffeb76..2017ed3ae4a7 100644 >>> --- a/drivers/usb/host/xhci.c >>> +++ b/drivers/usb/host/xhci.c >>> @@ -1028,7 +1028,8 @@ int xhci_resume(struct xhci_hcd *xhci, pm_message_t msg) >>> temp = readl(&xhci->op_regs->status); >>> >>> /* re-initialize the HC on Restore Error, or Host Controller Error */ >>> - if (temp & (STS_SRE | STS_HCE)) { >>> + if ((temp & (STS_SRE | STS_HCE)) && >>> + !(xhci->xhc_state & XHCI_STATE_REMOVING)) { >> >> Please add one more tab here in order not to blend it with the following lines. > > Ick, no, please do not do that, it needs to move left instead. Don't we usually use 2 tabs to indent the continuation lines in the USB code? > greg k-h MBR, Sergey