net: dsa: ksz: added the generic port_stp_state_set function
PATCH 1/1 net: dsa: ksz: added the generic port_stp_state_set function
The ksz8795 and ksz9477 uses the same algorithm for the port_stp_state_set function except the register address is different. So moved the algorithm to the ksz_common.c and used the dev_ops for register read and write. This function can also used for the lan937x part. Hence making it generic for all the parts.
--- drivers/net/dsa/microchip/ksz8795.c | 35 +--------------------- drivers/net/dsa/microchip/ksz8795_reg.h | 3 -- drivers/net/dsa/microchip/ksz9477.c | 33 +------------------- drivers/net/dsa/microchip/ksz9477_reg.h | 4 --- drivers/net/dsa/microchip/ksz_common.c | 40 +++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 7 +++++ 6 files changed, 49 insertions(+), 73 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +1 -34
@@ -1027,40 +1027,7 @@ static void ksz8_cfg_port_member(struct ksz_device *dev, int port, u8 member)static void ksz8_port_stp_state_set (struct dsa_switch *ds,int port,u8 state) { -struct ksz_device *dev = ds->priv; -struct ksz_port *p; -u8 data; - -ksz_pread8 (dev, port,P_STP_CTRL , &data); - data &= ~(PORT_TX_ENABLE |PORT_RX_ENABLE |PORT_LEARN_DISABLE ); - -switch (state) { -case BR_STATE_DISABLED : - data |=PORT_LEARN_DISABLE ; -break ; -case BR_STATE_LISTENING : - data |= (PORT_RX_ENABLE |PORT_LEARN_DISABLE ); -break ; -case BR_STATE_LEARNING : - data |=PORT_RX_ENABLE ; -break ; -case BR_STATE_FORWARDING : - data |= (PORT_TX_ENABLE |PORT_RX_ENABLE ); -break ; -case BR_STATE_BLOCKING : - data |=PORT_LEARN_DISABLE ; -break ; -default : -dev_err (ds->dev,"invalid STP state: %d\n" , state); -return ; - } - -ksz_pwrite8 (dev, port,P_STP_CTRL , data); - - p = &dev->ports[port]; - p->stp_state = state; - -ksz_update_port_member (dev, port); +ksz_port_stp_state_set (ds, port, state,P_STP_CTRL ); }static void ksz8_flush_dyn_mac_table (struct ksz_device *dev,int port)
drivers/net/dsa/microchip/ksz8795_reg.h +0 -3
@@ -160,9 +160,6 @@#define PORT_DISCARD_NON_VID BIT(5)#define PORT_FORCE_FLOW_CTRL BIT(4)#define PORT_BACK_PRESSURE BIT(3) -#define PORT_TX_ENABLE BIT(2) -#define PORT_RX_ENABLE BIT(1) -#define PORT_LEARN_DISABLE BIT(0)#define REG_PORT_1_CTRL_3 0x13#define REG_PORT_2_CTRL_3 0x23
drivers/net/dsa/microchip/ksz9477.c +1 -32
@@ -517,38 +517,7 @@ static void ksz9477_cfg_port_member(struct ksz_device *dev, int port,static void ksz9477_port_stp_state_set (struct dsa_switch *ds,int port,u8 state) { -struct ksz_device *dev = ds->priv; -struct ksz_port *p = &dev->ports[port]; -u8 data; - -ksz_pread8 (dev, port,P_STP_CTRL , &data); - data &= ~(PORT_TX_ENABLE |PORT_RX_ENABLE |PORT_LEARN_DISABLE ); - -switch (state) { -case BR_STATE_DISABLED : - data |=PORT_LEARN_DISABLE ; -break ; -case BR_STATE_LISTENING : - data |= (PORT_RX_ENABLE |PORT_LEARN_DISABLE ); -break ; -case BR_STATE_LEARNING : - data |=PORT_RX_ENABLE ; -break ; -case BR_STATE_FORWARDING : - data |= (PORT_TX_ENABLE |PORT_RX_ENABLE ); -break ; -case BR_STATE_BLOCKING : - data |=PORT_LEARN_DISABLE ; -break ; -default : -dev_err (ds->dev,"invalid STP state: %d\n" , state); -return ; - } - -ksz_pwrite8 (dev, port,P_STP_CTRL , data); - p->stp_state = state; - -ksz_update_port_member (dev, port); +ksz_port_stp_state_set (ds, port, state,P_STP_CTRL ); }static void ksz9477_flush_dyn_mac_table (struct ksz_device *dev,int port)
drivers/net/dsa/microchip/ksz9477_reg.h +0 -4
@@ -1586,10 +1586,6 @@#define REG_PORT_LUE_MSTP_STATE 0x0B04 -#define PORT_TX_ENABLE BIT(2) -#define PORT_RX_ENABLE BIT(1) -#define PORT_LEARN_DISABLE BIT(0) -/* C - PTP */ #define REG_PTP_PORT_RX_DELAY__2 0x0C00
drivers/net/dsa/microchip/ksz_common.c +40 -0
@@ -372,6 +372,46 @@ int ksz_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy) }EXPORT_SYMBOL_GPL (ksz_enable_port); +void ksz_port_stp_state_set (struct dsa_switch *ds,int port, +u8 state,int reg) +{ +struct ksz_device *dev = ds->priv; +struct ksz_port *p; +u8 data; + +ksz_pread8 (dev, port, reg, &data); + data &= ~(PORT_TX_ENABLE |PORT_RX_ENABLE |PORT_LEARN_DISABLE ); + +switch (state) { +case BR_STATE_DISABLED : + data |=PORT_LEARN_DISABLE ; +break ; +case BR_STATE_LISTENING : + data |= (PORT_RX_ENABLE |PORT_LEARN_DISABLE ); +break ; +case BR_STATE_LEARNING : + data |=PORT_RX_ENABLE ; +break ; +case BR_STATE_FORWARDING : + data |= (PORT_TX_ENABLE |PORT_RX_ENABLE ); +break ; +case BR_STATE_BLOCKING : + data |=PORT_LEARN_DISABLE ; +break ; +default : +dev_err (ds->dev,"invalid STP state: %d\n" , state); +return ; + } + +ksz_pwrite8 (dev, port, reg, data); + + p = &dev->ports[port]; + p->stp_state = state; + +ksz_update_port_member (dev, port); +} +EXPORT_SYMBOL_GPL (ksz_port_stp_state_set); +struct ksz_device *ksz_switch_alloc (struct device *base,void *priv) {struct dsa_switch *ds;
drivers/net/dsa/microchip/ksz_common.h +7 -0
@@ -165,6 +165,8 @@ int ksz_port_bridge_join(struct dsa_switch *ds, int port, struct netlink_ext_ack *extack);void ksz_port_bridge_leave (struct dsa_switch *ds,int port,struct dsa_bridge bridge); +void ksz_port_stp_state_set (struct dsa_switch *ds,int port, +u8 state,int reg);void ksz_port_fast_age (struct dsa_switch *ds,int port);int ksz_port_fdb_dump (struct dsa_switch *ds,int port,dsa_fdb_dump_cb_t *cb,void *data);
@@ -292,6 +294,11 @@ static inline void ksz_regmap_unlock(void *__mtx)mutex_unlock (mtx); } +/* STP State Defines */ +#define PORT_TX_ENABLE BIT(2) +#define PORT_RX_ENABLE BIT(1) +#define PORT_LEARN_DISABLE BIT(0) +/* Regmap tables generation */ #define KSZ_SPI_OP_RD 3#define KSZ_SPI_OP_WR 2
base-commit: cfc1d91a7d78cf9de25b043d81efcc16966d55b3
Signature · 1 line
2.33.0
Quoted 7 lines · Arun Ramadoss
The ksz8795 and ksz9477 uses the same algorithm for the
port_stp_state_setfunction except the register address is different. So moved the algorithm to theksz_common.cand used thedev_opsfor register read and write. This function can also used for the lan937x part. Hence making it generic for all the parts.Signed-off-by Arun Ramadoss <[email protected]>
Signature · 1 line
Florian
This patch was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Quoted 9 lines · On Sun, 24 Apr 2022 16:58:31 +0530 you wrote:
The ksz8795 and ksz9477 uses the same algorithm for the
port_stp_state_setfunction except the register address is different. So moved the algorithm to theksz_common.cand used thedev_opsfor register read and write. This function can also used for the lan937x part. Hence making it generic for all the parts.Signed-off-by Arun Ramadoss <[email protected]>[...]
Here is the summary with links:
- [net-next] net: dsa: ksz: added the generic port_stp_state_set function
https://git.kernel.org/netdev/net-next/c/de6dd626d708
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html