Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
Date:   Mon, 20 Nov 2023 18:15:43 +0100
From:   Larysa Zaremba <larysa.zaremba@intel.com>
To:     Christian Marangi <ansuelsmth@gmail.com>
CC:     Andrew Lunn <andrew@lunn.ch>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [net-next PATCH] net: phy: correctly check soft_reset ret ONLY
 if defined for PHY
Message-ID: <ZVuUP797C4PLzJsP@lzaremba-mobl.ger.corp.intel.com>
References: <20231120131540.9442-1-ansuelsmth@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20231120131540.9442-1-ansuelsmth@gmail.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nWbDJHgAg4nWAimQNMMBxcsGj1OjhLQBZAKD1PPfPl8wWCUArPon9bIdRxfu?=
 =?us-ascii?Q?Q5UYM0ML+a5EnY02HlKvU0sXE+EWMMMlDz9dVRguiK/2UfUBQl4kjoFk5Go2?=
 =?us-ascii?Q?VxWfuIaDo/c6IGt82FipB4lwSs1IHZtpP2fToHwDzhgd8kXhfz0+HTBf2Y8U?=
 =?us-ascii?Q?ip0JfwRSSaPuygfxUhoTR8YA5LQsAv8TagZcjmAKksz4afMS7mp9L0mTY8AO?=
 =?us-ascii?Q?AuP+Z6IKIPlbMYFznmUMJh2Rvf/wKGbgM/raSOuhy10V+JaZGikOvrXi5ADr?=
 =?us-ascii?Q?t9OEqTKkb46kR60UH78bLVNkElAyUfGdveg4H4ICcGUHToNAa658gKIWsv6f?=
 =?us-ascii?Q?d7x6+jaJz3x+YZVOd8hCRdyaldh0ho60DIg6+m8T6qpTlEtmou1DmJ+AADYg?=
 =?us-ascii?Q?X3EkJnlEex7I5kKF3v4WSTtyv0jgDgI+ppkfks9ruWHrGWNcmdUA1InW5tz1?=
 =?us-ascii?Q?/DHSAJo9NLSqHuHqCAeIVBcyubXIg3WpL/0gd0QwnOeTvwtwwtw07ko3+kZb?=
 =?us-ascii?Q?uqNCGU+fmOFgISPP4KOZciwBczNQk8J2JxlQhp5Sno5IjrpDn8hhbdr3PsRC?=
 =?us-ascii?Q?c9mLF8OUGL6D7Ro6eod4/mnIhZDBHrntHnkv3LcQTcdWz6hmfwTy9RIwwEaN?=
 =?us-ascii?Q?mHt32m8Wv3Npnd7hK9m3vvpbwgv0gG2V1Xm73WxyecCmBnwD0lhbBjIgj+de?=
 =?us-ascii?Q?99BPRbrav5ZlJ96Iv/wELSvYuiQLZ0N9HyoysZP1ncybdpOfAIcdbVgUWapV?=
 =?us-ascii?Q?kx8mx0Pv4BVumWwOH4GaKQDgJ4MvpP9j7Q6d0Zwy3dnQHOZBdmW002pez7t1?=
 =?us-ascii?Q?f7iQWpd5E6AJ+kAg3sWL1Y4LIb5uYXwWMhTtEKzUGFCh0W4Q/HovaQ7XCK/t?=
 =?us-ascii?Q?qlZUgj1IqnWpQd2bahBMEGaRTo/E1kj1cR5JQb/8UQEVXQPKQMMwqsv9Oh1t?=
 =?us-ascii?Q?6BbudH0wk/r32WJTDbgsdC3TxjgRsSICh0Cz9EniL7cbm/JWG/nu+wkyr7Yc?=
 =?us-ascii?Q?Kr69aCoC3QWRrkc1yQH6TqYaOYaCWhCf4OIvH02A5vUG+b0ITXDo96dktXZh?=
 =?us-ascii?Q?Cwfr4SfeVJWxk+jfjyp9h7DG1gUsgNqzSPQWgr8qE1TFAXceGwCErk1aroez?=
 =?us-ascii?Q?xPixuKgom9ixKeqXrTnO1GmoM/uQdCHDtkRn/IuDYlaqp+wP4AnOJCmwIk5l?=
 =?us-ascii?Q?azOYXNd/JIz5PTvvSk7sbbCxbt+FqNTQix67Hmak/a9rjzgfIKECY45DkZmB?=
 =?us-ascii?Q?dOqa2IMVFFh6xwsIHzmqLU0qpoFcZMGrGTaS1pu02iVlIB/XkKcjEqcDps98?=
 =?us-ascii?Q?FrI4BtgO8LzSxgT8dI1VjP9Nd2MJc5Pw4jiB0Ddl2BN/B/bTbtu/sh6KA/Uv?=
 =?us-ascii?Q?J2kEnAKwua0HZNxdC0SwpsN89LMhwG57J7L4byn8/I5dqcaxkhCaUGkQxJS5?=
 =?us-ascii?Q?Zo8duitT29WjMeDKaRvDms0SYGlXsQJguIjALIz+AO5WntnmsEhJXE9vkymV?=
 =?us-ascii?Q?lvd55/v8fNT9riSA1x0CKQzWdH8FbFHyobadN/APehVA4zXZLEJyf3lufHOI?=
 =?us-ascii?Q?l/EoyprS6+qlaTwrUa2lKdU+toIkUB7jDYZ85Rho+4l/QZnolPYgB7Asx9Mz?=
 =?us-ascii?Q?YQ=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: fc1f201e-4b6a-4099-60d8-08dbe9ec59b0
X-MS-Exchange-CrossTenant-AuthSource: SN7PR11MB7540.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2023 17:15:53.0709
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Py/uQep/9yOa9y+In6E8C+78K/hKsFHk2LMxtlT557XBOCzqFLMU3NsyPvhcXkUHKmwER5aXMnoQxwYsr7InrssUCs2hFfK84gOi0GrSaaU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB4784
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 20 Nov 2023 09:16:28 -0800 (PST)

On Mon, Nov 20, 2023 at 02:15:40PM +0100, Christian Marangi wrote:
> soft_reset call for phy_init_hw had multiple revision across the years
> and the implementation goes back to 2014. Originally was a simple call
> to write the generic PHY reset BIT, it was then moved to a dedicated
> function. It was then added the option for PHY driver to define their
> own special way to reset the PHY. Till this change, checking for ret was
> correct as it was always filled by either the generic reset or the
> custom implementation. This changed tho with commit 6e2d85ec0559 ("net:
> phy: Stop with excessive soft reset"), as the generic reset call to PHY
> was dropped but the ret check was never made entirely optional and
> dependent whether soft_reset was defined for the PHY driver or not.
> 
> Luckly nothing was ever added before the soft_reset call so the ret
> check (in the case where a PHY didn't had soft_reset defined) although
> wrong, never caused problems as ret was init 0 at the start of
> phy_init_hw.
> 
> To prevent any kind of problem and to make the function cleaner and more
> robust, correctly move the ret check if the soft_reset section making it
> optional and needed only with the function defined.
> 
> Fixes: 6e2d85ec0559 ("net: phy: Stop with excessive soft reset")
> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
> ---
>  drivers/net/phy/phy_device.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
> index 2ce74593d6e4..478126f6b5bc 100644
> --- a/drivers/net/phy/phy_device.c
> +++ b/drivers/net/phy/phy_device.c
> @@ -1235,14 +1235,13 @@ int phy_init_hw(struct phy_device *phydev)
>  
>  	if (phydev->drv->soft_reset) {
>  		ret = phydev->drv->soft_reset(phydev);
> +		if (ret < 0)
> +			return ret;
> +
>  		/* see comment in genphy_soft_reset for an explanation */
> -		if (!ret)
> -			phydev->suspended = 0;
> +		phydev->suspended = 0;

Are you sure 'suspended' should not be cleared, if soft_reset fails?

>  	}
>  
> -	if (ret < 0)
> -		return ret;
> -
>  	ret = phy_scan_fixups(phydev);
>  	if (ret < 0)
>  		return ret;
> -- 
> 2.40.1
> 
>