Add more commands for VSC9953 L2 Switch
v3 cover Add more commands for VSC9953 L2 Switch
This patch set adds several features for VSC9953 L2 Switch:
- VLAN configuration;
- port statistics;
- FDB table operations;
- enable/disable HW learning;
- private/shared VLAN learning.
Also, the parser needed to be changed to allow commands with optional parameters and to allow developers to easily add new commands. This set also creates a parser with generic commands for L2 Ethernet Switche drivers.
Since new features are added, the default configuration had to be changed to:
- HW learning enabled on all ports; (HW default)
- All ports are in VLAN 1;
- All ports are VLAN aware;
- All ports have POP_COUNT 1;
- All ports have PVID 1;
- All ports have TPID 0x8100; (HW default)
- All ports tag frames classified to all VLANs that are not PVID;
If the user decides to compile the VSC9953 driver without the support for commands, the above default configuration should be sufficient to make the L2 Switch work in unmanaged mode.
New supported commands:
- show a port's statistics;
- enable/disable/show learning configuration on a port;
- add/delete a MAC entry in FDB; show the FDB table;
- add/remove a VLAN to/from a port (VLAN members);
- set/show PVID (ingress and egress VLAN tagging) for a port;
- set egress tagging mod for a port;
- configure VID source for egress tag;
- make VLAN learning shared or private;
- enable/disable VLAN ingress filtering on a port.
Changes for v2:
- removed Change-id field;
- Added the patch that changes the License at the end of the patch set for an easier integration;
Changes for v3:
- added a patch that creates a parser with generic commands for Ethernet switch drivers
- added a patch that adds new functions for working with bitfields;
- added a patch that exports a function that verifies if a string has the format of a MAC address
- added a patch to rename macros from vsc9953.h that started with "CONFIG_"
- added a patch with a bug fix fdone in the Cleanup patch
- all patches declare each variable on a line, without using tabs
- in the parser, the MAC address is no longer remembered dynamically, but statically
- the parser now returns CMD_RET_* macros instead of 1 and 0
- small code fixes
Codrin Ciubotariu (16):
drivers/net/vsc9953: Remove 'CONFIG_' from macros' name drivers/net/vsc9953: Cleanup patch
drivers/net/vsc9953: Fix bug when enabling a port drivers/net/vsc9953: Fix missing reserved register include/bitfield: Add new bitfield operations drivers/net/vsc9953: Add default configuration for VSC9953 L2 Switch common/cmd_ethsw: Add generic commands for Ethernet Switches drivers/net/vsc9953: Use the generic Ethernet Switch parser drivers/net/vsc9953: Add command to show/clear port counters drivers/net/vsc9953: Add commands to enable/disable HW learning net/eth.c: Add function to validate a MAC address drivers/net/vsc9953: Add commands to manipulate the FDB for VSC9953 drivers/net/vsc9953: Add VLAN commands for VSC9953 drivers/net/vsc9953: Add command for shared/private VLAN learning drivers/net/vsc9953: Add commands for VLAN ingress filtering drivers/net/vsc9953: Add GPL-2.0+ SPDX-License-Identifier
common/Makefile | 1 + common/cmd_ethsw.c | 1025 ++++++++++++++++++++ common/env_flags.c | 15 +- drivers/net/vsc9953.c | 2247 +++++++++++++++++++++++++++++++++++++++----- include/bitfield.h | 32 + include/configs/T104xRDB.h | 2 +- include/ethsw.h | 95 ++ include/net.h | 1 + include/vsc9953.h | 389 ++++++-- net/eth.c | 30 + 10 files changed, 3502 insertions(+), 335 deletions(-) create mode 100644 common/cmd_ethsw.c create mode 100644 include/ethsw.h
Signature · 1 line
1.9.3
PATCH v3 1/16 drivers/net/vsc9953: Remove 'CONFIG_' from macros' name
---
Changes for v3:
- none; new patch;
drivers/net/vsc9953.c | 38 +++++++++++++++++++------------------- include/vsc9953.h | 46 +++++++++++++++++++++++----------------------- 2 files changed, 42 insertions(+), 42 deletions(-)
drivers/net/vsc9953.c +19 -19
@@ -202,26 +202,26 @@ void vsc9953_init(bd_t *bis) VSC9953_DEVCPU_GCB);out_le32 (&l2dev_gcb->chip_regs.soft_rst, -CONFIG_VSC9953_SOFT_SWC_RST_ENA ); +VSC9953_SOFT_SWC_RST_ENA ); timeout =50000 ;while ((in_le32 (&l2dev_gcb->chip_regs.soft_rst) & -CONFIG_VSC9953_SOFT_SWC_RST_ENA ) && --timeout) +VSC9953_SOFT_SWC_RST_ENA ) && --timeout)udelay (1 );/* busy wait for vsc9953 soft reset */ if (timeout ==0 )debug ("Timeout waiting for VSC9953 to reset\n" ); -out_le32 (&l2sys_reg->sys.reset_cfg,CONFIG_VSC9953_MEM_ENABLE | -CONFIG_VSC9953_MEM_INIT ); +out_le32 (&l2sys_reg->sys.reset_cfg,VSC9953_MEM_ENABLE | +VSC9953_MEM_INIT ); timeout =50000 ;while ((in_le32 (&l2sys_reg->sys.reset_cfg) & -CONFIG_VSC9953_MEM_INIT ) && --timeout) +VSC9953_MEM_INIT ) && --timeout)udelay (1 );/* busy wait for vsc9953 memory init */ if (timeout ==0 )debug ("Timeout waiting for VSC9953 memory to initialize\n" );out_le32 (&l2sys_reg->sys.reset_cfg, (in_le32 (&l2sys_reg->sys.reset_cfg) - |CONFIG_VSC9953_CORE_ENABLE )); + |VSC9953_CORE_ENABLE ));/* VSC9953 Setting to be done once only */ out_le32 (&l2qsys_reg->sys.ext_cpu_cfg,0x00000b00 );
@@ -233,34 +233,34 @@ void vsc9953_init(bd_t *bis)/* Enable VSC9953 GMII Ports Port ID 0 - 7 */ if (VSC9953_INTERNAL_PORT_CHECK (i)) {out_le32 (&l2ana_reg->pfc[i].pfc_cfg, -CONFIG_VSC9953_PFC_FC_QSGMII ); +VSC9953_PFC_FC_QSGMII );out_le32 (&l2sys_reg->pause_cfg.mac_fc_cfg[i], -CONFIG_VSC9953_MAC_FC_CFG_QSGMII ); +VSC9953_MAC_FC_CFG_QSGMII ); }else {out_le32 (&l2ana_reg->pfc[i].pfc_cfg, -CONFIG_VSC9953_PFC_FC ); +VSC9953_PFC_FC );out_le32 (&l2sys_reg->pause_cfg.mac_fc_cfg[i], -CONFIG_VSC9953_MAC_FC_CFG ); +VSC9953_MAC_FC_CFG ); }out_le32 (&l2dev_gmii_reg->port_mode.clock_cfg, -CONFIG_VSC9953_CLOCK_CFG ); +VSC9953_CLOCK_CFG );out_le32 (&l2dev_gmii_reg->mac_cfg_status.mac_ena_cfg, -CONFIG_VSC9953_MAC_ENA_CFG ); +VSC9953_MAC_ENA_CFG );out_le32 (&l2dev_gmii_reg->mac_cfg_status.mac_mode_cfg, -CONFIG_VSC9953_MAC_MODE_CFG ); +VSC9953_MAC_MODE_CFG );out_le32 (&l2dev_gmii_reg->mac_cfg_status.mac_ifg_cfg, -CONFIG_VSC9953_MAC_IFG_CFG ); +VSC9953_MAC_IFG_CFG );/* mac_hdx_cfg varies with port id*/ - hdx_cfg = (CONFIG_VSC9953_MAC_HDX_CFG | (i <<16 )); + hdx_cfg =VSC9953_MAC_HDX_CFG | (i <<16 );out_le32 (&l2dev_gmii_reg->mac_cfg_status.mac_hdx_cfg, hdx_cfg);out_le32 (&l2sys_reg->sys.front_port_mode[i], -CONFIG_VSC9953_FRONT_PORT_MODE ); +VSC9953_FRONT_PORT_MODE );out_le32 (&l2qsys_reg->sys.switch_port_mode[i], -CONFIG_VSC9953_PORT_ENA ); +VSC9953_PORT_ENA );out_le32 (&l2dev_gmii_reg->mac_cfg_status.mac_maxlen_cfg, -CONFIG_VSC9953_MAC_MAX_LEN ); +VSC9953_MAC_MAX_LEN );out_le32 (&l2sys_reg->pause_cfg.pause_cfg[i], -CONFIG_VSC9953_PAUSE_CFG ); +VSC9953_PAUSE_CFG );/* WAIT FOR 2 us*/ udelay (2 );
include/vsc9953.h +23 -23
52 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v3 1/16 drivers/net/vsc9953: Remove 'CONFIG_' from macros' name
Hi Codrin,
Quoted 2 lines · Codrin Ciubotariu
Signed-off-by Codrin Ciubotariu <[email protected]>---
PATCH v3 1/16 drivers/net/vsc9953: Remove 'CONFIG_' from macros' name
Quoted 9 lines · Joe Hershberger
Hi Codrin,
Quoted 2 lines · Codrin Ciubotariu
Signed-off-by Codrin Ciubotariu <[email protected]>---
Acked-by Joe Hershberger <[email protected]>
Joe,
Do you want to take them in, or leave them to me?
York
PATCH v3 1/16 drivers/net/vsc9953: Remove 'CONFIG_' from macros' name
Hi York,
Quoted 10 lines · York Sun
Quoted 7 lines · Joe Hershberger
Hi Codrin,
Quoted 2 lines · Codrin Ciubotariu
Signed-off-by Codrin Ciubotariu <[email protected]>---
Quoted 6 lines
Quoted 2 lines
Acked-by Joe Hershberger <[email protected]>Joe,
Do you want to take them in, or leave them to me?
They are only used on your platform, right? So it will probably be faster tested in that branch.
I think you should take them, but notice that there is an issue with patch 7. Maybe you can fix it inline and not resend the series.
Thanks,
-Joe
PATCH v3 1/16 drivers/net/vsc9953: Remove 'CONFIG_' from macros' name
Quoted 18 lines · Joe Hershberger
Hi York,
Quoted 15 lines · York Sun
Quoted 9 lines · Joe Hershberger
Hi Codrin,
Quoted 2 lines · Codrin Ciubotariu
Signed-off-by Codrin Ciubotariu <[email protected]>---
Acked-by Joe Hershberger <[email protected]>Joe,
Quoted 8 lines
Quoted 1 line
Do you want to take them in, or leave them to me?
They are only used on your platform, right? So it will probably be faster tested in that branch.
I think you should take them, but notice that there is an issue with patch 7. Maybe you can fix it inline and not resend the series.
I will take care of them. Thanks.
York
PATCH v3 2/16 drivers/net/vsc9953: Cleanup patch
In reply to Codrin CiubotariuThis patch groups some macros defined for registers and replaces some magic numbers from vsc9953 with macros. Also, "port" and "port_nr" words are replaced with "port_no", puts each variable declaration on a line and removes unnecessary tabs.
---
Changes for v2:
- removed Change-id field;
Changes for v3:
- each variable is declared on a separate line, without using tabs
- some functions return macros from errno.h insted of 1 or -1
- removed duplicate of macro CONFIG_VSC9953_PAUSE_CFG
- code that fixed a small bug was moved in a new patch;
drivers/net/vsc9953.c | 144 +++++++++++++++++++++++++------------------------- include/vsc9953.h | 121 ++++++++++++++++++++++++++---------------- 2 files changed, 147 insertions(+), 118 deletions(-)
drivers/net/vsc9953.c +73 -71
@@ -10,6 +10,8 @@#include <asm/fsl_serdes.h> #include <fm_eth.h> #include <fsl_memac.h> +#include <errno.h> +#include <malloc.h> #include <vsc9953.h> static struct vsc9953_info vsc9953_l2sw = {
@@ -25,50 +27,50 @@ static struct vsc9953_info vsc9953_l2sw = { .port[9] = VSC9953_PORT_INFO_INITIALIZER(9), }; -void vsc9953_port_info_set_mdio (int port,struct mii_dev *bus) +void vsc9953_port_info_set_mdio (int port_no,struct mii_dev *bus) { -if (!VSC9953_PORT_CHECK (port)) +if (!VSC9953_PORT_CHECK (port_no))return ; - vsc9953_l2sw.port[port].bus = bus; + vsc9953_l2sw.port[port_no].bus = bus; } -void vsc9953_port_info_set_phy_address (int port,int address) +void vsc9953_port_info_set_phy_address (int port_no,int address) { -if (!VSC9953_PORT_CHECK (port)) +if (!VSC9953_PORT_CHECK (port_no))return ; - vsc9953_l2sw.port[port].phyaddr = address; + vsc9953_l2sw.port[port_no].phyaddr = address; } -void vsc9953_port_info_set_phy_int (int port,phy_interface_t phy_int) +void vsc9953_port_info_set_phy_int (int port_no,phy_interface_t phy_int) { -if (!VSC9953_PORT_CHECK (port)) +if (!VSC9953_PORT_CHECK (port_no))return ; - vsc9953_l2sw.port[port].enet_if = phy_int; + vsc9953_l2sw.port[port_no].enet_if = phy_int; } -void vsc9953_port_enable (int port) +void vsc9953_port_enable (int port_no) { -if (!VSC9953_PORT_CHECK (port)) +if (!VSC9953_PORT_CHECK (port_no))return ; - vsc9953_l2sw.port[port].enabled =1 ; + vsc9953_l2sw.port[port_no].enabled =1 ; } -void vsc9953_port_disable (int port) +void vsc9953_port_disable (int port_no) { -if (!VSC9953_PORT_CHECK (port)) +if (!VSC9953_PORT_CHECK (port_no))return ; - vsc9953_l2sw.port[port].enabled =0 ; + vsc9953_l2sw.port[port_no].enabled =0 ; }static void vsc9953_mdio_write (struct vsc9953_mii_mng *phyregs,int port_addr,int regnum,int value) { -int timeout =50000 ; +int timeout =50000 ; out_le32(&phyregs->miimcmd, (0x1 << 31) | ((port_addr & 0x1f) << 25) | ((regnum & 0x1f) << 20) | ((value & 0xffff) << 4) |
@@ -85,8 +87,8 @@ static void vsc9953_mdio_write(struct vsc9953_mii_mng *phyregs, int port_addr,static int vsc9953_mdio_read (struct vsc9953_mii_mng *phyregs,int port_addr,int regnum) { -int value =0xFFFF ; -int timeout =50000 ; +int value =0xFFFF ; +int timeout =50000 ;while ((in_le32 (&phyregs->miimstatus) &MIIMIND_OPR_PEND ) && --timeout)udelay (1 );
@@ -120,8 +122,8 @@ static int vsc9953_mdio_read(struct vsc9953_mii_mng *phyregs, int port_addr,static int init_phy (struct eth_device *dev) { -struct vsc9953_port_info *l2sw_port = dev->priv; -struct phy_device *phydev =NULL ; +struct vsc9953_port_info *l2sw_port = dev->priv; +struct phy_device *phydev =NULL ;#ifdef CONFIG_PHYLIB if (!l2sw_port->bus)
@@ -148,21 +150,21 @@ static int init_phy(struct eth_device *dev)return 0 ; } -static int vsc9953_port_init (int port) +static int vsc9953_port_init (int port_no) { -struct eth_device *dev; +struct eth_device *dev;/* Internal ports never have a PHY */ -if (VSC9953_INTERNAL_PORT_CHECK (port)) +if (VSC9953_INTERNAL_PORT_CHECK (port_no))return 0 ;/* alloc eth device */ dev = (struct eth_device *)calloc (1 ,sizeof (struct eth_device ));if (!dev) -return 1 ; +return -ENOMEM ; -sprintf (dev->name,"SW at PORT%d" , port); - dev->priv = &vsc9953_l2sw.port[port]; +sprintf (dev->name,"SW at PORT%d" , port_no); + dev->priv = &vsc9953_l2sw.port[port_no]; dev->init =NULL ; dev->halt =NULL ; dev->send =NULL ;
@@ -170,7 +172,7 @@ static int vsc9953_port_init(int port)if (init_phy (dev)) {free (dev); -return 1 ; +return -ENODEV ; }return 0 ;
@@ -178,13 +180,15 @@ static int vsc9953_port_init(int port)void vsc9953_init (bd_t *bis) { -u32 i, hdx_cfg =0 , phy_addr =0 ; -int timeout; -struct vsc9953_system_reg *l2sys_reg; -struct vsc9953_qsys_reg *l2qsys_reg; -struct vsc9953_dev_gmii *l2dev_gmii_reg; -struct vsc9953_analyzer *l2ana_reg; -struct vsc9953_devcpu_gcb *l2dev_gcb; +u32 i; +u32 hdx_cfg =0 ; +u32 phy_addr =0 ; +int timeout; +struct vsc9953_system_reg *l2sys_reg; +struct vsc9953_qsys_reg *l2qsys_reg; +struct vsc9953_dev_gmii *l2dev_gmii_reg; +struct vsc9953_analyzer *l2ana_reg; +struct vsc9953_devcpu_gcb *l2dev_gcb; l2dev_gmii_reg = (struct vsc9953_dev_gmii *)(VSC9953_OFFSET +VSC9953_DEV_GMII_OFFSET );
@@ -312,83 +316,81 @@ void vsc9953_init(bd_t *bis)#ifdef CONFIG_VSC9953_CMD /* Enable/disable status of a VSC9953 port */ -static void vsc9953_port_status_set (int port_nr,u8 enabled) +static void vsc9953_port_status_set (int port_no,u8 enabled) { -u32 val; -struct vsc9953_qsys_reg *l2qsys_reg; +struct vsc9953_qsys_reg *l2qsys_reg;/* Administrative down */ -if (vsc9953_l2sw.port[port_nr].enabled ==0 ) +if (!vsc9953_l2sw.port[port_no].enabled)return ; l2qsys_reg = (struct vsc9953_qsys_reg *)(VSC9953_OFFSET +VSC9953_QSYS_OFFSET ); - val =in_le32 (&l2qsys_reg->sys.switch_port_mode[port_nr]); -if (enabled ==1 ) - val |= (1 <<13 ); +if (enabled) +setbits_le32 (&l2qsys_reg->sys.switch_port_mode[port_no], +VSC9953_PORT_ENA );else - val &= ~(1 <<13 ); - -out_le32 (&l2qsys_reg->sys.switch_port_mode[port_nr], val); +clrbits_le32 (&l2qsys_reg->sys.switch_port_mode[port_no], +VSC9953_PORT_ENA ); }/* Set all VSC9953 ports' status */ static void vsc9953_port_all_status_set (u8 enabled) { -int i; +int i;for (i =0 ; i <VSC9953_MAX_PORTS ; i++)vsc9953_port_status_set (i, enabled); }/* Start autonegotiation for a VSC9953 PHY */ -static void vsc9953_phy_autoneg (int port_nr) +static void vsc9953_phy_autoneg (int port_no) { -if (!vsc9953_l2sw.port[port_nr].phydev) +if (!vsc9953_l2sw.port[port_no].phydev)return ; -if (vsc9953_l2sw.port[port_nr].phydev->drv->startup ( - vsc9953_l2sw.port[port_nr].phydev)) -printf ("Failed to start PHY for port %d\n" , port_nr); +if (vsc9953_l2sw.port[port_no].phydev->drv->startup ( + vsc9953_l2sw.port[port_no].phydev)) +printf ("Failed to start PHY for port %d\n" , port_no); }/* Start autonegotiation for all VSC9953 PHYs */ static void vsc9953_phy_all_autoneg (void ) { -int i; +int i;for (i =0 ; i <VSC9953_MAX_PORTS ; i++)vsc9953_phy_autoneg (i); }/* Print a VSC9953 port's configuration */ -static void vsc9953_port_config_show (int port) +static void vsc9953_port_config_show (int port_no) { -int speed; -int duplex; -int link; -u8 enabled; -u32 val; +int speed; +int duplex; +int link; +u8 enabled; +u32 val;struct vsc9953_qsys_reg *l2qsys_reg; l2qsys_reg = (struct vsc9953_qsys_reg *)(VSC9953_OFFSET +VSC9953_QSYS_OFFSET ); - val =in_le32 (&l2qsys_reg->sys.switch_port_mode[port]); - enabled = vsc9953_l2sw.port[port].enabled & - ((val &0x00002000 ) >>13 ); + val =in_le32 (&l2qsys_reg->sys.switch_port_mode[port_no]); + enabled = vsc9953_l2sw.port[port_no].enabled && + (val &VSC9953_PORT_ENA );/* internal ports (8 and 9) are fixed */ -if (VSC9953_INTERNAL_PORT_CHECK (port)) { +if (VSC9953_INTERNAL_PORT_CHECK (port_no)) { link =1 ; speed =SPEED_2500 ; duplex =DUPLEX_FULL ; }else { -if (vsc9953_l2sw.port[port].phydev) { - link = vsc9953_l2sw.port[port].phydev->link; - speed = vsc9953_l2sw.port[port].phydev->speed; - duplex = vsc9953_l2sw.port[port].phydev->duplex; +if (vsc9953_l2sw.port[port_no].phydev) { + link = vsc9953_l2sw.port[port_no].phydev->link; + speed = vsc9953_l2sw.port[port_no].phydev->speed; + duplex = vsc9953_l2sw.port[port_no].phydev->duplex; }else { link =-1 ; speed =-1 ;
@@ -396,7 +398,7 @@ static void vsc9953_port_config_show(int port) } } -printf ("%8d " , port); +printf ("%8d " , port_no);printf ("%8s " , enabled ==1 ?"enabled" :"disabled" );printf ("%8s " , link ==1 ?"up" :"down" );
@@ -426,7 +428,7 @@ static void vsc9953_port_config_show(int port)/* Print VSC9953 ports' configuration */ static void vsc9953_port_all_config_show (void ) { -int i; +int i;for (i =0 ; i <VSC9953_MAX_PORTS ; i++)vsc9953_port_config_show (i);
@@ -487,11 +489,11 @@ static int do_ethsw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])U_BOOT_CMD (ethsw,5 ,0 , do_ethsw,"vsc9953 l2 switch commands" , -"port <port_nr> enable|disable\n" +"port <port_no> enable|disable\n" " - enable/disable an l2 switch port\n" -" port_nr=0..9; use \"all\" for all ports\n" -"ethsw port <port_nr> show\n" +" port_no=0..9; use \"all\" for all ports\n" +"ethsw port <port_no> show\n" " - show an l2 switch port's configuration\n" -" port_nr=0..9; use \"all\" for all ports\n" +" port_no=0..9; use \"all\" for all ports\n" );#endif /* CONFIG_VSC9953_CMD */
include/vsc9953.h +74 -47
301 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v3 2/16 drivers/net/vsc9953: Cleanup patch
Hi Codrin,
Quoted 18 lines · Codrin Ciubotariu
This patch groups some macros defined for registers and replaces some magic numbers from vsc9953 with macros. Also, "port" and "
port_nr" words are replaced with "port_no", puts each variable declaration on a line and removes unnecessary tabs.Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v2:
- removed Change-id field;Changes for v3:
- each variable is declared on a separate line, without using tabs
- some functions return macros fromerrno.hinsted of 1 or -1
- removed duplicate of macroCONFIG_VSC9953_PAUSE_CFG
- code that fixed a small bug was moved in a new patch;
Quoted 3 lines
drivers/net/vsc9953.c | 144 +++++++++++++++++++++++++------------------------- include/vsc9953.h | 121 ++++++++++++++++++++++++++---------------- 2 files changed, 147 insertions(+), 118 deletions(-)
PATCH v3 3/16 drivers/net/vsc9953: Fix bug when enabling a port
In reply to Codrin CiubotariuWhen a port is enabled at init time, the initializing function touches more bits than necessary to enable a port (also touches reserved bits and default bit values). This patch fixes this issue by changing the value of the define used to enable the port and assures that no other bits are changes by replacing out_le32() with setbits_le32().
---
Dhanges for v3:
- none; new patch;
drivers/net/vsc9953.c | 4 ++-- include/vsc9953.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/vsc9953.c +2 -2
@@ -259,8 +259,8 @@ void vsc9953_init(bd_t *bis)out_le32 (&l2dev_gmii_reg->mac_cfg_status.mac_hdx_cfg, hdx_cfg);out_le32 (&l2sys_reg->sys.front_port_mode[i],VSC9953_FRONT_PORT_MODE ); -out_le32 (&l2qsys_reg->sys.switch_port_mode[i], -VSC9953_PORT_ENA ); +setbits_le32 (&l2qsys_reg->sys.switch_port_mode[i], +VSC9953_PORT_ENA );out_le32 (&l2dev_gmii_reg->mac_cfg_status.mac_maxlen_cfg,VSC9953_MAC_MAX_LEN ); out_le32(&l2sys_reg->pause_cfg.pause_cfg[i],
include/vsc9953.h +1 -1
@@ -81,7 +81,7 @@#define VSC9953_VCAP_UPDATE_CTRL 0x01000004/* Macros for vsc9953_qsys_sys.switch_port_mode register */ -#define VSC9953_PORT_ENA 0x00003a00 +#define VSC9953_PORT_ENA 0x00002000#define VSC9953_MAX_PORTS 10#define VSC9953_PORT_CHECK (port) \
Signature · 1 line
1.9.3
PATCH v3 3/16 drivers/net/vsc9953: Fix bug when enabling a port
Hi Codrin,
Quoted 8 lines · Codrin Ciubotariu
When a port is enabled at init time, the initializing function touches more bits than necessary to enable a port (also touches reserved bits and default bit values). This patch fixes this issue by changing the value of the define used to enable the port and assures that no other bits are changes by replacing
out_le32()withsetbits_le32().Signed-off-by Codrin Ciubotariu <[email protected]>
Quoted 8 lines
---
Dhanges for v3:
- none; new patch;drivers/net/vsc9953.c | 4 ++-- include/vsc9953.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
v3 cover Add more commands for VSC9953 L2 Switch
In reply to Codrin CiubotariuQuoted 57 lines · Codrin Ciubotariu
This patch set adds several features for VSC9953 L2 Switch:
- VLAN configuration;
- port statistics;
- FDB table operations;
- enable/disable HW learning;
- private/shared VLAN learning.Also, the parser needed to be changed to allow commands with optional parameters and to allow developers to easily add new commands. This set also creates a parser with generic commands for L2 Ethernet Switche drivers.
Since new features are added, the default configuration had to be changed to:
- HW learning enabled on all ports; (HW default)
- All ports are in VLAN 1;
- All ports are VLAN aware;
- All ports havePOP_COUNT1;
- All ports have PVID 1;
- All ports have TPID0x8100; (HW default)
- All ports tag frames classified to all VLANs that are not PVID;If the user decides to compile the VSC9953 driver without the support for commands, the above default configuration should be sufficient to make the L2 Switch work in unmanaged mode.
New supported commands:
- show a port's statistics;
- enable/disable/show learning configuration on a port;
- add/delete a MAC entry in FDB; show the FDB table;
- add/remove a VLAN to/from a port (VLAN members);
- set/show PVID (ingress and egress VLAN tagging) for a port;
- set egress tagging mod for a port;
- configure VID source for egress tag;
- make VLAN learning shared or private;
- enable/disable VLAN ingress filtering on a port.Changes for v2:
- removed Change-id field;
- Added the patch that changes the License at the end of the patch set for an easier integration;Changes for v3:
- added a patch that creates a parser with generic commands for Ethernet switch drivers
- added a patch that adds new functions for working with bitfields;
- added a patch that exports a function that verifies if a string has the format of a MAC address
- added a patch to rename macros fromvsc9953.hthat started with "CONFIG_"
- added a patch with a bug fix fdone in the Cleanup patch
- all patches declare each variable on a line, without using tabs
- in the parser, the MAC address is no longer remembered dynamically, but statically
- the parser now returns CMD_RET_* macros instead of 1 and 0
- small code fixesCodrin Ciubotariu (16):
drivers/net/vsc9953: Remove 'CONFIG_' from macros' namedrivers/net/vsc9953: Cleanup patch
drivers/net/vsc9953: Fix bug when enabling a portdrivers/net/vsc9953: Fix missing reserved registerinclude/bitfield: Add new bitfield operationsdrivers/net/vsc9953: Add default configuration for VSC9953 L2 Switch common/cmd_ethsw: Add generic commands for Ethernet Switchesdrivers/net/vsc9953: Use the generic Ethernet Switch parser
Quoted 9 lines
drivers/net/vsc9953: Add command to show/clear port countersdrivers/net/vsc9953: Add commands to enable/disable HW learningnet/eth.c: Add function to validate a MAC addressdrivers/net/vsc9953: Add commands to manipulate the FDB for VSC9953drivers/net/vsc9953: Add VLAN commands for VSC9953drivers/net/vsc9953: Add command for shared/private VLAN learningdrivers/net/vsc9953: Add commands for VLAN ingress filteringdrivers/net/vsc9953: Add GPL-2.0+ SPDX-License-Identifier
This set with updated patches are applied to fsl-qoriq master, awaiting upstream.
[PATCH v4 11/16] common/env_flags.c: Add function to validate a MAC address
- function eth_validate_ethaddr_str() has been moved to common/env_flags.c and its header to include/env_flags.h;
- patch desription updated;
[PATCH v4 12/16] drivers/net/vsc9953: Add commands to manipulate the FDB for VSC9953
- eth_validate_ethaddr_str() is now declared in include/env_flags.h instead of include/net.h so we have to include net.h instead of env_flags.h;
York