From:   Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
To:     Ziyang Huang <hzyitc@outlook.com>,
        "amelie.delaunay@foss.st.com" <amelie.delaunay@foss.st.com>
CC:     "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
        "fabrice.gasnier@foss.st.com" <fabrice.gasnier@foss.st.com>,
        "amelie.delaunay@foss.st.com" <amelie.delaunay@foss.st.com>,
        "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH v2] usb: dwc2: drd: fix inconsistent mode if
 role-switch-default-mode="host"
Thread-Topic: [PATCH v2] usb: dwc2: drd: fix inconsistent mode if
 role-switch-default-mode="host"
Thread-Index: AQHZRd+knSYE4gin9E6iCq3Lba7rya7aiagg
Date:   Wed, 22 Feb 2023 07:00:28 +0000
Message-ID: <BYAPR12MB33996D70422B24DE982F3B4AA7AA9@BYAPR12MB3399.namprd12.prod.outlook.com>
References: <SG2PR01MB204837BF68EDB0E343D2A375C9A59@SG2PR01MB2048.apcprd01.prod.exchangelabs.com>
In-Reply-To: <SG2PR01MB204837BF68EDB0E343D2A375C9A59@SG2PR01MB2048.apcprd01.prod.exchangelabs.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?y5Zk/GL188fkINAW6r2PehzaoX6EDdEJb+FHaGCyJscsaQshP8YQlnXv2QpO?=
 =?us-ascii?Q?g7I5gS3IYS9qFvSSm4m86X268Li/BdZgrg57AjLakHhNbZu9w6+9yjHyekzT?=
 =?us-ascii?Q?b353kcUXnK9vjI2Jc3F/rG37odf2OCcVaSBMkGF/Aihtw0r3M7ynv/w2wXqc?=
 =?us-ascii?Q?i2r+IAa8knRnCnU8NoYGssCqB2IBDOevkBs2tP5EHcCrHgTrDMTsVdXHBE8r?=
 =?us-ascii?Q?6y4djWdkwWU//SAIumNmGO8SGBA8A7CRbJWc1IZTkaUDqPh+SYR15TjKMzOv?=
 =?us-ascii?Q?LpS1Ipg8m/0QvEN7TaYDwoNNLE0I/ZcXp6ygtuFEc3BeLcXMTYzo7ldyYUzP?=
 =?us-ascii?Q?rAuAynz/gg6YtrQH/n9voTL4izI147kEy9bEFIXglvBmYjokdhaDdBXR3jye?=
 =?us-ascii?Q?AJCzHtDoOWYZZ8E0UYORsojDWPVc7uLZiXIzdPtKHOO4gGpiV0jyVVpE8v7U?=
 =?us-ascii?Q?zTwzC8UR2I2Rl/8SBqLJNLoB0SA8wiK5Dw8LWtSrS9DggNpQATR2J5TKy4p1?=
 =?us-ascii?Q?xbenIWmVPBVCQc3bGqnKbpIwKc6Kn3OYk5Dki5hLl9/ajk2q2Wg/Ve30Ael3?=
 =?us-ascii?Q?w9jps1mexRSy2vVdKBa/G2PjLom0/Hb8tsPSZTLhuUoBAbLLctP5VBR4LnfC?=
 =?us-ascii?Q?SI3YrwWCMrRmtOIbg/JDamkM43y36Urfwp0Xc+jLJDA021ZEblJfHRyXgM1o?=
 =?us-ascii?Q?FHx/BrbodfKX801Yn/FkDp52J9BjwGIOUg2/OhoPDNaEYz+O4bgKA2yIgkFX?=
 =?us-ascii?Q?soeFiq/Dn6c7nrCWNaI3mj/JTlMCvfpbADIhmGBlSiljLZDSfQrbDGxU3Dzu?=
 =?us-ascii?Q?M1yfIMQ6jtrGCMpla2U2fWoOd0lnQ4gS5FH8zjU3zcBtHm9tzcTmFoaae+OY?=
 =?us-ascii?Q?UHGVP7e9dsAHAg8Rx8/7pHPXWRt149BaMtb0o25KScqHV5V5IBYWcB58ZZFt?=
 =?us-ascii?Q?Bm3A4QvD+wQzCg+GsEqvY8LkVj92AN0QBViTXAdkJ3Sy1BEdh3nm6b3bclDG?=
 =?us-ascii?Q?gzTfJgtX8l4XoQU5oTzewRsHWFihFpMYSRGV7xntF0InKOZUpjLoZLZHlAXi?=
 =?us-ascii?Q?ua0KtQP1k4xc7/DUuJSgHvOkzNAi6WKU9IvBwqAIx3gjHfIsOZw4sFMq1/Q1?=
 =?us-ascii?Q?nXzZUckRbu662aRZxOOSNtGXZdxoUFYaVz2C882v3k8g4RP2TgvCswEZIsya?=
 =?us-ascii?Q?VRfV8hF9eW9uZzuKdS+9t6OMtGxvwlJLHoNIe8mbekG4KCXvR/YCBK9Twg4f?=
 =?us-ascii?Q?TLqZ58CUq8qDRwKFdJWckuumL/TE3ttftIaISzMKo2pEfmcTK5igdYT3DaAX?=
 =?us-ascii?Q?S3ba0hkwe7AFC6FztRE/uP7pZKOpuKtvUv0u4j9nQ3+BtMj5B6qLquZQWkHt?=
 =?us-ascii?Q?Cd6pJboPe1ja91Dc9Odov0Y0EhIfWSaw5IRLQyQImvyCnvdg1mZk3NeDxGpl?=
 =?us-ascii?Q?g569ndxkcyS3t/wVrzJO21kJfuInLwRNdvr0gXDcaG8rQPQz21sOEq4Mn953?=
 =?us-ascii?Q?Nqn4LpISWZv5ALp5BJJmTlhU1Au3V4Xb6plAVGpu3xo27HVZ7uZVkWIRQZiI?=
 =?us-ascii?Q?NbjLmFD9zXYMsSknamdNL9I/j+Y5T6jCG9kYIoWd?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: glz29UAy31B1RT3/0C+fjarNwN2bkAvkJ1IkB3gLTpXc5BQGcveXjYOs2CPaFfQeWzppKKdJ2cokBdue8YMHG/lbKskOTgSaFWL2X7busin3SoOWtdd4B5gXp1En1iUFAwx51ySJHynOJfYkb0TF9VTfTAuaicFATREPOYeVY2+Z5NpCzzLqZgLbLCnMHsT/yWFspHvumWlKP/i1JPijTPpzxMl2d48kK/EtfyVtLxgLLqCuU9CU9CleKb7Cm4lxYNf8k4cycOR76aRmrXNw2JCcemSc9o1si9UsL12X+qmnCfhvyX7ueEd3wbzAYogc0F2FXNyLDuLzvIixzEBSHhxlvbaPkj8JcA6MsFNNr+E8cJ75efvPJobPro6g5qE6ILC4hBCwYtfi5RRi55AWLqwC1FwlfoYQToY+INgiCCkbUDAT/pjhivB/4b78SikRsL9lnWB4Ft+rMssH/duazkZ2KbwCBQUtj4nFR9CmQuCn+GH4oC2+dR5KT3+v+6UTHqhG101ZeiryVQuCISCBZfzKukc/x96iWkZeh7YvWQpAcIkj5e3UvfC3dT1nLeHQUDVIDLLSkPERxCA1SQJV1C6RCO4nRbYcOWPRvkI+z9hmpMmXqZ0KK37DjWG6v2Wn/tw2xbu1fi5W8t0zjd7MYswgc00tp5P8HXjcHgzvcexeUr5KpkvV7vDdC5KKebe3wV0N434MBWmWahwai9TsPbT5FLm18GbRReraGxF++qDOsBe2Fe/IQXYriGyZTiLUFYo6/dYErW+uhD86HukM5urX931SNPFIYs8dqv+f09oStJvONKC31gDRtbycOclbnJrHiAURXK5497yuOhRjom8izkM4GR47MsHAIm7o+vr5jr3o0/HP8ijoq2HJN2li6smXFdsiCvp31NO2pyZivt/4gw3WaTmY/P5Bc/AKhCg=
