net: dsa: b53/bcm_sf2 cleanups
v2 cover net: dsa: b53/bcm_sf2 cleanups
Hi all,
This patch series is a first pass set of clean-ups to reduce the number of LOCs between b53 and bcm_sf2 and sharing as many functions as possible.
There is a number of additional cleanups queued up locally that require more thorough testing.
Thanks!
Changes in v2:
- added Reviewed-by tags from Vivien
- added a missing EXPORT_SYMBOL() in patch 8
- fixed a typo in patch 5
Florian Fainelli (12):
net: dsa: b53: Remove is_cpu_port()
net: dsa: b53: Make b53_enable_cpu_port() take a port argument
net: dsa: b53: Defer port enabling to calling port_enable
net: dsa: bcm_sf2: Defer port enabling to calling port_enable
net: dsa: b53: Use a macro to define I/O operations
net: dsa: b53: Move Broadcom header setup to b53
net: dsa: b53: Define EEE register page
net: dsa: b53: Move EEE functions to b53
net: dsa: b53: Wire-up EEE
net: dsa: b53: Export b53_imp_vlan_setup()
net: dsa: bcm_sf2: Use SF2_NUM_EGRESS_QUEUES for CFP
net: dsa: bcm_sf2: Utilize b53_{enable,disable}_port
drivers/net/dsa/b53/b53_common.c | 151 ++++++++++++++++++++++++++++++++---- drivers/net/dsa/b53/b53_priv.h | 145 ++++++++--------------------------- drivers/net/dsa/b53/b53_regs.h | 48 ++++++++++++ drivers/net/dsa/bcm_sf2.c | 161 +++------------------------------------ drivers/net/dsa/bcm_sf2.h | 2 - drivers/net/dsa/bcm_sf2_cfp.c | 6 +- drivers/net/dsa/bcm_sf2_regs.h | 11 --- 7 files changed, 228 insertions(+), 296 deletions(-)
Signature · 1 line
2.9.3
PATCH v2 1/12 net: dsa: b53: Remove is_cpu_port()
This is not used anywhere, so remove it.
--- drivers/net/dsa/b53/b53_priv.h | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/dsa/b53/b53_priv.h +0 -5
@@ -186,11 +186,6 @@ static inline int is58xx(struct b53_device *dev)#define B53_CPU_PORT_25 5#define B53_CPU_PORT 8 -static inline int is_cpu_port (struct b53_device *dev,int port) -{ -return dev->cpu_port; -} -struct b53_device *b53_switch_alloc (struct device *base,const struct b53_io_ops *ops,void *priv);
Signature · 1 line
2.9.3
PATCH v2 2/12 net: dsa: b53: Make b53_enable_cpu_port() take a port argument
In reply to Florian FainelliIn preparation for future changes allowing the configuring of multiple CPU ports, make b53_enable_cpu_port() take a port argument.
--- drivers/net/dsa/b53/b53_common.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/net/dsa/b53/b53_common.c +5 -6
@@ -538,19 +538,18 @@ static void b53_disable_port(struct dsa_switch *ds, int port,b53_write8 (dev,B53_CTRL_PAGE ,B53_PORT_CTRL (port), reg); } -static void b53_enable_cpu_port (struct b53_device *dev) +static void b53_enable_cpu_port (struct b53_device *dev,int port) { -unsigned int cpu_port = dev->cpu_port;u8 port_ctrl;/* BCM5325 CPU port is at 8 */ -if ((is5325 (dev) ||is5365 (dev)) && cpu_port ==B53_CPU_PORT_25 ) - cpu_port =B53_CPU_PORT ; +if ((is5325 (dev) ||is5365 (dev)) && port ==B53_CPU_PORT_25 ) + port =B53_CPU_PORT ; port_ctrl =PORT_CTRL_RX_BCST_EN |PORT_CTRL_RX_MCST_EN |PORT_CTRL_RX_UCST_EN ; -b53_write8 (dev,B53_CTRL_PAGE ,B53_PORT_CTRL (cpu_port), port_ctrl); +b53_write8 (dev,B53_CTRL_PAGE ,B53_PORT_CTRL (port), port_ctrl); }static void b53_enable_mib (struct b53_device *dev)
@@ -820,7 +819,7 @@ static int b53_setup(struct dsa_switch *ds)if (BIT (port) & ds->enabled_port_mask)b53_enable_port (ds, port,NULL );else if (dsa_is_cpu_port (ds, port)) -b53_enable_cpu_port (dev); +b53_enable_cpu_port (dev, port);else b53_disable_port (ds, port,NULL ); }
Signature · 1 line
2.9.3
PATCH v2 3/12 net: dsa: b53: Defer port enabling to calling port_enable
In reply to Florian FainelliThere is no need to configure the enabled ports once in b53_setup() and then a second time around when dsa_switch_ops::port_enable is called, just do it when port_enable is called which is better in terms of power consumption and correctness.
--- drivers/net/dsa/b53/b53_common.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/dsa/b53/b53_common.c +5 -4
@@ -815,12 +815,13 @@ static int b53_setup(struct dsa_switch *ds)if (ret)dev_err (ds->dev,"failed to apply configuration\n" ); +/* Configure IMP/CPU port, disable unused ports. Enabled +* ports will be configured with .port_enable +*/ for (port =0 ; port < dev->num_ports; port++) { -if (BIT (port) & ds->enabled_port_mask) -b53_enable_port (ds, port,NULL ); -else if (dsa_is_cpu_port (ds, port)) +if (dsa_is_cpu_port (ds, port))b53_enable_cpu_port (dev, port); -else +else if (!(BIT (port) & ds->enabled_port_mask))b53_disable_port (ds, port,NULL ); }
Signature · 1 line
2.9.3
PATCH v2 4/12 net: dsa: bcm_sf2: Defer port enabling to calling port_enable
In reply to Florian FainelliThere is no need to configure the enabled ports once in bcm_sf2_sw_setup() and then a second time around when dsa_switch_ops::port_enable is called, just do it when port_enable is called which is better in terms of power consumption and correctness.
--- drivers/net/dsa/bcm_sf2.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/dsa/bcm_sf2.c +3 -6
@@ -890,14 +890,11 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds)struct bcm_sf2_priv *priv =bcm_sf2_to_priv (ds);unsigned int port; -/* Enable all valid ports and disable those unused */ +/* Disable unused ports and configure IMP port */ for (port =0 ; port < priv->hw_params.num_ports; port++) { -/* IMP port receives special treatment */ -if ((1 << port) & ds->enabled_port_mask) -bcm_sf2_port_setup (ds, port,NULL ); -else if (dsa_is_cpu_port (ds, port)) +if (dsa_is_cpu_port (ds, port))bcm_sf2_imp_setup (ds, port); -else +else if (!((1 << port) & ds->enabled_port_mask))bcm_sf2_port_disable (ds, port,NULL ); }
Signature · 1 line
2.9.3
PATCH v2 5/12 net: dsa: b53: Use a macro to define I/O operations
In reply to Florian FainelliInstead of repeating the same pattern: acquire mutex, read/write, release mutex, define a macro: b53_build_op() which takes the type (read|write), I/O size, and value (scalar or pointer). This helps with fixing bugs that could exist (e.g: missing barrier, lock etc.).
--- drivers/net/dsa/b53/b53_priv.h | 133 +++++++---------------------------------- 1 file changed, 22 insertions(+), 111 deletions(-)
drivers/net/dsa/b53/b53_priv.h +22 -111
@@ -199,119 +199,30 @@ static inline void b53_switch_remove(struct b53_device *dev)dsa_unregister_switch (dev->ds); } -static inline int b53_read8 (struct b53_device *dev,u8 page,u8 reg,u8 *val) -{ -int ret; - -mutex_lock (&dev->reg_mutex); - ret = dev->ops->read8 (dev, page, reg, val); -mutex_unlock (&dev->reg_mutex); - -return ret; -} - -static inline int b53_read16 (struct b53_device *dev,u8 page,u8 reg,u16 *val) -{ -int ret; - -mutex_lock (&dev->reg_mutex); - ret = dev->ops->read16 (dev, page, reg, val); -mutex_unlock (&dev->reg_mutex); - -return ret; -} - -static inline int b53_read32 (struct b53_device *dev,u8 page,u8 reg,u32 *val) -{ -int ret; - -mutex_lock (&dev->reg_mutex); - ret = dev->ops->read32 (dev, page, reg, val); -mutex_unlock (&dev->reg_mutex); - -return ret; -} - -static inline int b53_read48 (struct b53_device *dev,u8 page,u8 reg,u64 *val) -{ -int ret; - -mutex_lock (&dev->reg_mutex); - ret = dev->ops->read48 (dev, page, reg, val); -mutex_unlock (&dev->reg_mutex); - -return ret; +#define b53_build_op (type, op_size, val_type) \ +static inline int b53_##type##op_size(struct b53_device *dev, u8 page, \ + u8 reg, val_type val) \ +{ \ + int ret; \ + \ + mutex_lock(&dev->reg_mutex); \ + ret = dev->ops->type##op_size(dev, page, reg, val); \ + mutex_unlock(&dev->reg_mutex); \ + \ + return ret; \ } -static inline int b53_read64 (struct b53_device *dev,u8 page,u8 reg,u64 *val) -{ -int ret; - -mutex_lock (&dev->reg_mutex); - ret = dev->ops->read64 (dev, page, reg, val); -mutex_unlock (&dev->reg_mutex); - -return ret; -} - -static inline int b53_write8 (struct b53_device *dev,u8 page,u8 reg,u8 value) -{ -int ret; - -mutex_lock (&dev->reg_mutex); - ret = dev->ops->write8 (dev, page, reg, value); -mutex_unlock (&dev->reg_mutex); - -return ret; -} - -static inline int b53_write16 (struct b53_device *dev,u8 page,u8 reg, -u16 value) -{ -int ret; - -mutex_lock (&dev->reg_mutex); - ret = dev->ops->write16 (dev, page, reg, value); -mutex_unlock (&dev->reg_mutex); - -return ret; -} - -static inline int b53_write32 (struct b53_device *dev,u8 page,u8 reg, -u32 value) -{ -int ret; - -mutex_lock (&dev->reg_mutex); - ret = dev->ops->write32 (dev, page, reg, value); -mutex_unlock (&dev->reg_mutex); - -return ret; -} - -static inline int b53_write48 (struct b53_device *dev,u8 page,u8 reg, -u64 value) -{ -int ret; - -mutex_lock (&dev->reg_mutex); - ret = dev->ops->write48 (dev, page, reg, value); -mutex_unlock (&dev->reg_mutex); - -return ret; -} - -static inline int b53_write64 (struct b53_device *dev,u8 page,u8 reg, -u64 value) -{ -int ret; - -mutex_lock (&dev->reg_mutex); - ret = dev->ops->write64 (dev, page, reg, value); -mutex_unlock (&dev->reg_mutex); - -return ret; -} +b53_build_op(read, 8, u8 *); +b53_build_op(read, 16, u16 *); +b53_build_op(read, 32, u32 *); +b53_build_op(read, 48, u64 *); +b53_build_op(read, 64, u64 *); + +b53_build_op (write,8 , u8); +b53_build_op (write,16 , u16); +b53_build_op (write,32 , u32); +b53_build_op (write,48 , u64); +b53_build_op (write,64 , u64);struct b53_arl_entry {u8 port;
Signature · 1 line
2.9.3
PATCH v2 6/12 net: dsa: b53: Move Broadcom header setup to b53
In reply to Florian FainelliThe code to enable Broadcom tags/headers is largely switch independent, and in preparation for enabling it for multiple devices with b53, move the code we have in bcm_sf2.c to b53_common.c
--- drivers/net/dsa/b53/b53_common.c | 47 ++++++++++++++++++++++++++++++++++++++++ drivers/net/dsa/b53/b53_priv.h | 1 + drivers/net/dsa/b53/b53_regs.h | 7 ++++++ drivers/net/dsa/bcm_sf2.c | 43 ++---------------------------------- drivers/net/dsa/bcm_sf2_regs.h | 8 ------- 5 files changed, 57 insertions(+), 49 deletions(-)
drivers/net/dsa/b53/b53_common.c +47 -0
@@ -538,6 +538,53 @@ static void b53_disable_port(struct dsa_switch *ds, int port,b53_write8 (dev,B53_CTRL_PAGE ,B53_PORT_CTRL (port), reg); } +void b53_brcm_hdr_setup (struct dsa_switch *ds,int port) +{ +struct b53_device *dev = ds->priv; +u8 hdr_ctl, val; +u16 reg; + +/* Resolve which bit controls the Broadcom tag */ +switch (port) { +case 8 : + val =BRCM_HDR_P8_EN ; +break ; +case 7 : + val =BRCM_HDR_P7_EN ; +break ; +case 5 : + val =BRCM_HDR_P5_EN ; +break ; +default : + val =0 ; +break ; + } + +/* Enable Broadcom tags for IMP port */ +b53_read8 (dev,B53_MGMT_PAGE ,B53_BRCM_HDR , &hdr_ctl); + hdr_ctl |= val; +b53_write8 (dev,B53_MGMT_PAGE ,B53_BRCM_HDR , hdr_ctl); + +/* Registers below are only accessible on newer devices */ +if (!is58xx (dev)) +return ; + +/* Enable reception Broadcom tag for CPU TX (switch RX) to +* allow us to tag outgoing frames +*/ +b53_read16 (dev,B53_MGMT_PAGE ,B53_BRCM_HDR_RX_DIS , ®); + reg &= ~BIT (port); +b53_write16 (dev,B53_MGMT_PAGE ,B53_BRCM_HDR_RX_DIS , reg); + +/* Enable transmission of Broadcom tags from the switch (CPU RX) to +* allow delivering frames to the per-port net_devices +*/ +b53_read16 (dev,B53_MGMT_PAGE ,B53_BRCM_HDR_TX_DIS , ®); + reg &= ~BIT (port); +b53_write16 (dev,B53_MGMT_PAGE ,B53_BRCM_HDR_TX_DIS , reg); +} +EXPORT_SYMBOL (b53_brcm_hdr_setup); +static void b53_enable_cpu_port (struct b53_device *dev,int port) {u8 port_ctrl;
drivers/net/dsa/b53/b53_priv.h +1 -0
@@ -309,5 +309,6 @@ int b53_mirror_add(struct dsa_switch *ds, int port, struct dsa_mall_mirror_tc_entry *mirror, bool ingress);void b53_mirror_del (struct dsa_switch *ds,int port,struct dsa_mall_mirror_tc_entry *mirror); +void b53_brcm_hdr_setup (struct dsa_switch *ds,int port);#endif
drivers/net/dsa/b53/b53_regs.h +7 -0
@@ -210,6 +210,7 @@#define B53_BRCM_HDR 0x03#define BRCM_HDR_P8_EN BIT(0)/* Enable tagging on port 8 */ #define BRCM_HDR_P5_EN BIT(1)/* Enable tagging on port 5 */ +#define BRCM_HDR_P7_EN BIT(2)/* Enable tagging on port 7 */ /* Mirror capture control register (16 bit) */ #define B53_MIR_CAP_CTL 0x10
@@ -249,6 +250,12 @@/* Revision ID register (8 bit) */ #define B53_REV_ID 0x40 +/* Broadcom header RX control (16 bit) */ +#define B53_BRCM_HDR_RX_DIS 0x60 + +/* Broadcom header TX control (16 bit) */ +#define B53_BRCM_HDR_TX_DIS 0x62 +/************************************************************************* * ARL Access Page Registers *************************************************************************/
drivers/net/dsa/bcm_sf2.c +2 -41
61 lines not on this page · raw message
drivers/net/dsa/bcm_sf2_regs.h +0 -8
@@ -205,16 +205,8 @@ enum bcm_sf2_reg_offs {#define CORE_IMP0_PRT_ID 0x0804 -#define CORE_BRCM_HDR_CTRL 0x0080c -#define BRCM_HDR_EN_P8 (1 << 0) -#define BRCM_HDR_EN_P5 (1 << 1) -#define BRCM_HDR_EN_P7 (1 << 2) -#define CORE_RST_MIB_CNT_EN 0x0950 -#define CORE_BRCM_HDR_RX_DIS 0x0980 -#define CORE_BRCM_HDR_TX_DIS 0x0988 -#define CORE_ARLA_VTBL_RWCTRL 0x1600#define ARLA_VTBL_CMD_WRITE 0#define ARLA_VTBL_CMD_READ 1
Signature · 1 line
2.9.3
PATCH v2 7/12 net: dsa: b53: Define EEE register page
In reply to Florian FainelliIn preparation for migrating the EEE code from bcm_sf2 to b53, define the full EEE register page and offsets within that page.
--- drivers/net/dsa/b53/b53_regs.h | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)
drivers/net/dsa/b53/b53_regs.h +41 -0
@@ -50,6 +50,9 @@/* Jumbo Frame Registers */ #define B53_JUMBO_PAGE 0x40 +/* EEE Control Registers Page */ +#define B53_EEE_PAGE 0x92 +/* CFP Configuration Registers Page */ #define B53_CFP_PAGE 0xa1
@@ -472,6 +475,44 @@#define JMS_MAX_SIZE 9724/************************************************************************* +* EEE Configuration Page Registers +*************************************************************************/ + +/* EEE Enable control register (16 bit) */ +#define B53_EEE_EN_CTRL 0x00 + +/* EEE LPI assert status register (16 bit) */ +#define B53_EEE_LPI_ASSERT_STS 0x02 + +/* EEE LPI indicate status register (16 bit) */ +#define B53_EEE_LPI_INDICATE 0x4 + +/* EEE Receiving idle symbols status register (16 bit) */ +#define B53_EEE_RX_IDLE_SYM_STS 0x6 + +/* EEE Pipeline timer register (32 bit) */ +#define B53_EEE_PIP_TIMER 0xC + +/* EEE Sleep timer Gig register (32 bit) */ +#define B53_EEE_SLEEP_TIMER_GIG (i) (0x10 + 4 * (i)) + +/* EEE Sleep timer FE register (32 bit) */ +#define B53_EEE_SLEEP_TIMER_FE (i) (0x34 + 4 * (i)) + +/* EEE Minimum LP timer Gig register (32 bit) */ +#define B53_EEE_MIN_LP_TIMER_GIG (i) (0x58 + 4 * (i)) + +/* EEE Minimum LP timer FE register (32 bit) */ +#define B53_EEE_MIN_LP_TIMER_FE (i) (0x7c + 4 * (i)) + +/* EEE Wake timer Gig register (16 bit) */ +#define B53_EEE_WAKE_TIMER_GIG (i) (0xa0 + 2 * (i)) + +/* EEE Wake timer FE register (16 bit) */ +#define B53_EEE_WAKE_TIMER_FE (i) (0xb2 + 2 * (i)) + + +/************************************************************************* * CFP Configuration Page Registers *************************************************************************/
Signature · 1 line
2.9.3
PATCH v2 8/12 net: dsa: b53: Move EEE functions to b53
In reply to Florian FainelliMove the bcm_sf2 EEE-related functions to the b53 driver because this is shared code amongst Gigabit capable switch, only 5325 and 5365 are too old to support that.
--- drivers/net/dsa/b53/b53_common.c | 63 ++++++++++++++++++++++++++++++++++++++ drivers/net/dsa/b53/b53_priv.h | 5 +++ drivers/net/dsa/bcm_sf2.c | 66 ++++------------------------------------ drivers/net/dsa/bcm_sf2.h | 2 -- drivers/net/dsa/bcm_sf2_regs.h | 3 -- 5 files changed, 74 insertions(+), 65 deletions(-)
drivers/net/dsa/b53/b53_common.c +63 -0
@@ -1531,6 +1531,69 @@ void b53_mirror_del(struct dsa_switch *ds, int port, }EXPORT_SYMBOL (b53_mirror_del); +void b53_eee_enable_set (struct dsa_switch *ds,int port,bool enable) +{ +struct b53_device *dev = ds->priv; +u16 reg; + +b53_read16 (dev,B53_EEE_PAGE ,B53_EEE_EN_CTRL , ®); +if (enable) + reg |=BIT (port); +else + reg &= ~BIT (port); +b53_write16 (dev,B53_EEE_PAGE ,B53_EEE_EN_CTRL , reg); +} +EXPORT_SYMBOL (b53_eee_enable_set); + + +/* Returns 0 if EEE was not enabled, or 1 otherwise +*/ +int b53_eee_init (struct dsa_switch *ds,int port,struct phy_device *phy) +{ +int ret; + + ret =phy_init_eee (phy,0 ); +if (ret) +return 0 ; + +b53_eee_enable_set (ds, port, true); + +return 1 ; +} +EXPORT_SYMBOL (b53_eee_init); + +int b53_get_mac_eee (struct dsa_switch *ds,int port,struct ethtool_eee *e) +{ +struct b53_device *dev = ds->priv; +struct ethtool_eee *p = &dev->ports[port].eee; +u16 reg; + +if (is5325 (dev) ||is5365 (dev)) +return -EOPNOTSUPP ; + +b53_read16 (dev,B53_EEE_PAGE ,B53_EEE_LPI_INDICATE , ®); + e->eee_enabled = p->eee_enabled; + e->eee_active = !!(reg &BIT (port)); + +return 0 ; +} +EXPORT_SYMBOL (b53_get_mac_eee); + +int b53_set_mac_eee (struct dsa_switch *ds,int port,struct ethtool_eee *e) +{ +struct b53_device *dev = ds->priv; +struct ethtool_eee *p = &dev->ports[port].eee; + +if (is5325 (dev) ||is5365 (dev)) +return -EOPNOTSUPP ; + + p->eee_enabled = e->eee_enabled; +b53_eee_enable_set (ds, port, e->eee_enabled); + +return 0 ; +} +EXPORT_SYMBOL (b53_set_mac_eee); +static const struct dsa_switch_ops b53_switch_ops = { .get_tag_protocol = b53_get_tag_protocol, .setup = b53_setup,
drivers/net/dsa/b53/b53_priv.h +5 -0
@@ -70,6 +70,7 @@ enum {struct b53_port {u16 vlan_ctl_mask; +struct ethtool_eee eee; };struct b53_vlan {
@@ -310,5 +311,9 @@ int b53_mirror_add(struct dsa_switch *ds, int port,void b53_mirror_del (struct dsa_switch *ds,int port,struct dsa_mall_mirror_tc_entry *mirror);void b53_brcm_hdr_setup (struct dsa_switch *ds,int port); +void b53_eee_enable_set (struct dsa_switch *ds,int port,bool enable); +int b53_eee_init (struct dsa_switch *ds,int port,struct phy_device *phy); +int b53_get_mac_eee (struct dsa_switch *ds,int port,struct ethtool_eee *e); +int b53_set_mac_eee (struct dsa_switch *ds,int port,struct ethtool_eee *e);#endif
drivers/net/dsa/bcm_sf2.c +6 -60
102 lines not on this page · raw message
drivers/net/dsa/bcm_sf2.h +0 -2
@@ -48,8 +48,6 @@ struct bcm_sf2_hw_params {struct bcm_sf2_port_status {unsigned int link; - -struct ethtool_eee eee; };struct bcm_sf2_cfp_priv {
drivers/net/dsa/bcm_sf2_regs.h +0 -3
@@ -244,9 +244,6 @@ enum bcm_sf2_reg_offs {#define CORE_JOIN_ALL_VLAN_EN 0xd140 -#define CORE_EEE_EN_CTRL 0x24800 -#define CORE_EEE_LPI_INDICATE 0x24810 -#define CORE_CFP_ACC 0x28000#define OP_STR_DONE (1 << 0)#define OP_SEL_SHIFT 1
Signature · 1 line
2.9.3
Re: [PATCH net-next v2 08/12] net: dsa: b53: Move EEE functions to b53
Quoted 5 lines · Florian Fainelli
Move the
bcm_sf2EEE-related functions to the b53 driver because this is shared code amongst Gigabit capable switch, only 5325 and 5365 are too old to support that.Signed-off-by Florian Fainelli <[email protected]>
PATCH v2 9/12 net: dsa: b53: Wire-up EEE
In reply to Florian FainelliAdd support for enabling and disabling EEE, as well as re-negotiating it in .adjust_link() and in .port_enable().
--- drivers/net/dsa/b53/b53_common.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/dsa/b53/b53_common.c +10 -0
@@ -523,6 +523,10 @@ static int b53_enable_port(struct dsa_switch *ds, int port,b53_imp_vlan_setup (ds, cpu_port); +/* If EEE was enabled, restore it */ +if (dev->ports[port].eee.eee_enabled) +b53_eee_enable_set (ds, port, true); +return 0 ; }
@@ -879,6 +883,7 @@ static void b53_adjust_link(struct dsa_switch *ds, int port, struct phy_device *phydev) {struct b53_device *dev = ds->priv; +struct ethtool_eee *p = &dev->ports[port].eee;u8 rgmii_ctrl =0 , reg =0 , off;if (!phy_is_pseudo_fixed_link (phydev))
@@ -1000,6 +1005,9 @@ static void b53_adjust_link(struct dsa_switch *ds, int port,b53_write8 (dev,B53_CTRL_PAGE , po_reg, gmii_po); } } + +/* Re-negotiate EEE if it was enabled already */ + p->eee_enabled =b53_eee_init (ds, port, phydev); }int b53_vlan_filtering (struct dsa_switch *ds,int port,bool vlan_filtering)
@@ -1605,6 +1613,8 @@ static const struct dsa_switch_ops b53_switch_ops = { .adjust_link = b53_adjust_link, .port_enable = b53_enable_port, .port_disable = b53_disable_port, + .get_mac_eee = b53_get_mac_eee, + .set_mac_eee = b53_set_mac_eee, .port_bridge_join = b53_br_join, .port_bridge_leave = b53_br_leave, .port_stp_state_set = b53_br_set_stp_state,
Signature · 1 line
2.9.3
Re: [PATCH net-next v2 09/12] net: dsa: b53: Wire-up EEE
Quoted 4 lines · Florian Fainelli
Add support for enabling and disabling EEE, as well as re-negotiating it in .adjust_link() and in .port_enable().
Signed-off-by Florian Fainelli <[email protected]>
PATCH v2 10/12 net: dsa: b53: Export b53_imp_vlan_setup()
In reply to Florian Fainellibcm_sf2 and b53 do exactly the same thing, so share that piece.
--- drivers/net/dsa/b53/b53_common.c | 3 ++- drivers/net/dsa/b53/b53_priv.h | 1 + drivers/net/dsa/bcm_sf2.c | 23 +---------------------- 3 files changed, 4 insertions(+), 23 deletions(-)
drivers/net/dsa/b53/b53_common.c +2 -1
@@ -484,7 +484,7 @@ static int b53_fast_age_vlan(struct b53_device *dev, u16 vid)return b53_flush_arl (dev,FAST_AGE_VLAN ); } -static void b53_imp_vlan_setup (struct dsa_switch *ds,int cpu_port) +void b53_imp_vlan_setup (struct dsa_switch *ds,int cpu_port) {struct b53_device *dev = ds->priv;unsigned int i;
@@ -500,6 +500,7 @@ static void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)b53_write16 (dev,B53_PVLAN_PAGE ,B53_PVLAN_PORT_MASK (i), pvlan); } } +EXPORT_SYMBOL (b53_imp_vlan_setup);static int b53_enable_port (struct dsa_switch *ds,int port,struct phy_device *phy)
drivers/net/dsa/b53/b53_priv.h +1 -0
@@ -284,6 +284,7 @@ static inline int b53_switch_get_reset_gpio(struct b53_device *dev)#endif /* Exported functions towards other drivers */ +void b53_imp_vlan_setup (struct dsa_switch *ds,int cpu_port);void b53_get_strings (struct dsa_switch *ds,int port,uint8_t *data);void b53_get_ethtool_stats (struct dsa_switch *ds,int port,uint64_t *data);int b53_get_sset_count (struct dsa_switch *ds);
drivers/net/dsa/bcm_sf2.c +1 -22
@@ -40,27 +40,6 @@ static enum dsa_tag_protocol bcm_sf2_sw_get_tag_protocol(struct dsa_switch *ds)return DSA_TAG_PROTO_BRCM ; } -static void bcm_sf2_imp_vlan_setup (struct dsa_switch *ds,int cpu_port) -{ -struct bcm_sf2_priv *priv =bcm_sf2_to_priv (ds); -unsigned int i; -u32 reg; - -/* Enable the IMP Port to be in the same VLAN as the other ports -* on a per-port basis such that we only have Port i and IMP in -* the same VLAN. -*/ -for (i =0 ; i < priv->hw_params.num_ports; i++) { -if (!((1 << i) & ds->enabled_port_mask)) -continue ; - - reg =core_readl (priv,CORE_PORT_VLAN_CTL_PORT (i)); - reg |= (1 << cpu_port); -core_writel (priv, reg,CORE_PORT_VLAN_CTL_PORT (i)); - } -} - -static void bcm_sf2_imp_setup (struct dsa_switch *ds,int port) {struct bcm_sf2_priv *priv =bcm_sf2_to_priv (ds);
@@ -240,7 +219,7 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port, reg |= priv->dev->ports[port].vlan_ctl_mask;core_writel (priv, reg,CORE_PORT_VLAN_CTL_PORT (port)); -bcm_sf2_imp_vlan_setup (ds, cpu_port); +b53_imp_vlan_setup (ds, cpu_port);/* If EEE was enabled, restore it */ if (priv->dev->ports[port].eee.eee_enabled)
Signature · 1 line
2.9.3
Re: [PATCH net-next v2 10/12] net: dsa: b53: Export b53_imp_vlan_setup()
Quoted 3 lines · Florian Fainelli
bcm_sf2and b53 do exactly the same thing, so share that piece.Signed-off-by Florian Fainelli <[email protected]>
PATCH v2 11/12 net: dsa: bcm_sf2: Use SF2_NUM_EGRESS_QUEUES for CFP
In reply to Florian FainelliThe magic number 8 in 3 locations in bcm_sf2_cfp.c actually designates the number of switch port egress queues, so use that define instead of open-coding it.
--- drivers/net/dsa/bcm_sf2_cfp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/dsa/bcm_sf2_cfp.c +3 -3
@@ -144,7 +144,7 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port,* destination port is enabled and that we are within the * number of ports supported by the switch */ - port_num = fs->ring_cookie /8 ; + port_num = fs->ring_cookie /SF2_NUM_EGRESS_QUEUES ; if (fs->ring_cookie == RX_CLS_FLOW_DISC || !(BIT(port_num) & ds->enabled_port_mask) ||
@@ -280,7 +280,7 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port,* We have a small oddity where Port 6 just does not have a * valid bit here (so we subtract by one). */ - queue_num = fs->ring_cookie %8 ; + queue_num = fs->ring_cookie %SF2_NUM_EGRESS_QUEUES ;if (port_num >=7 ) port_num -=1 ;
@@ -401,7 +401,7 @@ static int bcm_sf2_cfp_rule_get(struct bcm_sf2_priv *priv, int port,/* There is no Port 6, so we compensate for that here */ if (nfc->fs.ring_cookie >=6 ) nfc->fs.ring_cookie++; - nfc->fs.ring_cookie *=8 ; + nfc->fs.ring_cookie *=SF2_NUM_EGRESS_QUEUES ;/* Extract the destination queue */ queue_num = (reg >>NEW_TC_SHIFT ) &NEW_TC_MASK ;
Signature · 1 line
2.9.3
Re: [PATCH net-next v2 11/12] net: dsa: bcm_sf2: Use SF2_NUM_EGRESS_QUEUES for CFP
Quoted 5 lines · Florian Fainelli
The magic number 8 in 3 locations in
bcm_sf2_cfp.cactually designates the number of switch port egress queues, so use that define instead of open-coding it.Signed-off-by Florian Fainelli <[email protected]>
PATCH v2 12/12 net: dsa: bcm_sf2: Utilize b53_{enable,disable}_port
In reply to Florian FainelliExport b53_{enable,disable}_port and use these two functions in bcm_sf2_port_setup and bcm_sf2_port_disable. The generic functions cannot be used without wrapping because we need to manage additional switch integration details (PHY, Broadcom tag etc.).
--- drivers/net/dsa/b53/b53_common.c | 8 ++++---- drivers/net/dsa/b53/b53_priv.h | 2 ++ drivers/net/dsa/bcm_sf2.c | 26 ++------------------------ 3 files changed, 8 insertions(+), 28 deletions(-)
drivers/net/dsa/b53/b53_common.c +4 -4
@@ -502,8 +502,7 @@ void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port) }EXPORT_SYMBOL (b53_imp_vlan_setup); -static int b53_enable_port (struct dsa_switch *ds,int port, -struct phy_device *phy) +int b53_enable_port (struct dsa_switch *ds,int port,struct phy_device *phy) {struct b53_device *dev = ds->priv;unsigned int cpu_port = dev->cpu_port;
@@ -530,9 +529,9 @@ static int b53_enable_port(struct dsa_switch *ds, int port,return 0 ; } +EXPORT_SYMBOL (b53_enable_port); -static void b53_disable_port (struct dsa_switch *ds,int port, -struct phy_device *phy) +void b53_disable_port (struct dsa_switch *ds,int port,struct phy_device *phy) {struct b53_device *dev = ds->priv;u8 reg;
@@ -542,6 +541,7 @@ static void b53_disable_port(struct dsa_switch *ds, int port, reg |=PORT_CTRL_RX_DISABLE |PORT_CTRL_TX_DISABLE ;b53_write8 (dev,B53_CTRL_PAGE ,B53_PORT_CTRL (port), reg); } +EXPORT_SYMBOL (b53_disable_port);void b53_brcm_hdr_setup (struct dsa_switch *ds,int port) {
drivers/net/dsa/b53/b53_priv.h +2 -0
@@ -311,6 +311,8 @@ int b53_mirror_add(struct dsa_switch *ds, int port, struct dsa_mall_mirror_tc_entry *mirror, bool ingress);void b53_mirror_del (struct dsa_switch *ds,int port,struct dsa_mall_mirror_tc_entry *mirror); +int b53_enable_port (struct dsa_switch *ds,int port,struct phy_device *phy); +void b53_disable_port (struct dsa_switch *ds,int port,struct phy_device *phy);void b53_brcm_hdr_setup (struct dsa_switch *ds,int port);void b53_eee_enable_set (struct dsa_switch *ds,int port,bool enable);int b53_eee_init (struct dsa_switch *ds,int port,struct phy_device *phy);
drivers/net/dsa/bcm_sf2.c +2 -24
@@ -163,7 +163,6 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port, struct phy_device *phy) {struct bcm_sf2_priv *priv =bcm_sf2_to_priv (ds); -s8 cpu_port = ds->dst->cpu_dp->index;unsigned int i;u32 reg;
@@ -184,9 +183,6 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port, reg |= i << (PRT_TO_QID_SHIFT * i);core_writel (priv, reg,CORE_PORT_TC2_QOS_MAP_PORT (port)); -/* Clear the Rx and Tx disable bits and set to no spanning tree */ -core_writel (priv,0 ,CORE_G_PCTL_PORT (port)); -/* Re-enable the GPHY and re-apply workarounds */ if (priv->int_phy_mask &1 << port && priv->hw_params.num_gphy ==1 ) {bcm_sf2_gphy_enable_set (ds, true);
@@ -209,23 +205,7 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,if (port == priv->moca_port)bcm_sf2_port_intr_enable (priv, port); -/* Set this port, and only this one to be in the default VLAN, -* if member of a bridge, restore its membership prior to -* bringing down this port. -*/ - reg =core_readl (priv,CORE_PORT_VLAN_CTL_PORT (port)); - reg &= ~PORT_VLAN_CTRL_MASK ; - reg |= (1 << port); - reg |= priv->dev->ports[port].vlan_ctl_mask; -core_writel (priv, reg,CORE_PORT_VLAN_CTL_PORT (port)); - -b53_imp_vlan_setup (ds, cpu_port); - -/* If EEE was enabled, restore it */ -if (priv->dev->ports[port].eee.eee_enabled) -b53_eee_enable_set (ds, port, true); - -return 0 ; +return b53_enable_port (ds, port, phy); } static void bcm_sf2_port_disable(struct dsa_switch *ds, int port,
@@ -248,9 +228,7 @@ static void bcm_sf2_port_disable(struct dsa_switch *ds, int port,else off =CORE_G_PCTL_PORT (port); - reg =core_readl (priv, off); - reg |=RX_DIS |TX_DIS ; -core_writel (priv, reg, off); +b53_disable_port (ds, port, phy);/* Power down the port memory */ reg =core_readl (priv,CORE_MEM_PSM_VDD_CTRL );
Signature · 1 line
2.9.3
Re: [PATCH net-next v2 12/12] net: dsa: bcm_sf2: Utilize b53_{enable,disable}_port
Quoted 6 lines · Florian Fainelli
Export b53_{enable,disable}_port and use these two functions in
bcm_sf2_port_setupandbcm_sf2_port_disable. The generic functions cannot be used without wrapping because we need to manage additional switch integration details (PHY, Broadcom tag etc.).Signed-off-by Florian Fainelli <[email protected]>