Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc:     Paolo Abeni <pabeni@redhat.com>, Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Vladimir Oltean <vladimir.oltean@nxp.com>
Subject: [PATCH v2 net-next 2/2] net: mscc: ocelot: check return values of writes during reset
Date:   Sat, 17 Sep 2022 10:51:27 -0700
Message-Id: <20220917175127.161504-3-colin.foster@in-advantage.com>
In-Reply-To: <20220917175127.161504-1-colin.foster@in-advantage.com>
References: <20220917175127.161504-1-colin.foster@in-advantage.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bh1yBHA2BizGjrE7oa84Xllc3TZmYL7BF/9HyHBtdt3fEUJJzpgpojHfBBEW?=
 =?us-ascii?Q?0kfuadRAa37/YzisWzqGeSHG0V5eYzPKaOo6hYpdXCel4cUtbm6XQvg6Wzzw?=
 =?us-ascii?Q?ivqCJiBIDJEGIgkjxAi/G4DuBFnTH6O2eJzR73ukIX1tsrjrYypCoMRP36Ew?=
 =?us-ascii?Q?H2LFnY5zKgw941qVnP5Inc6/gMj8cmVB+sFHUc7VXtKykMY6niZ11S133LnM?=
 =?us-ascii?Q?cHC1bdAe9G8o1Fj1l2Ehs9zHGlFTv3xNOLJhhNOQv4e0GLx8rf39gT1LWNt5?=
 =?us-ascii?Q?v46SXHsApHUaW8JPl4uxHxPp9T1a5eIagviPzS1nSxpQKedVONg8+xHK8SUn?=
 =?us-ascii?Q?EVN3+GwErJti7JXOs3q5M9bJc8hjfZwPcpOSj7risogRwTKqu7oPLh50FVAq?=
 =?us-ascii?Q?RX+IseHUR02JUlptUo1hqRWv7TqbPVC3iAwQcLatiZlRDQalytUNKKGGBmdR?=
 =?us-ascii?Q?Jd5r2XRsL2bGywHTJPB3SJL+D8ogyaBs7Qq1nn5IrWhiD6h/NsVknu711cqS?=
 =?us-ascii?Q?Wx+FasKOyu9KvxFqUjjQd5NxjDWVbL1CQ/oVagfIH9vOauV56SZ9grWyO6dH?=
 =?us-ascii?Q?eHPKsM/x87vdKNhQKixwLb4z0wPDFZxp98+gfSVTdCUKjsJFe1IFFuftHDo/?=
 =?us-ascii?Q?tTj1cllGkqfCDBKuhwL+CrH5I6HnbxgVvCjhZj9421Y/c4QwmfUBeLOYe60i?=
 =?us-ascii?Q?Z/qUQ9XVfSNggLBp6Z20AOYMXlRFvlV0Zt/ijtZWuTBh6WJtwSYazgM7uZU+?=
 =?us-ascii?Q?r4ThCwk1HyvfMbVOBYDHNxnLs2rCtbZDUgRx4AxlmYDighfsOa+hGdCPx7WP?=
 =?us-ascii?Q?mXmk8fToUnNfVuAAPM7ByKRX2qm/mk3hjwv67L9i6PPRyV50364L1ocvLDK1?=
 =?us-ascii?Q?DpLCz/gofX9QbMex8WbmHo8TsZVwEjR36hH8xLxqqy9qPVgXfrN7ZK0szgMB?=
 =?us-ascii?Q?X8dVozdGrgDwwUqWI9Ic9kSe/yZx4WialsFb5lewEoS77RYzvOFED5dF3JlH?=
 =?us-ascii?Q?AGPq0PWzIDVHMC/b9IKQyhFTY7Ezf66jcetGhy2toQ8yB9wcmEUANki2zuEH?=
 =?us-ascii?Q?y2YyKf3jmRqOG5KTkbIlGceEObrFM2C0P/OZdwUvylSDHeLWGJtf1kXcHcLs?=
 =?us-ascii?Q?jb2uVTLkOKGrQMuZVRn3+C8sWfgyiZOlJs2WKkY2QklSapgcToNIA5s9ZmKi?=
 =?us-ascii?Q?G4D0mnFAduMwU1C6x2OGT/HBHHxmoqlUk2SJr6SGkBA/4jwcdtI7NlLIsfhc?=
 =?us-ascii?Q?D3PaaeL2VNkIeMA4JLSuT71pb11LLux9g9GjNIGj5hQZRrNLgrWd+uHIKux8?=
 =?us-ascii?Q?F+EPB8iXhld85BgUhWEwOSIUTFDCVG+9fUpzbPon6mK2t78GlRjx0agN9ON4?=
 =?us-ascii?Q?J7VvkMEkn3hDG0S7cTFUs8KmyTETI5BB0hV5NaZuexWk6EJy2aVbnRZXFbjQ?=
 =?us-ascii?Q?R0gZqjKdsnGT7UtSzhbLiIXkY7jFSAkBdvF/mEkegBgVCQPsZ4LHEfiXQKef?=
 =?us-ascii?Q?Hx8sLFtis8bXQSWfzyK745N0jzJAW/fdgcZgzBafE0J5ETSucFh2iCC1Fc+z?=
 =?us-ascii?Q?vsrhSzYgLda7/V+KhVWhytdJBJ22l5ob8Vw2SujHeV9mh482WPxfUaYP8CcP?=
 =?us-ascii?Q?XejkyaugU24ql05rfRXqkts=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b5213f95-1d4e-4830-7eaf-08da98d547d2
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2022 17:51:42.8810
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: BmoVvVGriPNoiHkC9ji3b70WtIf3InoOF+a7DySpsPhuFm9Qk79Vk+FqbF+TQPWnGUFp1swwhpmMnoNCU95tL/s2w1nRusAmf7Pz/QxXuIM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4523
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The ocelot_reset() function utilizes regmap_field_write() but wasn't
checking return values. While this won't cause issues for the current MMIO
regmaps, it could be an issue for externally controlled interfaces.