X-OriginatorOrg: synopsys.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3399.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f3958752-f44f-4145-00ef-08db14a27b52
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Feb 2023 07:00:28.8973
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: c33c9f88-1eb7-4099-9700-16013fd9e8aa
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 81pQ9bgOh35LtFJIdvFummp3ycvLi7jWXyl+T481J9fmafnb9lPnON1AVLuEhTPG584UZG0h3+fOCPJ0OkK7Lg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7927
X-Proofpoint-GUID: NvfjtlooI6jIXRPGEZdW-m3GKPLVO5ey
X-Proofpoint-ORIG-GUID: NvfjtlooI6jIXRPGEZdW-m3GKPLVO5ey
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22
 definitions=2023-02-22_02,2023-02-20_02,2023-02-09_01
X-Proofpoint-Spam-Details: rule=outbound_active_cloned_notspam policy=outbound_active_cloned score=0
 impostorscore=0 mlxscore=0 bulkscore=0 clxscore=1011 spamscore=0
 priorityscore=1501 malwarescore=0 adultscore=0 mlxlogscore=999
 phishscore=0 suspectscore=0 lowpriorityscore=0 classifier=spam adjust=0
 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2302220058
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Amelie,

Could you please review and test this patch on your setup.
Doesn't broke anything.

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=3D"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 =3D "okay";
>		dr_mode =3D "otg";
>		usb-role-switch;
>		role-switch-default-mode =3D "host";
>	};
>
>After boot, dwc2_ovr_init() sets GOTGCTL to GOTGCTL_AVALOVAL and call
>dwc2_force_mode() with parameter host=3Dfalse, which causes inconsistent m=
ode
>- 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 =3D=3D USB_DR_MODE_HOST));
>+	dwc2_force_mode(hsotg, (hsotg->dr_mode =3D=3D USB_DR_MODE_HOST) ||
>+				(hsotg->role_sw_default_mode =3D=3D USB_DR_MODE_HOST));
> }
>
> static int dwc2_ovr_avalid(struct dwc2_hsotg *hsotg, bool valid)
>--
>2.34.1