lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 506/862] phy: rockchip-inno-usb2: Return zero after otg sync
    Date
    From: Peter Geis <pgwipeout@gmail.com>

    [ Upstream commit f340ed8664a55a467850ec1689996e63d9ee971a ]

    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>
    Reviewed-by: Samuel Holland <samuel@sholland.org>
    Link: https://lore.kernel.org/r/20220902184543.1234835-1-pgwipeout@gmail.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
    index 0b1e9337ee8e..e6ededc51523 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];
    @@ -1162,13 +1162,15 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,

    ret = devm_extcon_register_notifier(rphy->dev, rphy->edev,
    EXTCON_USB_HOST, &rport->event_nb);
    - if (ret)
    + if (ret) {
    dev_err(rphy->dev, "register USB HOST notifier failed\n");
    + goto out;
    + }

    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);
    }
    }

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 12:50    [W:4.077 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site