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;
Message-ID: <0aa1caae-ab09-2ef9-0ec8-3dd01a3f3af0@quicinc.com>
Date:   Wed, 29 Mar 2023 10:04:47 +0530
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.12.0
Subject: Re: [PATCH v2 1/2] usb: dwc3: gadget: Bail out in pullup if soft
 reset timeout happens
Content-Language: en-US
To:     Thinh Nguyen <Thinh.Nguyen@synopsys.com>
CC:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Alan Stern <stern@rowland.harvard.edu>,
        Geert Uytterhoeven <geert+renesas@glider.be>,
        Colin Ian King <colin.i.king@gmail.com>,
        Jiantao Zhang <water.zhangjiantao@huawei.com>,
        "Rafael J . Wysocki" <rafael@kernel.org>,
        "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "quic_ppratap@quicinc.com" <quic_ppratap@quicinc.com>,
        "quic_wcheng@quicinc.com" <quic_wcheng@quicinc.com>,
        "quic_jackp@quicinc.com" <quic_jackp@quicinc.com>,
        "quic_ugoswami@quicinc.com" <quic_ugoswami@quicinc.com>
References: <20230328160756.30520-1-quic_kriskura@quicinc.com>
 <20230328160756.30520-2-quic_kriskura@quicinc.com>
 <20230328212048.rpm4ly265etahwm3@synopsys.com>
From:   Krishna Kurapati PSSNV <quic_kriskura@quicinc.com>
In-Reply-To: <20230328212048.rpm4ly265etahwm3@synopsys.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 3/29/2023 2:50 AM, Thinh Nguyen wrote:
> Hi,
> 
> On Tue, Mar 28, 2023, Krishna Kurapati wrote:
>> If the core soft reset timeout happens, avoid setting up event
>> buffers and starting gadget as the writes to these registers
>> may not reflect when in reset and setting the run stop bit
>> can lead the controller to access wrong event buffer address
>> resulting in a crash.
>>
>> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
>> ---
>>   drivers/usb/dwc3/gadget.c | 5 ++++-
>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
>> index 3c63fa97a680..f0472801d9a5 100644
>> --- a/drivers/usb/dwc3/gadget.c
>> +++ b/drivers/usb/dwc3/gadget.c
>> @@ -2620,13 +2620,16 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)
>>   		 * device-initiated disconnect requires a core soft reset
>>   		 * (DCTL.CSftRst) before enabling the run/stop bit.
>>   		 */
>> -		dwc3_core_soft_reset(dwc);
>> +		ret = dwc3_core_soft_reset(dwc);
>> +		if (ret)
>> +			goto done;
>>   
>>   		dwc3_event_buffers_setup(dwc);
>>   		__dwc3_gadget_start(dwc);
>>   		ret = dwc3_gadget_run_stop(dwc, true, false);
>>   	}
>>   
>> +done:
>>   	pm_runtime_put(dwc->dev);
>>   
>>   	return ret;
>> -- 
>> 2.40.0
>>
> 
> I think there's one more place that may needs this check. Can you also
> add this check in __dwc3_set_mode()?

Hi Thinh,

   Sure. Will do it.
Will the below be good enough ? Or would it be good to add an error/warn 
log there>

kriskura@hu-kriskura-hyd:/local/mnt/workspace/krishna/skales2/skales/kernel$ 
git diff drivers/usb/
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 476b63618511..8d1d213d1dcd 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -210,7 +210,9 @@ static void __dwc3_set_mode(struct work_struct *work)
                 }
                 break;
         case DWC3_GCTL_PRTCAP_DEVICE:
-               dwc3_core_soft_reset(dwc);
+               ret = dwc3_core_soft_reset(dwc);
+               if (ret)
+                       goto out;

                 dwc3_event_buffers_setup(dwc);

Regards,
Krishna,