From: "Heiko Stübner" <heiko@sntech.de>
To: Kishon Vijay Abraham I <kishon@ti.com>,
Vinod Koul <vkoul@kernel.org>, Peter Geis <pgwipeout@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Peter Geis <pgwipeout@gmail.com>
Cc: Markus Reichl <m.reichl@fivetechno.de>,
Michael Riesch <michael.riesch@wolfvision.net>,
linux-phy@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] phy: rockchip-inno-usb2: Return zero after otg sync
Date: Tue, 23 Aug 2022 20:48:55 +0200 [thread overview]
Message-ID: <2872516.OBFZWjSADL@diego> (raw)
In-Reply-To: <20220823144728.47068-1-pgwipeout@gmail.com>
Am Dienstag, 23. August 2022, 16:47:28 CEST schrieb Peter Geis:
> 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: Heiko Stuebner <heiko@sntech.de>
Tested-by: Heiko Stuebner <heiko@sntech.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)
> 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);
> }
> }
>
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-08-23 18:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-23 14:47 [PATCH v2] phy: rockchip-inno-usb2: Return zero after otg sync Peter Geis
2022-08-23 18:48 ` Heiko Stübner [this message]
2022-08-24 5:33 ` Michael Riesch
2022-08-24 10:17 ` Peter Geis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2872516.OBFZWjSADL@diego \
--to=heiko@sntech.de \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-phy@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=m.reichl@fivetechno.de \
--cc=michael.riesch@wolfvision.net \
--cc=pgwipeout@gmail.com \
--cc=samuel@sholland.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).