Message-ID: <2b56f248-15b7-e7a5-bf90-6ba90ba78740@foss.st.com>
Date:   Wed, 1 Mar 2023 12:31:47 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.7.1
Subject: Re: [PATCH v2] usb: dwc2: drd: fix inconsistent mode if
 role-switch-default-mode="host"
To:     Fabrice Gasnier <fabrice.gasnier@foss.st.com>,
        Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>,
        Ziyang Huang <hzyitc@outlook.com>
CC:     "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
        "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
References: <SG2PR01MB204837BF68EDB0E343D2A375C9A59@SG2PR01MB2048.apcprd01.prod.exchangelabs.com>
 <BYAPR12MB33996D70422B24DE982F3B4AA7AA9@BYAPR12MB3399.namprd12.prod.outlook.com>
 <0ffed85a-6bc9-b51e-c431-a23b9bf3919c@foss.st.com>
Content-Language: en-US
From:   Amelie Delaunay <amelie.delaunay@foss.st.com>
In-Reply-To: <0ffed85a-6bc9-b51e-c431-a23b9bf3919c@foss.st.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 3/1/23 12:26, Fabrice Gasnier wrote:
> On 2/22/23 08:00, Minas Harutyunyan wrote:
>> Hi Amelie,
>>
>> Could you please review and test this patch on your setup.
>> Doesn't broke anything.
>>
> 
> Hi Minas,
> 
> I tested at my end on behalf of Amelie.
> Of course I let her possibly comment.
> 
> This doesn't break anything on existing boards. I also tested the
> example described by Ziyang in the commit message.
> 
> You can add my:
> Tested-by: Fabrice Gasnier <fabrice.gasnier@foss.st.com>
> 

Thanks Fabrice for testing!

You can also add my:
Reviewed-by: Amelie Delaunay <amelie.delaunay@foss.st.com>

Regards,
Amelie

> Thanks & BR,
> Fabrice
> 
>> Thanks,
>> Minas
>>
>> On 2/21/2023 2:30 PM, Ziyang Huang <hzyitc@outlook.com> wrote:
>>> From: Ziyang Huang <hzyitc@outlook.com>
>>> Sent: Tuesday, February 21, 2023 2:30 PM
>>> To: Minas Harutyunyan <hminas@synopsys.com>
>>> Cc: gregkh@linuxfoundation.org; fabrice.gasnier@foss.st.com;
>>> amelie.delaunay@foss.st.com; linux-usb@vger.kernel.org; linux-
>>> kernel@vger.kernel.org; Ziyang Huang <hzyitc@outlook.com>
>>> Subject: [PATCH v2] usb: dwc2: drd: fix inconsistent mode if role-switch-
>>> default-mode="host"
>>>
>>> Some boards might use USB-A female connector for USB ports, however, the
>>> port could be connected to a dual-mode USB controller, making it also
>>> behaves as a peripheral device if male-to-male cable is connected.
>>>
>>> In this case, the dts looks like this:
>>>
>>> 	&usb0 {
>>> 		status = "okay";
>>> 		dr_mode = "otg";
>>> 		usb-role-switch;
>>> 		role-switch-default-mode = "host";
>>> 	};
>>>
>>> After boot, dwc2_ovr_init() sets GOTGCTL to GOTGCTL_AVALOVAL and call
>>> dwc2_force_mode() with parameter host=false, which causes inconsistent mode
>>> - The hardware is in peripheral mode while the kernel status is in host
>>> mode.
>>>
>>> What we can do now is to call dwc2_drd_role_sw_set() to switch to device
>>> mode, and everything should work just fine now, even switching back to
>>> none(default) mode afterwards.
>>>
>>> Fixes: e14acb876985 ("usb: dwc2: drd: add role-switch-default-node support")
>>> Signed-off-by: Ziyang Huang <hzyitc@outlook.com>
>>> ---
>>> Changes since v1
>>> - Use corrent name in Signed-off-by
>>>
>>> drivers/usb/dwc2/drd.c | 3 ++-
>>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/usb/dwc2/drd.c b/drivers/usb/dwc2/drd.c index
>>> d8d6493bc457..a8605b02115b 100644
>>> --- a/drivers/usb/dwc2/drd.c
>>> +++ b/drivers/usb/dwc2/drd.c
>>> @@ -35,7 +35,8 @@ static void dwc2_ovr_init(struct dwc2_hsotg *hsotg)
>>>
>>> 	spin_unlock_irqrestore(&hsotg->lock, flags);
>>>
>>> -	dwc2_force_mode(hsotg, (hsotg->dr_mode == USB_DR_MODE_HOST));
>>> +	dwc2_force_mode(hsotg, (hsotg->dr_mode == USB_DR_MODE_HOST) ||
>>> +				(hsotg->role_sw_default_mode == USB_DR_MODE_HOST));
>>> }
>>>
>>> static int dwc2_ovr_avalid(struct dwc2_hsotg *hsotg, bool valid)
>>> --
>>> 2.34.1
>>