[PATCH] phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode

[PATCH] phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode

[Paul Kocialkowski]

On platforms where the MUSB and HCI controllers share PHY0, PHY passby
is required when using the HCI controller with the PHY, but it must be
disabled when the MUSB controller is used instead.

Without this, PHY0 passby is always enabled, which results in broken
peripheral mode on such platforms (e.g. H3/H5).

Fixes: ba4bdc9e1dc0 ("PHY: sunxi: Add driver for sunxi usb phy")

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
---
 drivers/phy/allwinner/phy-sun4i-usb.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index 5163097b43df..7b23920e0068 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
@@ -551,6 +551,7 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)
 	struct sun4i_usb_phy_data *data =
 		container_of(work, struct sun4i_usb_phy_data, detect.work);
 	struct phy *phy0 = data->phys[0].phy;
+	struct sun4i_usb_phy *phy = phy_get_drvdata(phy0);
 	bool force_session_end, id_notify = false, vbus_notify = false;
 	int id_det, vbus_det;
 
@@ -607,6 +608,9 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)
 			mutex_unlock(&phy0->mutex);
 		}
 
+		/* Enable PHY0 passby for host mode only. */
+		sun4i_usb_phy_passby(phy, !id_det);
+
 		/* Re-route PHY0 if necessary */
 		if (data->cfg->phy0_dual_route)
 			sun4i_usb_phy0_reroute(data, id_det);
-- 
2.20.1

Re: [PATCH] phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode

[Paul Kocialkowski]

Hi,

Le jeudi 14 mars 2019 à 14:05 +0100, Paul Kocialkowski a écrit :
> On platforms where the MUSB and HCI controllers share PHY0, PHY passby
> is required when using the HCI controller with the PHY, but it must be
> disabled when the MUSB controller is used instead.
> 
> Without this, PHY0 passby is always enabled, which results in broken
> peripheral mode on such platforms (e.g. H3/H5).
> 
> Fixes: ba4bdc9e1dc0 ("PHY: sunxi: Add driver for sunxi usb phy")

Does anyone have feedback about this? I was hoping to get it merged
rather soon since it pretty much fixes USB gadget on H3/R40/V3/V3s.

Cheers,

Paul

> Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
> ---
>  drivers/phy/allwinner/phy-sun4i-usb.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
> index 5163097b43df..7b23920e0068 100644
> --- a/drivers/phy/allwinner/phy-sun4i-usb.c
> +++ b/drivers/phy/allwinner/phy-sun4i-usb.c
> @@ -551,6 +551,7 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)
>  	struct sun4i_usb_phy_data *data =
>  		container_of(work, struct sun4i_usb_phy_data, detect.work);
>  	struct phy *phy0 = data->phys[0].phy;
> +	struct sun4i_usb_phy *phy = phy_get_drvdata(phy0);
>  	bool force_session_end, id_notify = false, vbus_notify = false;
>  	int id_det, vbus_det;
>  
> @@ -607,6 +608,9 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)
>  			mutex_unlock(&phy0->mutex);
>  		}
>  
> +		/* Enable PHY0 passby for host mode only. */
> +		sun4i_usb_phy_passby(phy, !id_det);
> +
>  		/* Re-route PHY0 if necessary */
>  		if (data->cfg->phy0_dual_route)
>  			sun4i_usb_phy0_reroute(data, id_det);
-- 
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com

Re: [PATCH] phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode

[Kishon Vijay Abraham I]

On 15/04/19 4:47 PM, Paul Kocialkowski wrote:
> Hi,
> 
> Le jeudi 14 mars 2019 à 14:05 +0100, Paul Kocialkowski a écrit :
>> On platforms where the MUSB and HCI controllers share PHY0, PHY passby
>> is required when using the HCI controller with the PHY, but it must be
>> disabled when the MUSB controller is used instead.
>>
>> Without this, PHY0 passby is always enabled, which results in broken
>> peripheral mode on such platforms (e.g. H3/H5).
>>
>> Fixes: ba4bdc9e1dc0 ("PHY: sunxi: Add driver for sunxi usb phy")
> 
> Does anyone have feedback about this? I was hoping to get it merged
> rather soon since it pretty much fixes USB gadget on H3/R40/V3/V3s.

merged now, thanks.

-Kishon
> 
> Cheers,
> 
> Paul
> 
>> Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
>> ---
>>  drivers/phy/allwinner/phy-sun4i-usb.c | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
>> index 5163097b43df..7b23920e0068 100644
>> --- a/drivers/phy/allwinner/phy-sun4i-usb.c
>> +++ b/drivers/phy/allwinner/phy-sun4i-usb.c
>> @@ -551,6 +551,7 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)
>>  	struct sun4i_usb_phy_data *data =
>>  		container_of(work, struct sun4i_usb_phy_data, detect.work);
>>  	struct phy *phy0 = data->phys[0].phy;
>> +	struct sun4i_usb_phy *phy = phy_get_drvdata(phy0);
>>  	bool force_session_end, id_notify = false, vbus_notify = false;
>>  	int id_det, vbus_det;
>>  
>> @@ -607,6 +608,9 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)
>>  			mutex_unlock(&phy0->mutex);
>>  		}
>>  
>> +		/* Enable PHY0 passby for host mode only. */
>> +		sun4i_usb_phy_passby(phy, !id_det);
>> +
>>  		/* Re-route PHY0 if necessary */
>>  		if (data->cfg->phy0_dual_route)
>>  			sun4i_usb_phy0_reroute(data, id_det);