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: <33e7f57d-b3f3-b4cb-b466-49c0eeb28191@quicinc.com>
Date:   Wed, 22 Mar 2023 21:03:17 +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: [RFC 2/2] usb: gadget: udc: Handle gadget_connect failure during
 bind operation
Content-Language: en-US
To:     Alan Stern <stern@rowland.harvard.edu>
CC:     Thinh Nguyen <Thinh.Nguyen@synopsys.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Rafael J . Wysocki" <rafael@kernel.org>,
        "Geert Uytterhoeven" <geert+renesas@glider.be>,
        Sebastian Reichel <sre@kernel.org>,
        Colin Ian King <colin.i.king@gmail.com>,
        Jiantao Zhang <water.zhangjiantao@huawei.com>,
        <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <quic_ppratap@quicinc.com>, <quic_wcheng@quicinc.com>,
        <quic_jackp@quicinc.com>, <quic_ugoswami@quicinc.com>
References: <20230322092740.28491-1-quic_kriskura@quicinc.com>
 <20230322092740.28491-3-quic_kriskura@quicinc.com>
 <a5b57150-81e1-4eba-89e5-005cc78e243a@rowland.harvard.edu>
From:   Krishna Kurapati PSSNV <quic_kriskura@quicinc.com>
In-Reply-To: <a5b57150-81e1-4eba-89e5-005cc78e243a@rowland.harvard.edu>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 3/22/2023 8:11 PM, Alan Stern wrote:
> On Wed, Mar 22, 2023 at 02:57:40PM +0530, Krishna Kurapati wrote:
>> In the event, gadget_connect call (which invokes pullup) fails,
>> propagate the error to udc bind operation which inturn sends the
>> error to configfs. The userspace can then retry enumeartion if
>> it chooses to.
>>
>> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
>> ---
>>   drivers/usb/gadget/udc/core.c | 17 +++++++++++++----
>>   1 file changed, 13 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
>> index 23b0629a8774..26bfed5c3a45 100644
>> --- a/drivers/usb/gadget/udc/core.c
>> +++ b/drivers/usb/gadget/udc/core.c
>> @@ -1051,12 +1051,16 @@ EXPORT_SYMBOL_GPL(usb_gadget_set_state);
>>   
>>   /* ------------------------------------------------------------------------- */
>>   
>> -static void usb_udc_connect_control(struct usb_udc *udc)
>> +static int usb_udc_connect_control(struct usb_udc *udc)
>>   {
>> +	int ret;
>> +
>>   	if (udc->vbus)
>> -		usb_gadget_connect(udc->gadget);
>> +		ret = usb_gadget_connect(udc->gadget);
>>   	else
>> -		usb_gadget_disconnect(udc->gadget);
>> +		ret = usb_gadget_disconnect(udc->gadget);
>> +
>> +	return ret;
>>   }
>>   
>>   /**
>> @@ -1500,11 +1504,16 @@ static int gadget_bind_driver(struct device *dev)
>>   	if (ret)
>>   		goto err_start;
>>   	usb_gadget_enable_async_callbacks(udc);
>> -	usb_udc_connect_control(udc);
>> +	ret = usb_udc_connect_control(udc);
>> +	if (ret)
>> +		goto err_connect_control;
>>   
>>   	kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
>>   	return 0;
>>   
>> + err_connect_control:
> 
> At this point you need to copy the code in gadget_unbind_driver().  In
> particular, this should have:
> 
> +	usb_gadget_disable_async_callbacks(udc);
> +	if (gadget->irq)
> +		synchronize_irq(gadget->irq);
> 
> Alan Stern
> 
>> +	usb_gadget_udc_stop(udc);
>> +
>>    err_start:
>>   	driver->unbind(udc->gadget);
>>   
>> -- 
>> 2.40.0
>>
Hi Alan,

  Thanks for the review. Will make sure to add it in the formal patch.

Regards,
Krishna,