From patchwork Mon Oct 23 09:33:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 156773 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1174833vqx; Mon, 23 Oct 2023 02:34:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQTVjAuMwzFhjvibjVE7GD2nDVagcq5Hd5BmtAiAr1oguIr78dFOyLJZzV6nkvMmrasQyn X-Received: by 2002:a05:6a20:da8e:b0:153:78c1:c40f with SMTP id iy14-20020a056a20da8e00b0015378c1c40fmr8069600pzb.15.1698053673397; Mon, 23 Oct 2023 02:34:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698053673; cv=none; d=google.com; s=arc-20160816; b=yIUCA7wG6cR8cQ6Fn8qEUi8Mkz/9jnz/E9f79WYsp6ztfjgTj70Jt8Jc/nj9gLiUz6 HqWyNK2fTJ4YgS3tx8KeT4E3rL0NeG1Muq4eMl6GsHuR9Xmvuq/xsMcD+yjzq8RtNs9X 5JVdD+d1hpaYSr4njcbi08bL8QKOOoH5cTuaVEdy/GARaiNZSpgWx1VoncucPZJmFHEG QvQJJSQMKS2n1kxf/Xi6pI4QbWcD/d7GeIbFpadvvFLoCntbQrF01YBFS++D1SWTgjvf JYd9ti7h3JU177faRIHMvJtE6gKEJviAFZzEl2U/sBu+6Vw4FwG28dYmRVCalVpuKlsR LFyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=wn2NWNYeGanFaApncEdVXpH/V6Z7b82vh5ZeRrHpZ8w=; fh=oL5u1qxwpthPG0onT/4SNMwjdlMbLicDue2DPzZvioY=; b=Fz5w7xJrMSnLlfv1BuCiCxM8FDH1Q4JPyQGVVkuNXX5KAyXRba9P/3Ajb8pwuGXzA8 PlQeCYajug+b357RmMHnjW9eMHh3HfEfdvy1XjbJW7T4Y67qLbaoCL9h3RTQNalhP2sT kGg8vv7Ip3Evjk65qmUCPhAFyiES9PLXkY1j1P9TnvrikEACiqjxAsxKYIaTIiH4iEZj j2wCpgS/sU5e5vLCBmtvobF+8XNnsjoJ79gv3YaGsWEZNVCDtbDEsvswxUqleJ+hQmNZ WKtrQOdgyGb0TLWLLqt4vQTGb8ih3quc4SNB1+g2zdN0+4iTWD0jvP0HbBfMuWRycfJk /NqQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id e21-20020a17090ab39500b00277382d4803si8351978pjr.173.2023.10.23.02.34.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 02:34:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 307BD8042D37; Mon, 23 Oct 2023 02:34:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232856AbjJWJeO (ORCPT + 27 others); Mon, 23 Oct 2023 05:34:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229807AbjJWJeI (ORCPT ); Mon, 23 Oct 2023 05:34:08 -0400 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [IPv6:2a0a:edc0:2:b01:1d::104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 061F5BE for ; Mon, 23 Oct 2023 02:34:05 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qurJi-0000DE-0r; Mon, 23 Oct 2023 11:33:46 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qurJh-003fww-2w; Mon, 23 Oct 2023 11:33:45 +0200 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qurJg-009wdd-3A; Mon, 23 Oct 2023 11:33:44 +0200 From: Oleksij Rempel To: "David S. Miller" , Andrew Lunn , Eric Dumazet , Florian Fainelli , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Woojung Huh , Arun Ramadoss , Conor Dooley , Krzysztof Kozlowski , Rob Herring Cc: Oleksij Rempel , Florian Fainelli , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com, "Russell King (Oracle)" , devicetree@vger.kernel.org Subject: [PATCH net-next v7 7/9] net: dsa: microchip: Add error handling for ksz_switch_macaddr_get() Date: Mon, 23 Oct 2023 11:33:41 +0200 Message-Id: <20231023093343.2370248-8-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231023093343.2370248-1-o.rempel@pengutronix.de> References: <20231023093343.2370248-1-o.rempel@pengutronix.de> MIME-Version: 1.0 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 23 Oct 2023 02:34:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780538328436680036 X-GMAIL-MSGID: 1780538328436680036 Enhance the ksz_switch_macaddr_get() function to handle errors that may occur during the call to ksz_write8(). Specifically, this update checks the return value of ksz_write8(), which may fail if regmap ranges validation is not passed and returns the error code. Signed-off-by: Oleksij Rempel Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- drivers/net/dsa/microchip/ksz_common.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index 0442c1b628d9..58ba1e6ff75f 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -3640,7 +3640,7 @@ int ksz_switch_macaddr_get(struct dsa_switch *ds, int port, struct ksz_switch_macaddr *switch_macaddr; struct ksz_device *dev = ds->priv; const u16 *regs = dev->info->regs; - int i; + int i, ret; /* Make sure concurrent MAC address changes are blocked */ ASSERT_RTNL(); @@ -3667,10 +3667,20 @@ int ksz_switch_macaddr_get(struct dsa_switch *ds, int port, dev->switch_macaddr = switch_macaddr; /* Program the switch MAC address to hardware */ - for (i = 0; i < ETH_ALEN; i++) - ksz_write8(dev, regs[REG_SW_MAC_ADDR] + i, addr[i]); + for (i = 0; i < ETH_ALEN; i++) { + ret = ksz_write8(dev, regs[REG_SW_MAC_ADDR] + i, addr[i]); + if (ret) + goto macaddr_drop; + } return 0; + +macaddr_drop: + dev->switch_macaddr = NULL; + refcount_set(&switch_macaddr->refcount, 0); + kfree(switch_macaddr); + + return ret; } void ksz_switch_macaddr_put(struct dsa_switch *ds)