Add checks for these return values.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
---

v2:
    Change "err = ...; return err" to just "return ..."

---
 drivers/net/ethernet/mscc/ocelot_vsc7514.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
index 3fb9183c1159..6f22aea08a64 100644
--- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
+++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
@@ -211,8 +211,13 @@ static int ocelot_reset(struct ocelot *ocelot)
 	int err;
 	u32 val;
 
-	regmap_field_write(ocelot->regfields[SYS_RESET_CFG_MEM_INIT], 1);
-	regmap_field_write(ocelot->regfields[SYS_RESET_CFG_MEM_ENA], 1);
+	err = regmap_field_write(ocelot->regfields[SYS_RESET_CFG_MEM_INIT], 1);
+	if (err)
+		return err;
+
+	err = regmap_field_write(ocelot->regfields[SYS_RESET_CFG_MEM_ENA], 1);
+	if (err)
+		return err;
 
 	/* MEM_INIT is a self-clearing bit. Wait for it to be cleared (should be
 	 * 100us) before enabling the switch core.
@@ -222,10 +227,11 @@ static int ocelot_reset(struct ocelot *ocelot)
 	if (err)
 		return err;
 
-	regmap_field_write(ocelot->regfields[SYS_RESET_CFG_MEM_ENA], 1);
-	regmap_field_write(ocelot->regfields[SYS_RESET_CFG_CORE_ENA], 1);
+	err = regmap_field_write(ocelot->regfields[SYS_RESET_CFG_MEM_ENA], 1);
+	if (err)
+		return err;
 
-	return 0;
+	return regmap_field_write(ocelot->regfields[SYS_RESET_CFG_CORE_ENA], 1);
 }
 
 /* Watermark encode
-- 
2.25.1