From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E414C433FE for ; Tue, 19 Oct 2021 15:00:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EA46660FDA for ; Tue, 19 Oct 2021 15:00:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232170AbhJSPCj (ORCPT ); Tue, 19 Oct 2021 11:02:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:53190 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233046AbhJSPCb (ORCPT ); Tue, 19 Oct 2021 11:02:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3FAED61175; Tue, 19 Oct 2021 15:00:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634655618; bh=4rfkTexNqA3QcHsJYu/4uKzSLEHA8UvTplZVI9VxCVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R7iSR/kbMH8Ycee4zCqPy9qmQAbLlb2+fxG0laerL/HT+4QKw1nGwawuXd3E8ojWQ hTBadMZk7fAx06rIulAnZuxteHzIqdNIPkl40gt1eyXF9U0ZcL29dEIiMLge4lkoaV jyiTq8umrvlxWdqREFFLqalyIf7DMCI9fVZb3VHX4PyWVSyTWmIfS++M64CknWiS2O VCe4AH25m+qkG8hJTbNBPtW3muFVwaBew7Iq/x0DQsrtntRi5n8kfDvN2zDrVfjwOJ tx5M8EIpuWCQpAgNSSH3srpKCMSuz4jIs9NDfggz6OXNBvhfB/WcaO+LeIh6KUcUJv JvYIdiH/KcA0g== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, Jakub Kicinski , peppe.cavallaro@st.com, alexandre.torgue@foss.st.com, joabreu@synopsys.com, mcoquelin.stm32@gmail.com, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH net-next 2/6] ethernet: stmmac: use eth_hw_addr_set() Date: Tue, 19 Oct 2021 08:00:07 -0700 Message-Id: <20211019150011.1355755-3-kuba@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211019150011.1355755-1-kuba@kernel.org> References: <20211019150011.1355755-1-kuba@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 406f42fa0d3c ("net-next: When a bond have a massive amount of VLANs...") introduced a rbtree for faster Ethernet address look up. To maintain netdev->dev_addr in this tree we need to make all the writes to it got through appropriate helpers. Read the address into an array on the stack, then call eth_hw_addr_set(). Signed-off-by: Jakub Kicinski --- CC: peppe.cavallaro@st.com CC: alexandre.torgue@foss.st.com CC: joabreu@synopsys.com CC: mcoquelin.stm32@gmail.com CC: linux-stm32@st-md-mailman.stormreply.com CC: linux-arm-kernel@lists.infradead.org --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index b720539ccb0a..88d3053d2f87 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2818,9 +2818,13 @@ static int stmmac_get_hw_features(struct stmmac_priv *priv) */ static void stmmac_check_ether_addr(struct stmmac_priv *priv) { + u8 addr[ETH_ALEN]; + if (!is_valid_ether_addr(priv->dev->dev_addr)) { - stmmac_get_umac_addr(priv, priv->hw, priv->dev->dev_addr, 0); - if (!is_valid_ether_addr(priv->dev->dev_addr)) + stmmac_get_umac_addr(priv, priv->hw, addr, 0); + if (is_valid_ether_addr(addr)) + eth_hw_addr_set(priv->dev, addr); + else eth_hw_addr_random(priv->dev); dev_info(priv->device, "device MAC address %pM\n", priv->dev->dev_addr); -- 2.31.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C433C433EF for ; Tue, 19 Oct 2021 15:01:45 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CB2FD60FDA for ; Tue, 19 Oct 2021 15:01:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CB2FD60FDA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zyv7A7b9ffEmLesjfdR9lhA5pHUmYzEC0N+CnQUtElI=; b=GV6SC7PU24U+9i xKRxwsmPY5K8wqnW8lVqNSRm9Hur1TslxJwsMOchKggYYQv0078ywNtwJxqjFBN0t9asZL9kFVU/o sTTiGOgFPyPlwwrYYXRlvShkBcE2zG4mt4gRZXDeXDT2OWdPAbxXSVbU9ekCBOmdnamPYby4RL5G5 0yvTvlKMZfEYPgBs1Wp+FMG8u8Zb3cW0snavq3dHsmRd+/HgYd0P2NM40HzgNZsAuucv8tn53TbGs AcP2WfIPSEvZ3NPlQfRAlUvdM80Dk4TL/qQUaLciXlrgqghlTIljWX32c62bZdbEdWGXG9QHNJgyR E/shT5rrNnXW/GYrw9dw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcqbG-001bgs-Fm; Tue, 19 Oct 2021 15:00:22 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcqbD-001bg7-8z for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 15:00:20 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3FAED61175; Tue, 19 Oct 2021 15:00:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634655618; bh=4rfkTexNqA3QcHsJYu/4uKzSLEHA8UvTplZVI9VxCVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R7iSR/kbMH8Ycee4zCqPy9qmQAbLlb2+fxG0laerL/HT+4QKw1nGwawuXd3E8ojWQ hTBadMZk7fAx06rIulAnZuxteHzIqdNIPkl40gt1eyXF9U0ZcL29dEIiMLge4lkoaV jyiTq8umrvlxWdqREFFLqalyIf7DMCI9fVZb3VHX4PyWVSyTWmIfS++M64CknWiS2O VCe4AH25m+qkG8hJTbNBPtW3muFVwaBew7Iq/x0DQsrtntRi5n8kfDvN2zDrVfjwOJ tx5M8EIpuWCQpAgNSSH3srpKCMSuz4jIs9NDfggz6OXNBvhfB/WcaO+LeIh6KUcUJv JvYIdiH/KcA0g== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, Jakub Kicinski , peppe.cavallaro@st.com, alexandre.torgue@foss.st.com, joabreu@synopsys.com, mcoquelin.stm32@gmail.com, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH net-next 2/6] ethernet: stmmac: use eth_hw_addr_set() Date: Tue, 19 Oct 2021 08:00:07 -0700 Message-Id: <20211019150011.1355755-3-kuba@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211019150011.1355755-1-kuba@kernel.org> References: <20211019150011.1355755-1-kuba@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_080019_357269_283F5BE0 X-CRM114-Status: GOOD ( 10.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit 406f42fa0d3c ("net-next: When a bond have a massive amount of VLANs...") introduced a rbtree for faster Ethernet address look up. To maintain netdev->dev_addr in this tree we need to make all the writes to it got through appropriate helpers. Read the address into an array on the stack, then call eth_hw_addr_set(). Signed-off-by: Jakub Kicinski --- CC: peppe.cavallaro@st.com CC: alexandre.torgue@foss.st.com CC: joabreu@synopsys.com CC: mcoquelin.stm32@gmail.com CC: linux-stm32@st-md-mailman.stormreply.com CC: linux-arm-kernel@lists.infradead.org --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index b720539ccb0a..88d3053d2f87 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2818,9 +2818,13 @@ static int stmmac_get_hw_features(struct stmmac_priv *priv) */ static void stmmac_check_ether_addr(struct stmmac_priv *priv) { + u8 addr[ETH_ALEN]; + if (!is_valid_ether_addr(priv->dev->dev_addr)) { - stmmac_get_umac_addr(priv, priv->hw, priv->dev->dev_addr, 0); - if (!is_valid_ether_addr(priv->dev->dev_addr)) + stmmac_get_umac_addr(priv, priv->hw, addr, 0); + if (is_valid_ether_addr(addr)) + eth_hw_addr_set(priv->dev, addr); + else eth_hw_addr_random(priv->dev); dev_info(priv->device, "device MAC address %pM\n", priv->dev->dev_addr); -- 2.31.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel