From nobody Fri Sep 19 07:01:47 2025 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 5069CC4708A for ; Mon, 28 Nov 2022 12:00:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231439AbiK1MAa (ORCPT ); Mon, 28 Nov 2022 07:00:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230050AbiK1MAP (ORCPT ); Mon, 28 Nov 2022 07:00:15 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 711E0186FE for ; Mon, 28 Nov 2022 04:00:14 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ozcns-0003pk-S0; Mon, 28 Nov 2022 13:00:04 +0100 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1ozcnr-000o9T-B5; Mon, 28 Nov 2022 13:00:04 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ozcnn-00Gzfi-Vi; Mon, 28 Nov 2022 12:59:59 +0100 From: Oleksij Rempel To: Woojung Huh , UNGLinuxDriver@microchip.com, Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Arun.Ramadoss@microchip.com Subject: [PATCH v1 18/26] net: dsa: microchip: ksz8_r_dyn_mac_table(): return read/write error if we got any Date: Mon, 28 Nov 2022 12:59:50 +0100 Message-Id: <20221128115958.4049431-19-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221128115958.4049431-1-o.rempel@pengutronix.de> References: <20221128115958.4049431-1-o.rempel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The read/write path may fail. So, return error if we got it. Signed-off-by: Oleksij Rempel --- drivers/net/dsa/microchip/ksz8795.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchi= p/ksz8795.c index 1b067e0cacd5..3348f5c25942 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -371,12 +371,16 @@ static int ksz8_valid_dyn_entry(struct ksz_device *de= v, u8 *data) int timeout =3D 100; const u32 *masks; const u16 *regs; + int ret; =20 masks =3D dev->info->masks; regs =3D dev->info->regs; =20 do { - ksz_read8(dev, regs[REG_IND_DATA_CHECK], data); + ret =3D ksz_read8(dev, regs[REG_IND_DATA_CHECK], data); + if (ret) + return ret; + timeout--; } while ((*data & masks[DYNAMIC_MAC_TABLE_NOT_READY]) && timeout); =20 @@ -385,7 +389,9 @@ static int ksz8_valid_dyn_entry(struct ksz_device *dev,= u8 *data) return -ETIMEDOUT; /* Entry is ready for accessing. */ } else { - ksz_read8(dev, regs[REG_IND_DATA_8], data); + ret =3D ksz_read8(dev, regs[REG_IND_DATA_8], data); + if (ret) + return ret; =20 /* There is no valid entry in the table. */ if (*data & masks[DYNAMIC_MAC_TABLE_MAC_EMPTY]) @@ -414,7 +420,9 @@ static int ksz8_r_dyn_mac_table(struct ksz_device *dev,= u16 addr, u8 *mac_addr, ctrl_addr =3D IND_ACC_TABLE(TABLE_DYNAMIC_MAC | TABLE_READ) | addr; =20 mutex_lock(&dev->alu_mutex); - ksz_write16(dev, regs[REG_IND_CTRL_0], ctrl_addr); + ret =3D ksz_write16(dev, regs[REG_IND_CTRL_0], ctrl_addr); + if (ret) + goto unlock_alu; =20 ret =3D ksz8_valid_dyn_entry(dev, &data); if (ret =3D=3D -ENXIO) { @@ -425,7 +433,10 @@ static int ksz8_r_dyn_mac_table(struct ksz_device *dev= , u16 addr, u8 *mac_addr, if (ret) goto unlock_alu; =20 - ksz_read64(dev, regs[REG_IND_DATA_HI], &buf); + ret =3D ksz_read64(dev, regs[REG_IND_DATA_HI], &buf); + if (ret) + goto unlock_alu; + data_hi =3D (u32)(buf >> 32); data_lo =3D (u32)buf; =20 @@ -446,7 +457,6 @@ static int ksz8_r_dyn_mac_table(struct ksz_device *dev,= u16 addr, u8 *mac_addr, =20 mac_addr[1] =3D (u8)data_hi; mac_addr[0] =3D (u8)(data_hi >> 8); - ret =3D 0; =20 unlock_alu: mutex_unlock(&dev->alu_mutex); --=20 2.30.2