From patchwork Wed Oct 18 11:39:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 154843 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4725342vqb; Wed, 18 Oct 2023 04:39:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFjcennHm4WF6vR4H3DuvTTbjcdfdeyzEQ3twyleC0n8oEtFOAbcwic/Uf1Jlge1KXz9+8y X-Received: by 2002:a17:902:d04c:b0:1b8:2ba0:c9a8 with SMTP id l12-20020a170902d04c00b001b82ba0c9a8mr4866693pll.2.1697629195383; Wed, 18 Oct 2023 04:39:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697629195; cv=none; d=google.com; s=arc-20160816; b=rJmhsS+cpUJd8BFM7/yHmqH471Xp2C+8h04+gqGZinxlK2DNgVx57Xn159HW8uovSX SXllRPHZOP/3VSqRL7stiQouQgeMz5pDyu5rmgOs808aqU3z1/Nt2GZ37C6O1ntqbtzI 3JZ0YNDcMY8G+uh+qEs26xhMts4GN9c3Ht1zQRpamRuOEbhCZx7jqOoqtC5WyIels4EU wUS87fqcZb7TGEYO3zk21nrbrPEMYW9OnvuApYez7khh6QFgFRz0A3GFwrlQn1eOi8+N Vm2vLN/gwpdkOAHsedoGHQhlirMCXCc0wSKYvgOv67uERg1pB4sM/bUM0vbeaLuT1kGP ybQg== 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=qg+M8mvk7yxj/VboNGwBKCG34lNWWtwvMc1wkZzmSuw=; fh=oL5u1qxwpthPG0onT/4SNMwjdlMbLicDue2DPzZvioY=; b=HGCS9EKFVqIoy/oMx0+NyKddtPa5TQjgGVVZmcG1ik6r9TYKMGZvaBXCFWffLeklkO wUlIb4rEweyNEkPiOTD97yv1PjCN5fdnRwxPGREJm5zNb1N2Eg9N3E+1mzo5Dt4AVNpm 7nGHrmqZGh7ERxQom7IjeiwZb5t6YwZVINxkygCYMBZhXHoCYqmBUHEpxOLCxK2aG0H3 Tf8ZOytsUqz1XJr0Sb9NT36eqA2X8WDe4bBbHY5iipNB882bm73IEdZNnzayHO6GN4ix 7azkK49Mlk06701ReSbmgfceOWMr3NnSNP66ES0vuh9+vBd8S1e6Sa6foQhh/v0Ofco/ Msow== 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:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id f1-20020a170902ce8100b001b9ed021929si4167579plg.225.2023.10.18.04.39.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 04:39:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id AFC5E813A598; Wed, 18 Oct 2023 04:39:54 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344557AbjJRLjo (ORCPT + 24 others); Wed, 18 Oct 2023 07:39:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231150AbjJRLjh (ORCPT ); Wed, 18 Oct 2023 07:39:37 -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 B20E711D for ; Wed, 18 Oct 2023 04:39:35 -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 1qt4tP-0002JQ-Po; Wed, 18 Oct 2023 13:39:15 +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 1qt4tO-002Xit-JI; Wed, 18 Oct 2023 13:39:14 +0200 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qt4tO-00FE8S-1a; Wed, 18 Oct 2023 13:39:14 +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 v5 7/9] net: dsa: microchip: Add error handling for ksz_switch_macaddr_get() Date: Wed, 18 Oct 2023 13:39:11 +0200 Message-Id: <20231018113913.3629151-8-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018113913.3629151-1-o.rempel@pengutronix.de> References: <20231018113913.3629151-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=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,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: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 18 Oct 2023 04:39:54 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780093231093030324 X-GMAIL-MSGID: 1780093231093030324 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 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index 7b05de6fe987..79052a54880c 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -3612,7 +3612,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(); @@ -3639,8 +3639,11 @@ 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) + return ret; + } return 0; }