lkml.org 
[lkml]   [2022]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH v2] phy: rockchip-inno-usb2: Return zero after otg sync
From
Hi Peter,

On 8/23/22 16:47, Peter Geis wrote:
> The otg sync state patch reuses the ret variable, but fails to set it to
> zero after use. This leads to a situation when the otg port is in
> peripheral mode where the otg phy aborts halfway through setup. It also
> fails to account for a failure to register the extcon notifier. Fix this
> by using our own variable and skipping otg sync in case of failure.
>
> Fixes: 8dc60f8da22f ("phy: rockchip-inno-usb2: Sync initial otg state")
>
> Reported-by: Markus Reichl <m.reichl@fivetechno.de>
> Reported-by: Michael Riesch <michael.riesch@wolfvision.net>
> Signed-off-by: Peter Geis <pgwipeout@gmail.com>
> Tested-by: Michael Riesch <michael.riesch@wolfvision.net>
> Tested-by: Markus Reichl <m.reichl@fivetechno.de>
> ---
> drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
> index 0b1e9337ee8e..d579a22c61df 100644
> --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
> +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
> @@ -1124,7 +1124,7 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
> struct rockchip_usb2phy_port *rport,
> struct device_node *child_np)
> {
> - int ret;
> + int ret, id;
>
> rport->port_id = USB2PHY_PORT_OTG;
> rport->port_cfg = &rphy->phy_cfg->port_cfgs[USB2PHY_PORT_OTG];
> @@ -1164,11 +1164,12 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
> EXTCON_USB_HOST, &rport->event_nb);
> if (ret)

This needs braces, right?

if (ret) {
> dev_err(rphy->dev, "register USB HOST notifier failed\n");
> + goto out;

}

With the braces the patch works as expected.

Thanks and best regards,
Michael

>
> if (!of_property_read_bool(rphy->dev->of_node, "extcon")) {
> /* do initial sync of usb state */
> - ret = property_enabled(rphy->grf, &rport->port_cfg->utmi_id);
> - extcon_set_state_sync(rphy->edev, EXTCON_USB_HOST, !ret);
> + id = property_enabled(rphy->grf, &rport->port_cfg->utmi_id);
> + extcon_set_state_sync(rphy->edev, EXTCON_USB_HOST, !id);
> }
> }
>

\
 
 \ /
  Last update: 2022-08-24 07:33    [W:1.117 / U:0.488 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site