From patchwork Thu Nov 18 14:27:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 12627169 X-Patchwork-Delegate: kuba@kernel.org 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 42D8DC433FE for ; Thu, 18 Nov 2021 14:27:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2BDC66128C for ; Thu, 18 Nov 2021 14:27:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233086AbhKROa2 (ORCPT ); Thu, 18 Nov 2021 09:30:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:46384 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233068AbhKROa1 (ORCPT ); Thu, 18 Nov 2021 09:30:27 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 81A2461406; Thu, 18 Nov 2021 14:27:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637245647; bh=Z5sEMqaKEjdeRs8J9yX4V/4uXgJ2vqgipplbSL1ps4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hDEMALms2vFLaCE1Hmeja0wtFdkczGIul8mlayOT8ko/9t8R1WjbvPNTFQ3W+xvlY N8vlBR4rFYwT6tgU0orvFeqUeKBQJIn8nuWaC52CAmY4TcCwoARLlcPa/XWNcmrkEE ylLNt995+QKZ6/F+4tMS2C3MBdCrFBHymF1yWGbBdpUuWnJ9mTzhqFT6eASKO305qr rJ7ZUXx0g87C/bL70ytNiRRP4Oh9QBUU+sXyn20+L0EErola9LbYTg2+4tYf/qxL4A Im0c+uLVeFTDku3PdQCFX0Bz3VrM1Y6TAiDDhpjh2hwEbggEEZoaYLSZTNnc4T5hWp SNN/T6rD88khw== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, Jakub Kicinski , Lukasz Stelmach Subject: [PATCH net-next 1/4] net: ax88796c: don't write to netdev->dev_addr directly Date: Thu, 18 Nov 2021 06:27:17 -0800 Message-Id: <20211118142720.3176980-2-kuba@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211118142720.3176980-1-kuba@kernel.org> References: <20211118142720.3176980-1-kuba@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The future is here, convert the new driver as we are about to make netdev->dev_addr const. Acked-by: Lukasz Stelmach Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/asix/ax88796c_main.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c index e230d8d0ff73..e7a9f9863258 100644 --- a/drivers/net/ethernet/asix/ax88796c_main.c +++ b/drivers/net/ethernet/asix/ax88796c_main.c @@ -144,12 +144,13 @@ static void ax88796c_set_mac_addr(struct net_device *ndev) static void ax88796c_load_mac_addr(struct net_device *ndev) { struct ax88796c_device *ax_local = to_ax88796c_device(ndev); + u8 addr[ETH_ALEN]; u16 temp; lockdep_assert_held(&ax_local->spi_lock); /* Try the device tree first */ - if (!eth_platform_get_mac_address(&ax_local->spi->dev, ndev->dev_addr) && + if (!platform_get_ethdev_address(&ax_local->spi->dev, ndev) && is_valid_ether_addr(ndev->dev_addr)) { if (netif_msg_probe(ax_local)) dev_info(&ax_local->spi->dev, @@ -159,18 +160,19 @@ static void ax88796c_load_mac_addr(struct net_device *ndev) /* Read the MAC address from AX88796C */ temp = AX_READ(&ax_local->ax_spi, P3_MACASR0); - ndev->dev_addr[5] = (u8)temp; - ndev->dev_addr[4] = (u8)(temp >> 8); + addr[5] = (u8)temp; + addr[4] = (u8)(temp >> 8); temp = AX_READ(&ax_local->ax_spi, P3_MACASR1); - ndev->dev_addr[3] = (u8)temp; - ndev->dev_addr[2] = (u8)(temp >> 8); + addr[3] = (u8)temp; + addr[2] = (u8)(temp >> 8); temp = AX_READ(&ax_local->ax_spi, P3_MACASR2); - ndev->dev_addr[1] = (u8)temp; - ndev->dev_addr[0] = (u8)(temp >> 8); + addr[1] = (u8)temp; + addr[0] = (u8)(temp >> 8); - if (is_valid_ether_addr(ndev->dev_addr)) { + if (is_valid_ether_addr(addr)) { + eth_hw_addr_set(ndev, addr); if (netif_msg_probe(ax_local)) dev_info(&ax_local->spi->dev, "MAC address read from ASIX chip\n"); From patchwork Thu Nov 18 14:27:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 12627171 X-Patchwork-Delegate: kuba@kernel.org 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 E397CC4332F for ; Thu, 18 Nov 2021 14:27:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D06C761260 for ; Thu, 18 Nov 2021 14:27:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233092AbhKROa3 (ORCPT ); Thu, 18 Nov 2021 09:30:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:46392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233001AbhKROa2 (ORCPT ); Thu, 18 Nov 2021 09:30:28 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id CC41561452; Thu, 18 Nov 2021 14:27:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637245648; bh=1fYhL2/dwOHU+DAYurDA2pq8Nt+JCeUbaAUtKDU5Z4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l7uXg3a9FtB9yBZcviAEyAR5LNkWYm7aHywJ9/9zA0fH6Wwqe2Cyzi+9IhboZ7A5C fqV8RpjheEEME4BFfxLo7ZlyCCotHx7A0rsbKOosy3I/kNQTB1IU18G/1LgAi79Adm EWop1XgW426TepSyK0DV739eZB3JAP5j2VEbSHgoPsdffGIoJ+bVAm9MsqDatU8CVm 5hPGf51NBM0X3TQ+XsKovwILHteKPKl8xT8pz6IUThaFBc9zktXglb/9Y764vrKw9v BVNq4USVtuG21i4UeM+hUQVXWhnXabwJKoRD6cPODUPpkWLv4CBWMhRm3Ozr0fM8Fs ptnAAB1gr6Vig== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, Jakub Kicinski , Ido Schimmel Subject: [PATCH net-next 2/4] mlxsw: constify address in mlxsw_sp_port_dev_addr_set Date: Thu, 18 Nov 2021 06:27:18 -0800 Message-Id: <20211118142720.3176980-3-kuba@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211118142720.3176980-1-kuba@kernel.org> References: <20211118142720.3176980-1-kuba@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Argument comes from netdev->dev_addr directly, it needs a const. Reviewed-by: Ido Schimmel Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index 5925db386b1b..4ce07f9905f6 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -303,7 +303,7 @@ int mlxsw_sp_port_admin_status_set(struct mlxsw_sp_port *mlxsw_sp_port, } static int mlxsw_sp_port_dev_addr_set(struct mlxsw_sp_port *mlxsw_sp_port, - unsigned char *addr) + const unsigned char *addr) { struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp; char ppad_pl[MLXSW_REG_PPAD_LEN]; From patchwork Thu Nov 18 14:27:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 12627175 X-Patchwork-Delegate: kuba@kernel.org 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 E73D8C433EF for ; Thu, 18 Nov 2021 14:27:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CF8E661B6F for ; Thu, 18 Nov 2021 14:27:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233099AbhKROa3 (ORCPT ); Thu, 18 Nov 2021 09:30:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:46400 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233068AbhKROa2 (ORCPT ); Thu, 18 Nov 2021 09:30:28 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2286F61881; Thu, 18 Nov 2021 14:27:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637245648; bh=ggM/t0CsUScJiqimTWYRkutSY19TQge2u1WHul5n12g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U8VCo0T9kTKtgbi1Lx923GSgMI289/v/P9jJvxlxHOFSOUW02l0QzCq6tM21Wb7R0 jPE58t+wjw+g7o5T6v7zq1TYTqct2iGCkuy0prm3BpPx0q/tZ1MhdtxmpCLSIAfJd7 5KjImPLdqL42K1SywBqXkw4uaAPxK0ZozGgeaHS/FTOB6ySdZ4gTxQlabh8i8sk0sB Pd2gsq7WPSkrAQ4gpzHpcrHO0aJlGPzRScD2DSEgWf0DoPsDpzFW4Bu4psJbRtIU/q ebDaMx3oVCTHt4sVexfneSVGd8RLTcU1y9FLbdSXuNxMPrxzJKXD6wU4fCK/Z+I7DJ OAKhX94LcCAFA== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, Jakub Kicinski , Kalle Valo , ajay.kathat@microchip.com, claudiu.beznea@microchip.com Subject: [PATCH net-next 3/4] wilc1000: copy address before calling wilc_set_mac_address Date: Thu, 18 Nov 2021 06:27:19 -0800 Message-Id: <20211118142720.3176980-4-kuba@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211118142720.3176980-1-kuba@kernel.org> References: <20211118142720.3176980-1-kuba@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org wilc_set_mac_address() calls IO routines which don't guarantee the pointer won't be written to. Make a copy. Acked-by: Kalle Valo Signed-off-by: Jakub Kicinski --- CC: ajay.kathat@microchip.com CC: claudiu.beznea@microchip.com --- drivers/net/wireless/microchip/wilc1000/netdev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c index 690572e01a2a..4712cd7dff9f 100644 --- a/drivers/net/wireless/microchip/wilc1000/netdev.c +++ b/drivers/net/wireless/microchip/wilc1000/netdev.c @@ -574,6 +574,7 @@ static int wilc_mac_open(struct net_device *ndev) struct wilc *wl = vif->wilc; int ret = 0; struct mgmt_frame_regs mgmt_regs = {}; + u8 addr[ETH_ALEN] __aligned(2); if (!wl || !wl->dev) { netdev_err(ndev, "device not ready\n"); @@ -596,10 +597,9 @@ static int wilc_mac_open(struct net_device *ndev) vif->idx); if (is_valid_ether_addr(ndev->dev_addr)) { - wilc_set_mac_address(vif, ndev->dev_addr); + ether_addr_copy(addr, ndev->dev_addr); + wilc_set_mac_address(vif, addr); } else { - u8 addr[ETH_ALEN]; - wilc_get_mac_address(vif, addr); eth_hw_addr_set(ndev, addr); } From patchwork Thu Nov 18 14:27:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 12627173 X-Patchwork-Delegate: kuba@kernel.org 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 D4E71C433F5 for ; Thu, 18 Nov 2021 14:27:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC47C61260 for ; Thu, 18 Nov 2021 14:27:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233093AbhKROa3 (ORCPT ); Thu, 18 Nov 2021 09:30:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:46426 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233088AbhKROa2 (ORCPT ); Thu, 18 Nov 2021 09:30:28 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7ECA161B95; Thu, 18 Nov 2021 14:27:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637245648; bh=tAYoPgFnNhAvwyavdw0eBZsQCuGuTZJXZCyExNSeQAM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SDLgbBBx3+5EdO3TSwTs6FUvVBP7zG17fd3XwK3XgB3YKmTmiqfxjNn0Zp3aK8eO2 YBJ5ITYJSHRg74L9frRov7pW8UO6+jH/zHqhO8UWT56edQyr/+w3bmA1oeVwoy22c6 tDlt8dXJAkmkNDCKV3bTBfClYGhbw1Hic9qSC9WiYrItJMcCAcuzdArEbveg7P6ZDr VdDHjyjODVIOsVdW/PxgBFUs3Migqg+UgNAQT1t6uf9wew3Etq2GJtxMM4A90sPY01 GQ5oJ8mlREXcSIbguPkEXAoCMBCxDAvvvzHxYA/V4Ts7CE1X0tpCff34q7/isIW4wq iT2A6dLvNTvOA== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, Jakub Kicinski , Kalle Valo , stas.yakovlev@gmail.com Subject: [PATCH net-next 4/4] ipw2200: constify address in ipw_send_adapter_address Date: Thu, 18 Nov 2021 06:27:20 -0800 Message-Id: <20211118142720.3176980-5-kuba@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211118142720.3176980-1-kuba@kernel.org> References: <20211118142720.3176980-1-kuba@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Add const to the address param of ipw_send_adapter_address() all the functions down the chain have already been changed. Not sure how I lost this in the rebase. Acked-by: Kalle Valo Signed-off-by: Jakub Kicinski Acked-by: Stanislav Yakovlev --- CC: stas.yakovlev@gmail.com --- drivers/net/wireless/intel/ipw2x00/ipw2200.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c index 23037bfc9e4c..5727c7c00a28 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c @@ -2303,7 +2303,7 @@ static int ipw_send_ssid(struct ipw_priv *priv, u8 * ssid, int len) ssid); } -static int ipw_send_adapter_address(struct ipw_priv *priv, u8 * mac) +static int ipw_send_adapter_address(struct ipw_priv *priv, const u8 * mac) { if (!priv || !mac) { IPW_ERROR("Invalid args\n");