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;
Subject: Re: [PATCH] usb: host: xhci: Do not re-initialize the XHCI HC if
 being removed
To:     Greg KH <gregkh@linuxfoundation.org>
CC:     Wesley Cheng <quic_wcheng@quicinc.com>, <mathias.nyman@intel.com>,
        <linux-kernel@vger.kernel.org>, <linux-usb@vger.kernel.org>,
        <quic_jackp@quicinc.com>
References: <20230523015354.18497-1-quic_wcheng@quicinc.com>
 <f34927c3-7f23-3971-9f16-88cb5773f973@omp.ru>
 <2023052303-dreaded-professed-d259@gregkh>
From:   Sergey Shtylyov <s.shtylyov@omp.ru>
Organization: Open Mobile Platform
Message-ID: <ca38a375-d611-4084-a8ef-f4f4da72ea4f@omp.ru>
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-KSE-Attachment-Filter-Triggered-Filters: Clean
X-KSE-BulkMessagesFiltering-Scan-Result: InTheLimit
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,NICE_REPLY_A,
        SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: <linux-kernel.vger.kernel.org>
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 <quic_wcheng@quicinc.com>
>>> ---
>>>  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