Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Peter Chen <peter.chen@nxp.com>
To:     Roger Quadros <rogerq@ti.com>
CC:     "heikki.krogerus@linux.intel.com" <heikki.krogerus@linux.intel.com>,
        "pawell@cadence.com" <pawell@cadence.com>,
        "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
        "balbi@kernel.org" <balbi@kernel.org>,
        "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] Revert "usb: cdns3: core: quit if it uses role switch
 class"
Thread-Topic: [PATCH] Revert "usb: cdns3: core: quit if it uses role switch
 class"
Thread-Index: AQHWwY7qvaWheOMvwU2q0XXgyvVqyqnW1uYAgAAxWYCAAAPXgIAAC1EAgAAUboCAAAn7gIAAzOsA
Date:   Wed, 25 Nov 2020 00:36:19 +0000
Message-ID: <20201125003550.GB9929@b29397-desktop>
References: <20201123115051.30047-1-rogerq@ti.com>
 <20201124064242.GA32310@b29397-desktop>
 <89067b6a-5b94-d7d2-b07a-f434c9e5e2bd@ti.com>
 <DBBPR04MB797982E6E190F0C0E0980F258BFB0@DBBPR04MB7979.eurprd04.prod.outlook.com>
 <bdb2b4cb-686e-9283-bc66-78808b92c349@ti.com>
 <20201124114641.GA9929@b29397-desktop>
 <1c4fb95a-97b7-9022-7062-8fafcfe42c3d@ti.com>
In-Reply-To: <1c4fb95a-97b7-9022-7062-8fafcfe42c3d@ti.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-ID: <B76D297D66AB314BB08491915D65B1CC@eurprd04.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 893187cd-ef49-4481-a95b-08d890da2071
X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Nov 2020 00:36:19.3878
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: zEuy1TFOUD4SDmYbLJ0N8nxv68XQFSflvEH0My96mB5A5wu2vp9pLsa83vJPeVbz64wXPZsUlmhGY6vjVLhZ0w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7515
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 20-11-24 14:22:25, Roger Quadros wrote:
> Peter,
>=20
> On 24/11/2020 13:47, Peter Chen wrote:
> > On 20-11-24 12:33:34, Roger Quadros wrote:
> > > > > >=20
> > > > > > I am sorry about that. Do you use role switch /sys entry, if yo=
u have
> > > > > > used, I prefer using "usb-role-switch" property at dts to judge=
 if SoC
> > > > > > OTG signals or external signals for role switch. If you have no=
t used
> > > > > > it, I prefer only setting cdns->role_sw for role switch use cas=
es.
> > > > > >=20
> > > > >=20
> > > > > We use both hardware role switch and /sys entries for manually fo=
rcing a
> > > > > certain role.
> > > > >=20
> > > > > We do not set any "usb-role-switch" property at DTS.
> > > > >=20
> > > > > Currently cdns->role_sw is being always set by driver irrespectiv=
e of any DT
> > > > > property, so this patch is clearly wrong and needs to be reverted=
.
> > > > >=20
> > > > > What do you think?
> > > > >=20
> > > >=20
> > > > Could you accept below fix?
> > > >=20
> > > > diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
> > > > index 2e469139769f..fdd52e87a7b2 100644
> > > > --- a/drivers/usb/cdns3/core.c
> > > > +++ b/drivers/usb/cdns3/core.c
> > > > @@ -280,8 +280,8 @@ int cdns3_hw_role_switch(struct cdns3 *cdns)
> > > >           enum usb_role real_role, current_role;
> > > >           int ret =3D 0;
> > > >=20
> > > > -       /* Depends on role switch class */
> > > > -       if (cdns->role_sw)
> > > > +       /* quit if switch role through external signals */
> > > > +       if (device_property_read_bool(cdns->dev, "usb-role-switch")=
)
> > > >                   return 0;
> > > >=20
> > > >           pm_runtime_get_sync(cdns->dev);
> > >=20
> > > Although this will fix the issue I don't think this is making the dri=
ver to behave
> > > as expected with usb-role-switch property.
> > >=20
> > > Now, even if usb-role-switch property is not present the driver will =
still register
> > > the role switch driver.
> > >=20
> > > I think we need to register the role switch driver only if usb-role-s=
witch property
> > > is present. We would also need to set the default role if role-switch=
-default-mode is present.
> > >=20
> > > How about the following? It still doesn't handle role-switch-default-=
mode property though.
> > >=20
> >=20
> > Roger, you said you also use /sys entries (I suppose it means through r=
ole
> > switch class) to do role switch, with your change, there will be no /sy=
s
> > entry for role switch.
>=20
> Sorry for the confusion. Although we do need both features (SW role switc=
h + HW role switch)
> I don't think it is required to operate simultaneously. If users need SW =
control they can set the DT flag.
>=20

I see. I prefer embracing all things related to role switch under the
firmware entry condition. Besides, I find another issue that devm_request_i=
rq
for wakeup_irq does not call usb_role_switch_unregister if it has
failed. So, probably, two patches are needed. I am OK you send the
patches to fix both.

diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index 2e469139769f..fc6a8152406c 100644
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -427,7 +427,6 @@ static irqreturn_t cdns3_wakeup_irq(int irq, void *data=
)
  */
 static int cdns3_probe(struct platform_device *pdev)
 {
-	struct usb_role_switch_desc sw_desc =3D { };
 	struct device *dev =3D &pdev->dev;
 	struct resource	*res;
 	struct cdns3 *cdns;
@@ -529,18 +528,21 @@ static int cdns3_probe(struct platform_device *pdev)
 	if (ret)
 		goto err2;
=20
-	sw_desc.set =3D cdns3_role_set;
-	sw_desc.get =3D cdns3_role_get;
-	sw_desc.allow_userspace_control =3D true;
-	sw_desc.driver_data =3D cdns;
-	if (device_property_read_bool(dev, "usb-role-switch"))
+	if (device_property_read_bool(dev, "usb-role-switch")) {
+		struct usb_role_switch_desc sw_desc =3D { };
+
+		sw_desc.set =3D cdns3_role_set;
+		sw_desc.get =3D cdns3_role_get;
+		sw_desc.allow_userspace_control =3D true;
+		sw_desc.driver_data =3D cdns;
 		sw_desc.fwnode =3D dev->fwnode;
=20
-	cdns->role_sw =3D usb_role_switch_register(dev, &sw_desc);
-	if (IS_ERR(cdns->role_sw)) {
-		ret =3D PTR_ERR(cdns->role_sw);
-		dev_warn(dev, "Unable to register Role Switch\n");
-		goto err3;
+		cdns->role_sw =3D usb_role_switch_register(dev, &sw_desc);
+		if (IS_ERR(cdns->role_sw)) {
+			ret =3D PTR_ERR(cdns->role_sw);
+			dev_warn(dev, "Unable to register Role Switch\n");
+			goto err3;
+		}
 	}
=20
 	if (cdns->wakeup_irq) {
@@ -583,7 +585,8 @@ static int cdns3_probe(struct platform_device *pdev)
 	return 0;
 err4:
 	cdns3_drd_exit(cdns);
-	usb_role_switch_unregister(cdns->role_sw);
+	if (cdns->role_sw)
+		usb_role_switch_unregister(cdns->role_sw);
 err3:
 	set_phy_power_off(cdns);
 err2:

--=20

Thanks,
Peter Chen=