From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 573D33176EF; Mon, 20 Oct 2025 12:58:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.142.180.65 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760965109; cv=none; b=HtrRSyL/ahVfxZdLwbRQs4aNFM/pB0O6rw0EygfP5vcVXMQ1HYvj+kpD6HN7eAmvvBBQRyVZkE9l7l6yoPoza/KnZuAsb4cqdjcvhZOdiUg0aBKgSbsuFnCfoHr2Sg6DS3AmgyOdV9S9K9dlNzihDR045TTDYhfXTpMIOMjXyis= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760965109; c=relaxed/simple; bh=QGwya7XGHc2pPdIPv+Y6/ZT+xnX4BsWVWRcZlHs/2jw=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=PF4sDxAzkhTEzLcFtiHDpf4x6NkQmEh/TRcIadMm/6+4rf6yT2VlyfDfsxwPUxIQBHJ+ZwYUwkmjMTW2rGeZsn40gnUltl2SmpPa+nqmjN3AHx1i39QTZnsER8D/Si52pjAOB2oVvjWK8kCuvah8OlDpUZCgAmCGxoJpRGmEFP4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org; spf=pass smtp.mailfrom=makrotopia.org; arc=none smtp.client-ip=185.142.180.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=makrotopia.org Received: from local by pidgin.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.98.2) (envelope-from ) id 1vApSx-000000003sm-0PEC; Mon, 20 Oct 2025 12:58:23 +0000 Date: Mon, 20 Oct 2025 13:58:19 +0100 From: Daniel Golle To: Hauke Mehrtens , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andreas Schirm , Lukas Stockmann , Alexander Sverdlin , Peter Christen , Avinash Jayaraman , Bing tao Xu , Liang Xu , Juraj Povazanec , "Fanni (Fang-Yi) Chan" , "Benny (Ying-Tsan) Weng" , "Livia M. Rosu" , John Crispin Subject: [PATCH net-next v4 6/7] net: dsa: lantiq_gswip: optimize regmap_write_bits() statements Message-ID: <0c19eff7f20927d7eea4c4d99276e9fba4ae4547.1760964550.git.daniel@makrotopia.org> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Further optimize the previous naive conversion of the *_mask() accessor functions to regmap_write_bits by manually removing redundant mask operands. Signed-off-by: Daniel Golle --- v2: optimize more of the regmap_write_bits() calls drivers/net/dsa/lantiq/lantiq_gswip.c | 33 ++++++++++++--------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/drivers/net/dsa/lantiq/lantiq_gswip.c b/drivers/net/dsa/lantiq/lantiq_gswip.c index 7e490c1fd3b7..4a843d24ee69 100644 --- a/drivers/net/dsa/lantiq/lantiq_gswip.c +++ b/drivers/net/dsa/lantiq/lantiq_gswip.c @@ -276,7 +276,7 @@ static int gswip_pce_table_entry_read(struct gswip_priv *priv, regmap_write_bits(priv->gswip, GSWIP_PCE_TBL_CTRL, GSWIP_PCE_TBL_CTRL_ADDR_MASK | GSWIP_PCE_TBL_CTRL_OPMOD_MASK | - tbl->table | addr_mode | GSWIP_PCE_TBL_CTRL_BAS, + GSWIP_PCE_TBL_CTRL_BAS, tbl->table | addr_mode | GSWIP_PCE_TBL_CTRL_BAS); err = gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL, @@ -337,8 +337,7 @@ static int gswip_pce_table_entry_write(struct gswip_priv *priv, regmap_write(priv->gswip, GSWIP_PCE_TBL_ADDR, tbl->index); regmap_write_bits(priv->gswip, GSWIP_PCE_TBL_CTRL, GSWIP_PCE_TBL_CTRL_ADDR_MASK | - GSWIP_PCE_TBL_CTRL_OPMOD_MASK | - tbl->table | addr_mode, + GSWIP_PCE_TBL_CTRL_OPMOD_MASK, tbl->table | addr_mode); for (i = 0; i < ARRAY_SIZE(tbl->key); i++) @@ -349,8 +348,7 @@ static int gswip_pce_table_entry_write(struct gswip_priv *priv, regmap_write_bits(priv->gswip, GSWIP_PCE_TBL_CTRL, GSWIP_PCE_TBL_CTRL_ADDR_MASK | - GSWIP_PCE_TBL_CTRL_OPMOD_MASK | - tbl->table | addr_mode, + GSWIP_PCE_TBL_CTRL_OPMOD_MASK, tbl->table | addr_mode); regmap_write(priv->gswip, GSWIP_PCE_TBL_MASK, tbl->mask); @@ -439,7 +437,7 @@ static int gswip_port_enable(struct dsa_switch *ds, int port, mdio_phy = phydev->mdio.addr & GSWIP_MDIO_PHY_ADDR_MASK; regmap_write_bits(priv->mdio, GSWIP_MDIO_PHYp(port), - GSWIP_MDIO_PHY_ADDR_MASK | mdio_phy, + GSWIP_MDIO_PHY_ADDR_MASK, mdio_phy); } @@ -542,8 +540,7 @@ static void gswip_port_commit_pvid(struct gswip_priv *priv, int port) vinr = idx ? GSWIP_PCE_VCTRL_VINR_ALL : GSWIP_PCE_VCTRL_VINR_TAGGED; regmap_write_bits(priv->gswip, GSWIP_PCE_VCTRL(port), - GSWIP_PCE_VCTRL_VINR | - FIELD_PREP(GSWIP_PCE_VCTRL_VINR, vinr), + GSWIP_PCE_VCTRL_VINR, FIELD_PREP(GSWIP_PCE_VCTRL_VINR, vinr)); /* Note that in GSWIP 2.2 VLAN mode the VID needs to be programmed @@ -642,7 +639,7 @@ static int gswip_setup(struct dsa_switch *ds) regmap_write(priv->mdio, GSWIP_MDIO_MDC_CFG0, 0x0); /* Configure the MDIO Clock 2.5 MHz */ - regmap_write_bits(priv->mdio, GSWIP_MDIO_MDC_CFG1, 0xff | 0x09, 0x09); + regmap_write_bits(priv->mdio, GSWIP_MDIO_MDC_CFG1, 0xff, 0x09); /* bring up the mdio bus */ err = gswip_mdio(priv); @@ -1084,7 +1081,7 @@ static void gswip_port_stp_state_set(struct dsa_switch *ds, int port, u8 state) regmap_set_bits(priv->gswip, GSWIP_SDMA_PCTRLp(port), GSWIP_SDMA_PCTRL_EN); regmap_write_bits(priv->gswip, GSWIP_PCE_PCTRL_0p(port), - GSWIP_PCE_PCTRL_0_PSTATE_MASK | stp_state, + GSWIP_PCE_PCTRL_0_PSTATE_MASK, stp_state); } @@ -1315,7 +1312,7 @@ static void gswip_port_set_link(struct gswip_priv *priv, int port, bool link) mdio_phy = GSWIP_MDIO_PHY_LINK_DOWN; regmap_write_bits(priv->mdio, GSWIP_MDIO_PHYp(port), - GSWIP_MDIO_PHY_LINK_MASK | mdio_phy, mdio_phy); + GSWIP_MDIO_PHY_LINK_MASK, mdio_phy); } static void gswip_port_set_speed(struct gswip_priv *priv, int port, int speed, @@ -1356,10 +1353,10 @@ static void gswip_port_set_speed(struct gswip_priv *priv, int port, int speed, } regmap_write_bits(priv->mdio, GSWIP_MDIO_PHYp(port), - GSWIP_MDIO_PHY_SPEED_MASK | mdio_phy, mdio_phy); + GSWIP_MDIO_PHY_SPEED_MASK, mdio_phy); gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_RATE_MASK, mii_cfg, port); regmap_write_bits(priv->gswip, GSWIP_MAC_CTRL_0p(port), - GSWIP_MAC_CTRL_0_GMII_MASK | mac_ctrl_0, mac_ctrl_0); + GSWIP_MAC_CTRL_0_GMII_MASK, mac_ctrl_0); } static void gswip_port_set_duplex(struct gswip_priv *priv, int port, int duplex) @@ -1375,9 +1372,9 @@ static void gswip_port_set_duplex(struct gswip_priv *priv, int port, int duplex) } regmap_write_bits(priv->gswip, GSWIP_MAC_CTRL_0p(port), - GSWIP_MAC_CTRL_0_FDUP_MASK | mac_ctrl_0, mac_ctrl_0); + GSWIP_MAC_CTRL_0_FDUP_MASK, mac_ctrl_0); regmap_write_bits(priv->mdio, GSWIP_MDIO_PHYp(port), - GSWIP_MDIO_PHY_FDUP_MASK | mdio_phy, mdio_phy); + GSWIP_MDIO_PHY_FDUP_MASK, mdio_phy); } static void gswip_port_set_pause(struct gswip_priv *priv, int port, @@ -1404,9 +1401,9 @@ static void gswip_port_set_pause(struct gswip_priv *priv, int port, } regmap_write_bits(priv->gswip, GSWIP_MAC_CTRL_0p(port), - GSWIP_MAC_CTRL_0_FCON_MASK | mac_ctrl_0, mac_ctrl_0); + GSWIP_MAC_CTRL_0_FCON_MASK, mac_ctrl_0); regmap_write_bits(priv->mdio, GSWIP_MDIO_PHYp(port), - GSWIP_MDIO_PHY_FCONTX_MASK | GSWIP_MDIO_PHY_FCONRX_MASK | mdio_phy, + GSWIP_MDIO_PHY_FCONTX_MASK | GSWIP_MDIO_PHY_FCONRX_MASK, mdio_phy); } @@ -1528,7 +1525,7 @@ static u32 gswip_bcm_ram_entry_read(struct gswip_priv *priv, u32 table, regmap_write(priv->gswip, GSWIP_BM_RAM_ADDR, index); regmap_write_bits(priv->gswip, GSWIP_BM_RAM_CTRL, GSWIP_BM_RAM_CTRL_ADDR_MASK | GSWIP_BM_RAM_CTRL_OPMOD | - table | GSWIP_BM_RAM_CTRL_BAS, + GSWIP_BM_RAM_CTRL_BAS, table | GSWIP_BM_RAM_CTRL_BAS); err = gswip_switch_r_timeout(priv, GSWIP_BM_RAM_CTRL, -- 2.51.1.dirty