net: dsa: lantiq_gswip: use regmap for register access
Subsystems (4)
v5 cover net: dsa: lantiq_gswip: use regmap for register access
This series refactors the lantiq_gswip driver to utilize the regmap API for register access, replacing the previous approach of open-coding register operations.
Using regmap paves the way for supporting different busses to access the switch registers, for example it makes it easier to use an MDIO-based method required to access the registers of the MaxLinear GSW1xx series of dedicated switch ICs.
Apart from that, the use of regmap improves readability and maintainability of the driver by standardizing register access.
When ever possible changes were made using Coccinelle semantic patches, sometimes adjusting white space and adding line breaks when needed. The remaining changes which were not done using semantic patches are small and should be easy to review and verify.
The whole series has been
---
Changes since v4:
* use REGMAP_UPSHIFT(2) macro instead of -2 value for reg_shift
Changes since v3:
* unlock mutex in error path
* simplify some of the manually converted register reads by changing the type to u32 instead of using a u32 tmp variable and then assigning the value to the previously used u16 variable.
Changes since v2:
* correctly target net-next tree (fix typo in subject)
Changes since RFC:
* drop error handling, it wasn't there before and it would anyway be removed again by a follow-up change
* optimize more of the regmap_write_bits() calls
Daniel Golle (7):
net: dsa: lantiq_gswip: clarify GSWIP 2.2 VLAN mode in comment
net: dsa: lantiq_gswip: convert accessors to use regmap
net: dsa: lantiq_gswip: convert trivial accessor uses to regmap
net: dsa: lantiq_gswip: manually convert remaining uses of read
accessors
net: dsa: lantiq_gswip: replace *_mask() functions with regmap API
net: dsa: lantiq_gswip: optimize regmap_write_bits() statements
net: dsa: lantiq_gswip: harmonize gswip_mii_mask_*() parameters
drivers/net/dsa/lantiq/Kconfig | 1 + drivers/net/dsa/lantiq/lantiq_gswip.c | 471 +++++++++++++------------- drivers/net/dsa/lantiq/lantiq_gswip.h | 6 +- 3 files changed, 243 insertions(+), 235 deletions(-)
Signature · 1 line
2.51.1
PATCH v5 1/7 net: dsa: lantiq_gswip: clarify GSWIP 2.2 VLAN mode in comment
The comment above writing the default PVID incorrectly states that "GSWIP 2.2 (GRX300) and later program here the VID directly." The truth is that even GSWIP 2.2 and newer maintain the behavior of GSWIP 2.1 unless the VLANMD bit in PCE Global Control Register 1 is set ("GSWIP2.2 VLAN Mode").
Fix the misleading comment accordingly.
--- drivers/net/dsa/lantiq/lantiq_gswip.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/dsa/lantiq/lantiq_gswip.c +5 -1
@@ -588,7 +588,11 @@ static void gswip_port_commit_pvid(struct gswip_priv *priv, int port)FIELD_PREP (GSWIP_PCE_VCTRL_VINR , vinr), GSWIP_PCE_VCTRL(port)); -/* GSWIP 2.2 (GRX300) and later program here the VID directly. */ +/* Note that in GSWIP 2.2 VLAN mode the VID needs to be programmed +* directly instead of referencing the index in the Active VLAN Tablet. +* However, without the VLANMD bit (9) in PCE_GCTRL_1 (0x457) even +* GSWIP 2.2 and newer hardware maintain the GSWIP 2.1 behavior. +*/ gswip_switch_w (priv, idx,GSWIP_PCE_DEFPVID (port)); }
Signature · 1 line
2.51.1
PATCH v5 2/7 net: dsa: lantiq_gswip: convert accessors to use regmap
In reply to Daniel GolleUse regmap for register access in preparation for supporting the MaxLinear GSW1xx family of switches connected via MDIO or SPI.
Rewrite the existing accessor read-poll-timeout functions to use calls to the regmap API for now.
---
v5: use REGMAP_UPSHIFT(2) macro instead of -2 value for reg_shift
v2: drop error handling, it wasn't there before and it would anyway be
removed again by a follow-up change
drivers/net/dsa/lantiq/Kconfig | 1 + drivers/net/dsa/lantiq/lantiq_gswip.c | 107 +++++++++++++++----------- drivers/net/dsa/lantiq/lantiq_gswip.h | 6 +- 3 files changed, 67 insertions(+), 47 deletions(-)
drivers/net/dsa/lantiq/Kconfig +1 -0
@@ -2,6 +2,7 @@ config NET_DSA_LANTIQ_GSWIP tristate "Lantiq / Intel GSWIP" depends on HAS_IOMEM select NET_DSA_TAG_GSWIP + select REGMAP help This enables support for the Lantiq / Intel GSWIP 2.1 found in the xrx200 / VR9 SoC.
drivers/net/dsa/lantiq/lantiq_gswip.c +63 -44
174 lines not on this page · raw message
drivers/net/dsa/lantiq/lantiq_gswip.h +3 -3
@@ -263,9 +263,9 @@ struct gswip_vlan { };struct gswip_priv { -__iomem void *gswip; -__iomem void *mdio; -__iomem void *mii; +struct regmap *gswip; +struct regmap *mdio; +struct regmap *mii;const struct gswip_hw_info *hw_info;const struct xway_gphy_match_data *gphy_fw_name_cfg;struct dsa_switch *ds;
Signature · 1 line
2.51.1
PATCH v5 3/7 net: dsa: lantiq_gswip: convert trivial accessor uses to regmap
In reply to Daniel GolleUse coccinelle semantic patch to convert all trivial uses of the register accessor functions to use the regmap API directly.
// Replace gswip_switch_w with regmap_write
@@
expression priv, val, offset;
@@
- gswip_switch_w(priv, val, offset)
+ regmap_write(priv->gswip, offset, val)
// Replace gswip_mdio_w with regmap_write
@@
expression priv, val, offset;
@@
- gswip_mdio_w(priv, val, offset)
+ regmap_write(priv->mdio, offset, val)
// Replace gswip_switch_r in simple assignment - only for u32 @@
expression priv, offset;
u32 var;
@@
- var = gswip_switch_r(priv, offset)
+ regmap_read(priv->gswip, offset, &var)
// Replace gswip_switch_mask with regmap_set_bits when clear is 0 @@
expression priv, set, offset;
@@
- gswip_switch_mask(priv, 0, set, offset)
+ regmap_set_bits(priv->gswip, offset, set)
// Replace gswip_mdio_mask with regmap_set_bits when clear is 0 @@
expression priv, set, offset;
@@
- gswip_mdio_mask(priv, 0, set, offset)
+ regmap_set_bits(priv->mdio, offset, set)
// Replace gswip_switch_mask with regmap_clear_bits when set is 0 @@
expression priv, clear, offset;
@@
- gswip_switch_mask(priv, clear, 0, offset)
+ regmap_clear_bits(priv->gswip, offset, clear)
// Replace gswip_mdio_mask with regmap_clear_bits when set is 0 @@
expression priv, clear, offset;
@@
- gswip_mdio_mask(priv, clear, 0, offset)
+ regmap_clear_bits(priv->mdio, offset, clear)
Remove gswip_switch_w() and gswip_mdio_w() functions as they now no longer have any users.
--- drivers/net/dsa/lantiq/lantiq_gswip.c | 160 ++++++++++++-------------- 1 file changed, 76 insertions(+), 84 deletions(-)
drivers/net/dsa/lantiq/lantiq_gswip.c +76 -84
@@ -120,11 +120,6 @@ static u32 gswip_switch_r(struct gswip_priv *priv, u32 offset)return val; } -static void gswip_switch_w (struct gswip_priv *priv,u32 val,u32 offset) -{ -regmap_write (priv->gswip, offset, val); -} -static void gswip_switch_mask (struct gswip_priv *priv,u32 clear,u32 set,u32 offset) {
@@ -149,11 +144,6 @@ static u32 gswip_mdio_r(struct gswip_priv *priv, u32 offset)return val; } -static void gswip_mdio_w (struct gswip_priv *priv,u32 val,u32 offset) -{ -regmap_write (priv->mdio, offset, val); -} -static void gswip_mdio_mask (struct gswip_priv *priv,u32 clear,u32 set,u32 offset) {
@@ -223,11 +213,11 @@ static int gswip_mdio_wr(struct mii_bus *bus, int addr, int reg, u16 val)return err; } -gswip_mdio_w (priv, val,GSWIP_MDIO_WRITE ); -gswip_mdio_w (priv,GSWIP_MDIO_CTRL_BUSY |GSWIP_MDIO_CTRL_WR | - ((addr &GSWIP_MDIO_CTRL_PHYAD_MASK ) <<GSWIP_MDIO_CTRL_PHYAD_SHIFT ) | - (reg &GSWIP_MDIO_CTRL_REGAD_MASK ), -GSWIP_MDIO_CTRL ); +regmap_write (priv->mdio,GSWIP_MDIO_WRITE , val); +regmap_write (priv->mdio,GSWIP_MDIO_CTRL , +GSWIP_MDIO_CTRL_BUSY |GSWIP_MDIO_CTRL_WR | + ((addr &GSWIP_MDIO_CTRL_PHYAD_MASK ) <<GSWIP_MDIO_CTRL_PHYAD_SHIFT ) | + (reg &GSWIP_MDIO_CTRL_REGAD_MASK ));return 0 ; }
@@ -243,10 +233,10 @@ static int gswip_mdio_rd(struct mii_bus *bus, int addr, int reg)return err; } -gswip_mdio_w (priv,GSWIP_MDIO_CTRL_BUSY |GSWIP_MDIO_CTRL_RD | - ((addr &GSWIP_MDIO_CTRL_PHYAD_MASK ) <<GSWIP_MDIO_CTRL_PHYAD_SHIFT ) | - (reg &GSWIP_MDIO_CTRL_REGAD_MASK ), -GSWIP_MDIO_CTRL ); +regmap_write (priv->mdio,GSWIP_MDIO_CTRL , +GSWIP_MDIO_CTRL_BUSY |GSWIP_MDIO_CTRL_RD | + ((addr &GSWIP_MDIO_CTRL_PHYAD_MASK ) <<GSWIP_MDIO_CTRL_PHYAD_SHIFT ) | + (reg &GSWIP_MDIO_CTRL_REGAD_MASK )); err =gswip_mdio_poll (priv);if (err) {
@@ -310,7 +300,7 @@ static int gswip_pce_table_entry_read(struct gswip_priv *priv,return err; } -gswip_switch_w (priv, tbl->index,GSWIP_PCE_TBL_ADDR ); +regmap_write (priv->gswip,GSWIP_PCE_TBL_ADDR , tbl->index); gswip_switch_mask(priv, GSWIP_PCE_TBL_CTRL_ADDR_MASK | GSWIP_PCE_TBL_CTRL_OPMOD_MASK, tbl->table | addr_mode | GSWIP_PCE_TBL_CTRL_BAS,
@@ -360,24 +350,24 @@ static int gswip_pce_table_entry_write(struct gswip_priv *priv,return err; } -gswip_switch_w (priv, tbl->index,GSWIP_PCE_TBL_ADDR ); +regmap_write (priv->gswip,GSWIP_PCE_TBL_ADDR , tbl->index);gswip_switch_mask (priv,GSWIP_PCE_TBL_CTRL_ADDR_MASK |GSWIP_PCE_TBL_CTRL_OPMOD_MASK , tbl->table | addr_mode,GSWIP_PCE_TBL_CTRL );for (i =0 ; i <ARRAY_SIZE (tbl->key); i++) -gswip_switch_w (priv, tbl->key[i],GSWIP_PCE_TBL_KEY (i)); +regmap_write (priv->gswip,GSWIP_PCE_TBL_KEY (i), tbl->key[i]);for (i =0 ; i <ARRAY_SIZE (tbl->val); i++) -gswip_switch_w (priv, tbl->val[i],GSWIP_PCE_TBL_VAL (i)); +regmap_write (priv->gswip,GSWIP_PCE_TBL_VAL (i), tbl->val[i]);gswip_switch_mask (priv,GSWIP_PCE_TBL_CTRL_ADDR_MASK |GSWIP_PCE_TBL_CTRL_OPMOD_MASK , tbl->table | addr_mode,GSWIP_PCE_TBL_CTRL ); -gswip_switch_w (priv, tbl->mask,GSWIP_PCE_TBL_MASK ); +regmap_write (priv->gswip,GSWIP_PCE_TBL_MASK , tbl->mask); crtl =gswip_switch_r (priv,GSWIP_PCE_TBL_CTRL ); crtl &= ~(GSWIP_PCE_TBL_CTRL_TYPE | GSWIP_PCE_TBL_CTRL_VLD |
@@ -388,7 +378,7 @@ static int gswip_pce_table_entry_write(struct gswip_priv *priv, crtl |=GSWIP_PCE_TBL_CTRL_VLD ; crtl |= (tbl->gmap <<7 ) &GSWIP_PCE_TBL_CTRL_GMAP_MASK ; crtl |=GSWIP_PCE_TBL_CTRL_BAS ; -gswip_switch_w (priv, crtl,GSWIP_PCE_TBL_CTRL ); +regmap_write (priv->gswip,GSWIP_PCE_TBL_CTRL , crtl); err =gswip_switch_r_timeout (priv,GSWIP_PCE_TBL_CTRL ,GSWIP_PCE_TBL_CTRL_BAS );
@@ -467,14 +457,13 @@ static int gswip_port_enable(struct dsa_switch *ds, int port, }/* RMON Counter Enable for port */ -gswip_switch_w (priv,GSWIP_BM_PCFG_CNTEN ,GSWIP_BM_PCFGp (port)); +regmap_write (priv->gswip,GSWIP_BM_PCFGp (port),GSWIP_BM_PCFG_CNTEN );/* enable port fetch/store dma & VLAN Modification */ -gswip_switch_mask (priv,0 ,GSWIP_FDMA_PCTRL_EN | -GSWIP_FDMA_PCTRL_VLANMOD_BOTH , -GSWIP_FDMA_PCTRLp (port)); -gswip_switch_mask (priv,0 ,GSWIP_SDMA_PCTRL_EN , -GSWIP_SDMA_PCTRLp (port)); +regmap_set_bits (priv->gswip,GSWIP_FDMA_PCTRLp (port), +GSWIP_FDMA_PCTRL_EN |GSWIP_FDMA_PCTRL_VLANMOD_BOTH ); +regmap_set_bits (priv->gswip,GSWIP_SDMA_PCTRLp (port), +GSWIP_SDMA_PCTRL_EN );return 0 ; }
@@ -483,10 +472,10 @@ static void gswip_port_disable(struct dsa_switch *ds, int port) {struct gswip_priv *priv = ds->priv; -gswip_switch_mask (priv,GSWIP_FDMA_PCTRL_EN ,0 , -GSWIP_FDMA_PCTRLp (port)); -gswip_switch_mask (priv,GSWIP_SDMA_PCTRL_EN ,0 , -GSWIP_SDMA_PCTRLp (port)); +regmap_clear_bits (priv->gswip,GSWIP_FDMA_PCTRLp (port), +GSWIP_FDMA_PCTRL_EN ); +regmap_clear_bits (priv->gswip,GSWIP_SDMA_PCTRLp (port), +GSWIP_SDMA_PCTRL_EN ); }static int gswip_pce_load_microcode (struct gswip_priv *priv)
@@ -497,22 +486,22 @@ static int gswip_pce_load_microcode(struct gswip_priv *priv)gswip_switch_mask (priv,GSWIP_PCE_TBL_CTRL_ADDR_MASK |GSWIP_PCE_TBL_CTRL_OPMOD_MASK ,GSWIP_PCE_TBL_CTRL_OPMOD_ADWR ,GSWIP_PCE_TBL_CTRL ); -gswip_switch_w (priv,0 ,GSWIP_PCE_TBL_MASK ); +regmap_write (priv->gswip,GSWIP_PCE_TBL_MASK ,0 );for (i =0 ; i < priv->hw_info->pce_microcode_size; i++) { -gswip_switch_w (priv, i,GSWIP_PCE_TBL_ADDR ); -gswip_switch_w (priv, (*priv->hw_info->pce_microcode)[i].val_0, -GSWIP_PCE_TBL_VAL (0 )); -gswip_switch_w (priv, (*priv->hw_info->pce_microcode)[i].val_1, -GSWIP_PCE_TBL_VAL (1 )); -gswip_switch_w (priv, (*priv->hw_info->pce_microcode)[i].val_2, -GSWIP_PCE_TBL_VAL (2 )); -gswip_switch_w (priv, (*priv->hw_info->pce_microcode)[i].val_3, -GSWIP_PCE_TBL_VAL (3 )); +regmap_write (priv->gswip,GSWIP_PCE_TBL_ADDR , i); +regmap_write (priv->gswip,GSWIP_PCE_TBL_VAL (0 ), + (*priv->hw_info->pce_microcode)[i].val_0); +regmap_write (priv->gswip,GSWIP_PCE_TBL_VAL (1 ), + (*priv->hw_info->pce_microcode)[i].val_1); +regmap_write (priv->gswip,GSWIP_PCE_TBL_VAL (2 ), + (*priv->hw_info->pce_microcode)[i].val_2); +regmap_write (priv->gswip,GSWIP_PCE_TBL_VAL (3 ), + (*priv->hw_info->pce_microcode)[i].val_3);/* start the table access: */ -gswip_switch_mask (priv,0 ,GSWIP_PCE_TBL_CTRL_BAS , -GSWIP_PCE_TBL_CTRL ); +regmap_set_bits (priv->gswip,GSWIP_PCE_TBL_CTRL , +GSWIP_PCE_TBL_CTRL_BAS ); err =gswip_switch_r_timeout (priv,GSWIP_PCE_TBL_CTRL ,GSWIP_PCE_TBL_CTRL_BAS );if (err)
@@ -520,8 +509,8 @@ static int gswip_pce_load_microcode(struct gswip_priv *priv) }/* tell the switch that the microcode is loaded */ -gswip_switch_mask (priv,0 ,GSWIP_PCE_GCTRL_0_MC_VALID , -GSWIP_PCE_GCTRL_0 ); +regmap_set_bits (priv->gswip,GSWIP_PCE_GCTRL_0 , +GSWIP_PCE_GCTRL_0_MC_VALID );return 0 ; }
@@ -572,7 +561,7 @@ static void gswip_port_commit_pvid(struct gswip_priv *priv, int port)* However, without the VLANMD bit (9) in PCE_GCTRL_1 (0x457) even * GSWIP 2.2 and newer hardware maintain the GSWIP 2.1 behavior. */ -gswip_switch_w (priv, idx,GSWIP_PCE_DEFPVID (port)); +regmap_write (priv->gswip,GSWIP_PCE_DEFPVID (port), idx); } static int gswip_port_vlan_filtering(struct dsa_switch *ds, int port,
@@ -588,8 +577,8 @@ static int gswip_port_vlan_filtering(struct dsa_switch *ds, int port,GSWIP_PCE_VCTRL_UVR |GSWIP_PCE_VCTRL_VIMR |GSWIP_PCE_VCTRL_VEMR |GSWIP_PCE_VCTRL_VID0 , GSWIP_PCE_VCTRL(port)); -gswip_switch_mask (priv,GSWIP_PCE_PCTRL_0_TVM ,0 , -GSWIP_PCE_PCTRL_0p (port)); +regmap_clear_bits (priv->gswip,GSWIP_PCE_PCTRL_0p (port), +GSWIP_PCE_PCTRL_0_TVM ); }else {/* Use port based VLAN */ gswip_switch_mask(priv,
@@ -597,8 +586,8 @@ static int gswip_port_vlan_filtering(struct dsa_switch *ds, int port,GSWIP_PCE_VCTRL_VEMR |GSWIP_PCE_VCTRL_VID0 ,GSWIP_PCE_VCTRL_VSR , GSWIP_PCE_VCTRL(port)); -gswip_switch_mask (priv,0 ,GSWIP_PCE_PCTRL_0_TVM , -GSWIP_PCE_PCTRL_0p (port)); +regmap_set_bits (priv->gswip,GSWIP_PCE_PCTRL_0p (port), +GSWIP_PCE_PCTRL_0_TVM ); }gswip_port_commit_pvid (priv, port);
@@ -613,9 +602,9 @@ static int gswip_setup(struct dsa_switch *ds)struct dsa_port *cpu_dp;int err, i; -gswip_switch_w (priv,GSWIP_SWRES_R0 ,GSWIP_SWRES ); +regmap_write (priv->gswip,GSWIP_SWRES ,GSWIP_SWRES_R0 );usleep_range (5000 ,10000 ); -gswip_switch_w (priv,0 ,GSWIP_SWRES ); +regmap_write (priv->gswip,GSWIP_SWRES ,0 );/* disable port fetch/store dma on all ports */ for (i =0 ; i < priv->hw_info->max_ports; i++) {
@@ -624,7 +613,7 @@ static int gswip_setup(struct dsa_switch *ds) }/* enable Switch */ -gswip_mdio_mask (priv,0 ,GSWIP_MDIO_GLOB_ENABLE ,GSWIP_MDIO_GLOB ); +regmap_set_bits (priv->mdio,GSWIP_MDIO_GLOB ,GSWIP_MDIO_GLOB_ENABLE ); err =gswip_pce_load_microcode (priv);if (err) {
@@ -633,9 +622,9 @@ static int gswip_setup(struct dsa_switch *ds) }/* Default unknown Broadcast/Multicast/Unicast port maps */ -gswip_switch_w (priv, cpu_ports,GSWIP_PCE_PMAP1 ); -gswip_switch_w (priv, cpu_ports,GSWIP_PCE_PMAP2 ); -gswip_switch_w (priv, cpu_ports,GSWIP_PCE_PMAP3 ); +regmap_write (priv->gswip,GSWIP_PCE_PMAP1 , cpu_ports); +regmap_write (priv->gswip,GSWIP_PCE_PMAP2 , cpu_ports); +regmap_write (priv->gswip,GSWIP_PCE_PMAP3 , cpu_ports);/* Deactivate MDIO PHY auto polling. Some PHYs as the AR8030 have an * interoperability problem with this auto polling mechanism because
@@ -653,7 +642,7 @@ static int gswip_setup(struct dsa_switch *ds)* Testing shows that when PHY auto polling is disabled these problems * go away. */ -gswip_mdio_w (priv,0x0 ,GSWIP_MDIO_MDC_CFG0 ); +regmap_write (priv->mdio,GSWIP_MDIO_MDC_CFG0 ,0x0 );/* Configure the MDIO Clock 2.5 MHz */ gswip_mdio_mask (priv,0xff ,0x09 ,GSWIP_MDIO_MDC_CFG1 );
@@ -673,22 +662,25 @@ static int gswip_setup(struct dsa_switch *ds)dsa_switch_for_each_cpu_port (cpu_dp, ds) {/* enable special tag insertion on cpu port */ -gswip_switch_mask (priv,0 ,GSWIP_FDMA_PCTRL_STEN , -GSWIP_FDMA_PCTRLp (cpu_dp->index)); +regmap_set_bits (priv->gswip,GSWIP_FDMA_PCTRLp (cpu_dp->index), +GSWIP_FDMA_PCTRL_STEN );/* accept special tag in ingress direction */ -gswip_switch_mask (priv,0 ,GSWIP_PCE_PCTRL_0_INGRESS , -GSWIP_PCE_PCTRL_0p (cpu_dp->index)); +regmap_set_bits (priv->gswip, +GSWIP_PCE_PCTRL_0p (cpu_dp->index), +GSWIP_PCE_PCTRL_0_INGRESS ); } -gswip_switch_mask (priv,0 ,GSWIP_BM_QUEUE_GCTRL_GL_MOD , -GSWIP_BM_QUEUE_GCTRL ); +regmap_set_bits (priv->gswip,GSWIP_BM_QUEUE_GCTRL , +GSWIP_BM_QUEUE_GCTRL_GL_MOD );/* VLAN aware Switching */ -gswip_switch_mask (priv,0 ,GSWIP_PCE_GCTRL_0_VLAN ,GSWIP_PCE_GCTRL_0 ); +regmap_set_bits (priv->gswip,GSWIP_PCE_GCTRL_0 , +GSWIP_PCE_GCTRL_0_VLAN );/* Flush MAC Table */ -gswip_switch_mask (priv,0 ,GSWIP_PCE_GCTRL_0_MTFL ,GSWIP_PCE_GCTRL_0 ); +regmap_set_bits (priv->gswip,GSWIP_PCE_GCTRL_0 , +GSWIP_PCE_GCTRL_0_MTFL ); err =gswip_switch_r_timeout (priv,GSWIP_PCE_GCTRL_0 ,GSWIP_PCE_GCTRL_0_MTFL );
@@ -1074,8 +1066,8 @@ static void gswip_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)switch (state) {case BR_STATE_DISABLED : -gswip_switch_mask (priv,GSWIP_SDMA_PCTRL_EN ,0 , -GSWIP_SDMA_PCTRLp (port)); +regmap_clear_bits (priv->gswip,GSWIP_SDMA_PCTRLp (port), +GSWIP_SDMA_PCTRL_EN );return ;case BR_STATE_BLOCKING :case BR_STATE_LISTENING :
@@ -1092,8 +1084,8 @@ static void gswip_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)return ; } -gswip_switch_mask (priv,0 ,GSWIP_SDMA_PCTRL_EN , -GSWIP_SDMA_PCTRLp (port)); +regmap_set_bits (priv->gswip,GSWIP_SDMA_PCTRLp (port), +GSWIP_SDMA_PCTRL_EN );gswip_switch_mask (priv,GSWIP_PCE_PCTRL_0_PSTATE_MASK , stp_state,GSWIP_PCE_PCTRL_0p (port)); }
@@ -1222,19 +1214,19 @@ static int gswip_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)*/ if (dsa_is_cpu_port (ds, port)) { new_mtu +=8 ; -gswip_switch_w (priv,VLAN_ETH_HLEN + new_mtu +ETH_FCS_LEN , -GSWIP_MAC_FLEN ); +regmap_write (priv->gswip,GSWIP_MAC_FLEN , +VLAN_ETH_HLEN + new_mtu +ETH_FCS_LEN ); }/* Enable MLEN for ports with non-standard MTUs, including the special * header on the CPU port added above. */ if (new_mtu !=ETH_DATA_LEN ) -gswip_switch_mask (priv,0 ,GSWIP_MAC_CTRL_2_MLEN , -GSWIP_MAC_CTRL_2p (port)); +regmap_set_bits (priv->gswip,GSWIP_MAC_CTRL_2p (port), +GSWIP_MAC_CTRL_2_MLEN );else -gswip_switch_mask (priv,GSWIP_MAC_CTRL_2_MLEN ,0 , -GSWIP_MAC_CTRL_2p (port)); +regmap_clear_bits (priv->gswip,GSWIP_MAC_CTRL_2p (port), +GSWIP_MAC_CTRL_2_MLEN );return 0 ; }
@@ -1536,7 +1528,7 @@ static u32 gswip_bcm_ram_entry_read(struct gswip_priv *priv, u32 table,u32 result;int err; -gswip_switch_w (priv, index,GSWIP_BM_RAM_ADDR ); +regmap_write (priv->gswip,GSWIP_BM_RAM_ADDR , index); gswip_switch_mask(priv, GSWIP_BM_RAM_CTRL_ADDR_MASK | GSWIP_BM_RAM_CTRL_OPMOD, table | GSWIP_BM_RAM_CTRL_BAS,
@@ -1550,7 +1542,7 @@ static u32 gswip_bcm_ram_entry_read(struct gswip_priv *priv, u32 table,return 0 ; } - result =gswip_switch_r (priv,GSWIP_BM_RAM_VAL (0 )); +regmap_read (priv->gswip,GSWIP_BM_RAM_VAL (0 ), &result); result |=gswip_switch_r (priv,GSWIP_BM_RAM_VAL (1 )) <<16 ;return result;
@@ -1952,7 +1944,7 @@ static int gswip_probe(struct platform_device *pdev) priv->ds->phylink_mac_ops = &gswip_phylink_mac_ops; priv->dev = dev;mutex_init (&priv->pce_table_lock); - version =gswip_switch_r (priv,GSWIP_VERSION ); +regmap_read (priv->gswip,GSWIP_VERSION , &version);/* The hardware has the 'major/minor' version bytes in the wrong order * preventing numerical comparisons. Construct a 16-bit unsigned integer
@@ -2009,7 +2001,7 @@ static int gswip_probe(struct platform_device *pdev)return 0 ; disable_switch: -gswip_mdio_mask (priv,GSWIP_MDIO_GLOB_ENABLE ,0 ,GSWIP_MDIO_GLOB ); +regmap_clear_bits (priv->mdio,GSWIP_MDIO_GLOB ,GSWIP_MDIO_GLOB_ENABLE );dsa_unregister_switch (priv->ds); gphy_fw_remove:for (i =0 ; i < priv->num_gphy_fw; i++)
@@ -2026,7 +2018,7 @@ static void gswip_remove(struct platform_device *pdev)return ;/* disable the switch */ -gswip_mdio_mask (priv,GSWIP_MDIO_GLOB_ENABLE ,0 ,GSWIP_MDIO_GLOB ); +regmap_clear_bits (priv->mdio,GSWIP_MDIO_GLOB ,GSWIP_MDIO_GLOB_ENABLE );dsa_unregister_switch (priv->ds);
Signature · 1 line
2.51.1
PATCH v5 4/7 net: dsa: lantiq_gswip: manually convert remaining uses of read accessors
In reply to Daniel GolleManually convert the remaining uses of the read accessor functions and remove them now that they are unused.
---
v4: unlock mutex in error path
simplify things by changing type from u16+assignment to u32
drivers/net/dsa/lantiq/lantiq_gswip.c | 78 +++++++++++++-------------- 1 file changed, 38 insertions(+), 40 deletions(-)
drivers/net/dsa/lantiq/lantiq_gswip.c +38 -40
@@ -111,15 +111,6 @@ static const struct gswip_rmon_cnt_desc gswip_rmon_cnt[] = { MIB_DESC(2, 0x0E, "TxGoodBytes"), }; -static u32 gswip_switch_r (struct gswip_priv *priv,u32 offset) -{ -u32 val; - -regmap_read (priv->gswip, offset, &val); - -return val; -} -static void gswip_switch_mask (struct gswip_priv *priv,u32 clear,u32 set,u32 offset) {
@@ -135,15 +126,6 @@ static u32 gswip_switch_r_timeout(struct gswip_priv *priv, u32 offset, !(val & cleared), 20, 50000); } -static u32 gswip_mdio_r (struct gswip_priv *priv,u32 offset) -{ -u32 val; - -regmap_read (priv->mdio, offset, &val); - -return val; -} -static void gswip_mdio_mask (struct gswip_priv *priv,u32 clear,u32 set,u32 offset) {
@@ -225,6 +207,7 @@ static int gswip_mdio_wr(struct mii_bus *bus, int addr, int reg, u16 val)static int gswip_mdio_rd (struct mii_bus *bus,int addr,int reg) {struct gswip_priv *priv = bus->priv; +u32 val;int err; err =gswip_mdio_poll (priv);
@@ -244,7 +227,11 @@ static int gswip_mdio_rd(struct mii_bus *bus, int addr, int reg)return err; } -return gswip_mdio_r (priv,GSWIP_MDIO_READ ); + err =regmap_read (priv->mdio,GSWIP_MDIO_READ , &val); +if (err) +return err; + +return val; }static int gswip_mdio (struct gswip_priv *priv)
@@ -287,7 +274,8 @@ static int gswip_pce_table_entry_read(struct gswip_priv *priv, {int i;int err; -u16 crtl; +u32 crtl; +u32 tmp;u16 addr_mode = tbl->key_mode ?GSWIP_PCE_TBL_CTRL_OPMOD_KSRD :GSWIP_PCE_TBL_CTRL_OPMOD_ADRD ;
@@ -295,10 +283,8 @@ static int gswip_pce_table_entry_read(struct gswip_priv *priv, err =gswip_switch_r_timeout (priv,GSWIP_PCE_TBL_CTRL ,GSWIP_PCE_TBL_CTRL_BAS ); -if (err) { -mutex_unlock (&priv->pce_table_lock); -return err; - } +if (err) + goto out_unlock;regmap_write (priv->gswip,GSWIP_PCE_TBL_ADDR , tbl->index); gswip_switch_mask(priv, GSWIP_PCE_TBL_CTRL_ADDR_MASK |
@@ -308,28 +294,39 @@ static int gswip_pce_table_entry_read(struct gswip_priv *priv, err =gswip_switch_r_timeout (priv,GSWIP_PCE_TBL_CTRL ,GSWIP_PCE_TBL_CTRL_BAS ); -if (err) { -mutex_unlock (&priv->pce_table_lock); -return err; - } - -for (i =0 ; i <ARRAY_SIZE (tbl->key); i++) - tbl->key[i] =gswip_switch_r (priv,GSWIP_PCE_TBL_KEY (i)); +if (err) + goto out_unlock; -for (i =0 ; i <ARRAY_SIZE (tbl->val); i++) - tbl->val[i] =gswip_switch_r (priv,GSWIP_PCE_TBL_VAL (i)); +for (i =0 ; i <ARRAY_SIZE (tbl->key); i++) { + err =regmap_read (priv->gswip,GSWIP_PCE_TBL_KEY (i), &tmp); +if (err) + goto out_unlock; + tbl->key[i] = tmp; + } +for (i =0 ; i <ARRAY_SIZE (tbl->val); i++) { + err =regmap_read (priv->gswip,GSWIP_PCE_TBL_VAL (i), &tmp); +if (err) + goto out_unlock; + tbl->val[i] = tmp; + } - tbl->mask =gswip_switch_r (priv,GSWIP_PCE_TBL_MASK ); + err =regmap_read (priv->gswip,GSWIP_PCE_TBL_MASK , &tmp); +if (err) + goto out_unlock; - crtl =gswip_switch_r (priv,GSWIP_PCE_TBL_CTRL ); + tbl->mask = tmp; + err =regmap_read (priv->gswip,GSWIP_PCE_TBL_CTRL , &crtl); +if (err) + goto out_unlock; tbl->type = !!(crtl &GSWIP_PCE_TBL_CTRL_TYPE ); tbl->valid = !!(crtl &GSWIP_PCE_TBL_CTRL_VLD ); tbl->gmap = (crtl &GSWIP_PCE_TBL_CTRL_GMAP_MASK ) >>7 ; +out_unlock:mutex_unlock (&priv->pce_table_lock); -return 0 ; +return err; } static int gswip_pce_table_entry_write(struct gswip_priv *priv,
@@ -337,7 +334,7 @@ static int gswip_pce_table_entry_write(struct gswip_priv *priv, {int i;int err; -u16 crtl; +u32 crtl;u16 addr_mode = tbl->key_mode ?GSWIP_PCE_TBL_CTRL_OPMOD_KSWR :GSWIP_PCE_TBL_CTRL_OPMOD_ADWR ;
@@ -369,7 +366,7 @@ static int gswip_pce_table_entry_write(struct gswip_priv *priv,regmap_write (priv->gswip,GSWIP_PCE_TBL_MASK , tbl->mask); - crtl =gswip_switch_r (priv,GSWIP_PCE_TBL_CTRL ); +regmap_read (priv->gswip,GSWIP_PCE_TBL_CTRL , &crtl); crtl &= ~(GSWIP_PCE_TBL_CTRL_TYPE |GSWIP_PCE_TBL_CTRL_VLD |GSWIP_PCE_TBL_CTRL_GMAP_MASK );if (tbl->type)
@@ -1525,7 +1522,7 @@ static void gswip_get_strings(struct dsa_switch *ds, int port, u32 stringset,static u32 gswip_bcm_ram_entry_read (struct gswip_priv *priv,u32 table,u32 index) { -u32 result; +u32 result, val;int err;regmap_write (priv->gswip,GSWIP_BM_RAM_ADDR , index);
@@ -1543,7 +1540,8 @@ static u32 gswip_bcm_ram_entry_read(struct gswip_priv *priv, u32 table, }regmap_read (priv->gswip,GSWIP_BM_RAM_VAL (0 ), &result); - result |=gswip_switch_r (priv,GSWIP_BM_RAM_VAL (1 )) <<16 ; +regmap_read (priv->gswip,GSWIP_BM_RAM_VAL (1 ), &val); + result |= val <<16 ;return result; }
Signature · 1 line
2.51.1
PATCH v5 5/7 net: dsa: lantiq_gswip: replace *_mask() functions with regmap API
In reply to Daniel GolleUse coccinelle to replace all uses of *_mask() with an equivalent call to regmap_write_bits().
// Replace gswip_switch_mask with regmap_write_bits @@
expression priv, clear, set, offset;
@@
- gswip_switch_mask(priv, clear, set, offset)
+ regmap_write_bits(priv->gswip, offset, clear | set, set)
// Replace gswip_mdio_mask with regmap_write_bits @@
expression priv, clear, set, offset;
@@
- gswip_mdio_mask(priv, clear, set, offset)
+ regmap_write_bits(priv->mdio, offset, clear | set, set)
// Replace gswip_mii_mask with regmap_write_bits @@
expression priv, clear, set, offset;
@@
- gswip_mii_mask(priv, clear, set, offset)
+ regmap_write_bits(priv->mii, offset, clear | set, set)
Remove the new unused *_mask() functions.
This naive approach will be further optmized manually in the next commit.
--- drivers/net/dsa/lantiq/lantiq_gswip.c | 140 +++++++++++++------------- 1 file changed, 70 insertions(+), 70 deletions(-)
drivers/net/dsa/lantiq/lantiq_gswip.c +70 -70
@@ -111,12 +111,6 @@ static const struct gswip_rmon_cnt_desc gswip_rmon_cnt[] = { MIB_DESC(2, 0x0E, "TxGoodBytes"), }; -static void gswip_switch_mask (struct gswip_priv *priv,u32 clear,u32 set, -u32 offset) -{ -regmap_write_bits (priv->gswip, offset, clear | set, set); -} -static u32 gswip_switch_r_timeout (struct gswip_priv *priv,u32 offset,u32 cleared) {
@@ -126,18 +120,6 @@ static u32 gswip_switch_r_timeout(struct gswip_priv *priv, u32 offset, !(val & cleared), 20, 50000); } -static void gswip_mdio_mask (struct gswip_priv *priv,u32 clear,u32 set, -u32 offset) -{ -regmap_write_bits (priv->mdio, offset, clear | set, set); -} - -static void gswip_mii_mask (struct gswip_priv *priv,u32 clear,u32 set, -u32 offset) -{ -regmap_write_bits (priv->mii, offset, clear | set, set); -} -static void gswip_mii_mask_cfg (struct gswip_priv *priv,u32 clear,u32 set,int port) {
@@ -149,7 +131,8 @@ static void gswip_mii_mask_cfg(struct gswip_priv *priv, u32 clear, u32 set, reg_port = port + priv->hw_info->mii_port_reg_offset; -gswip_mii_mask (priv, clear, set,GSWIP_MII_CFGp (reg_port)); +regmap_write_bits (priv->mii,GSWIP_MII_CFGp (reg_port), clear | set, + set); } static void gswip_mii_mask_pcdu(struct gswip_priv *priv, u32 clear, u32 set,
@@ -165,13 +148,16 @@ static void gswip_mii_mask_pcdu(struct gswip_priv *priv, u32 clear, u32 set,switch (reg_port) {case 0 : -gswip_mii_mask (priv, clear, set,GSWIP_MII_PCDU0 ); +regmap_write_bits (priv->mii,GSWIP_MII_PCDU0 , clear | set, + set);break ;case 1 : -gswip_mii_mask (priv, clear, set,GSWIP_MII_PCDU1 ); +regmap_write_bits (priv->mii,GSWIP_MII_PCDU1 , clear | set, + set);break ;case 5 : -gswip_mii_mask (priv, clear, set,GSWIP_MII_PCDU5 ); +regmap_write_bits (priv->mii,GSWIP_MII_PCDU5 , clear | set, + set);break ; } }
@@ -287,10 +273,11 @@ static int gswip_pce_table_entry_read(struct gswip_priv *priv, goto out_unlock;regmap_write (priv->gswip,GSWIP_PCE_TBL_ADDR , tbl->index); -gswip_switch_mask (priv,GSWIP_PCE_TBL_CTRL_ADDR_MASK | -GSWIP_PCE_TBL_CTRL_OPMOD_MASK , +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 ); + tbl->table | addr_mode |GSWIP_PCE_TBL_CTRL_BAS ); err =gswip_switch_r_timeout (priv,GSWIP_PCE_TBL_CTRL ,GSWIP_PCE_TBL_CTRL_BAS );
@@ -348,10 +335,11 @@ static int gswip_pce_table_entry_write(struct gswip_priv *priv, }regmap_write (priv->gswip,GSWIP_PCE_TBL_ADDR , tbl->index); -gswip_switch_mask (priv,GSWIP_PCE_TBL_CTRL_ADDR_MASK | -GSWIP_PCE_TBL_CTRL_OPMOD_MASK , +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 ); + tbl->table | addr_mode);for (i =0 ; i <ARRAY_SIZE (tbl->key); i++)regmap_write (priv->gswip,GSWIP_PCE_TBL_KEY (i), tbl->key[i]);
@@ -359,10 +347,11 @@ static int gswip_pce_table_entry_write(struct gswip_priv *priv,for (i =0 ; i <ARRAY_SIZE (tbl->val); i++)regmap_write (priv->gswip,GSWIP_PCE_TBL_VAL (i), tbl->val[i]); -gswip_switch_mask (priv,GSWIP_PCE_TBL_CTRL_ADDR_MASK | -GSWIP_PCE_TBL_CTRL_OPMOD_MASK , +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 ); + tbl->table | addr_mode);regmap_write (priv->gswip,GSWIP_PCE_TBL_MASK , tbl->mask);
@@ -449,8 +438,9 @@ static int gswip_port_enable(struct dsa_switch *ds, int port,if (phydev) mdio_phy = phydev->mdio.addr &GSWIP_MDIO_PHY_ADDR_MASK ; -gswip_mdio_mask (priv,GSWIP_MDIO_PHY_ADDR_MASK , mdio_phy, -GSWIP_MDIO_PHYp (port)); +regmap_write_bits (priv->mdio,GSWIP_MDIO_PHYp (port), +GSWIP_MDIO_PHY_ADDR_MASK | mdio_phy, + mdio_phy); }/* RMON Counter Enable for port */
@@ -480,9 +470,11 @@ static int gswip_pce_load_microcode(struct gswip_priv *priv)int i;int err; -gswip_switch_mask (priv,GSWIP_PCE_TBL_CTRL_ADDR_MASK | -GSWIP_PCE_TBL_CTRL_OPMOD_MASK , -GSWIP_PCE_TBL_CTRL_OPMOD_ADWR ,GSWIP_PCE_TBL_CTRL ); +regmap_write_bits (priv->gswip,GSWIP_PCE_TBL_CTRL , +GSWIP_PCE_TBL_CTRL_ADDR_MASK | +GSWIP_PCE_TBL_CTRL_OPMOD_MASK | +GSWIP_PCE_TBL_CTRL_OPMOD_ADWR , +GSWIP_PCE_TBL_CTRL_OPMOD_ADWR );regmap_write (priv->gswip,GSWIP_PCE_TBL_MASK ,0 );for (i =0 ; i < priv->hw_info->pce_microcode_size; i++) {
@@ -549,9 +541,10 @@ static void gswip_port_commit_pvid(struct gswip_priv *priv, int port) } vinr = idx ?GSWIP_PCE_VCTRL_VINR_ALL :GSWIP_PCE_VCTRL_VINR_TAGGED ; -gswip_switch_mask (priv,GSWIP_PCE_VCTRL_VINR , +regmap_write_bits (priv->gswip,GSWIP_PCE_VCTRL (port), +GSWIP_PCE_VCTRL_VINR |FIELD_PREP (GSWIP_PCE_VCTRL_VINR , vinr), -GSWIP_PCE_VCTRL (port)); +FIELD_PREP (GSWIP_PCE_VCTRL_VINR , vinr));/* Note that in GSWIP 2.2 VLAN mode the VID needs to be programmed * directly instead of referencing the index in the Active VLAN Tablet.
@@ -569,20 +562,27 @@ static int gswip_port_vlan_filtering(struct dsa_switch *ds, int port,if (vlan_filtering) {/* Use tag based VLAN */ -gswip_switch_mask (priv, -GSWIP_PCE_VCTRL_VSR , -GSWIP_PCE_VCTRL_UVR |GSWIP_PCE_VCTRL_VIMR | -GSWIP_PCE_VCTRL_VEMR |GSWIP_PCE_VCTRL_VID0 , -GSWIP_PCE_VCTRL (port)); +regmap_write_bits (priv->gswip,GSWIP_PCE_VCTRL (port), +GSWIP_PCE_VCTRL_VSR | +GSWIP_PCE_VCTRL_UVR | +GSWIP_PCE_VCTRL_VIMR | +GSWIP_PCE_VCTRL_VEMR | +GSWIP_PCE_VCTRL_VID0 , +GSWIP_PCE_VCTRL_UVR | +GSWIP_PCE_VCTRL_VIMR | +GSWIP_PCE_VCTRL_VEMR | +GSWIP_PCE_VCTRL_VID0 );regmap_clear_bits (priv->gswip,GSWIP_PCE_PCTRL_0p (port),GSWIP_PCE_PCTRL_0_TVM ); }else {/* Use port based VLAN */ -gswip_switch_mask (priv, -GSWIP_PCE_VCTRL_UVR |GSWIP_PCE_VCTRL_VIMR | -GSWIP_PCE_VCTRL_VEMR |GSWIP_PCE_VCTRL_VID0 , +regmap_write_bits (priv->gswip,GSWIP_PCE_VCTRL (port), +GSWIP_PCE_VCTRL_UVR | +GSWIP_PCE_VCTRL_VIMR | +GSWIP_PCE_VCTRL_VEMR | +GSWIP_PCE_VCTRL_VID0 |GSWIP_PCE_VCTRL_VSR , -GSWIP_PCE_VCTRL (port)); +GSWIP_PCE_VCTRL_VSR );regmap_set_bits (priv->gswip,GSWIP_PCE_PCTRL_0p (port),GSWIP_PCE_PCTRL_0_TVM ); }
@@ -642,7 +642,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 */ -gswip_mdio_mask (priv,0xff ,0x09 ,GSWIP_MDIO_MDC_CFG1 ); +regmap_write_bits (priv->mdio,GSWIP_MDIO_MDC_CFG1 ,0xff |0x09 ,0x09 );/* bring up the mdio bus */ err =gswip_mdio (priv);
@@ -1083,8 +1083,9 @@ 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 ); -gswip_switch_mask (priv,GSWIP_PCE_PCTRL_0_PSTATE_MASK , stp_state, -GSWIP_PCE_PCTRL_0p (port)); +regmap_write_bits (priv->gswip,GSWIP_PCE_PCTRL_0p (port), +GSWIP_PCE_PCTRL_0_PSTATE_MASK | stp_state, + stp_state); } static int gswip_port_fdb(struct dsa_switch *ds, int port,
@@ -1313,8 +1314,8 @@ static void gswip_port_set_link(struct gswip_priv *priv, int port, bool link)else mdio_phy =GSWIP_MDIO_PHY_LINK_DOWN ; -gswip_mdio_mask (priv,GSWIP_MDIO_PHY_LINK_MASK , mdio_phy, -GSWIP_MDIO_PHYp (port)); +regmap_write_bits (priv->mdio,GSWIP_MDIO_PHYp (port), +GSWIP_MDIO_PHY_LINK_MASK | mdio_phy, mdio_phy); } static void gswip_port_set_speed(struct gswip_priv *priv, int port, int speed,
@@ -1354,11 +1355,11 @@ static void gswip_port_set_speed(struct gswip_priv *priv, int port, int speed,break ; } -gswip_mdio_mask (priv,GSWIP_MDIO_PHY_SPEED_MASK , mdio_phy, -GSWIP_MDIO_PHYp (port)); +regmap_write_bits (priv->mdio,GSWIP_MDIO_PHYp (port), +GSWIP_MDIO_PHY_SPEED_MASK | mdio_phy, mdio_phy);gswip_mii_mask_cfg (priv,GSWIP_MII_CFG_RATE_MASK , mii_cfg, port); -gswip_switch_mask (priv,GSWIP_MAC_CTRL_0_GMII_MASK , mac_ctrl_0, -GSWIP_MAC_CTRL_0p (port)); +regmap_write_bits (priv->gswip,GSWIP_MAC_CTRL_0p (port), +GSWIP_MAC_CTRL_0_GMII_MASK | mac_ctrl_0, mac_ctrl_0); }static void gswip_port_set_duplex (struct gswip_priv *priv,int port,int duplex)
@@ -1373,10 +1374,10 @@ static void gswip_port_set_duplex(struct gswip_priv *priv, int port, int duplex) mdio_phy =GSWIP_MDIO_PHY_FDUP_DIS ; } -gswip_switch_mask (priv,GSWIP_MAC_CTRL_0_FDUP_MASK , mac_ctrl_0, -GSWIP_MAC_CTRL_0p (port)); -gswip_mdio_mask (priv,GSWIP_MDIO_PHY_FDUP_MASK , mdio_phy, -GSWIP_MDIO_PHYp (port)); +regmap_write_bits (priv->gswip,GSWIP_MAC_CTRL_0p (port), +GSWIP_MAC_CTRL_0_FDUP_MASK | mac_ctrl_0, mac_ctrl_0); +regmap_write_bits (priv->mdio,GSWIP_MDIO_PHYp (port), +GSWIP_MDIO_PHY_FDUP_MASK | mdio_phy, mdio_phy); } static void gswip_port_set_pause(struct gswip_priv *priv, int port,
@@ -1402,12 +1403,11 @@ static void gswip_port_set_pause(struct gswip_priv *priv, int port,GSWIP_MDIO_PHY_FCONRX_DIS ; } -gswip_switch_mask (priv,GSWIP_MAC_CTRL_0_FCON_MASK , - mac_ctrl_0,GSWIP_MAC_CTRL_0p (port)); -gswip_mdio_mask (priv, -GSWIP_MDIO_PHY_FCONTX_MASK | -GSWIP_MDIO_PHY_FCONRX_MASK , - mdio_phy,GSWIP_MDIO_PHYp (port)); +regmap_write_bits (priv->gswip,GSWIP_MAC_CTRL_0p (port), +GSWIP_MAC_CTRL_0_FCON_MASK | mac_ctrl_0, mac_ctrl_0); +regmap_write_bits (priv->mdio,GSWIP_MDIO_PHYp (port), +GSWIP_MDIO_PHY_FCONTX_MASK |GSWIP_MDIO_PHY_FCONRX_MASK | mdio_phy, + mdio_phy); } static void gswip_phylink_mac_config(struct phylink_config *config,
@@ -1526,10 +1526,10 @@ static u32 gswip_bcm_ram_entry_read(struct gswip_priv *priv, u32 table,int err;regmap_write (priv->gswip,GSWIP_BM_RAM_ADDR , index); -gswip_switch_mask (priv,GSWIP_BM_RAM_CTRL_ADDR_MASK | -GSWIP_BM_RAM_CTRL_OPMOD , - table |GSWIP_BM_RAM_CTRL_BAS , -GSWIP_BM_RAM_CTRL ); +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 , + table |GSWIP_BM_RAM_CTRL_BAS ); err =gswip_switch_r_timeout (priv,GSWIP_BM_RAM_CTRL ,GSWIP_BM_RAM_CTRL_BAS );
Signature · 1 line
2.51.1
PATCH v5 6/7 net: dsa: lantiq_gswip: optimize regmap_write_bits() statements
In reply to Daniel GolleFurther optimize the previous naive conversion of the *_mask() accessor functions to regmap_write_bits by manually removing redundant mask operands.
---
v2: optimize more of the regmap_write_bits() calls
drivers/net/dsa/lantiq/lantiq_gswip.c | 33 ++++++++++++--------------- 1 file changed, 15 insertions(+), 18 deletions(-)
drivers/net/dsa/lantiq/lantiq_gswip.c +15 -18
@@ -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,
Signature · 1 line
2.51.1
PATCH v5 7/7 net: dsa: lantiq_gswip: harmonize gswip_mii_mask_*() parameters
In reply to Daniel GolleThe 'clear' parameter of gswip_mii_mask_cfg() and gswip_mii_mask_pcdu() is inconsistent with the semantics of regmap_write_bits() which also applies the mask to the value to be written.
Change the semantic mask/set of the functions gswip_mii_mask_cfg() and gswip_mii_mask_pcdu() to follow the regmap_write_bits() pattern.
--- drivers/net/dsa/lantiq/lantiq_gswip.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
drivers/net/dsa/lantiq/lantiq_gswip.c +7 -10
@@ -120,7 +120,7 @@ static u32 gswip_switch_r_timeout(struct gswip_priv *priv, u32 offset, !(val & cleared), 20, 50000); } -static void gswip_mii_mask_cfg (struct gswip_priv *priv,u32 clear,u32 set, +static void gswip_mii_mask_cfg (struct gswip_priv *priv,u32 mask,u32 set,int port) {int reg_port;
@@ -131,11 +131,11 @@ static void gswip_mii_mask_cfg(struct gswip_priv *priv, u32 clear, u32 set, reg_port = port + priv->hw_info->mii_port_reg_offset; -regmap_write_bits (priv->mii,GSWIP_MII_CFGp (reg_port), clear | set, +regmap_write_bits (priv->mii,GSWIP_MII_CFGp (reg_port), mask, set); } -static void gswip_mii_mask_pcdu (struct gswip_priv *priv,u32 clear,u32 set, +static void gswip_mii_mask_pcdu (struct gswip_priv *priv,u32 mask,u32 set,int port) {int reg_port;
@@ -148,16 +148,13 @@ static void gswip_mii_mask_pcdu(struct gswip_priv *priv, u32 clear, u32 set,switch (reg_port) {case 0 : -regmap_write_bits (priv->mii,GSWIP_MII_PCDU0 , clear | set, - set); +regmap_write_bits (priv->mii,GSWIP_MII_PCDU0 , mask, set);break ;case 1 : -regmap_write_bits (priv->mii,GSWIP_MII_PCDU1 , clear | set, - set); +regmap_write_bits (priv->mii,GSWIP_MII_PCDU1 , mask, set);break ;case 5 : -regmap_write_bits (priv->mii,GSWIP_MII_PCDU5 , clear | set, - set); +regmap_write_bits (priv->mii,GSWIP_MII_PCDU5 , mask, set);break ; } }
@@ -1501,7 +1498,7 @@ static void gswip_phylink_mac_link_up(struct phylink_config *config,gswip_port_set_pause (priv, port, tx_pause, rx_pause); } -gswip_mii_mask_cfg (priv,0 ,GSWIP_MII_CFG_EN , port); +gswip_mii_mask_cfg (priv,GSWIP_MII_CFG_EN ,GSWIP_MII_CFG_EN , port); } static void gswip_get_strings(struct dsa_switch *ds, int port, u32 stringset,
Signature · 1 line
2.51.1
Re: [PATCH net-next v5 2/7] net: dsa: lantiq_gswip: convert accessors to use regmap
In reply to Daniel GolleQuoted 6 lines · Daniel Golle
Use regmap for register access in preparation for supporting the MaxLinear GSW1xx family of switches connected via MDIO or SPI.
Rewrite the existing accessor read-poll-timeout functions to use calls to the regmap API for now.Signed-off-by Daniel Golle <[email protected]>
Thanks !
Maxime
Hauke Mehrtens
maintainerQuoted 48 lines · Daniel Golle
This series refactors the
lantiq_gswipdriver to utilize the regmap API for register access, replacing the previous approach of open-coding register operations.Using regmap paves the way for supporting different busses to access the switch registers, for example it makes it easier to use an MDIO-based method required to access the registers of the MaxLinear GSW1xx series of dedicated switch ICs.
Apart from that, the use of regmap improves readability and maintainability of the driver by standardizing register access.
When ever possible changes were made using Coccinelle semantic patches, sometimes adjusting white space and adding line breaks when needed. The remaining changes which were not done using semantic patches are small and should be easy to review and verify.
The whole series has been
Tested-by Alexander Sverdlin <[email protected]>---
Changes since v4:
* useREGMAP_UPSHIFT(2)macro instead of -2 value forreg_shiftChanges since v3:
* unlock mutex in error path
* simplify some of the manually converted register reads by changing the type to u32 instead of using a u32 tmp variable and then assigning the value to the previously used u16 variable.Changes since v2:
* correctly target net-next tree (fix typo in subject)Changes since RFC:
* drop error handling, it wasn't there before and it would anyway be removed again by a follow-up change
* optimize more of theregmap_write_bits()callsDaniel Golle (7):
net: dsa:lantiq_gswip: clarify GSWIP 2.2 VLAN mode in comment
net: dsa:lantiq_gswip: convert accessors to use regmap
net: dsa:lantiq_gswip: convert trivial accessor uses to regmap
net: dsa:lantiq_gswip: manually convert remaining uses of read
accessors
net: dsa:lantiq_gswip: replace*_mask()functions with regmap API
net: dsa:lantiq_gswip: optimizeregmap_write_bits()statements
net: dsa:lantiq_gswip: harmonize gswip_mii_mask_*() parameters
Quoted 5 lines
drivers/net/dsa/lantiq/Kconfig | 1 + drivers/net/dsa/lantiq/lantiq_gswip.c | 471 +++++++++++++------------- drivers/net/dsa/lantiq/lantiq_gswip.h | 6 +- 3 files changed, 243 insertions(+), 235 deletions(-)
I reviewed the series and it looks good to me.
Acked-by; Hauke Mehrtens <[email protected]>
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Tue, 21 Oct 2025 12:16:19 +0100 you wrote:
This series refactors the
lantiq_gswipdriver to utilize the regmap API for register access, replacing the previous approach of open-coding register operations.Using regmap paves the way for supporting different busses to access the switch registers, for example it makes it easier to use an MDIO-based method required to access the registers of the MaxLinear GSW1xx series of dedicated switch ICs.
[...]
Here is the summary with links:
- [net-next,v5,1/7] net: dsa: lantiq_gswip: clarify GSWIP 2.2 VLAN mode in comment
https://git.kernel.org/netdev/net-next/c/41b66240e90b - [net-next,v5,2/7] net: dsa: lantiq_gswip: convert accessors to use regmap https://git.kernel.org/netdev/net-next/c/705359797389 - [net-next,v5,3/7] net: dsa: lantiq_gswip: convert trivial accessor uses to regmap https://git.kernel.org/netdev/net-next/c/128f5cf40fa5 - [net-next,v5,4/7] net: dsa: lantiq_gswip: manually convert remaining uses of read accessors https://git.kernel.org/netdev/net-next/c/4cc06901ef34 - [net-next,v5,5/7] net: dsa: lantiq_gswip: replace *_mask() functions with regmap API https://git.kernel.org/netdev/net-next/c/748b0aebd48f - [net-next,v5,6/7] net: dsa: lantiq_gswip: optimize regmap_write_bits() statements https://git.kernel.org/netdev/net-next/c/1d88358303fc - [net-next,v5,7/7] net: dsa: lantiq_gswip: harmonize gswip_mii_mask_*() parameters https://git.kernel.org/netdev/net-next/c/b0911b9e0140
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html