From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 677DFECAAD5 for ; Fri, 2 Sep 2022 17:35:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235473AbiIBRfl (ORCPT ); Fri, 2 Sep 2022 13:35:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232815AbiIBRfi (ORCPT ); Fri, 2 Sep 2022 13:35:38 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0308A37F8B for ; Fri, 2 Sep 2022 10:35:37 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 9305FB82CE4 for ; Fri, 2 Sep 2022 17:35:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BE56BC433C1; Fri, 2 Sep 2022 17:35:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662140134; bh=Yg/1HfkU9lTB+P/qKj15r6DxFkOzWEP0cv8ZznfLd0o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=qZxiakJ5v/5PYKfFDMFamky9atKexvD/yePMGz3Ag/XpcZ8kKGCr5qC75qRBLtQd1 OiJ9qTQ/YJ5nKVQLIFb/266WnWI0bk2/hXdT/8kLh0rhd0EJhQCXsH/fREQpKqMJij l8pVFKgT2A2652IoIgDqX36xZLwenuXvAAAW1Mg6MdG9hY9hisKe114VsW08JnqgPa VgefgZvKqlS5n8AacSxxP/M2cCexCLX3OCPG3ZaDz8X1Y1O0KPfwYeYkBqdw9z4Rkn jPoNkYCZNilYT1hlW8HTK1MJMLwnedCHbrY8i5A7IhGvfeRr0YqiWelyFAhRNpCjNU Oze8aDlwQnVAA== Date: Fri, 2 Sep 2022 23:05:30 +0530 From: Vinod Koul To: Peter Geis Cc: Heiko Stuebner , Kishon Vijay Abraham I , Samuel Holland , Markus Reichl , Michael Riesch , linux-phy@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3] phy: rockchip-inno-usb2: Return zero after otg sync Message-ID: References: <20220824122543.174730-1-pgwipeout@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220824122543.174730-1-pgwipeout@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 24-08-22, 08:25, 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") > No blank here please > Reported-by: Markus Reichl > Reported-by: Michael Riesch > Signed-off-by: Peter Geis > Tested-by: Michael Riesch > Tested-by: Markus Reichl > --- > Changelog: > v3 > - add missing brackets around new goto > v2 > - switch to using our own variable > - add missing goto to skip sync in case of registration failure > --- > drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 9 ++++++--- > 1 file changed, 6 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..27da5ba379c4 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]; > @@ -1163,12 +1163,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) > + { :-( this is _not_ linux kernel code style! Reminder: it always helps to run checkpatch > 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.25.1 -- ~Vinod