Commit f340ed86 authored by Peter Geis's avatar Peter Geis Committed by Vinod Koul
Browse files

phy: rockchip-inno-usb2: Return zero after otg sync 



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: 8dc60f8d ("phy: rockchip-inno-usb2: Sync initial otg state")
Reported-by: default avatarMarkus Reichl <m.reichl@fivetechno.de>
Reported-by: default avatarMichael Riesch <michael.riesch@wolfvision.net>
Signed-off-by: default avatarPeter Geis <pgwipeout@gmail.com>
Tested-by: default avatarMichael Riesch <michael.riesch@wolfvision.net>
Tested-by: default avatarMarkus Reichl <m.reichl@fivetechno.de>
Reviewed-by: default avatarSamuel Holland <samuel@sholland.org>
Link: https://lore.kernel.org/r/20220902184543.1234835-1-pgwipeout@gmail.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 766ab0de

drivers/phy/rockchip/phy-rockchip-inno-usb2.c

+6 −4
Original line number Diff line number Diff line
@@ -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);

		}

	}