drivers/net/vsc9953: Fix missing reserved register
Subsystems (2)
PATCH v3 4/16 drivers/net/vsc9953: Fix missing reserved register
The VSC9953 DS reserves a register between vlan_mask and anag_efil registers.
---
Changes for v2:
- removed Change-id field;
Changes for v3:
- added signature;
include/vsc9953.h | 1 + 1 file changed, 1 insertion(+)
include/vsc9953.h +1 -0
@@ -143,6 +143,7 @@ struct vsc9953_ana_ana_tables {struct vsc9953_ana_ana {u32 adv_learn;u32 vlan_mask; +u32 reserved;u32 anag_efil;u32 an_events;u32 storm_limit_burst;
Signature · 1 line
1.9.3
PATCH v3 5/16 include/bitfield: Add new bitfield operations
These new operations allow manipulation of bitfields within a word by using a mask instead of width and shift values to extract/replace the bitfields.
---
Changes for v3:
- none; new patch;
include/bitfield.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
include/bitfield.h +32 -0
@@ -27,6 +27,12 @@* old = bitfield_extract(old_reg_val, 10, 5); * new_reg_val = bitfield_replace(old_reg_val, 10, 5, new); * +* or +* +* mask = bitfield_mask(10, 5); +* old = bitfield_extract_by_mask(old_reg_val, mask); +* new_reg_val = bitfield_replace_by_mask(old_reg_val, mask, new); +* * The numbers 10 and 5 could for example come from data * tables which describe all bitfields in all registers. */
@@ -56,3 +62,29 @@ static inline uint bitfield_replace(uint reg_val, uint shift, uint width,return (reg_val & ~mask) | (bitfield_val << shift); } + +/* Produces a shift of the bitfield given a mask */ +static inline uint bitfield_shift (uint mask) +{ +return mask ?ffs (mask) -1 :0 ; +} + +/* Extract the value of a bitfield found within a given register value */ +static inline uint bitfield_extract_by_mask (uint reg_val,uint mask) +{ +uint shift =bitfield_shift (mask); + +return (reg_val & mask) >> shift; +} + +/* +* Replace the value of a bitfield found within a given register value +* Returns the newly modified uint value with the replaced field. +*/ +static inline uint bitfield_replace_by_mask (uint reg_val,uint mask, +uint bitfield_val) +{ +uint shift =bitfield_shift (mask); + +return (reg_val & ~mask) | ((bitfield_val << shift) & mask); +}
Signature · 1 line
1.9.3
PATCH v3 5/16 include/bitfield: Add new bitfield operations
Hi Codrin,
Quoted 4 lines · Codrin Ciubotariu
These new operations allow manipulation of bitfields within a word by using a mask instead of width and shift values to extract/replace the bitfields.
Quoted 8 lines
Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v3:
- none; new patch;include/bitfield.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
PATCH v3 6/16 drivers/net/vsc9953: Add default configuration for VSC9953 L2 Switch
In reply to Codrin CiubotariuAt startup, the default configuration should be:
- enable HW learning on all ports (HW default);
- all ports are VLAN aware;
- all ports are members of VLAN 1;
- all ports have Port-based VLAN 1;
- on all ports, the switch is allowed to remove maximum one VLAN tag,
- on egress, the switch should add a VLAN tag if the frame is classified to a different VLAN than the port's Port-based VLAN;
---
Changes for v2:
- removed Change-id field;
Changes for v3:
- moved the copyright update in the last patch;
- return -EBUSY if the VLAN table is not ready;
- each variable is declared on a new line, without tabs;
- renamed variable "set" to "set_member";
- removed unnecessary brackets;
- renamed some VSC9953_TAG_CFG_* macros;
- removed field_set() and field_get() macros;
- removed "CONFIG_" from some macros' name;
- removed "port_' from members of struct vsc9953_rew_port;
- modified a comment describing struct vsc9953_rew_reg;
drivers/net/vsc9953.c | 253 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/vsc9953.h | 56 +++++++++++ 2 files changed, 309 insertions(+)
drivers/net/vsc9953.c +253 -0
@@ -10,6 +10,7 @@#include <asm/fsl_serdes.h> #include <fm_eth.h> #include <fsl_memac.h> +#include <bitfield.h> #include <errno.h> #include <malloc.h> #include <vsc9953.h>
@@ -178,6 +179,256 @@ static int vsc9953_port_init(int port_no)return 0 ; } +static int vsc9953_vlan_table_poll_idle (void ) +{ +struct vsc9953_analyzer *l2ana_reg; +int timeout; + + l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET + +VSC9953_ANA_OFFSET ); + + timeout =50000 ; +while (((in_le32 (&l2ana_reg->ana_tables.vlan_access) & +VSC9953_VLAN_CMD_MASK ) !=VSC9953_VLAN_CMD_IDLE ) && --timeout) +udelay (1 ); + +return timeout ?0 : -EBUSY ; +} + +/* vlan table set/clear all membership of vid */ +static void vsc9953_vlan_table_membership_all_set (int vid,int set_member) +{ +uint val; +struct vsc9953_analyzer *l2ana_reg; + + l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET + +VSC9953_ANA_OFFSET ); + +if (vsc9953_vlan_table_poll_idle () <0 ) { +debug ("VLAN table timeout\n" ); +return ; + } + +/* read current vlan configuration */ + val =in_le32 (&l2ana_reg->ana_tables.vlan_tidx); +out_le32 (&l2ana_reg->ana_tables.vlan_tidx, +bitfield_replace_by_mask (val,VSC9953_ANA_TBL_VID_MASK , vid)); + +clrsetbits_le32 (&l2ana_reg->ana_tables.vlan_access, +VSC9953_VLAN_CMD_MASK ,VSC9953_VLAN_CMD_READ ); + +if (vsc9953_vlan_table_poll_idle () <0 ) { +debug ("VLAN table timeout\n" ); +return ; + } + + val =in_le32 (&l2ana_reg->ana_tables.vlan_tidx); +out_le32 (&l2ana_reg->ana_tables.vlan_tidx, +bitfield_replace_by_mask (val,VSC9953_ANA_TBL_VID_MASK , vid)); + +clrsetbits_le32 (&l2ana_reg->ana_tables.vlan_access, +VSC9953_VLAN_PORT_MASK |VSC9953_VLAN_CMD_MASK , +VSC9953_VLAN_CMD_WRITE | + (set_member ?VSC9953_VLAN_PORT_MASK :0 )); +} + +/* Set PVID for a VSC9953 port */ +static void vsc9953_port_vlan_pvid_set (int port_no,int pvid) +{ +uint val; +struct vsc9953_analyzer *l2ana_reg; +struct vsc9953_rew_reg *l2rew_reg; + +/* Administrative down */ +if (!vsc9953_l2sw.port[port_no].enabled) { +printf ("Port %d is administrative down\n" , port_no); +return ; + } + + l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET + +VSC9953_ANA_OFFSET ); + l2rew_reg = (struct vsc9953_rew_reg *)(VSC9953_OFFSET + +VSC9953_REW_OFFSET ); + +/* Set PVID on ingress */ + val =in_le32 (&l2ana_reg->port[port_no].vlan_cfg); + val =bitfield_replace_by_mask (val,VSC9953_VLAN_CFG_VID_MASK , pvid); +out_le32 (&l2ana_reg->port[port_no].vlan_cfg, val); + +/* Set PVID on egress */ + val =in_le32 (&l2rew_reg->port[port_no].port_vlan_cfg); + val =bitfield_replace_by_mask (val,VSC9953_PORT_VLAN_CFG_VID_MASK , + pvid); +out_le32 (&l2rew_reg->port[port_no].port_vlan_cfg, val); +} + +static void vsc9953_port_all_vlan_pvid_set (int pvid) +{ +int i; + +for (i =0 ; i <VSC9953_MAX_PORTS ; i++) +vsc9953_port_vlan_pvid_set (i, pvid); +} + +/* Enable/disable vlan aware of a VSC9953 port */ +static void vsc9953_port_vlan_aware_set (int port_no,int enabled) +{ +struct vsc9953_analyzer *l2ana_reg; + +/* Administrative down */ +if (!vsc9953_l2sw.port[port_no].enabled) { +printf ("Port %d is administrative down\n" , port_no); +return ; + } + + l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET + +VSC9953_ANA_OFFSET ); + +if (enabled) +setbits_le32 (&l2ana_reg->port[port_no].vlan_cfg, +VSC9953_VLAN_CFG_AWARE_ENA ); +else +clrbits_le32 (&l2ana_reg->port[port_no].vlan_cfg, +VSC9953_VLAN_CFG_AWARE_ENA ); +} + +/* Set all VSC9953 ports' vlan aware */ +static void vsc9953_port_all_vlan_aware_set (int enabled) +{ +int i; + +for (i =0 ; i <VSC9953_MAX_PORTS ; i++) +vsc9953_port_vlan_aware_set (i, enabled); +} + +/* Enable/disable vlan pop count of a VSC9953 port */ +static void vsc9953_port_vlan_popcnt_set (int port_no,int popcnt) +{ +uint val; +struct vsc9953_analyzer *l2ana_reg; + +/* Administrative down */ +if (!vsc9953_l2sw.port[port_no].enabled) { +printf ("Port %d is administrative down\n" , port_no); +return ; + } + +if (popcnt >3 || popcnt <0 ) { +printf ("Invalid pop count value: %d\n" , port_no); +return ; + } + + l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET + +VSC9953_ANA_OFFSET ); + + val =in_le32 (&l2ana_reg->port[port_no].vlan_cfg); + val =bitfield_replace_by_mask (val,VSC9953_VLAN_CFG_POP_CNT_MASK , + popcnt); +out_le32 (&l2ana_reg->port[port_no].vlan_cfg, val); +} + +/* Set all VSC9953 ports' pop count */ +static void vsc9953_port_all_vlan_poncnt_set (int popcnt) +{ +int i; + +for (i =0 ; i <VSC9953_MAX_PORTS ; i++) +vsc9953_port_vlan_popcnt_set (i, popcnt); +} + +/* Enable/disable learning for frames dropped due to ingress filtering */ +static void vsc9953_vlan_ingr_fltr_learn_drop (int enable) +{ +struct vsc9953_analyzer *l2ana_reg; + + l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET + +VSC9953_ANA_OFFSET ); + +if (enable) +setbits_le32 (&l2ana_reg->ana.adv_learn,VSC9953_VLAN_CHK ); +else +clrbits_le32 (&l2ana_reg->ana.adv_learn,VSC9953_VLAN_CHK ); +} + +/* Egress untag modes of a VSC9953 port */ +enum egress_untag_mode { +EGRESS_UNTAG_ALL =0 , +EGRESS_UNTAG_PVID_AND_ZERO , +EGRESS_UNTAG_ZERO , +EGRESS_UNTAG_NONE , +}; + +static void vsc9953_port_vlan_egr_untag_set (int port_no, +enum egress_untag_mode mode) +{ +struct vsc9953_rew_reg *l2rew_reg; + +/* Administrative down */ +if (!vsc9953_l2sw.port[port_no].enabled) { +printf ("Port %d is administrative down\n" , port_no); +return ; + } + + l2rew_reg = (struct vsc9953_rew_reg *)(VSC9953_OFFSET + +VSC9953_REW_OFFSET ); + +switch (mode) { +case EGRESS_UNTAG_ALL : +clrsetbits_le32 (&l2rew_reg->port[port_no].port_tag_cfg, +VSC9953_TAG_CFG_MASK ,VSC9953_TAG_CFG_NONE ); +break ; +case EGRESS_UNTAG_PVID_AND_ZERO : +clrsetbits_le32 (&l2rew_reg->port[port_no].port_tag_cfg, +VSC9953_TAG_CFG_MASK , +VSC9953_TAG_CFG_ALL_BUT_PVID_ZERO ); +break ; +case EGRESS_UNTAG_ZERO : +clrsetbits_le32 (&l2rew_reg->port[port_no].port_tag_cfg, +VSC9953_TAG_CFG_MASK , +VSC9953_TAG_CFG_ALL_BUT_ZERO ); +break ; +case EGRESS_UNTAG_NONE : +clrsetbits_le32 (&l2rew_reg->port[port_no].port_tag_cfg, +VSC9953_TAG_CFG_MASK ,VSC9953_TAG_CFG_ALL ); +break ; +default : +printf ("Unknown untag mode for port %d\n" , port_no); + } +} + +static void vsc9953_port_all_vlan_egress_untagged_set ( +enum egress_untag_mode mode) +{ +int i; + +for (i =0 ; i <VSC9953_MAX_PORTS ; i++) +vsc9953_port_vlan_egr_untag_set (i, mode); +} + +/***************************************************************************** +At startup, the default configuration would be: +- 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; +*****************************************************************************/ +void vsc9953_default_configuration (void ) +{ +int i; + +for (i =0 ; i <VSC9953_MAX_VLAN ; i++) +vsc9953_vlan_table_membership_all_set (i,0 ); +vsc9953_port_all_vlan_aware_set (1 ); +vsc9953_port_all_vlan_pvid_set (1 ); +vsc9953_port_all_vlan_poncnt_set (1 ); +vsc9953_vlan_table_membership_all_set (1 ,1 ); +vsc9953_vlan_ingr_fltr_learn_drop (1 ); +vsc9953_port_all_vlan_egress_untagged_set (EGRESS_UNTAG_PVID_AND_ZERO ); +} +void vsc9953_init (bd_t *bis) {u32 i;
@@ -310,6 +561,8 @@ void vsc9953_init(bd_t *bis) } } +vsc9953_default_configuration (); +printf ("VSC9953 L2 switch initialized\n" );return ; }
include/vsc9953.h +56 -0
83 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v3 6/16 drivers/net/vsc9953: Add default configuration for VSC9953 L2 Switch
Hi Codrin,
Quoted 30 lines · Codrin Ciubotariu
At startup, the default configuration should be:
- enable HW learning on all ports (HW default);
- all ports are VLAN aware;
- all ports are members of VLAN 1;
- all ports have Port-based VLAN 1;
- on all ports, the switch is allowed to remove maximum one VLAN tag,
- on egress, the switch should add a VLAN tag if the frame is classified to a different VLAN than the port's Port-based VLAN;Signed-off-by Johnson Leung <[email protected]>Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v2:
- removed Change-id field;Changes for v3:
- moved the copyright update in the last patch;
- return-EBUSYif the VLAN table is not ready;
- each variable is declared on a new line, without tabs;
- renamed variable "set" to "set_member";
- removed unnecessary brackets;
- renamed some VSC9953_TAG_CFG_* macros;
- removedfield_set()andfield_get()macros;
- removed "CONFIG_" from some macros' name;
- removed "port_' from members of structvsc9953_rew_port;
- modified a comment describing structvsc9953_rew_reg;
Quoted 3 lines
drivers/net/vsc9953.c | 253 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/vsc9953.h | 56 +++++++++++ 2 files changed, 309 insertions(+)
PATCH v3 7/16 common/cmd_ethsw: Add generic commands for Ethernet Switches
In reply to Codrin CiubotariuThis patch creates a flexible parser for Ethernet Switch configurations that should support complex commands. The parser searches for predefined keywords in the command and calls the proper function when a match is found. Also, the parser allows for optional keywords, such as "port", to apply the command on a port
or on all ports. For now, the defined commands are:
ethsw [port <port_no>] { enable | disable | show }
---
Changes for v3:
- parser removed from previous patch:
"drivers/net/vsc9953: Refractor the parser for VSC9953 commands";
- removed member "err" from struct command_def;
- using CMD_RET_* macros instead of magic numbers;
- moved each variable declaration on a separate line, with a single space;
- the code from functions cmd_keywords*_check() should be more clear now;
- removed unused function command_def_cleanup();
common/Makefile | 1 + common/cmd_ethsw.c | 346 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ethsw.h | 48 ++++++++ 3 files changed, 395 insertions(+) create mode 100644 common/cmd_ethsw.c create mode 100644 include/ethsw.h
common/Makefile +1 -0
@@ -211,6 +211,7 @@ obj-$(CONFIG_UPDATE_TFTP) += update.o obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o obj-$(CONFIG_CMD_DFU) += cmd_dfu.o obj-$(CONFIG_CMD_GPT) += cmd_gpt.o +obj-$(CONFIG_CMD_ETHSW) += cmd_ethsw.o # Power obj-$(CONFIG_CMD_PMIC) += cmd_pmic.o
common/cmd_ethsw.c new file +346 -0
346 lines not on this page · raw message
include/ethsw.h new file +48 -0
48 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v3 7/16 common/cmd_ethsw: Add generic commands for Ethernet Switches
Hi Codrin,
Quoted 237 lines · Codrin Ciubotariu
This patch creates a flexible parser for Ethernet Switch configurations that should support complex commands. The parser searches for predefined keywords in the command and calls the proper function when a match is found. Also, the parser allows for optional keywords, such as "port", to apply the command on a port
or on all ports. For now, the defined commands are:
ethsw [port <port_no>] { enable | disable | show }Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v3:
- parser removed from previous patch:
"drivers/net/vsc9953: Refractor the parser for VSC9953 commands";
- removed member "err" from structcommand_def;
- using CMD_RET_* macros instead of magic numbers;
- moved each variable declaration on a separate line, with a single space;
- the code from functions cmd_keywords*_check() should be more clear now;
- removed unused functioncommand_def_cleanup();common/Makefile | 1 + common/cmd_ethsw.c | 346 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ethsw.h | 48 ++++++++ 3 files changed, 395 insertions(+) create mode 100644 common/cmd_ethsw.c create mode 100644 include/ethsw.hcommon/Makefile +1
-0@@ -211,6 +211,7 @@ obj-$(CONFIG_UPDATE_TFTP) += update.o obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o obj-$(CONFIG_CMD_DFU) += cmd_dfu.o obj-$(CONFIG_CMD_GPT) += cmd_gpt.o +obj-$(CONFIG_CMD_ETHSW) += cmd_ethsw.o # Power obj-$(CONFIG_CMD_PMIC) += cmd_pmic.ocommon/cmd_ethsw.c new file +191
-0@@ -0,0 +1,346 @@ +/* +* Copyright 2015 Freescale Semiconductor, Inc. +* +* SPDX-License-Identifier: GPL-2.0+ +* +* Ethernet Switch commands +*/ + +#include <common.h> +#include <command.h> +#include <errno.h> +#include <ethsw.h> + +static const char *ethsw_name; + +static struct keywords_to_function { +enum ethsw_keyword_id cmd_keyword[ETHSW_MAX_CMD_PARAMS ]; +int cmd_func_offset; +int (*keyword_function)(struct ethsw_command_def *parsed_cmd); +} ethsw_cmd_def[] = { + { + .cmd_keyword = { + ethsw_id_enable, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func , + port_enable), + .keyword_function =NULL , + }, { + .cmd_keyword = { + ethsw_id_disable, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func , + port_disable), + .keyword_function =NULL , + }, { + .cmd_keyword = { + ethsw_id_show, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func , + port_show), + .keyword_function =NULL , + }, +}; + +struct keywords_optional { +int cmd_keyword[ETHSW_MAX_CMD_PARAMS ]; +} cmd_opt_def[] = { + { + .cmd_keyword = { + ethsw_id_port, + ethsw_id_port_no, + ethsw_id_key_end, + }, + }, +}; + +static int keyword_match_gen (enum ethsw_keyword_id key_id,int argc,char + *const argv[],int *argc_nr, +struct ethsw_command_def *parsed_cmd); +static int keyword_match_port (enum ethsw_keyword_id key_id,int argc, +char *const argv[],int *argc_nr, +struct ethsw_command_def *parsed_cmd); + +/* +* Define properties for each keyword; +* keep the order synced with enum ethsw_keyword_id +*/ +struct keyword_def { +const char *keyword_name; +int (*match)(enum ethsw_keyword_id key_id,int argc,char *const argv[], +int *argc_nr,struct ethsw_command_def *parsed_cmd); +} keyword[] = { + { + .keyword_name ="help" , + .match = &keyword_match_gen, + }, { + .keyword_name ="show" , + .match = &keyword_match_gen, + }, { + .keyword_name ="port" , + .match = &keyword_match_port + }, { + .keyword_name ="enable" , + .match = &keyword_match_gen, + }, { + .keyword_name ="disable" , + .match = &keyword_match_gen, + }, +}; + +/* +* Function used by an Ethernet Switch driver to set the functions +* that must be called by the parser when an ethsw command is given +*/ +int ethsw_define_functions (const struct ethsw_command_func *cmd_func) +{ +int i; +void **aux_p; +int (*cmd_func_aux)(struct ethsw_command_def *); + +if (!cmd_func->ethsw_name) +return -EINVAL ; + + ethsw_name = cmd_func->ethsw_name; + +for (i =0 ; i <ARRAY_SIZE (ethsw_cmd_def); i++) { +/* +* get the pointer to the function send by the Ethernet Switch +* driver that corresponds to the proper ethsw command +*/ +if (ethsw_cmd_def[i].keyword_function) +continue ; + + aux_p = (void *)cmd_func + ethsw_cmd_def[i].cmd_func_offset; + + cmd_func_aux = (int (*)(struct ethsw_command_def *)) *aux_p; + ethsw_cmd_def[i].keyword_function = cmd_func_aux; + } + +return 0 ; +} + +/* Generic function used to match a keyword only by a string */ +static int keyword_match_gen (enum ethsw_keyword_id key_id,int argc, +char *const argv[],int *argc_nr, +struct ethsw_command_def *parsed_cmd) +{ +if (strcmp (argv[*argc_nr], keyword[key_id].keyword_name) ==0 ) { + parsed_cmd->cmd_to_keywords[*argc_nr] = key_id; + +return 1 ; + } +return 0 ; +} + +/* Function used to match the command's port */ +static int keyword_match_port (enum ethsw_keyword_id key_id,int argc, +char *const argv[],int *argc_nr, +struct ethsw_command_def *parsed_cmd) +{ +unsigned long val; + +if (!keyword_match_gen (key_id, argc, argv, argc_nr, parsed_cmd)) +return 0 ; + +if (*argc_nr +1 >= argc) +return 0 ; + +if (strict_strtoul (argv[*argc_nr +1 ],10 , &val) != -EINVAL ) { + parsed_cmd->port = val; + (*argc_nr)++; + parsed_cmd->cmd_to_keywords[*argc_nr] = ethsw_id_port_no; +return 1 ; + } + +return 0 ; +} + +/* Finds optional keywords and modifies *argc_va to skip them */ +static void cmd_keywords_opt_check (const struct ethsw_command_def *parsed_cmd, +int *argc_val) +{ +int i; +int keyw_opt_matched; +int argc_val_max; +int const *cmd_keyw_p; +int const *cmd_keyw_opt_p; + +/* remember the best match */ + argc_val_max = *argc_val; + +/* +* check if our command's optional keywords match the optional +* keywords of an available command +*/ +for (i =0 ; i <ARRAY_SIZE (ethsw_cmd_def); i++) { + keyw_opt_matched =0 ; + cmd_keyw_p = &parsed_cmd->cmd_to_keywords[keyw_opt_matched]; + cmd_keyw_opt_p = &cmd_opt_def[i].cmd_keyword[keyw_opt_matched]; + +/* +* increase the number of keywords that +* matched with a command +*/ +while (keyw_opt_matched + *argc_val < + parsed_cmd->cmd_keywords_nr && + *cmd_keyw_opt_p != ethsw_id_key_end && + *(cmd_keyw_p + *argc_val) == *cmd_keyw_opt_p) {
common/cmd_ethsw.c line 201
Quoted 10 lines
common/cmd_ethsw.c new file +10
-0+ keyw_opt_matched++; + cmd_keyw_p++; + cmd_keyw_opt_p++; + } + +/* if all our optional command's keywords perfectly match an +* optional pattern, then we can move to the next defined +* keywords in our command; remember the one that matched the +* greatest number of keywords +*/
Improper comment format. Please make sure you always run your patches through checkpatch.pl. I recommend using patman!
Quoted 206 lines
common/cmd_ethsw.c new file +145
-0+if (keyw_opt_matched + *argc_val <= + parsed_cmd->cmd_keywords_nr && + *cmd_keyw_opt_p == ethsw_id_key_end && + *argc_val + keyw_opt_matched > argc_val_max) + argc_val_max = *argc_val + keyw_opt_matched; + } + + *argc_val = argc_val_max; +} + +/* +* Finds the function to call based on keywords and +* modifies *argc_va to skip them +*/ +static void cmd_keywords_check (struct ethsw_command_def *parsed_cmd, +int *argc_val) +{ +int i; +int keyw_matched; +int *cmd_keyw_p; +int *cmd_keyw_def_p; + +/* +* check if our command's keywords match the +* keywords of an available command +*/ +for (i =0 ; i <ARRAY_SIZE (ethsw_cmd_def); i++) { + keyw_matched =0 ; + cmd_keyw_p = &parsed_cmd->cmd_to_keywords[keyw_matched]; + cmd_keyw_def_p = ðsw_cmd_def[i].cmd_keyword[keyw_matched]; + +/* +* increase the number of keywords that +* matched with a command +*/ +while (keyw_matched + *argc_val < parsed_cmd->cmd_keywords_nr && + *cmd_keyw_def_p != ethsw_id_key_end && + *(cmd_keyw_p + *argc_val) == *cmd_keyw_def_p) { + keyw_matched++; + cmd_keyw_p++; + cmd_keyw_def_p++; + } + +/* +* if all our command's keywords perfectly match an +* available command, then we get the function we need to call +* to configure the Ethernet Switch +*/ +if (keyw_matched && keyw_matched + *argc_val == + parsed_cmd->cmd_keywords_nr && + *cmd_keyw_def_p == ethsw_id_key_end) { + *argc_val += keyw_matched; + parsed_cmd->cmd_function = + ethsw_cmd_def[i].keyword_function; +return ; + } + } +} + +/* find all the keywords in the command */ +static int keywords_find (int argc,char *const argv[], +struct ethsw_command_def *parsed_cmd) +{ +int i; +int j; +int argc_val; +int rc =CMD_RET_SUCCESS ; + +for (i =1 ; i < argc; i++) { +for (j =0 ; j < ethsw_id_count; j++) { +if (keyword[j].match (j, argc, argv, &i, parsed_cmd)) +break ; + } + } + +/* if there is no keyword match for a word, the command is invalid */ +for (i =1 ; i < argc; i++) +if (parsed_cmd->cmd_to_keywords[i] == ethsw_id_key_end) + rc =CMD_RET_USAGE ; + + parsed_cmd->cmd_keywords_nr = argc; + argc_val =1 ; + +/* get optional parameters first */ +cmd_keywords_opt_check (parsed_cmd, &argc_val); + +if (argc_val == parsed_cmd->cmd_keywords_nr) +return CMD_RET_USAGE ; + +/* +* check the keywords and if a match is found, +* get the function to call +*/ +cmd_keywords_check (parsed_cmd, &argc_val); + +/* error if not all commands' parameters were matched */ +if (argc_val == parsed_cmd->cmd_keywords_nr) { +if (!parsed_cmd->cmd_function) { +printf ("Command not available for: %s\n" , ethsw_name); + rc =CMD_RET_FAILURE ; + } + }else { + rc =CMD_RET_USAGE ; + } + +return rc; +} + +static void command_def_init (struct ethsw_command_def *parsed_cmd) +{ +int i; + +for (i =0 ; i <ETHSW_MAX_CMD_PARAMS ; i++) + parsed_cmd->cmd_to_keywords[i] = ethsw_id_key_end; + + parsed_cmd->port =ETHSW_CMD_PORT_ALL ; + parsed_cmd->cmd_function =NULL ; +} + +/* function to interpret commands starting with "ethsw " */ +static int do_ethsw (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) +{ +struct ethsw_command_def parsed_cmd; +int rc =CMD_RET_SUCCESS ; + +if (argc ==1 || argc >=ETHSW_MAX_CMD_PARAMS ) +return CMD_RET_USAGE ; + +command_def_init (&parsed_cmd); + + rc =keywords_find (argc, argv, &parsed_cmd); + +if (rc ==CMD_RET_SUCCESS ) + rc = parsed_cmd.cmd_function (&parsed_cmd); + +return rc; +} + +#define ETHSW_PORT_CONF_HELP "[port <port_no>] { enable | disable | show } " \ +"- enable/disable a port; show shows a port's configuration" + +U_BOOT_CMD (ethsw,ETHSW_MAX_CMD_PARAMS ,0 , do_ethsw, +"Ethernet l2 switch commands" , +ETHSW_PORT_CONF_HELP "\n" +);include/ethsw.h new file +48
-1@@ -0,0 +1,48 @@ +/* +* Copyright 2015 Freescale Semiconductor, Inc. +* +* SPDX-License-Identifier: GPL-2.0+ +* +* Ethernet Switch commands +*/ + +#ifndef _CMD_ETHSW_H_ +#define _CMD_ETHSW_H_ + +#define ETHSW_MAX_CMD_PARAMS 20 +#define ETHSW_CMD_PORT_ALL -1 + +/* IDs used to track keywords in a command */ +enum ethsw_keyword_id { + ethsw_id_key_end =-1 , + ethsw_id_help, + ethsw_id_show, + ethsw_id_port, + ethsw_id_enable, + ethsw_id_disable, + ethsw_id_count,/* keep last */ +}; + +enum ethsw_keyword_opt_id { + ethsw_id_port_no = ethsw_id_count +1 , + ethsw_id_count_all,/* keep last */ +}; + +struct ethsw_command_def { +int cmd_to_keywords[ETHSW_MAX_CMD_PARAMS ]; +int cmd_keywords_nr; +int port; +int (*cmd_function)(struct ethsw_command_def *parsed_cmd); +}; + +/* Structure to be created and initialized by an Ethernet Switch driver */ +struct ethsw_command_func { +const char *ethsw_name; +int (*port_enable)(struct ethsw_command_def *parsed_cmd); +int (*port_disable)(struct ethsw_command_def *parsed_cmd); +int (*port_show)(struct ethsw_command_def *parsed_cmd); +}; + +int ethsw_define_functions (const struct ethsw_command_func *cmd_func); + +#endif /* _CMD_ETHSW_H_ */ --1.9.3
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
PATCH v3 7/16 common/cmd_ethsw: Add generic commands for Ethernet Switches
On 08/07/2015 01:18 PM, Joe Hershberger wrote:
<snip>
Quoted 11 lines
common/cmd_ethsw.c line 201
Quoted 7 lines
common/cmd_ethsw.c new file +7
-0+ } + +/* if all our optional command's keywords perfectly match an +* optional pattern, then we can move to the next defined +* keywords in our command; remember the one that matched the +* greatest number of keywords +*/ Improper comment format. Please make sure you always run your patches through checkpatch.pl. I recommend using patman!
Joe,
Do you mean the multiple-line comment should start from the second line? I can change it when I merge the patch.
Checkpatch/patman doesn't complain about this format.
York
PATCH v3 7/16 common/cmd_ethsw: Add generic commands for Ethernet Switches
Hi York,
Quoted 15 lines · York Sun
On 08/07/2015 01:18 PM, Joe Hershberger wrote:
<snip>Quoted 11 lines
common/cmd_ethsw.c line 201
Quoted 7 lines
common/cmd_ethsw.c new file +7
-0+ } + +/* if all our optional command's keywords perfectly match an +* optional pattern, then we can move to the next defined +* keywords in our command; remember the one that matched the +* greatest number of keywords +*/ Improper comment format. Please make sure you always run your patches through checkpatch.pl. I recommend using patman!
Quoted 6 lines
Joe,
Do you mean the multiple-line comment should start from the second line? I can change it when I merge the patch.
Checkpatch/patman doesn't complain about this format.
That is what I mean. I'm fairly certain that the format used here is incorrect. Perhaps there is an exception set in checkpatch.pl for this path or something.
U-Boot appears to defer to Linux Kernel style for this. It appears to be an exception for "net" and "drivers/net" based on this:
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/CodingStyle
I'm not sure that u-boot is planning on following the same thing. I honestly haven't gone looking for how much of this is in the U-Boot source for net/.
As the network stack maintainer, I would prefer to avoid a network stack difference from the rest of the codebase unless someone can present a good reason to do this.
Thanks,
-Joe
PATCH v3 8/16 drivers/net/vsc9953: Use the generic Ethernet Switch parser
In reply to Codrin CiubotariuThis patch replaces the parser used by VSC9953 L2 Switch driver with the generic one. Also, the config macro that enables the VSC9953 commands has been replaced in all the platforms that use this driver with the config macro that corresponds to the generic parser.
---
Changes for v3:
- this patch was extracted from previous patch:
"drivers/net/vsc9953: Refractor the parser for VSC9953 commands";
- used CMD_RET_* macros instead of magic numbers;
- each variable is declared on a new line, with one space only;
drivers/net/vsc9953.c | 349 +++++++++++++++++++++------------------------ include/configs/T104xRDB.h | 2 +- 2 files changed, 166 insertions(+), 185 deletions(-)
drivers/net/vsc9953.c +165 -184
@@ -14,6 +14,7 @@#include <errno.h> #include <malloc.h> #include <vsc9953.h> +#include <ethsw.h> static struct vsc9953_info vsc9953_l2sw = { .port[0 ] =VSC9953_PORT_INFO_INITIALIZER (0 ),
@@ -405,6 +406,165 @@ static void vsc9953_port_all_vlan_egress_untagged_set(vsc9953_port_vlan_egr_untag_set (i, mode); } +#ifdef CONFIG_CMD_ETHSW + +/* Enable/disable status of a VSC9953 port */ +static void vsc9953_port_status_set (int port_no,u8 enabled) +{ +struct vsc9953_qsys_reg *l2qsys_reg; + +/* Administrative down */ +if (!vsc9953_l2sw.port[port_no].enabled) +return ; + + l2qsys_reg = (struct vsc9953_qsys_reg *)(VSC9953_OFFSET + +VSC9953_QSYS_OFFSET ); + +if (enabled) +setbits_le32 (&l2qsys_reg->sys.switch_port_mode[port_no], +VSC9953_PORT_ENA ); +else +clrbits_le32 (&l2qsys_reg->sys.switch_port_mode[port_no], +VSC9953_PORT_ENA ); +} + +/* Start autonegotiation for a VSC9953 PHY */ +static void vsc9953_phy_autoneg (int port_no) +{ +if (!vsc9953_l2sw.port[port_no].phydev) +return ; + +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); +} + +/* Print a VSC9953 port's configuration */ +static void vsc9953_port_config_show (int port_no) +{ +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_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_no)) { + link =1 ; + speed =SPEED_2500 ; + duplex =DUPLEX_FULL ; + }else { +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 ; + duplex =-1 ; + } + } + +printf ("%8d " , port_no); +printf ("%8s " , enabled ==1 ?"enabled" :"disabled" ); +printf ("%8s " , link ==1 ?"up" :"down" ); + +switch (speed) { +case SPEED_10 : +printf ("%8d " ,10 ); +break ; +case SPEED_100 : +printf ("%8d " ,100 ); +break ; +case SPEED_1000 : +printf ("%8d " ,1000 ); +break ; +case SPEED_2500 : +printf ("%8d " ,2500 ); +break ; +case SPEED_10000 : +printf ("%8d " ,10000 ); +break ; +default : +printf ("%8s " ,"-" ); + } + +printf ("%8s\n" , duplex ==DUPLEX_FULL ?"full" :"half" ); +} + +static int vsc9953_port_status_key_func (struct ethsw_command_def *parsed_cmd) +{ +int i; +u8 enabled; + +/* Last keyword should tell us if we should enable/disable the port */ +if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr -1 ] == + ethsw_id_enable) + enabled =1 ; +else if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr -1 ] == + ethsw_id_disable) + enabled =0 ; +else +return CMD_RET_USAGE ; + +if (parsed_cmd->port !=ETHSW_CMD_PORT_ALL ) { +if (!VSC9953_PORT_CHECK (parsed_cmd->port)) { +printf ("Invalid port number: %d\n" , parsed_cmd->port); +return CMD_RET_FAILURE ; + } +vsc9953_port_status_set (parsed_cmd->port, enabled); + }else { +for (i =0 ; i <VSC9953_MAX_PORTS ; i++) +vsc9953_port_status_set (i, enabled); + } + +return CMD_RET_SUCCESS ; +} + +static int vsc9953_port_config_key_func (struct ethsw_command_def *parsed_cmd) +{ +int i; + +if (parsed_cmd->port !=ETHSW_CMD_PORT_ALL ) { +if (!VSC9953_PORT_CHECK (parsed_cmd->port)) { +printf ("Invalid port number: %d\n" , parsed_cmd->port); +return CMD_RET_FAILURE ; + } +vsc9953_phy_autoneg (parsed_cmd->port); +printf ("%8s %8s %8s %8s %8s\n" , +"Port" ,"Status" ,"Link" ,"Speed" , +"Duplex" ); +vsc9953_port_config_show (parsed_cmd->port); + + }else { +for (i =0 ; i <VSC9953_MAX_PORTS ; i++) +vsc9953_phy_autoneg (i); +printf ("%8s %8s %8s %8s %8s\n" , +"Port" ,"Status" ,"Link" ,"Speed" ,"Duplex" ); +for (i =0 ; i <VSC9953_MAX_PORTS ; i++) +vsc9953_port_config_show (i); + } + +return CMD_RET_SUCCESS ; +} + +static struct ethsw_command_func vsc9953_cmd_func = { + .ethsw_name ="L2 Switch VSC9953" , + .port_enable = &vsc9953_port_status_key_func, + .port_disable = &vsc9953_port_status_key_func, + .port_show = &vsc9953_port_config_key_func, +}; + +#endif /* CONFIG_CMD_ETHSW */ +/***************************************************************************** At startup, the default configuration would be: - HW learning enabled on all ports; (HW default)
@@ -563,190 +723,11 @@ void vsc9953_init(bd_t *bis)vsc9953_default_configuration (); +#ifdef CONFIG_CMD_ETHSW +if (ethsw_define_functions (&vsc9953_cmd_func) <0 ) +debug ("Unable to use \"ethsw\" commands\n" ); +#endif +printf ("VSC9953 L2 switch initialized\n" );return ; } - -#ifdef CONFIG_VSC9953_CMD -/* Enable/disable status of a VSC9953 port */ -static void vsc9953_port_status_set (int port_no,u8 enabled) -{ -struct vsc9953_qsys_reg *l2qsys_reg; - -/* Administrative down */ -if (!vsc9953_l2sw.port[port_no].enabled) -return ; - - l2qsys_reg = (struct vsc9953_qsys_reg *)(VSC9953_OFFSET + -VSC9953_QSYS_OFFSET ); - -if (enabled) -setbits_le32 (&l2qsys_reg->sys.switch_port_mode[port_no], -VSC9953_PORT_ENA ); -else -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; - -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_no) -{ -if (!vsc9953_l2sw.port[port_no].phydev) -return ; - -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; - -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_no) -{ -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_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_no)) { - link =1 ; - speed =SPEED_2500 ; - duplex =DUPLEX_FULL ; - }else { -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 ; - duplex =-1 ; - } - } - -printf ("%8d " , port_no); -printf ("%8s " , enabled ==1 ?"enabled" :"disabled" ); -printf ("%8s " , link ==1 ?"up" :"down" ); - -switch (speed) { -case SPEED_10 : -printf ("%8d " ,10 ); -break ; -case SPEED_100 : -printf ("%8d " ,100 ); -break ; -case SPEED_1000 : -printf ("%8d " ,1000 ); -break ; -case SPEED_2500 : -printf ("%8d " ,2500 ); -break ; -case SPEED_10000 : -printf ("%8d " ,10000 ); -break ; -default : -printf ("%8s " ,"-" ); - } - -printf ("%8s\n" , duplex ==DUPLEX_FULL ?"full" :"half" ); -} - -/* Print VSC9953 ports' configuration */ -static void vsc9953_port_all_config_show (void ) -{ -int i; - -for (i =0 ; i <VSC9953_MAX_PORTS ; i++) -vsc9953_port_config_show (i); -} - -/* function to interpret commands starting with "ethsw " */ -static int do_ethsw (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) -{ -u8 enable; -u32 port; - -if (argc <4 ) -return -1 ; - -if (strcmp (argv[1 ],"port" )) -return -1 ; - -if (!strcmp (argv[3 ],"show" )) { -if (!strcmp (argv[2 ],"all" )) { -vsc9953_phy_all_autoneg (); -printf ("%8s %8s %8s %8s %8s\n" , -"Port" ,"Status" ,"Link" ,"Speed" , -"Duplex" ); -vsc9953_port_all_config_show (); -return 0 ; - }else { - port =simple_strtoul (argv[2 ],NULL ,10 ); -if (!VSC9953_PORT_CHECK (port)) -return -1 ; -vsc9953_phy_autoneg (port); -printf ("%8s %8s %8s %8s %8s\n" , -"Port" ,"Status" ,"Link" ,"Speed" , -"Duplex" ); -vsc9953_port_config_show (port); -return 0 ; - } - }else if (!strcmp (argv[3 ],"enable" )) { - enable =1 ; - }else if (!strcmp (argv[3 ],"disable" )) { - enable =0 ; - }else { -return -1 ; - } - -if (!strcmp (argv[2 ],"all" )) { -vsc9953_port_all_status_set (enable); -return 0 ; - }else { - port =simple_strtoul (argv[2 ],NULL ,10 ); -if (!VSC9953_PORT_CHECK (port)) -return -1 ; -vsc9953_port_status_set (port, enable); -return 0 ; - } - -return -1 ; -} - -U_BOOT_CMD (ethsw,5 ,0 , do_ethsw, -"vsc9953 l2 switch commands" , -"port <port_no> enable|disable\n" -" - enable/disable an l2 switch port\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_no=0..9; use \"all\" for all ports\n" -); -#endif /* CONFIG_VSC9953_CMD */
include/configs/T104xRDB.h +1 -1
@@ -727,7 +727,7 @@/* Enable VSC9953 L2 Switch driver on T1040 SoC */ #ifdef CONFIG_T1040RDB #define CONFIG_VSC9953 -#define CONFIG_VSC9953_CMD +#define CONFIG_CMD_ETHSW #define CONFIG_SYS_FM1_QSGMII11_PHY_ADDR 0x04#define CONFIG_SYS_FM1_QSGMII21_PHY_ADDR 0x08#endif
Signature · 1 line
1.9.3
PATCH v3 8/16 drivers/net/vsc9953: Use the generic Ethernet Switch parser
Hi Codrin,
Quoted 15 lines · Codrin Ciubotariu
This patch replaces the parser used by VSC9953 L2 Switch driver with the generic one. Also, the config macro that enables the VSC9953 commands has been replaced in all the platforms that use this driver with the config macro that corresponds to the generic parser.
Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v3:
- this patch was extracted from previous patch:
"drivers/net/vsc9953: Refractor the parser for VSC9953 commands";
- used CMD_RET_* macros instead of magic numbers;
- each variable is declared on a new line, with one space only;
Quoted 3 lines
drivers/net/vsc9953.c | 349 +++++++++++++++++++++------------------------ include/configs/T104xRDB.h | 2 +- 2 files changed, 166 insertions(+), 185 deletions(-)
PATCH v3 9/16 drivers/net/vsc9953: Add command to show/clear port counters
In reply to Codrin CiubotariuThe new added command:
ethsw [port <port_no>] statistics { [help] | [clear] }
will print counters like the number of Rx/Tx frames, number of Rx/Tx bytes, number of Rx/Tx unicast frames, etc. This patch also adds this commnd in the genereric ethsw parser from cmd_ethsw.c
---
Changes for v2:
- removed Change-id field;
Changes for v3:
- moved each variable declaration on a separate line, with one space only;
- replaced magic numbers on functions called by the parser with CMD_RET_* macros;
common/cmd_ethsw.c | 42 +++++++++ drivers/net/vsc9953.c | 256 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/ethsw.h | 4 + include/vsc9953.h | 116 ++++++++++++++++++++++- 4 files changed, 415 insertions(+), 3 deletions(-)
common/cmd_ethsw.c +42 -0
@@ -13,6 +13,16 @@static const char *ethsw_name; +#define ETHSW_PORT_STATS_HELP "ethsw [port <port_no>] statistics " \ +"{ [help] | [clear] } - show an l2 switch port's statistics" + +static int ethsw_port_stats_help_key_func (struct ethsw_command_def *parsed_cmd) +{ +printf (ETHSW_PORT_STATS_HELP "\n" ); + +return CMD_RET_SUCCESS ; +} + static struct keywords_to_function { enum ethsw_keyword_id cmd_keyword[ETHSW_MAX_CMD_PARAMS]; int cmd_func_offset;
@@ -42,6 +52,31 @@ static struct keywords_to_function { .cmd_func_offset = offsetof(struct ethsw_command_func, port_show), .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_statistics, + ethsw_id_help, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_port_stats_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_statistics, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + port_stats), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_statistics, + ethsw_id_clear, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + port_stats_clear), + .keyword_function = NULL, }, };
@@ -88,6 +123,12 @@ struct keyword_def { }, { .keyword_name = "disable", .match = &keyword_match_gen, + }, { + .keyword_name = "statistics", + .match = &keyword_match_gen, + }, { + .keyword_name = "clear", + .match = &keyword_match_gen, }, };
@@ -343,4 +384,5 @@ static int do_ethsw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])U_BOOT_CMD (ethsw,ETHSW_MAX_CMD_PARAMS ,0 , do_ethsw,"Ethernet l2 switch commands" ,ETHSW_PORT_CONF_HELP "\n" +ETHSW_PORT_STATS_HELP "\n" );
drivers/net/vsc9953.c +256 -0
273 lines not on this page · raw message
include/ethsw.h +4 -0
@@ -20,6 +20,8 @@ enum ethsw_keyword_id { ethsw_id_port, ethsw_id_enable, ethsw_id_disable, + ethsw_id_statistics, + ethsw_id_clear, ethsw_id_count, /* keep last */ };
@@ -41,6 +43,8 @@ struct ethsw_command_func {int (*port_enable)(struct ethsw_command_def *parsed_cmd);int (*port_disable)(struct ethsw_command_def *parsed_cmd);int (*port_show)(struct ethsw_command_def *parsed_cmd); +int (*port_stats)(struct ethsw_command_def *parsed_cmd); +int (*port_stats_clear)(struct ethsw_command_def *parsed_cmd); };int ethsw_define_functions (const struct ethsw_command_func *cmd_func);
include/vsc9953.h +113 -3
129 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v3 9/16 drivers/net/vsc9953: Add command to show/clear port counters
Hi Codrin,
Quoted 19 lines · Codrin Ciubotariu
The new added command:
ethsw [port <port_no>] statistics { [help] | [clear] }will print counters like the number of Rx/Tx frames, number of Rx/Tx bytes, number of Rx/Tx unicast frames, etc. This patch also adds this commnd in the genereric ethsw parser from
cmd_ethsw.cSigned-off-by Codrin Ciubotariu <[email protected]>---
Changes for v2:
- removed Change-id field;Changes for v3:
- moved each variable declaration on a separate line, with one space only;
- replaced magic numbers on functions called by the parser with CMD_RET_* macros;
Quoted 5 lines
common/cmd_ethsw.c | 42 +++++++++ drivers/net/vsc9953.c | 256 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/ethsw.h | 4 + include/vsc9953.h | 116 ++++++++++++++++++++++- 4 files changed, 415 insertions(+), 3 deletions(-)
PATCH v3 10/16 drivers/net/vsc9953: Add commands to enable/disable HW learning
In reply to Codrin CiubotariuThe command:
ethsw [port <port_no>] learning { [help] | show | auto | disable }
can be used to enable/disable HW learning on a port. This patch also adds this command to the generic ethsw parser from cmd_ethsw.
---
Changes for v2:
- removed Change-id field;
Changes for v3:
- replaced values returned by functions called by the parser with CMD_RET_* macros;
- removed "CONFIG_" from macros added in vsc9953.h;
- each variabled is declared on a separate line, with one space instead of tab(s);
common/cmd_ethsw.c | 60 +++++++++++++++++++++ drivers/net/vsc9953.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/ethsw.h | 4 ++ include/vsc9953.h | 6 +++ 4 files changed, 211 insertions(+)
common/cmd_ethsw.c +60 -0
@@ -23,6 +23,17 @@ static int ethsw_port_stats_help_key_func(struct ethsw_command_def *parsed_cmd)return CMD_RET_SUCCESS ; } +#define ETHSW_LEARN_HELP "ethsw [port <port_no>] learning " \ +"{ [help] | show | auto | disable } " \ +"- enable/disable/show learning configuration on a port" + +static int ethsw_learn_help_key_func (struct ethsw_command_def *parsed_cmd) +{ +printf (ETHSW_LEARN_HELP "\n" ); + +return CMD_RET_SUCCESS ; +} + static struct keywords_to_function { enum ethsw_keyword_id cmd_keyword[ETHSW_MAX_CMD_PARAMS]; int cmd_func_offset;
@@ -77,6 +88,48 @@ static struct keywords_to_function { .cmd_func_offset = offsetof(struct ethsw_command_func, port_stats_clear), .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_learning, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_learn_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_learning, + ethsw_id_help, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_learn_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_learning, + ethsw_id_show, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + port_learn_show), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_learning, + ethsw_id_auto, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + port_learn), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_learning, + ethsw_id_disable, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + port_learn), + .keyword_function = NULL, }, };
@@ -129,6 +182,12 @@ struct keyword_def { }, { .keyword_name = "clear", .match = &keyword_match_gen, + }, { + .keyword_name = "learning", + .match = &keyword_match_gen, + }, { + .keyword_name = "auto", + .match = &keyword_match_gen, }, };
@@ -385,4 +444,5 @@ U_BOOT_CMD(ethsw, ETHSW_MAX_CMD_PARAMS, 0, do_ethsw,"Ethernet l2 switch commands" ,ETHSW_PORT_CONF_HELP "\n" ETHSW_PORT_STATS_HELP "\n" +ETHSW_LEARN_HELP "\n" );
drivers/net/vsc9953.c +141 -0
159 lines not on this page · raw message
include/ethsw.h +4 -0
@@ -22,6 +22,8 @@ enum ethsw_keyword_id { ethsw_id_disable, ethsw_id_statistics, ethsw_id_clear, + ethsw_id_learning, + ethsw_id_auto, ethsw_id_count, /* keep last */ };
@@ -45,6 +47,8 @@ struct ethsw_command_func {int (*port_show)(struct ethsw_command_def *parsed_cmd);int (*port_stats)(struct ethsw_command_def *parsed_cmd);int (*port_stats_clear)(struct ethsw_command_def *parsed_cmd); +int (*port_learn)(struct ethsw_command_def *parsed_cmd); +int (*port_learn_show)(struct ethsw_command_def *parsed_cmd); };int ethsw_define_functions (const struct ethsw_command_func *cmd_func);
include/vsc9953.h +6 -0
@@ -105,6 +105,12 @@#define VSC9953_VLAN_CMD_WRITE 0x00000002#define VSC9953_VLAN_CMD_INIT 0x00000003 +/* Macros for vsc9953_ana_port.port_cfg register */ +#define VSC9953_PORT_CFG_LEARN_ENA 0x00000080 +#define VSC9953_PORT_CFG_LEARN_AUTO 0x00000100 +#define VSC9953_PORT_CFG_LEARN_CPU 0x00000200 +#define VSC9953_PORT_CFG_LEARN_DROP 0x00000400 +/* Macros for vsc9953_qsys_sys.switch_port_mode register */ #define VSC9953_PORT_ENA 0x00002000
Signature · 1 line
1.9.3
PATCH v3 10/16 drivers/net/vsc9953: Add commands to enable/disable HW learning
Hi Codrin,
Quoted 19 lines · Codrin Ciubotariu
The command:
ethsw [port <port_no>] learning { [help] | show | auto | disable }can be used to enable/disable HW learning on a port. This patch also adds this command to the generic ethsw parser from
cmd_ethsw.Signed-off-by Johnson Leung <[email protected]>Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v2:
- removed Change-id field;Changes for v3:
- replaced values returned by functions called by the parser with CMD_RET_* macros;
- removed "CONFIG_" from macros added invsc9953.h;
- each variabled is declared on a separate line, with one space instead of tab(s);
Quoted 5 lines
common/cmd_ethsw.c | 60 +++++++++++++++++++++ drivers/net/vsc9953.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/ethsw.h | 4 ++ include/vsc9953.h | 6 +++ 4 files changed, 211 insertions(+)
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
In reply to Codrin CiubotariuThe code from common/env_flags.c that checks if a string has the format of a MAC address has been moved in net/eth.c as a separate function called eth_validate_ethaddr_str().
---
Changes for v3:
- none, new patch;
common/env_flags.c | 15 ++------------- include/net.h | 1 + net/eth.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 13 deletions(-)
common/env_flags.c +2 -13
@@ -239,19 +239,8 @@ static int _env_flags_validate_type(const char *value, }break ;case env_flags_vartype_macaddr: - cur = value; -for (i =0 ; i <6 ; i++) { -skip_num (1 , cur, &end,2 ); -if (cur == end) -return -1 ; -if (cur +2 == end &&is_hex_prefix (cur)) -return -1 ; -if (i !=5 && *end !=':' ) -return -1 ; -if (i ==5 && *end !='\0' ) -return -1 ; - cur = end +1 ; - } +if (eth_validate_ethaddr_str (value)) +return -1 ;break ;#endif case env_flags_vartype_end:
include/net.h +1 -0
@@ -218,6 +218,7 @@ void eth_try_another(int first_restart); /* Change the device */void eth_set_current (void );/* set nterface to ethcur var */ int eth_get_dev_index (void );/* get the device index */ +int eth_validate_ethaddr_str (const char *addr);void eth_parse_enetaddr (const char *addr,uchar *enetaddr);int eth_getenv_enetaddr (char *name,uchar *enetaddr);int eth_setenv_enetaddr (char *name,const uchar *enetaddr);
net/eth.c +30 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <linux/ctype.h> #include <command.h> #include <dm.h> #include <environment.h>
@@ -19,6 +20,35 @@DECLARE_GLOBAL_DATA_PTR ; +int eth_validate_ethaddr_str (const char *addr) +{ +unsigned long val; +int i; +const char *cur; +char *end; + +if (!addr) +return -1 ; + + cur = addr; +for (i =0 ; i <6 ; i++) { + val =simple_strtoul (cur, &end,16 ); +if (cur +1 != end && cur +2 != end) +return -1 ; +if (val >0xff ) +return -1 ; +if (cur +2 >= end &&tolower (*(cur +1 )) =='x' ) +return -1 ; +if (i !=5 && *end !=':' ) +return -1 ; +if (i ==5 && *end !='\0' ) +return -1 ; + cur = end +1 ; + } + +return 0 ; +} +void eth_parse_enetaddr (const char *addr,uchar *enetaddr) {char *end;
Signature · 1 line
1.9.3
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
Hi Codrin,
Quoted 8 lines · Codrin Ciubotariu
The code from
common/env_flags.cthat checks if a string has the format of a MAC address has been moved innet/eth.cas a separate function calledeth_validate_ethaddr_str().Signed-off-by Codrin Ciubotariu <[email protected]>---
Quoted 7 lines
Changes for v3:
- none, new patch;common/env_flags.c | 15 ++------------- include/net.h | 1 + net/eth.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 13 deletions(-)
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
In reply to Codrin CiubotariuQuoted 93 lines · Codrin Ciubotariu
The code from
common/env_flags.cthat checks if a string has the format of a MAC address has been moved innet/eth.cas a separate function calledeth_validate_ethaddr_str().Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v3:
- none, new patch;common/env_flags.c | 15 ++------------- include/net.h | 1 + net/eth.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 13 deletions(-)common/env_flags.c +2
-13@@ -239,19 +239,8 @@ static int _env_flags_validate_type(const char *value, }break ;case env_flags_vartype_macaddr: - cur = value; -for (i =0 ; i <6 ; i++) { -skip_num (1 , cur, &end,2 ); -if (cur == end) -return -1 ; -if (cur +2 == end &&is_hex_prefix (cur)) -return -1 ; -if (i !=5 && *end !=':' ) -return -1 ; -if (i ==5 && *end !='\0' ) -return -1 ; - cur = end +1 ; - } +if (eth_validate_ethaddr_str (value)) +return -1 ;break ;#endif case env_flags_vartype_end:include/net.h +1
-0@@ -218,6 +218,7 @@ void eth_try_another(int first_restart); /* Change the device */void eth_set_current (void );/* set nterface to ethcur var */ int eth_get_dev_index (void );/* get the device index */ +int eth_validate_ethaddr_str (const char *addr);void eth_parse_enetaddr (const char *addr,uchar *enetaddr);int eth_getenv_enetaddr (char *name,uchar *enetaddr);int eth_setenv_enetaddr (char *name,const uchar *enetaddr);net/eth.c +23
-0@@ -7,6 +7,7 @@*/ #include <common.h> +#include <linux/ctype.h> #include <command.h> #include <dm.h> #include <environment.h> @@ -19,6 +20,35 @@DECLARE_GLOBAL_DATA_PTR ; +int eth_validate_ethaddr_str (const char *addr) +{ +unsigned long val; +int i; +const char *cur; +char *end; + +if (!addr) +return -1 ; + + cur = addr; +for (i =0 ; i <6 ; i++) { + val =simple_strtoul (cur, &end,16 ); +if (cur +1 != end && cur +2 != end) +return -1 ; +if (val >0xff ) +return -1 ; +if (cur +2 >= end &&tolower (*(cur +1 )) =='x' ) +return -1 ; +if (i !=5 && *end !=':' ) +return -1 ; +if (i ==5 && *end !='\0' )
net/eth.c line 54
Quoted 10 lines
net/eth.c +7
-0+return -1 ; + cur = end +1 ; + } + +return 0 ; +} +void eth_parse_enetaddr (const char *addr,uchar *enetaddr) {char *end;
Codrin,
This patch breaks most SPL targets. Please reconsider the location of eth_validate_ethaddr_str().
York
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
Hi York,
I didn't know that SPL uses net/eth.c . Could you please suggest a place for eth_validate_ethaddr_str()?
Thanks and best regards,
Codrin
Quoted 115 lines
-----Original Message-----
From: Sun York-R58495
Sent: Saturday, August 08, 2015 3:31 AM
To: Ciubotariu Codrin Constantin-B43658; u-boot at lists.denx.de
Cc: joe.hershberger at ni.com; Kushwaha Prabhakar-B32579
Subject: Re: [PATCH v3 11/16]net/eth.c: Add function to validate a MAC addressinclude/net.h void eth_try_another(int first_restart); /* Change the
Quoted 46 lines · Codrin Ciubotariu
The code from
common/env_flags.cthat checks if a string has the format of a MAC address has been moved innet/eth.cas a separate function calledeth_validate_ethaddr_str().Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v3:
- none, new patch;common/env_flags.c | 15 ++------------- include/net.h | 1 + net/eth.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 13 deletions(-)common/env_flags.c index renamed from common/env_flags.c +0
-05189f5b..3e39fd1 100644
common/env_flags.c +2
-13@@ -239,19 +239,8 @@ static int _env_flags_validate_type(const char *value, }break ;case env_flags_vartype_macaddr: - cur = value; -for (i =0 ; i <6 ; i++) { -skip_num (1 , cur, &end,2 ); -if (cur == end) -return -1 ; -if (cur +2 == end &&is_hex_prefix (cur)) -return -1 ; -if (i !=5 && *end !=':' ) -return -1 ; -if (i ==5 && *end !='\0' ) -return -1 ; - cur = end +1 ; - } +if (eth_validate_ethaddr_str (value)) +return -1 ;break ;#endif case env_flags_vartype_end:include/net.h index d17173d..c487aa7 renamed from include/net.h +0
-0100644
include/net.h +0
-0@@ -218,6 +218,7 @@ void eth_try_another(int first_restart); /* Change thedevice */
Quoted 43 lines
include/net.h +1
-0void eth_set_current (void );/* set nterface to ethcur var */ int eth_get_dev_index (void );/* get the device index */ +int eth_validate_ethaddr_str (const char *addr);void eth_parse_enetaddr (const char *addr,uchar *enetaddr);int
eth_getenv_enetaddr(char *name, uchar *enetaddr); inteth_setenv_enetaddr(char *name, const uchar *enetaddr); diff --gita/net/eth.cb/net/eth.cindex 953b731..a6fdf1b 100644net/eth.c +22
-0@@ -7,6 +7,7 @@*/ #include <common.h> +#include <linux/ctype.h> #include <command.h> #include <dm.h> #include <environment.h> @@ -19,6 +20,35 @@DECLARE_GLOBAL_DATA_PTR ; +int eth_validate_ethaddr_str (const char *addr) { +unsigned long val; +int i; +const char *cur; +char *end; + +if (!addr) +return -1 ; + + cur = addr; +for (i =0 ; i <6 ; i++) { + val =simple_strtoul (cur, &end,16 ); +if (cur +1 != end && cur +2 != end) +return -1 ; +if (val >0xff ) +return -1 ; +if (cur +2 >= end &&tolower (*(cur +1 )) =='x' ) +return -1 ; +if (i !=5 && *end !=':' ) +return -1 ; +if (i ==5 && *end !='\0' )net/eth.c line 53
Quoted 10 lines
net/eth.c +7
-0+return -1 ; + cur = end +1 ; + } + +return 0 ; +} +void eth_parse_enetaddr (const char *addr,uchar *enetaddr) {char *end;Codrin,
This patch breaks most SPL targets. Please reconsider the location of
eth_validate_ethaddr_str().York
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
SPL doesn't use net/eth.c. You add a call in env_flags.c.
I think you can put it in header file and use static inline, or keep it in the same file where it is called.
Another way is to undef CONFIG_CMD_NET for SPL part. It is default to 'y' in Kconfig. Joe may have some good suggestion.
York
Quoted 122 lines · On 08/10/2015 01:44 AM, Ciubotariu Codrin Constantin-B43658 wrote:
Hi York,
I didn't know that SPL uses
net/eth.c. Could you please suggest a place foreth_validate_ethaddr_str()?Thanks and best regards,
CodrinQuoted 115 lines
-----Original Message-----
From: Sun York-R58495
Sent: Saturday, August 08, 2015 3:31 AM
To: Ciubotariu Codrin Constantin-B43658; u-boot at lists.denx.de
Cc: joe.hershberger at ni.com; Kushwaha Prabhakar-B32579
Subject: Re: [PATCH v3 11/16]net/eth.c: Add function to validate a MAC addressinclude/net.h void eth_try_another(int first_restart); /* Change the
Quoted 46 lines · Codrin Ciubotariu
The code from
common/env_flags.cthat checks if a string has the format of a MAC address has been moved innet/eth.cas a separate function calledeth_validate_ethaddr_str().Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v3:
- none, new patch;common/env_flags.c | 15 ++------------- include/net.h | 1 + net/eth.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 13 deletions(-)common/env_flags.c index renamed from common/env_flags.c +0
-05189f5b..3e39fd1 100644
common/env_flags.c +2
-13@@ -239,19 +239,8 @@ static int _env_flags_validate_type(const char *value, }break ;case env_flags_vartype_macaddr: - cur = value; -for (i =0 ; i <6 ; i++) { -skip_num (1 , cur, &end,2 ); -if (cur == end) -return -1 ; -if (cur +2 == end &&is_hex_prefix (cur)) -return -1 ; -if (i !=5 && *end !=':' ) -return -1 ; -if (i ==5 && *end !='\0' ) -return -1 ; - cur = end +1 ; - } +if (eth_validate_ethaddr_str (value)) +return -1 ;break ;#endif case env_flags_vartype_end:include/net.h index d17173d..c487aa7 renamed from include/net.h +0
-0100644
include/net.h +0
-0@@ -218,6 +218,7 @@ void eth_try_another(int first_restart); /* Change thedevice */
Quoted 43 lines
include/net.h +1
-0void eth_set_current (void );/* set nterface to ethcur var */ int eth_get_dev_index (void );/* get the device index */ +int eth_validate_ethaddr_str (const char *addr);void eth_parse_enetaddr (const char *addr,uchar *enetaddr);int
eth_getenv_enetaddr(char *name, uchar *enetaddr); inteth_setenv_enetaddr(char *name, const uchar *enetaddr); diff --gita/net/eth.cb/net/eth.cindex 953b731..a6fdf1b 100644net/eth.c +22
-0@@ -7,6 +7,7 @@*/ #include <common.h> +#include <linux/ctype.h> #include <command.h> #include <dm.h> #include <environment.h> @@ -19,6 +20,35 @@DECLARE_GLOBAL_DATA_PTR ; +int eth_validate_ethaddr_str (const char *addr) { +unsigned long val; +int i; +const char *cur; +char *end; + +if (!addr) +return -1 ; + + cur = addr; +for (i =0 ; i <6 ; i++) { + val =simple_strtoul (cur, &end,16 ); +if (cur +1 != end && cur +2 != end) +return -1 ; +if (val >0xff ) +return -1 ; +if (cur +2 >= end &&tolower (*(cur +1 )) =='x' ) +return -1 ; +if (i !=5 && *end !=':' ) +return -1 ; +if (i ==5 && *end !='\0' )net/eth.c line 53
Quoted 10 lines
net/eth.c +7
-0+return -1 ; + cur = end +1 ; + } + +return 0 ; +} +void eth_parse_enetaddr (const char *addr,uchar *enetaddr) {char *end;Codrin,
This patch breaks most SPL targets. Please reconsider the location of
eth_validate_ethaddr_str().York
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
Too much top-posting.
Quoted 4 lines · York Sun
SPL doesn't use
net/eth.c. You add a call inenv_flags.c.I think you can put it in header file and use static inline, or keep it in the same file where it is called.
That is probably fine.
Quoted 2 lines
Another way is to undef
CONFIG_CMD_NETfor SPL part. It is default to 'y' inKconfig. Joe may have some good suggestion.
I don't think this is the reason. The problem is that net is *not* build for SPL, but env is.
Quoted 127 lines · On 08/10/2015 01:44 AM, Ciubotariu Codrin Constantin-B43658 wrote:
Quoted 122 lines
Hi York,
I didn't know that SPL uses
net/eth.c. Could you please suggest a place foreth_validate_ethaddr_str()?Thanks and best regards,
CodrinQuoted 115 lines
-----Original Message-----
From: Sun York-R58495
Sent: Saturday, August 08, 2015 3:31 AM
To: Ciubotariu Codrin Constantin-B43658; u-boot at lists.denx.de
Cc: joe.hershberger at ni.com; Kushwaha Prabhakar-B32579
Subject: Re: [PATCH v3 11/16]net/eth.c: Add function to validate a MAC addressinclude/net.h void eth_try_another(int first_restart); /* Change the
Quoted 46 lines · Codrin Ciubotariu
The code from
common/env_flags.cthat checks if a string has the format of a MAC address has been moved innet/eth.cas a separate function calledeth_validate_ethaddr_str().Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v3:
- none, new patch;common/env_flags.c | 15 ++------------- include/net.h | 1 + net/eth.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 13 deletions(-)common/env_flags.c index renamed from common/env_flags.c +0
-05189f5b..3e39fd1 100644
common/env_flags.c +2
-13@@ -239,19 +239,8 @@ static int _env_flags_validate_type(const char *value, }break ;case env_flags_vartype_macaddr: - cur = value; -for (i =0 ; i <6 ; i++) { -skip_num (1 , cur, &end,2 ); -if (cur == end) -return -1 ; -if (cur +2 == end &&is_hex_prefix (cur)) -return -1 ; -if (i !=5 && *end !=':' ) -return -1 ; -if (i ==5 && *end !='\0' ) -return -1 ; - cur = end +1 ; - } +if (eth_validate_ethaddr_str (value)) +return -1 ;break ;#endif case env_flags_vartype_end:include/net.h index d17173d..c487aa7 renamed from include/net.h +0
-0100644
include/net.h +0
-0@@ -218,6 +218,7 @@ void eth_try_another(int first_restart); /* Change thedevice */
Quoted 43 lines
include/net.h +1
-0void eth_set_current (void );/* set nterface to ethcur var */ int eth_get_dev_index (void );/* get the device index */ +int eth_validate_ethaddr_str (const char *addr);void eth_parse_enetaddr (const char *addr,uchar *enetaddr);int
eth_getenv_enetaddr(char *name, uchar *enetaddr); inteth_setenv_enetaddr(char *name, const uchar *enetaddr); diff --gita/net/eth.cb/net/eth.cindex 953b731..a6fdf1b 100644net/eth.c +22
-0@@ -7,6 +7,7 @@*/ #include <common.h> +#include <linux/ctype.h> #include <command.h> #include <dm.h> #include <environment.h> @@ -19,6 +20,35 @@DECLARE_GLOBAL_DATA_PTR ; +int eth_validate_ethaddr_str (const char *addr) { +unsigned long val; +int i; +const char *cur; +char *end; + +if (!addr) +return -1 ; + + cur = addr; +for (i =0 ; i <6 ; i++) { + val =simple_strtoul (cur, &end,16 ); +if (cur +1 != end && cur +2 != end) +return -1 ; +if (val >0xff ) +return -1 ; +if (cur +2 >= end &&tolower (*(cur +1 )) =='x' ) +return -1 ; +if (i !=5 && *end !=':' ) +return -1 ; +if (i ==5 && *end !='\0' )net/eth.c line 53
Quoted 10 lines
net/eth.c +7
-0+return -1 ; + cur = end +1 ; + } + +return 0 ; +} +void eth_parse_enetaddr (const char *addr,uchar *enetaddr) {char *end;Codrin,
This patch breaks most SPL targets. Please reconsider the location of
eth_validate_ethaddr_str().York
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
Quoted 8 lines · Joe Hershberger
Too much top-posting.
Quoted 4 lines · York Sun
SPL doesn't use
net/eth.c. You add a call inenv_flags.c.I think you can put it in header file and use static inline, or keep it in the same file where it is called.
Quoted 7 lines
That is probably fine.
Quoted 2 lines
Another way is to undef
CONFIG_CMD_NETfor SPL part. It is default to 'y' inKconfig. Joe may have some good suggestion.I don't think this is the reason. The problem is that net is *not* build for SPL, but env is.
Yes, env is built. The offending lines in common/env_flags.c are gated by "#ifdef CONFIG_CMD_NET". That's why I say it could be another way.
York
Quoted 128 lines
Quoted 128 lines · On 08/10/2015 01:44 AM, Ciubotariu Codrin Constantin-B43658 wrote:
Quoted 122 lines
Hi York,
I didn't know that SPL uses
net/eth.c. Could you please suggest a place foreth_validate_ethaddr_str()?Thanks and best regards,
CodrinQuoted 115 lines
-----Original Message-----
From: Sun York-R58495
Sent: Saturday, August 08, 2015 3:31 AM
To: Ciubotariu Codrin Constantin-B43658; u-boot at lists.denx.de
Cc: joe.hershberger at ni.com; Kushwaha Prabhakar-B32579
Subject: Re: [PATCH v3 11/16]net/eth.c: Add function to validate a MAC addressinclude/net.h void eth_try_another(int first_restart); /* Change the
Quoted 46 lines · Codrin Ciubotariu
The code from
common/env_flags.cthat checks if a string has the format of a MAC address has been moved innet/eth.cas a separate function calledeth_validate_ethaddr_str().Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v3:
- none, new patch;common/env_flags.c | 15 ++------------- include/net.h | 1 + net/eth.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 13 deletions(-)common/env_flags.c index renamed from common/env_flags.c +0
-05189f5b..3e39fd1 100644
common/env_flags.c +2
-13@@ -239,19 +239,8 @@ static int _env_flags_validate_type(const char *value, }break ;case env_flags_vartype_macaddr: - cur = value; -for (i =0 ; i <6 ; i++) { -skip_num (1 , cur, &end,2 ); -if (cur == end) -return -1 ; -if (cur +2 == end &&is_hex_prefix (cur)) -return -1 ; -if (i !=5 && *end !=':' ) -return -1 ; -if (i ==5 && *end !='\0' ) -return -1 ; - cur = end +1 ; - } +if (eth_validate_ethaddr_str (value)) +return -1 ;break ;#endif case env_flags_vartype_end:include/net.h index d17173d..c487aa7 renamed from include/net.h +0
-0100644
include/net.h +0
-0@@ -218,6 +218,7 @@ void eth_try_another(int first_restart); /* Change thedevice */
Quoted 43 lines
include/net.h +1
-0void eth_set_current (void );/* set nterface to ethcur var */ int eth_get_dev_index (void );/* get the device index */ +int eth_validate_ethaddr_str (const char *addr);void eth_parse_enetaddr (const char *addr,uchar *enetaddr);int
eth_getenv_enetaddr(char *name, uchar *enetaddr); inteth_setenv_enetaddr(char *name, const uchar *enetaddr); diff --gita/net/eth.cb/net/eth.cindex 953b731..a6fdf1b 100644net/eth.c +22
-0@@ -7,6 +7,7 @@*/ #include <common.h> +#include <linux/ctype.h> #include <command.h> #include <dm.h> #include <environment.h> @@ -19,6 +20,35 @@DECLARE_GLOBAL_DATA_PTR ; +int eth_validate_ethaddr_str (const char *addr) { +unsigned long val; +int i; +const char *cur; +char *end; + +if (!addr) +return -1 ; + + cur = addr; +for (i =0 ; i <6 ; i++) { + val =simple_strtoul (cur, &end,16 ); +if (cur +1 != end && cur +2 != end) +return -1 ; +if (val >0xff ) +return -1 ; +if (cur +2 >= end &&tolower (*(cur +1 )) =='x' ) +return -1 ; +if (i !=5 && *end !=':' ) +return -1 ; +if (i ==5 && *end !='\0' )net/eth.c line 53
Quoted 10 lines
net/eth.c +7
-0+return -1 ; + cur = end +1 ; + } + +return 0 ; +} +void eth_parse_enetaddr (const char *addr,uchar *enetaddr) {char *end;Codrin,
This patch breaks most SPL targets. Please reconsider the location of
eth_validate_ethaddr_str().York
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
Hi York,
Quoted 13 lines · York Sun
Quoted 10 lines · Joe Hershberger
Too much top-posting.
Quoted 4 lines · York Sun
SPL doesn't use
net/eth.c. You add a call inenv_flags.c.I think you can put it in header file and use static inline, or keep it in the same file where it is called.
That is probably fine.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Another way is to undef
CONFIG_CMD_NETfor SPL part. It is default to 'y' inKconfig. Joe may have some good suggestion.I don't think this is the reason. The problem is that net is *not* build for SPL, but env is.
Yes, env is built. The offending lines in
common/env_flags.care gated by "#ifdefCONFIG_CMD_NET". That's why I say it could be another way.
OK, sure... but that breaks intended behavior, I think.
Quoted 128 lines
Quoted 128 lines
Quoted 128 lines · On 08/10/2015 01:44 AM, Ciubotariu Codrin Constantin-B43658 wrote:
Quoted 122 lines
Hi York,
I didn't know that SPL uses
net/eth.c. Could you please suggest a place foreth_validate_ethaddr_str()?Thanks and best regards,
CodrinQuoted 115 lines
-----Original Message-----
From: Sun York-R58495
Sent: Saturday, August 08, 2015 3:31 AM
To: Ciubotariu Codrin Constantin-B43658; u-boot at lists.denx.de
Cc: joe.hershberger at ni.com; Kushwaha Prabhakar-B32579
Subject: Re: [PATCH v3 11/16]net/eth.c: Add function to validate a MAC addressinclude/net.h void eth_try_another(int first_restart); /* Change the
Quoted 46 lines · Codrin Ciubotariu
The code from
common/env_flags.cthat checks if a string has the format of a MAC address has been moved innet/eth.cas a separate function calledeth_validate_ethaddr_str().Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v3:
- none, new patch;common/env_flags.c | 15 ++------------- include/net.h | 1 + net/eth.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 13 deletions(-)common/env_flags.c index renamed from common/env_flags.c +0
-05189f5b..3e39fd1 100644
common/env_flags.c +2
-13@@ -239,19 +239,8 @@ static int _env_flags_validate_type(const char *value, }break ;case env_flags_vartype_macaddr: - cur = value; -for (i =0 ; i <6 ; i++) { -skip_num (1 , cur, &end,2 ); -if (cur == end) -return -1 ; -if (cur +2 == end &&is_hex_prefix (cur)) -return -1 ; -if (i !=5 && *end !=':' ) -return -1 ; -if (i ==5 && *end !='\0' ) -return -1 ; - cur = end +1 ; - } +if (eth_validate_ethaddr_str (value)) +return -1 ;break ;#endif case env_flags_vartype_end:include/net.h index d17173d..c487aa7 renamed from include/net.h +0
-0100644
include/net.h +0
-0@@ -218,6 +218,7 @@ void eth_try_another(int first_restart); /* Change thedevice */
Quoted 43 lines
include/net.h +1
-0void eth_set_current (void );/* set nterface to ethcur var */ int eth_get_dev_index (void );/* get the device index */ +int eth_validate_ethaddr_str (const char *addr);void eth_parse_enetaddr (const char *addr,uchar *enetaddr);int
eth_getenv_enetaddr(char *name, uchar *enetaddr); inteth_setenv_enetaddr(char *name, const uchar *enetaddr); diff --gita/net/eth.cb/net/eth.cindex 953b731..a6fdf1b 100644net/eth.c +22
-0@@ -7,6 +7,7 @@*/ #include <common.h> +#include <linux/ctype.h> #include <command.h> #include <dm.h> #include <environment.h> @@ -19,6 +20,35 @@DECLARE_GLOBAL_DATA_PTR ; +int eth_validate_ethaddr_str (const char *addr) { +unsigned long val; +int i; +const char *cur; +char *end; + +if (!addr) +return -1 ; + + cur = addr; +for (i =0 ; i <6 ; i++) { + val =simple_strtoul (cur, &end,16 ); +if (cur +1 != end && cur +2 != end) +return -1 ; +if (val >0xff ) +return -1 ; +if (cur +2 >= end &&tolower (*(cur +1 )) =='x' ) +return -1 ; +if (i !=5 && *end !=':' ) +return -1 ; +if (i ==5 && *end !='\0' )net/eth.c line 53
Quoted 10 lines
net/eth.c +7
-0+return -1 ; + cur = end +1 ; + } + +return 0 ; +} +void eth_parse_enetaddr (const char *addr,uchar *enetaddr) {char *end;Codrin,
This patch breaks most SPL targets. Please reconsider the location of
eth_validate_ethaddr_str().York
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
Quoted 19 lines · Joe Hershberger
Hi York,
Quoted 16 lines · York Sun
Quoted 13 lines · Joe Hershberger
Too much top-posting.
Quoted 4 lines · York Sun
SPL doesn't use
net/eth.c. You add a call inenv_flags.c.I think you can put it in header file and use static inline, or keep it in the same file where it is called.
That is probably fine.
Quoted 2 lines
Another way is to undef
CONFIG_CMD_NETfor SPL part. It is default to 'y' inKconfig. Joe may have some good suggestion.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
I don't think this is the reason. The problem is that net is *not* build for SPL, but env is.
Yes, env is built. The offending lines in
common/env_flags.care gated by "#ifdefCONFIG_CMD_NET". That's why I say it could be another way.OK, sure... but that breaks intended behavior, I think.
I see. The CONFIG_CMD_NET is not evaluated separated for SPL build. So I guess the fix can be either to put the common function in header file after making it really simple to reduce dependency, or to keep the original code in env_flag.c.
York
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
+Codrin
Somehow I dropped Codrin in last reply.
Quoted 28 lines · York Sun
Quoted 25 lines · Joe Hershberger
Hi York,
Quoted 21 lines · York Sun
Quoted 8 lines · Joe Hershberger
Too much top-posting.
Quoted 4 lines · York Sun
SPL doesn't use
net/eth.c. You add a call inenv_flags.c.I think you can put it in header file and use static inline, or keep it in the same file where it is called.
Quoted 7 lines
That is probably fine.
Quoted 2 lines
Another way is to undef
CONFIG_CMD_NETfor SPL part. It is default to 'y' inKconfig. Joe may have some good suggestion.I don't think this is the reason. The problem is that net is *not* build for SPL, but env is.
Yes, env is built. The offending lines in
common/env_flags.care gated by "#ifdefCONFIG_CMD_NET". That's why I say it could be another way.
Quoted 7 lines
Quoted 2 lines
OK, sure... but that breaks intended behavior, I think.
I see. The
CONFIG_CMD_NETis not evaluated separated for SPL build. So I guess the fix can be either to put the common function in header file after making it really simple to reduce dependency, or to keep the original code inenv_flag.c.
Codrin,
Can you prepare a new patch? You don't have to send the whole set. All but one have been acked by Joe.
York
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
Hi York,
Sure, I will make v4 this week for this change only. I will try to shrink the function and inline it in the header file.
Thanks and best regards,
Codrin
Quoted 56 lines
-----Original Message-----
From: Sun York-R58495
Sent: Wednesday, August 12, 2015 10:59 PM
To: Ciubotariu Codrin Constantin-B43658
Cc: Joe Hershberger; u-boot at lists.denx.de; joe.hershberger at ni.com
Subject: Re: [U-Boot] [PATCH v3 11/16]net/eth.c: Add function to validate a MAC address+Codrin
Somehow I dropped Codrin in last reply.
Quoted 28 lines · York Sun
Quoted 25 lines · Joe Hershberger
Hi York,
Quoted 21 lines · York Sun
Quoted 8 lines · Joe Hershberger
Too much top-posting.
Quoted 4 lines · York Sun
SPL doesn't use
net/eth.c. You add a call inenv_flags.c.I think you can put it in header file and use static inline, or keep it in the same file where it is called.
Quoted 7 lines
That is probably fine.
Quoted 2 lines
Another way is to undef
CONFIG_CMD_NETfor SPL part. It is default to 'y' inKconfig. Joe may have some good suggestion.I don't think this is the reason. The problem is that net is *not* build for SPL, but env is.
Yes, env is built. The offending lines in
common/env_flags.care gated by "#ifdefCONFIG_CMD_NET". That's why I say it could be another way.Quoted 6 lines
Quoted 2 lines
OK, sure... but that breaks intended behavior, I think.
I see. The
CONFIG_CMD_NETis not evaluated separated for SPL build. So I guess the fix can be either to put the common function in header file after making it really simple to reduce dependency, or to keep theoriginal code in
env_flag.c.Quoted 1 line
Codrin,
Can you prepare a new patch? You don't have to send the whole set. All but one have been acked by Joe.
York
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
In reply to York SunHi Joe, York,
Quoted 50 lines
-----Original Message-----
From: Sun York-R58495
Sent: Wednesday, August 12, 2015 10:59 PM
To: Ciubotariu Codrin Constantin-B43658
Cc: Joe Hershberger; u-boot at lists.denx.de; joe.hershberger at ni.com
Subject: Re: [U-Boot] [PATCH v3 11/16]net/eth.c: Add function to validate a MAC address+Codrin
Somehow I dropped Codrin in last reply.
Quoted 28 lines · York Sun
Quoted 25 lines · Joe Hershberger
Hi York,
Quoted 21 lines · York Sun
Quoted 8 lines · Joe Hershberger
Too much top-posting.
Quoted 4 lines · York Sun
SPL doesn't use
net/eth.c. You add a call inenv_flags.c.I think you can put it in header file and use static inline, or keep it in the same file where it is called.
Quoted 7 lines
That is probably fine.
Quoted 2 lines
Another way is to undef
CONFIG_CMD_NETfor SPL part. It is default to 'y' inKconfig. Joe may have some good suggestion.I don't think this is the reason. The problem is that net is *not* build for SPL, but env is.
Yes, env is built. The offending lines in
common/env_flags.care gated by "#ifdefCONFIG_CMD_NET". That's why I say it could be another way.Quoted 6 lines
Quoted 2 lines
OK, sure... but that breaks intended behavior, I think.
I see. The
CONFIG_CMD_NETis not evaluated separated for SPL build. So I guess the fix can be either to put the common function in header file after making it really simple to reduce dependency, or to keep theoriginal code in
env_flag.c.Quoted 1 line
Quoted 6 lines
Codrin,
Can you prepare a new patch? You don't have to send the whole set. All but one have been acked by Joe.
York
I can't inline eth_validate_ethaddr_str in eth.h since it depends on simple_strtoul and tolower. Also, I can't let it in common/env_flags.c because I need to access if from drivers/net/vsc9953.c . I guess it has to be in a .c file that is also used by SPL targets. Could you please suggest such a file?
SPL targets make use of CONFIG_CMD_NET? It seems strange that ETH env is built, but net/net.c or net/eth.c not.
Thanks and best regards,
Codrin
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
Quoted 54 lines · On 08/13/2015 08:42 AM, Ciubotariu Codrin Constantin-B43658 wrote:
Hi Joe, York,
Quoted 52 lines
-----Original Message-----
From: Sun York-R58495
Sent: Wednesday, August 12, 2015 10:59 PM
To: Ciubotariu Codrin Constantin-B43658
Cc: Joe Hershberger; u-boot at lists.denx.de; joe.hershberger at ni.com
Subject: Re: [U-Boot] [PATCH v3 11/16]net/eth.c: Add function to validate a MAC address+Codrin
Somehow I dropped Codrin in last reply.
Quoted 28 lines · York Sun
Quoted 25 lines · Joe Hershberger
Hi York,
Quoted 21 lines · York Sun
Quoted 8 lines · Joe Hershberger
Too much top-posting.
Quoted 4 lines · York Sun
SPL doesn't use
net/eth.c. You add a call inenv_flags.c.I think you can put it in header file and use static inline, or keep it in the same file where it is called.
Quoted 7 lines
That is probably fine.
Quoted 2 lines
Another way is to undef
CONFIG_CMD_NETfor SPL part. It is default to 'y' inKconfig. Joe may have some good suggestion.I don't think this is the reason. The problem is that net is *not* build for SPL, but env is.
Yes, env is built. The offending lines in
common/env_flags.care gated by "#ifdefCONFIG_CMD_NET". That's why I say it could be another way.Quoted 6 lines
Quoted 2 lines
OK, sure... but that breaks intended behavior, I think.
I see. The
CONFIG_CMD_NETis not evaluated separated for SPL build. So I guess the fix can be either to put the common function in header file after making it really simple to reduce dependency, or to keep theoriginal code in
env_flag.c.Quoted 1 line
Codrin,
Quoted 9 lines
Quoted 4 lines
Can you prepare a new patch? You don't have to send the whole set. All but one have been acked by Joe.
York
I can't inline
eth_validate_ethaddr_strineth.hsince it depends onsimple_strtouland tolower. Also, I can't let it incommon/env_flags.cbecause I need to access if fromdrivers/net/vsc9953.c. I guess it has to be in a .c file that is also used by SPL targets. Could you please suggest such a file?SPL targets make use of
CONFIG_CMD_NET? It seems strange that ETH env is built, butnet/net.cornet/eth.cnot.
I was discussing with Joe about the possibility to deselect CONFIG_CMD_NET for SPL build. The issue here is Kconfig is not re-evaluated for the SPL part. If you can experiment it, you can try to gate the code in env_flags.c with CONFIG_SPL_BUILD. It sounds reasonable to me.
York
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
Hi York,
Quoted 81 lines
-----Original Message-----
From: Sun York-R58495
Sent: Thursday, August 13, 2015 6:55 PM
To: Ciubotariu Codrin Constantin-B43658
Cc: Joe Hershberger; u-boot at lists.denx.de; joe.hershberger at ni.com
Subject: Re: [U-Boot] [PATCH v3 11/16]net/eth.c: Add function to validate a MAC addressQuoted 42 lines · On 08/13/2015 08:42 AM, Ciubotariu Codrin Constantin-B43658 wrote:
Hi Joe, York,
Quoted 40 lines
-----Original Message-----
From: Sun York-R58495
Sent: Wednesday, August 12, 2015 10:59 PM
To: Ciubotariu Codrin Constantin-B43658
Cc: Joe Hershberger; u-boot at lists.denx.de; joe.hershberger at ni.com
Subject: Re: [U-Boot] [PATCH v3 11/16]net/eth.c: Add function to validate a MAC address+Codrin
Somehow I dropped Codrin in last reply.
Quoted 27 lines · York Sun
Quoted 24 lines · Joe Hershberger
Hi York,
Quoted 21 lines · York Sun
Quoted 8 lines · Joe Hershberger
Too much top-posting.
Quoted 4 lines · York Sun
SPL doesn't use
net/eth.c. You add a call inenv_flags.c.I think you can put it in header file and use static inline, or keep it in the same file where it is called.
Quoted 7 lines
That is probably fine.
Quoted 2 lines
Another way is to undef
CONFIG_CMD_NETfor SPL part. It is default to 'y' inKconfig. Joe may have some good suggestion.I don't think this is the reason. The problem is that net is *not* build for SPL, but env is.
Yes, env is built. The offending lines in
common/env_flags.care gated by "#ifdefCONFIG_CMD_NET". That's why I say it could be anotherway.
Quoted 11 lines
Quoted 11 lines
Quoted 8 lines
Quoted 3 lines
OK, sure... but that breaks intended behavior, I think.
I see. The
CONFIG_CMD_NETis not evaluated separated for SPL build. So I guess the fix can be either to put the common function in header file after making it really simple to reduce dependency, or to keep theoriginal code in
env_flag.c.Quoted 1 line
Quoted 8 lines
Quoted 6 lines
Codrin,
Can you prepare a new patch? You don't have to send the whole set. All but one have been acked by Joe.
York
I can't inline
eth_validate_ethaddr_strineth.hsince it depends on
simple_strtouland tolower. Also, I can't let it incommon/env_flags.cbecause I need to access if fromdrivers/net/vsc9953.c. I guess it has to be in a .c file that is also used by SPL targets. Could you please suggest such a file?Quoted 2 lines
SPL targets make use of
CONFIG_CMD_NET? It seems strange that ETH env isbuilt, but
net/net.cornet/eth.cnot.Quoted 1 line
Quoted 6 lines
I was discussing with Joe about the possibility to deselect
CONFIG_CMD_NETfor SPL build. The issue here isKconfigis not re-evaluated for the SPL part. If you can experiment it, you can try to gate the code inenv_flags.cwithCONFIG_SPL_BUILD. It sounds reasonable to me.York
Something like
#if defined(CONFIG_CMD_NET) && !defined(CONFIG_SPL_BUILD)
case env_flags_vartype_ipaddr:
cur = value;
for (i = 0; i < 4; i++) {
skip_num(0, cur, &end, 3);
if (cur == end)
return -1;
if (i != 3 && *end != '.')
return -1;
if (i == 3 && *end != '\0')
return -1;
cur = end + 1;
}
break;
case env_flags_vartype_macaddr:
if (eth_validate_ethaddr_str(value))
return -1;
break;#endif
?
I get two warnings on this:../common/env_flags.c: In function '_env_flags_validate_type':../common/env_flags.c:203:2: warning: enumeration value 'env_flags_vartype_ipaddr' not handled in switch [-Wswitch]
switch (type) {
^../common/env_flags.c:203:2: warning: enumeration value 'env_flags_vartype_macaddr' not handled in switch [-Wswitch]
Unless I guard these values in env_flags.h:
#if defined(CONFIG_CMD_NET) && !defined(CONFIG_SPL_BUILD)
env_flags_vartype_ipaddr, env_flags_vartype_macaddr,
#endif
Best regards,
Codrin
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
Quoted 121 lines · On 08/14/2015 01:28 AM, Ciubotariu Codrin Constantin-B43658 wrote:
Hi York,
Quoted 81 lines
-----Original Message-----
From: Sun York-R58495
Sent: Thursday, August 13, 2015 6:55 PM
To: Ciubotariu Codrin Constantin-B43658
Cc: Joe Hershberger; u-boot at lists.denx.de; joe.hershberger at ni.com
Subject: Re: [U-Boot] [PATCH v3 11/16]net/eth.c: Add function to validate a MAC addressQuoted 42 lines · On 08/13/2015 08:42 AM, Ciubotariu Codrin Constantin-B43658 wrote:
Hi Joe, York,
Quoted 40 lines
-----Original Message-----
From: Sun York-R58495
Sent: Wednesday, August 12, 2015 10:59 PM
To: Ciubotariu Codrin Constantin-B43658
Cc: Joe Hershberger; u-boot at lists.denx.de; joe.hershberger at ni.com
Subject: Re: [U-Boot] [PATCH v3 11/16]net/eth.c: Add function to validate a MAC address+Codrin
Somehow I dropped Codrin in last reply.
Quoted 27 lines · York Sun
Quoted 24 lines · Joe Hershberger
Hi York,
Quoted 21 lines · York Sun
Quoted 8 lines · Joe Hershberger
Too much top-posting.
Quoted 4 lines · York Sun
SPL doesn't use
net/eth.c. You add a call inenv_flags.c.I think you can put it in header file and use static inline, or keep it in the same file where it is called.
Quoted 7 lines
That is probably fine.
Quoted 2 lines
Another way is to undef
CONFIG_CMD_NETfor SPL part. It is default to 'y' inKconfig. Joe may have some good suggestion.I don't think this is the reason. The problem is that net is *not* build for SPL, but env is.
Yes, env is built. The offending lines in
common/env_flags.care gated by "#ifdefCONFIG_CMD_NET". That's why I say it could be anotherway.
Quoted 11 lines
Quoted 11 lines
Quoted 8 lines
Quoted 3 lines
OK, sure... but that breaks intended behavior, I think.
I see. The
CONFIG_CMD_NETis not evaluated separated for SPL build. So I guess the fix can be either to put the common function in header file after making it really simple to reduce dependency, or to keep theoriginal code in
env_flag.c.Quoted 1 line
Quoted 8 lines
Quoted 6 lines
Codrin,
Can you prepare a new patch? You don't have to send the whole set. All but one have been acked by Joe.
York
I can't inline
eth_validate_ethaddr_strineth.hsince it depends on
simple_strtouland tolower. Also, I can't let it incommon/env_flags.cbecause I need to access if fromdrivers/net/vsc9953.c. I guess it has to be in a .c file that is also used by SPL targets. Could you please suggest such a file?Quoted 2 lines
SPL targets make use of
CONFIG_CMD_NET? It seems strange that ETH env isbuilt, but
net/net.cornet/eth.cnot.Quoted 1 line
Quoted 6 lines
I was discussing with Joe about the possibility to deselect
CONFIG_CMD_NETfor SPL build. The issue here isKconfigis not re-evaluated for the SPL part. If you can experiment it, you can try to gate the code inenv_flags.cwithCONFIG_SPL_BUILD. It sounds reasonable to me.York
Something like
#if defined(CONFIG_CMD_NET) && !defined(CONFIG_SPL_BUILD) case env_flags_vartype_ipaddr: cur = value; for (i = 0; i < 4; i++) { skip_num(0, cur, &end, 3); if (cur == end) return -1; if (i != 3 && *end != '.') return -1; if (i == 3 && *end != '\0') return -1; cur = end + 1; } break; case env_flags_vartype_macaddr: if (eth_validate_ethaddr_str(value)) return -1; break;#endif
?
I get two warnings on this:
../common/env_flags.c: In function '_env_flags_validate_type':../common/env_flags.c:203:2: warning: enumeration value 'env_flags_vartype_ipaddr' not handled in switch [-Wswitch]
switch (type) {
^../common/env_flags.c:203:2: warning: enumeration value 'env_flags_vartype_macaddr' not handled in switch [-Wswitch]
Quoted 6 lines
Unless I guard these values in
env_flags.h:
#ifdefined(CONFIG_CMD_NET)&& !defined(CONFIG_SPL_BUILD)
env_flags_vartype_ipaddr,env_flags_vartype_macaddr,
#endif
It makes sense to me to take out these two for SPL build. The whole purpose of SPL is to load the final image. I don't see a chance users would be able to type any command.
Joe, do you agree the CMD_NET shouldn't be used for SPL?
York
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
Quoted 131 lines · York Sun
Quoted 121 lines · On 08/14/2015 01:28 AM, Ciubotariu Codrin Constantin-B43658 wrote:
Hi York,
Quoted 81 lines
-----Original Message-----
From: Sun York-R58495
Sent: Thursday, August 13, 2015 6:55 PM
To: Ciubotariu Codrin Constantin-B43658
Cc: Joe Hershberger; u-boot at lists.denx.de; joe.hershberger at ni.com
Subject: Re: [U-Boot] [PATCH v3 11/16]net/eth.c: Add function to validate a MAC addressQuoted 42 lines · On 08/13/2015 08:42 AM, Ciubotariu Codrin Constantin-B43658 wrote:
Hi Joe, York,
Quoted 40 lines
-----Original Message-----
From: Sun York-R58495
Sent: Wednesday, August 12, 2015 10:59 PM
To: Ciubotariu Codrin Constantin-B43658
Cc: Joe Hershberger; u-boot at lists.denx.de; joe.hershberger at ni.com
Subject: Re: [U-Boot] [PATCH v3 11/16]net/eth.c: Add function to validate a MAC address+Codrin
Somehow I dropped Codrin in last reply.
Quoted 27 lines · York Sun
Quoted 24 lines · Joe Hershberger
Hi York,
Quoted 21 lines · York Sun
Quoted 8 lines · Joe Hershberger
Too much top-posting.
Quoted 4 lines · York Sun
SPL doesn't use
net/eth.c. You add a call inenv_flags.c.I think you can put it in header file and use static inline, or keep it in the same file where it is called.
Quoted 7 lines
That is probably fine.
Quoted 2 lines
Another way is to undef
CONFIG_CMD_NETfor SPL part. It is default to 'y' inKconfig. Joe may have some good suggestion.I don't think this is the reason. The problem is that net is *not* build for SPL, but env is.
Yes, env is built. The offending lines in
common/env_flags.care gated by "#ifdefCONFIG_CMD_NET". That's why I say it could be anotherway.
Quoted 11 lines
Quoted 11 lines
Quoted 8 lines
Quoted 3 lines
OK, sure... but that breaks intended behavior, I think.
I see. The
CONFIG_CMD_NETis not evaluated separated for SPL build. So I guess the fix can be either to put the common function in header file after making it really simple to reduce dependency, or to keep theoriginal code in
env_flag.c.Quoted 1 line
Quoted 8 lines
Quoted 6 lines
Codrin,
Can you prepare a new patch? You don't have to send the whole set. All but one have been acked by Joe.
York
I can't inline
eth_validate_ethaddr_strineth.hsince it depends on
simple_strtouland tolower. Also, I can't let it incommon/env_flags.cbecause I need to access if fromdrivers/net/vsc9953.c. I guess it has to be in a .c file that is also used by SPL targets. Could you please suggest such a file?Quoted 2 lines
SPL targets make use of
CONFIG_CMD_NET? It seems strange that ETH env isbuilt, but
net/net.cornet/eth.cnot.Quoted 1 line
Quoted 6 lines
I was discussing with Joe about the possibility to deselect
CONFIG_CMD_NETfor SPL build. The issue here isKconfigis not re-evaluated for the SPL part. If you can experiment it, you can try to gate the code inenv_flags.cwithCONFIG_SPL_BUILD. It sounds reasonable to me.York
Something like
#if defined(CONFIG_CMD_NET) && !defined(CONFIG_SPL_BUILD) case env_flags_vartype_ipaddr: cur = value; for (i = 0; i < 4; i++) { skip_num(0, cur, &end, 3); if (cur == end) return -1; if (i != 3 && *end != '.') return -1; if (i == 3 && *end != '\0') return -1; cur = end + 1; } break; case env_flags_vartype_macaddr: if (eth_validate_ethaddr_str(value)) return -1; break;#endif
?
I get two warnings on this:
../common/env_flags.c: In function '_env_flags_validate_type':../common/env_flags.c:203:2: warning: enumeration value 'env_flags_vartype_ipaddr' not handled in switch [-Wswitch]
switch (type) {
^../common/env_flags.c:203:2: warning: enumeration value 'env_flags_vartype_macaddr' not handled in switch [-Wswitch]Quoted 6 lines
Unless I guard these values in
env_flags.h:
#ifdefined(CONFIG_CMD_NET)&& !defined(CONFIG_SPL_BUILD)
env_flags_vartype_ipaddr,env_flags_vartype_macaddr,
#endif
Quoted 5 lines
It makes sense to me to take out these two for SPL build. The whole purpose of SPL is to load the final image. I don't see a chance users would be able to type any command.
Joe, do you agree the
CMD_NETshouldn't be used for SPL?
I tend to agree, but I have a vague recollection that there is at least one SPL that uses net. Sorry I don't recall what board it was that I'm thinking about.
-Joe
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
Quoted 136 lines · Joe Hershberger
Quoted 135 lines · York Sun
Quoted 121 lines · On 08/14/2015 01:28 AM, Ciubotariu Codrin Constantin-B43658 wrote:
Hi York,
Quoted 81 lines
-----Original Message-----
From: Sun York-R58495
Sent: Thursday, August 13, 2015 6:55 PM
To: Ciubotariu Codrin Constantin-B43658
Cc: Joe Hershberger; u-boot at lists.denx.de; joe.hershberger at ni.com
Subject: Re: [U-Boot] [PATCH v3 11/16]net/eth.c: Add function to validate a MAC addressQuoted 42 lines · On 08/13/2015 08:42 AM, Ciubotariu Codrin Constantin-B43658 wrote:
Hi Joe, York,
Quoted 40 lines
-----Original Message-----
From: Sun York-R58495
Sent: Wednesday, August 12, 2015 10:59 PM
To: Ciubotariu Codrin Constantin-B43658
Cc: Joe Hershberger; u-boot at lists.denx.de; joe.hershberger at ni.com
Subject: Re: [U-Boot] [PATCH v3 11/16]net/eth.c: Add function to validate a MAC address+Codrin
Somehow I dropped Codrin in last reply.
Quoted 27 lines · York Sun
Quoted 24 lines · Joe Hershberger
Hi York,
Quoted 21 lines · York Sun
Quoted 8 lines · Joe Hershberger
Too much top-posting.
Quoted 4 lines · York Sun
SPL doesn't use
net/eth.c. You add a call inenv_flags.c.I think you can put it in header file and use static inline, or keep it in the same file where it is called.
Quoted 7 lines
That is probably fine.
Quoted 2 lines
Another way is to undef
CONFIG_CMD_NETfor SPL part. It is default to 'y' inKconfig. Joe may have some good suggestion.I don't think this is the reason. The problem is that net is *not* build for SPL, but env is.
Yes, env is built. The offending lines in
common/env_flags.care gated by "#ifdefCONFIG_CMD_NET". That's why I say it could be anotherway.
Quoted 11 lines
Quoted 11 lines
Quoted 8 lines
Quoted 3 lines
OK, sure... but that breaks intended behavior, I think.
I see. The
CONFIG_CMD_NETis not evaluated separated for SPL build. So I guess the fix can be either to put the common function in header file after making it really simple to reduce dependency, or to keep theoriginal code in
env_flag.c.Quoted 1 line
Quoted 8 lines
Quoted 6 lines
Codrin,
Can you prepare a new patch? You don't have to send the whole set. All but one have been acked by Joe.
York
I can't inline
eth_validate_ethaddr_strineth.hsince it depends on
simple_strtouland tolower. Also, I can't let it incommon/env_flags.cbecause I need to access if fromdrivers/net/vsc9953.c. I guess it has to be in a .c file that is also used by SPL targets. Could you please suggest such a file?Quoted 2 lines
SPL targets make use of
CONFIG_CMD_NET? It seems strange that ETH env isbuilt, but
net/net.cornet/eth.cnot.Quoted 1 line
Quoted 6 lines
I was discussing with Joe about the possibility to deselect
CONFIG_CMD_NETfor SPL build. The issue here isKconfigis not re-evaluated for the SPL part. If you can experiment it, you can try to gate the code inenv_flags.cwithCONFIG_SPL_BUILD. It sounds reasonable to me.York
Something like
#if defined(CONFIG_CMD_NET) && !defined(CONFIG_SPL_BUILD) case env_flags_vartype_ipaddr: cur = value; for (i = 0; i < 4; i++) { skip_num(0, cur, &end, 3); if (cur == end) return -1; if (i != 3 && *end != '.') return -1; if (i == 3 && *end != '\0') return -1; cur = end + 1; } break; case env_flags_vartype_macaddr: if (eth_validate_ethaddr_str(value)) return -1; break;#endif
?
I get two warnings on this:
../common/env_flags.c: In function '_env_flags_validate_type':../common/env_flags.c:203:2: warning: enumeration value 'env_flags_vartype_ipaddr' not handled in switch [-Wswitch]
switch (type) {
^../common/env_flags.c:203:2: warning: enumeration value 'env_flags_vartype_macaddr' not handled in switch [-Wswitch]Quoted 6 lines
Unless I guard these values in
env_flags.h:
#ifdefined(CONFIG_CMD_NET)&& !defined(CONFIG_SPL_BUILD)
env_flags_vartype_ipaddr,env_flags_vartype_macaddr,
#endifIt makes sense to me to take out these two for SPL build. The whole purpose of SPL is to load the final image. I don't see a chance users would be able to type any command.
Quoted 5 lines
Quoted 1 line
Joe, do you agree the
CMD_NETshouldn't be used for SPL?I tend to agree, but I have a vague recollection that there is at least one SPL that uses net. Sorry I don't recall what board it was that I'm thinking about.
That's exactly what I was worry about. In this case, can we settle with adding eth_validate_ethaddr_str() without changing the code in env_flag.c? It is a little duplication but seems easy and clean.
York
PATCH v3 11/16 net/eth.c: Add function to validate a MAC address
In reply to Joe HershbergerQuoted 151 lines
-----Original Message-----
From: Joe Hershberger [mailto:joe.hershberger at gmail.com]
Sent: Monday, August 17, 2015 5:38 PM
To: Sun York-R58495
Cc: Ciubotariu Codrin Constantin-B43658; u-boot at lists.denx.de; joe.hershberger at ni.com
Subject: Re: [U-Boot] [PATCH v3 11/16]net/eth.c: Add function to validate a MAC addressQuoted 43 lines · York Sun
Quoted 40 lines · On 08/14/2015 01:28 AM, Ciubotariu Codrin Constantin-B43658 wrote:
Hi York,
Quoted 38 lines
-----Original Message-----
From: Sun York-R58495
Sent: Thursday, August 13, 2015 6:55 PM
To: Ciubotariu Codrin Constantin-B43658
Cc: Joe Hershberger; u-boot at lists.denx.de; joe.hershberger at ni.com
Subject: Re: [U-Boot] [PATCH v3 11/16]net/eth.c: Add function to validate a MAC addressQuoted 27 lines · On 08/13/2015 08:42 AM, Ciubotariu Codrin Constantin-B43658 wrote:
Hi Joe, York,
Quoted 25 lines
-----Original Message-----
From: Sun York-R58495
Sent: Wednesday, August 12, 2015 10:59 PM
To: Ciubotariu Codrin Constantin-B43658
Cc: Joe Hershberger; u-boot at lists.denx.de; joe.hershberger at ni.com
Subject: Re: [U-Boot] [PATCH v3 11/16]net/eth.c: Add function to validate a MAC address+Codrin
Somehow I dropped Codrin in last reply.
Quoted 12 lines · York Sun
Quoted 9 lines · Joe Hershberger
Hi York,
Quoted 6 lines · York Sun
Quoted 3 lines · Joe Hershberger
Too much top-posting.
On Mon, Aug 10, 2015 at 2:41 PM, York Sun <[email protected]>
Quoted 33 lines · wrote:
Quoted 33 lines
Quoted 33 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 4 lines
SPL doesn't use
net/eth.c. You add a call inenv_flags.c.I think you can put it in header file and use static inline, or keep it in the same file where it is called.
That is probably fine.
Quoted 2 lines
Another way is to undef
CONFIG_CMD_NETfor SPL part. It is default to 'y' inKconfig. Joe may have some good suggestion.Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
I don't think this is the reason. The problem is that net is *not* build for SPL, but env is.
Yes, env is built. The offending lines in
common/env_flags.care gated by "#ifdefCONFIG_CMD_NET". That's why I say it could be anotherway.
Quoted 16 lines
Quoted 16 lines
Quoted 8 lines
Quoted 3 lines
OK, sure... but that breaks intended behavior, I think.
I see. The
CONFIG_CMD_NETis not evaluated separated for SPL build. So I guess the fix can be either to put the common function in header file after making it really simple to reduce dependency, or to keep theoriginal code in
env_flag.c.Quoted 1 line
Codrin,
Can you prepare a new patch? You don't have to send the whole set. All but one have been acked by Joe.
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
York
I can't inline
eth_validate_ethaddr_strineth.hsince it depends on
simple_strtouland tolower. Also, I can't let it incommon/env_flags.cbecause I need to access if fromdrivers/net/vsc9953.c. I guess it has to be in a .c file that is also usedby SPL targets. Could you please suggest such a file?
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 3 lines
SPL targets make use of
CONFIG_CMD_NET? It seems strange that ETH env isbuilt, but
net/net.cornet/eth.cnot.Quoted 1 line
I was discussing with Joe about the possibility to deselect
CONFIG_CMD_NETfor SPL build. The issue here isKconfigis not re-evaluated for the SPL part. If you can experiment it, you can try to gate the code inenv_flags.cwithCONFIG_SPL_BUILD. It sounds reasonableto me.
Quoted 25 lines
Quoted 25 lines
Quoted 2 lines
York
Something like
#if defined(CONFIG_CMD_NET) && !defined(CONFIG_SPL_BUILD) case env_flags_vartype_ipaddr: cur = value; for (i = 0; i < 4; i++) { skip_num(0, cur, &end, 3); if (cur == end) return -1; if (i != 3 && *end != '.') return -1; if (i == 3 && *end != '\0') return -1; cur = end + 1; } break; case env_flags_vartype_macaddr: if (eth_validate_ethaddr_str(value)) return -1; break;#endif
Quoted 5 lines
Quoted 5 lines
?
I get two warnings on this:
../common/env_flags.c: In function '_env_flags_validate_type':../common/env_flags.c:203:2: warning: enumeration value'
env_flags_vartype_ipaddr' not handled in switch [-Wswitch]Quoted 12 lines
Quoted 11 lines
switch (type) {
^../common/env_flags.c:203:2: warning: enumeration value 'env_flags_vartype_macaddr' not handled in switch [-Wswitch]Unless I guard these values in
env_flags.h:
#ifdefined(CONFIG_CMD_NET)&& !defined(CONFIG_SPL_BUILD)
env_flags_vartype_ipaddr,env_flags_vartype_macaddr,
#endif
Quoted 8 lines
Quoted 5 lines
It makes sense to me to take out these two for SPL build. The whole purpose of SPL is to load the final image. I don't see a chance users would be able to type any command.
Joe, do you agree the
CMD_NETshouldn't be used for SPL?I tend to agree, but I have a vague recollection that there is at least one SPL that uses net. Sorry I don't recall what board it was that I'm thinking about.
Is there some other place we could add eth_validate_ethaddr_str()? In a file also used by SPL targets?
Best regards,
Codrin
Quoted 2 lines
-Joe
PATCH v3 12/16 drivers/net/vsc9953: Add commands to manipulate the FDB for VSC9953
In reply to Codrin CiubotariuThe new command:
ethsw [port <port_no>] [vlan <vid>] fdb
{ [help] | show | flush | { add | del } <mac> }Can be used to add and delete FDB entries. Also, the command can be used to show entries from the FDB tables. When used with [port <port_no>] and [vlan <vid>], only the matching the FDB entries can be seen or flushed. The command has also been added to the generic ethsw parser from cmd_ethsw.c.
---
Changes for v2:
- removed Change-id field;
Changes for v3:
- replaced values returned by functions called by the parser with CMD_RET_* macros;
- removed "CONFIG_" from macros added in vsc9953.h;
- each variabled is declared on a separate line, with one space instead of tab(s);
- vsc9953_mac_table_poll_idle() returns -EBUSY if the table is not idle;
- the array used to hold the MAC address (mac_addr) has been renamed to ethaddr and is allocated statically instead of dynamically;
- reformulate definition of VSC9953_FDB_HELP macro;
- used the function added by previous patch to check if a string has the format of a MAC address;
common/cmd_ethsw.c | 177 +++++++++++++++++++ drivers/net/vsc9953.c | 473 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/ethsw.h | 15 ++ include/vsc9953.h | 28 +++ 4 files changed, 693 insertions(+)
common/cmd_ethsw.c +177 -0
@@ -34,6 +34,18 @@ static int ethsw_learn_help_key_func(struct ethsw_command_def *parsed_cmd)return CMD_RET_SUCCESS ; } +#define ETHSW_FDB_HELP "ethsw [port <port_no>] [vlan <vid>] fdb " \ +"{ [help] | show | flush | { add | del } <mac> } " \ +"- Add/delete a mac entry in FDB; use show to see FDB entries; " \ +"if vlan <vid> is missing, VID 1 will be used" + +static int ethsw_fdb_help_key_func (struct ethsw_command_def *parsed_cmd) +{ +printf (ETHSW_FDB_HELP "\n" ); + +return CMD_RET_SUCCESS ; +} + static struct keywords_to_function { enum ethsw_keyword_id cmd_keyword[ETHSW_MAX_CMD_PARAMS]; int cmd_func_offset;
@@ -130,6 +142,59 @@ static struct keywords_to_function { .cmd_func_offset = offsetof(struct ethsw_command_func, port_learn), .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_fdb, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_fdb_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_fdb, + ethsw_id_help, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_fdb_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_fdb, + ethsw_id_show, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + fdb_show), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_fdb, + ethsw_id_flush, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + fdb_flush), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_fdb, + ethsw_id_add, + ethsw_id_add_del_mac, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + fdb_entry_add), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_fdb, + ethsw_id_del, + ethsw_id_add_del_mac, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + fdb_entry_del), + .keyword_function = NULL, }, };
@@ -142,6 +207,20 @@ struct keywords_optional { ethsw_id_port_no, ethsw_id_key_end, }, + }, { + .cmd_keyword = { + ethsw_id_vlan, + ethsw_id_vlan_no, + ethsw_id_key_end, + }, + }, { + .cmd_keyword = { + ethsw_id_port, + ethsw_id_port_no, + ethsw_id_vlan, + ethsw_id_vlan_no, + ethsw_id_key_end, + }, }, };
@@ -151,6 +230,12 @@ static int keyword_match_gen(enum ethsw_keyword_id key_id, int argc, charstatic int keyword_match_port (enum ethsw_keyword_id key_id,int argc,char *const argv[],int *argc_nr,struct ethsw_command_def *parsed_cmd); +static int keyword_match_vlan (enum ethsw_keyword_id key_id,int argc, +char *const argv[],int *argc_nr, +struct ethsw_command_def *parsed_cmd); +static int keyword_match_mac_addr (enum ethsw_keyword_id key_id,int argc, +char *const argv[],int *argc_nr, +struct ethsw_command_def *parsed_cmd);/* * Define properties for each keyword;
@@ -188,6 +273,21 @@ struct keyword_def { }, { .keyword_name = "auto", .match = &keyword_match_gen, + }, { + .keyword_name = "vlan", + .match = &keyword_match_vlan, + }, { + .keyword_name = "fdb", + .match = &keyword_match_gen, + }, { + .keyword_name = "add", + .match = &keyword_match_mac_addr, + }, { + .keyword_name = "del", + .match = &keyword_match_mac_addr, + }, { + .keyword_name = "flush", + .match = &keyword_match_gen, }, };
@@ -259,6 +359,78 @@ static int keyword_match_port(enum ethsw_keyword_id key_id, int argc,return 0 ; } +/* Function used to match the command's vlan */ +static int keyword_match_vlan (enum ethsw_keyword_id key_id,int argc, +char *const argv[],int *argc_nr, +struct ethsw_command_def *parsed_cmd) +{ +unsigned long val; +int aux; + +if (!keyword_match_gen (key_id, argc, argv, argc_nr, parsed_cmd)) +return 0 ; + +if (*argc_nr +1 >= argc) +return 0 ; + +if (strict_strtoul (argv[*argc_nr +1 ],10 , &val) != -EINVAL ) { + parsed_cmd->vid = val; + (*argc_nr)++; + parsed_cmd->cmd_to_keywords[*argc_nr] = ethsw_id_vlan_no; +return 1 ; + } + + aux = *argc_nr +1 ; + +if (keyword_match_gen (ethsw_id_add, argc, argv, &aux, parsed_cmd)) + parsed_cmd->cmd_to_keywords[*argc_nr +1 ] = ethsw_id_add; +else if (keyword_match_gen (ethsw_id_del, argc, argv, &aux, parsed_cmd)) + parsed_cmd->cmd_to_keywords[*argc_nr +1 ] = ethsw_id_del; +else +return 0 ; + +if (*argc_nr +2 >= argc) +return 0 ; + +if (strict_strtoul (argv[*argc_nr +2 ],10 , &val) != -EINVAL ) { + parsed_cmd->vid = val; + (*argc_nr) +=2 ; + parsed_cmd->cmd_to_keywords[*argc_nr] = ethsw_id_add_del_no; +return 1 ; + } + +return 0 ; +} + +/* Function used to match the command's MAC address */ +static int keyword_match_mac_addr (enum ethsw_keyword_id key_id,int argc, +char *const argv[],int *argc_nr, +struct ethsw_command_def *parsed_cmd) +{ +if (!keyword_match_gen (key_id, argc, argv, argc_nr, parsed_cmd)) +return 0 ; + +if ((*argc_nr +1 >= argc) || + !is_broadcast_ethaddr (parsed_cmd->ethaddr)) +return 1 ; + +if (eth_validate_ethaddr_str (argv[*argc_nr +1 ])) { +printf ("Invalid MAC address: %s\n" , argv[*argc_nr +1 ]); +return 0 ; + } + +eth_parse_enetaddr (argv[*argc_nr +1 ], parsed_cmd->ethaddr); + +if (is_broadcast_ethaddr (parsed_cmd->ethaddr)) { +memset (parsed_cmd->ethaddr,0xFF ,sizeof (parsed_cmd->ethaddr)); +return 0 ; + } + + parsed_cmd->cmd_to_keywords[*argc_nr +1 ] = ethsw_id_add_del_mac; + +return 1 ; +} +/* Finds optional keywords and modifies *argc_va to skip them */ static void cmd_keywords_opt_check (const struct ethsw_command_def *parsed_cmd,int *argc_val)
@@ -415,7 +587,11 @@ static void command_def_init(struct ethsw_command_def *parsed_cmd) parsed_cmd->cmd_to_keywords[i] = ethsw_id_key_end; parsed_cmd->port =ETHSW_CMD_PORT_ALL ; + parsed_cmd->vid =ETHSW_CMD_VLAN_ALL ; parsed_cmd->cmd_function =NULL ; + +/* We initialize the MAC address with the Broadcast address */ +memset (parsed_cmd->ethaddr,0xff ,sizeof (parsed_cmd->ethaddr)); }/* function to interpret commands starting with "ethsw " */
@@ -445,4 +621,5 @@ U_BOOT_CMD(ethsw, ETHSW_MAX_CMD_PARAMS, 0, do_ethsw,ETHSW_PORT_CONF_HELP "\n" ETHSW_PORT_STATS_HELP "\n" ETHSW_LEARN_HELP "\n" +ETHSW_FDB_HELP "\n" );
drivers/net/vsc9953.c +473 -0
497 lines not on this page · raw message
include/ethsw.h +15 -0
@@ -11,6 +11,7 @@#define ETHSW_MAX_CMD_PARAMS 20#define ETHSW_CMD_PORT_ALL -1 +#define ETHSW_CMD_VLAN_ALL -1/* IDs used to track keywords in a command */ enum ethsw_keyword_id {
@@ -24,11 +25,19 @@ enum ethsw_keyword_id { ethsw_id_clear, ethsw_id_learning, ethsw_id_auto, + ethsw_id_vlan, + ethsw_id_fdb, + ethsw_id_add, + ethsw_id_del, + ethsw_id_flush, ethsw_id_count, /* keep last */ };enum ethsw_keyword_opt_id { ethsw_id_port_no = ethsw_id_count +1 , + ethsw_id_vlan_no, + ethsw_id_add_del_no, + ethsw_id_add_del_mac, ethsw_id_count_all,/* keep last */ };
@@ -36,6 +45,8 @@ struct ethsw_command_def {int cmd_to_keywords[ETHSW_MAX_CMD_PARAMS ];int cmd_keywords_nr;int port; +int vid; +uchar ethaddr[6 ];int (*cmd_function)(struct ethsw_command_def *parsed_cmd); };
@@ -49,6 +60,10 @@ struct ethsw_command_func {int (*port_stats_clear)(struct ethsw_command_def *parsed_cmd);int (*port_learn)(struct ethsw_command_def *parsed_cmd);int (*port_learn_show)(struct ethsw_command_def *parsed_cmd); +int (*fdb_show)(struct ethsw_command_def *parsed_cmd); +int (*fdb_flush)(struct ethsw_command_def *parsed_cmd); +int (*fdb_entry_add)(struct ethsw_command_def *parsed_cmd); +int (*fdb_entry_del)(struct ethsw_command_def *parsed_cmd); };int ethsw_define_functions (const struct ethsw_command_func *cmd_func);
include/vsc9953.h +28 -0
@@ -86,6 +86,25 @@#define VSC9953_VCAP_MV_CFG 0x0000ffff#define VSC9953_VCAP_UPDATE_CTRL 0x01000004 +/* Macros for register vsc9953_ana_ana_tables.mac_access register */ +#define VSC9953_MAC_CMD_IDLE 0x00000000 +#define VSC9953_MAC_CMD_LEARN 0x00000001 +#define VSC9953_MAC_CMD_FORGET 0x00000002 +#define VSC9953_MAC_CMD_AGE 0x00000003 +#define VSC9953_MAC_CMD_NEXT 0x00000004 +#define VSC9953_MAC_CMD_READ 0x00000006 +#define VSC9953_MAC_CMD_WRITE 0x00000007 +#define VSC9953_MAC_CMD_MASK 0x00000007 +#define VSC9953_MAC_CMD_VALID 0x00000800 +#define VSC9953_MAC_ENTRYTYPE_NORMAL 0x00000000 +#define VSC9953_MAC_ENTRYTYPE_LOCKED 0x00000200 +#define VSC9953_MAC_ENTRYTYPE_IPV4MCAST 0x00000400 +#define VSC9953_MAC_ENTRYTYPE_IPV6MCAST 0x00000600 +#define VSC9953_MAC_ENTRYTYPE_MASK 0x00000600 +#define VSC9953_MAC_DESTIDX_MASK 0x000001f8 +#define VSC9953_MAC_VID_MASK 0x1fff0000 +#define VSC9953_MAC_MACH_MASK 0x0000ffff +/* Macros for vsc9953_ana_port.vlan_cfg register */ #define VSC9953_VLAN_CFG_AWARE_ENA 0x00100000#define VSC9953_VLAN_CFG_POP_CNT_MASK 0x000c0000
@@ -124,6 +143,15 @@#define VSC9953_TAG_CFG_ALL_BUT_ZERO 0x00000100#define VSC9953_TAG_CFG_ALL 0x00000180 +/* Macros for vsc9953_ana_ana.anag_efil register */ +#define VSC9953_AGE_PORT_EN 0x00080000 +#define VSC9953_AGE_PORT_MASK 0x0007c000 +#define VSC9953_AGE_VID_EN 0x00002000 +#define VSC9953_AGE_VID_MASK 0x00001fff + +/* Macros for vsc9953_ana_ana_tables.mach_data register */ +#define VSC9953_MACHDATA_VID_MASK 0x1fff0000 +#define VSC9953_MAX_PORTS 10#define VSC9953_PORT_CHECK (port) \ (((port) < 0 || (port) >= VSC9953_MAX_PORTS) ? 0 : 1)
Signature · 1 line
1.9.3
PATCH v3 12/16 drivers/net/vsc9953: Add commands to manipulate the FDB for VSC9953
Hi Codrin,
Quoted 28 lines · Codrin Ciubotariu
The new command:
ethsw [port <port_no>] [vlan <vid>] fdb{ [help] | show | flush | { add | del } <mac> }Can be used to add and delete FDB entries. Also, the command can be used to show entries from the FDB tables. When used with [port <
port_no>] and [vlan <vid>], only the matching the FDB entries can be seen or flushed. The command has also been added to the generic ethsw parser fromcmd_ethsw.c.Signed-off-by Johnson Leung <[email protected]>Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v2:
- removed Change-id field;Changes for v3:
- replaced values returned by functions called by the parser with CMD_RET_* macros;
- removed "CONFIG_" from macros added invsc9953.h;
- each variabled is declared on a separate line, with one space instead of tab(s);
-vsc9953_mac_table_poll_idle()returns-EBUSYif the table is not idle;
- the array used to hold the MAC address (mac_addr) has been renamed to ethaddr and is allocated statically instead of dynamically;
- reformulate definition ofVSC9953_FDB_HELPmacro;
- used the function added by previous patch to check if a string has the format of a MAC address;
Quoted 5 lines
common/cmd_ethsw.c | 177 +++++++++++++++++++ drivers/net/vsc9953.c | 473 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/ethsw.h | 15 ++ include/vsc9953.h | 28 +++ 4 files changed, 693 insertions(+)
PATCH v3 13/16 drivers/net/vsc9953: Add VLAN commands for VSC9953
In reply to Codrin CiubotariuThe new added commands can be used to configure VLANs for a port on both ingress and egress.
The new commands are:
ethsw [port <port_no>] pvid { [help] | show | <pvid> }
- set/show PVID (ingress and egress VLAN tagging) for a port;
ethsw [port <port_no>] vlan { [help] | show | add <vid> | del <vid> }
- add a VLAN to a port (VLAN members);
ethsw [port <port_no>] untagged { [help] | show | all | none | pvid }
- set egress tagging mod for a port"
ethsw [port <port_no>] egress tag { [help] | show | pvid | classified }
- Configure VID source for egress tag. Tag's VID could be the frame's classified VID or the PVID of the port
These commands have also been added to the ethsw generic parser from common/cmd_ethsw.c
---
Changes for v2:
- removed Change-id field;
Changes for v3:
- replaced values returned by functions called by the parser with CMD_RET_* macros;
- removed "CONFIG_" from macros added in vsc9953.h;
- each variabled is declared on a separate line, with one space instead of tab(s);
- removed unecessary brackets;
- typo fix in comment: "Shiw";
common/cmd_ethsw.c | 270 ++++++++++++++++++++++++++++ drivers/net/vsc9953.c | 478 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/ethsw.h | 16 ++ include/vsc9953.h | 3 + 4 files changed, 767 insertions(+)
common/cmd_ethsw.c +270 -0
@@ -46,6 +46,51 @@ static int ethsw_fdb_help_key_func(struct ethsw_command_def *parsed_cmd)return CMD_RET_SUCCESS ; } +#define ETHSW_PVID_HELP "ethsw [port <port_no>] " \ +"pvid { [help] | show | <pvid> } " \ +"- set/show PVID (ingress and egress VLAN tagging) for a port" + +static int ethsw_pvid_help_key_func (struct ethsw_command_def *parsed_cmd) +{ +printf (ETHSW_PVID_HELP "\n" ); + +return CMD_RET_SUCCESS ; +} + +#define ETHSW_VLAN_HELP "ethsw [port <port_no>] vlan " \ +"{ [help] | show | add <vid> | del <vid> } " \ +"- add a VLAN to a port (VLAN members)" + +static int ethsw_vlan_help_key_func (struct ethsw_command_def *parsed_cmd) +{ +printf (ETHSW_VLAN_HELP "\n" ); + +return CMD_RET_SUCCESS ; +} + +#define ETHSW_PORT_UNTAG_HELP "ethsw [port <port_no>] untagged " \ +"{ [help] | show | all | none | pvid } " \ +" - set egress tagging mod for a port" + +static int ethsw_port_untag_help_key_func (struct ethsw_command_def *parsed_cmd) +{ +printf (ETHSW_PORT_UNTAG_HELP "\n" ); + +return CMD_RET_SUCCESS ; +} + +#define ETHSW_EGR_VLAN_TAG_HELP "ethsw [port <port_no>] egress tag " \ +"{ [help] | show | pvid | classified } " \ +"- Configure VID source for egress tag. " \ +"Tag's VID could be the frame's classified VID or the PVID of the port" + +static int ethsw_egr_tag_help_key_func (struct ethsw_command_def *parsed_cmd) +{ +printf (ETHSW_EGR_VLAN_TAG_HELP "\n" ); + +return CMD_RET_SUCCESS ; +} + static struct keywords_to_function { enum ethsw_keyword_id cmd_keyword[ETHSW_MAX_CMD_PARAMS]; int cmd_func_offset;
@@ -195,6 +240,181 @@ static struct keywords_to_function { .cmd_func_offset = offsetof(struct ethsw_command_func, fdb_entry_del), .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_pvid, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_pvid_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_pvid, + ethsw_id_help, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_pvid_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_pvid, + ethsw_id_show, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + pvid_show), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_pvid, + ethsw_id_pvid_no, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + pvid_set), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_vlan, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_vlan_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_vlan, + ethsw_id_help, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_vlan_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_vlan, + ethsw_id_show, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + vlan_show), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_vlan, + ethsw_id_add, + ethsw_id_add_del_no, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + vlan_set), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_vlan, + ethsw_id_del, + ethsw_id_add_del_no, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + vlan_set), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_untagged, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_port_untag_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_untagged, + ethsw_id_help, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_port_untag_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_untagged, + ethsw_id_show, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + port_untag_show), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_untagged, + ethsw_id_all, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + port_untag_set), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_untagged, + ethsw_id_none, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + port_untag_set), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_untagged, + ethsw_id_pvid, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + port_untag_set), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_egress, + ethsw_id_tag, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_egr_tag_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_egress, + ethsw_id_tag, + ethsw_id_help, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_egr_tag_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_egress, + ethsw_id_tag, + ethsw_id_show, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + port_egr_vlan_show), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_egress, + ethsw_id_tag, + ethsw_id_pvid, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + port_egr_vlan_set), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_egress, + ethsw_id_tag, + ethsw_id_classified, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + port_egr_vlan_set), + .keyword_function = NULL, }, };
@@ -233,6 +453,9 @@ static int keyword_match_port(enum ethsw_keyword_id key_id, int argc,static int keyword_match_vlan (enum ethsw_keyword_id key_id,int argc,char *const argv[],int *argc_nr,struct ethsw_command_def *parsed_cmd); +static int keyword_match_pvid (enum ethsw_keyword_id key_id,int argc, +char *const argv[],int *argc_nr, +struct ethsw_command_def *parsed_cmd);static int keyword_match_mac_addr (enum ethsw_keyword_id key_id,int argc,char *const argv[],int *argc_nr,struct ethsw_command_def *parsed_cmd);
@@ -288,6 +511,27 @@ struct keyword_def { }, { .keyword_name = "flush", .match = &keyword_match_gen, + }, { + .keyword_name = "pvid", + .match = &keyword_match_pvid, + }, { + .keyword_name = "untagged", + .match = &keyword_match_gen, + }, { + .keyword_name = "all", + .match = &keyword_match_gen, + }, { + .keyword_name = "none", + .match = &keyword_match_gen, + }, { + .keyword_name = "egress", + .match = &keyword_match_gen, + }, { + .keyword_name = "tag", + .match = &keyword_match_gen, + }, { + .keyword_name = "classified", + .match = &keyword_match_gen, }, };
@@ -402,6 +646,28 @@ static int keyword_match_vlan(enum ethsw_keyword_id key_id, int argc,return 0 ; } +/* Function used to match the command's pvid */ +static int keyword_match_pvid (enum ethsw_keyword_id key_id,int argc, +char *const argv[],int *argc_nr, +struct ethsw_command_def *parsed_cmd) +{ +unsigned long val; + +if (!keyword_match_gen (key_id, argc, argv, argc_nr, parsed_cmd)) +return 0 ; + +if (*argc_nr +1 >= argc) +return 1 ; + +if (strict_strtoul (argv[*argc_nr +1 ],10 , &val) != -EINVAL ) { + parsed_cmd->vid = val; + (*argc_nr)++; + parsed_cmd->cmd_to_keywords[*argc_nr] = ethsw_id_pvid_no; + } + +return 1 ; +} +/* Function used to match the command's MAC address */ static int keyword_match_mac_addr(enum ethsw_keyword_id key_id, int argc, char *const argv[], int *argc_nr,
@@ -622,4 +888,8 @@ U_BOOT_CMD(ethsw, ETHSW_MAX_CMD_PARAMS, 0, do_ethsw,ETHSW_PORT_STATS_HELP "\n" ETHSW_LEARN_HELP "\n" ETHSW_FDB_HELP "\n" +ETHSW_PVID_HELP "\n" +ETHSW_VLAN_HELP "\n" +ETHSW_PORT_UNTAG_HELP "\n" +ETHSW_EGR_VLAN_TAG_HELP "\n" );
drivers/net/vsc9953.c +478 -0
514 lines not on this page · raw message
include/ethsw.h +16 -0
@@ -30,12 +30,20 @@ enum ethsw_keyword_id { ethsw_id_add, ethsw_id_del, ethsw_id_flush, + ethsw_id_pvid, + ethsw_id_untagged, + ethsw_id_all, + ethsw_id_none, + ethsw_id_egress, + ethsw_id_tag, + ethsw_id_classified, ethsw_id_count, /* keep last */ };enum ethsw_keyword_opt_id { ethsw_id_port_no = ethsw_id_count +1 , ethsw_id_vlan_no, + ethsw_id_pvid_no, ethsw_id_add_del_no, ethsw_id_add_del_mac, ethsw_id_count_all, /* keep last */
@@ -64,6 +72,14 @@ struct ethsw_command_func {int (*fdb_flush)(struct ethsw_command_def *parsed_cmd);int (*fdb_entry_add)(struct ethsw_command_def *parsed_cmd);int (*fdb_entry_del)(struct ethsw_command_def *parsed_cmd); +int (*pvid_show)(struct ethsw_command_def *parsed_cmd); +int (*pvid_set)(struct ethsw_command_def *parsed_cmd); +int (*vlan_show)(struct ethsw_command_def *parsed_cmd); +int (*vlan_set)(struct ethsw_command_def *parsed_cmd); +int (*port_untag_show)(struct ethsw_command_def *parsed_cmd); +int (*port_untag_set)(struct ethsw_command_def *parsed_cmd); +int (*port_egr_vlan_show)(struct ethsw_command_def *parsed_cmd); +int (*port_egr_vlan_set)(struct ethsw_command_def *parsed_cmd); };int ethsw_define_functions (const struct ethsw_command_func *cmd_func);
include/vsc9953.h +3 -0
@@ -108,6 +108,8 @@/* Macros for vsc9953_ana_port.vlan_cfg register */ #define VSC9953_VLAN_CFG_AWARE_ENA 0x00100000#define VSC9953_VLAN_CFG_POP_CNT_MASK 0x000c0000 +#define VSC9953_VLAN_CFG_POP_CNT_NONE 0x00000000 +#define VSC9953_VLAN_CFG_POP_CNT_ONE 0x00040000#define VSC9953_VLAN_CFG_VID_MASK 0x00000fff/* Macros for vsc9953_rew_port.port_vlan_cfg register */
@@ -142,6 +144,7 @@#define VSC9953_TAG_CFG_ALL_BUT_PVID_ZERO 0x00000080#define VSC9953_TAG_CFG_ALL_BUT_ZERO 0x00000100#define VSC9953_TAG_CFG_ALL 0x00000180 +#define VSC9953_TAG_VID_PVID 0x00000010/* Macros for vsc9953_ana_ana.anag_efil register */ #define VSC9953_AGE_PORT_EN 0x00080000
Signature · 1 line
1.9.3
PATCH v3 13/16 drivers/net/vsc9953: Add VLAN commands for VSC9953
Hi Codrin,
Quoted 30 lines · Codrin Ciubotariu
The new added commands can be used to configure VLANs for a port on both ingress and egress.
The new commands are:
ethsw [port <port_no>] pvid { [help] | show | <pvid> }
- set/show PVID (ingress and egress VLAN tagging) for a port;
ethsw [port <port_no>] vlan { [help] | show | add <vid> | del <vid> }
- add a VLAN to a port (VLAN members);
ethsw [port <port_no>] untagged { [help] | show | all | none | pvid }
- set egress tagging mod for a port"
ethsw [port <port_no>] egress tag { [help] | show | pvid | classified }
- Configure VID source for egress tag. Tag's VID could be the frame's classified VID or the PVID of the port
These commands have also been added to the ethsw generic parser fromcommon/cmd_ethsw.cSigned-off-by Johnson Leung <[email protected]>Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v2:
- removed Change-id field;Changes for v3:
- replaced values returned by functions called by the parser with CMD_RET_* macros;
- removed "CONFIG_" from macros added invsc9953.h;
- each variabled is declared on a separate line, with one space instead of tab(s);
- removed unecessary brackets;
- typo fix in comment: "Shiw";
Quoted 5 lines
common/cmd_ethsw.c | 270 ++++++++++++++++++++++++++++ drivers/net/vsc9953.c | 478 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/ethsw.h | 16 ++ include/vsc9953.h | 3 + 4 files changed, 767 insertions(+)
PATCH v3 14/16 drivers/net/vsc9953: Add command for shared/private VLAN learning
In reply to Codrin CiubotariuThe command:
ethsw vlan fdb { [help] | show | shared | private }
- make VLAN learning shared or private"
configures the FDB to share the FDB entries learned on multiple VLANs or to keep them separated. By default, the FBD uses private VLAN learning. This command has also been added to the ethsw generic parser from common/cmd_ethsw.c
---
Changes for v2:
- removed Change-id field;
Changes for v3:
- replaced values returned by functions called by the parser with CMD_RET_* macros;
- removed "CONFIG_" from macros added in vsc9953.h;
- each variabled is declared on a separate line, with one space instead of tab(s);
common/cmd_ethsw.c | 65 +++++++++++++++++++++++++++++++++++ drivers/net/vsc9953.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/ethsw.h | 4 +++ include/vsc9953.h | 3 ++ 4 files changed, 167 insertions(+)
common/cmd_ethsw.c +65 -0
@@ -91,6 +91,17 @@ static int ethsw_egr_tag_help_key_func(struct ethsw_command_def *parsed_cmd)return CMD_RET_SUCCESS ; } +#define ETHSW_VLAN_FDB_HELP "ethsw vlan fdb " \ +"{ [help] | show | shared | private } " \ +"- make VLAN learning shared or private" + +static int ethsw_vlan_learn_help_key_func (struct ethsw_command_def *parsed_cmd) +{ +printf (ETHSW_VLAN_FDB_HELP "\n" ); + +return CMD_RET_SUCCESS ; +} + static struct keywords_to_function { enum ethsw_keyword_id cmd_keyword[ETHSW_MAX_CMD_PARAMS]; int cmd_func_offset;
@@ -415,6 +426,53 @@ static struct keywords_to_function { .cmd_func_offset = offsetof(struct ethsw_command_func, port_egr_vlan_set), .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_vlan, + ethsw_id_fdb, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_vlan_learn_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_vlan, + ethsw_id_fdb, + ethsw_id_help, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_vlan_learn_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_vlan, + ethsw_id_fdb, + ethsw_id_show, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + vlan_learn_show), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_vlan, + ethsw_id_fdb, + ethsw_id_shared, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + vlan_learn_set), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_vlan, + ethsw_id_fdb, + ethsw_id_private, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + vlan_learn_set), + .keyword_function = NULL, }, };
@@ -532,6 +590,12 @@ struct keyword_def { }, { .keyword_name = "classified", .match = &keyword_match_gen, + }, { + .keyword_name = "shared", + .match = &keyword_match_gen, + }, { + .keyword_name = "private", + .match = &keyword_match_gen, }, };
@@ -892,4 +956,5 @@ U_BOOT_CMD(ethsw, ETHSW_MAX_CMD_PARAMS, 0, do_ethsw,ETHSW_VLAN_HELP "\n" ETHSW_PORT_UNTAG_HELP "\n" ETHSW_EGR_VLAN_TAG_HELP "\n" +ETHSW_VLAN_FDB_HELP "\n" );
drivers/net/vsc9953.c +95 -0
113 lines not on this page · raw message
include/ethsw.h +4 -0
@@ -37,6 +37,8 @@ enum ethsw_keyword_id { ethsw_id_egress, ethsw_id_tag, ethsw_id_classified, + ethsw_id_shared, + ethsw_id_private, ethsw_id_count, /* keep last */ };
@@ -80,6 +82,8 @@ struct ethsw_command_func {int (*port_untag_set)(struct ethsw_command_def *parsed_cmd);int (*port_egr_vlan_show)(struct ethsw_command_def *parsed_cmd);int (*port_egr_vlan_set)(struct ethsw_command_def *parsed_cmd); +int (*vlan_learn_show)(struct ethsw_command_def *parsed_cmd); +int (*vlan_learn_set)(struct ethsw_command_def *parsed_cmd); };int ethsw_define_functions (const struct ethsw_command_func *cmd_func);
include/vsc9953.h +3 -0
@@ -135,6 +135,9 @@/* Macros for vsc9953_qsys_sys.switch_port_mode register */ #define VSC9953_PORT_ENA 0x00002000 +/* Macros for vsc9953_ana_ana.agen_ctrl register */ +#define VSC9953_FID_MASK_ALL 0x00fff000 +/* Macros for vsc9953_ana_ana.adv_learn register */ #define VSC9953_VLAN_CHK 0x00000400
Signature · 1 line
1.9.3
PATCH v3 14/16 drivers/net/vsc9953: Add command for shared/private VLAN learning
Hi Codrin,
Quoted 21 lines · Codrin Ciubotariu
The command:
ethsw vlan fdb { [help] | show | shared | private }
- make VLAN learning shared or private"configures the FDB to share the FDB entries learned on multiple VLANs or to keep them separated. By default, the FBD uses private VLAN learning. This command has also been added to the ethsw generic parser from
common/cmd_ethsw.cSigned-off-by Johnson Leung <[email protected]>Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v2:
- removed Change-id field;Changes for v3:
- replaced values returned by functions called by the parser with CMD_RET_* macros;
- removed "CONFIG_" from macros added invsc9953.h;
- each variabled is declared on a separate line, with one space instead of tab(s);
Quoted 5 lines
common/cmd_ethsw.c | 65 +++++++++++++++++++++++++++++++++++ drivers/net/vsc9953.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/ethsw.h | 4 +++ include/vsc9953.h | 3 ++ 4 files changed, 167 insertions(+)
PATCH v3 15/16 drivers/net/vsc9953: Add commands for VLAN ingress filtering
In reply to Codrin CiubotariuThe command:
ethsw [port <port_no>] ingress filtering
{ [help] | show | enable | disable }- enable/disable VLAN ingress filtering on port
can be used to enable/disable/show VLAN ingress filtering on a port. This command has also been added to the ethsw generic parser from common/cmd_ethsw.c
---
Changes for v2:
- removed Change-id field;
Changes for v3:
- replaced values returned by functions called by the parser with CMD_RET_* macros;
- each variabled is declared on a separate line, with one space instead of tab(s);
- vsc9953_port_ingress_filtering_get() returns "enabled" value;
common/cmd_ethsw.c | 65 ++++++++++++++++++++++++++++++++++++++ drivers/net/vsc9953.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/ethsw.h | 4 +++ 3 files changed, 155 insertions(+)
common/cmd_ethsw.c +65 -0
@@ -102,6 +102,17 @@ static int ethsw_vlan_learn_help_key_func(struct ethsw_command_def *parsed_cmd)return CMD_RET_SUCCESS ; } +#define ETHSW_PORT_INGR_FLTR_HELP "ethsw [port <port_no>] ingress filtering" \ +" { [help] | show | enable | disable } " \ +"- enable/disable VLAN ingress filtering on port" + +static int ethsw_ingr_fltr_help_key_func (struct ethsw_command_def *parsed_cmd) +{ +printf (ETHSW_PORT_INGR_FLTR_HELP "\n" ); + +return CMD_RET_SUCCESS ; +} + static struct keywords_to_function { enum ethsw_keyword_id cmd_keyword[ETHSW_MAX_CMD_PARAMS]; int cmd_func_offset;
@@ -473,6 +484,53 @@ static struct keywords_to_function { .cmd_func_offset = offsetof(struct ethsw_command_func, vlan_learn_set), .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_ingress, + ethsw_id_filtering, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_ingr_fltr_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_ingress, + ethsw_id_filtering, + ethsw_id_help, + ethsw_id_key_end, + }, + .cmd_func_offset = -1, + .keyword_function = ðsw_ingr_fltr_help_key_func, + }, { + .cmd_keyword = { + ethsw_id_ingress, + ethsw_id_filtering, + ethsw_id_show, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + port_ingr_filt_show), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_ingress, + ethsw_id_filtering, + ethsw_id_enable, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + port_ingr_filt_set), + .keyword_function = NULL, + }, { + .cmd_keyword = { + ethsw_id_ingress, + ethsw_id_filtering, + ethsw_id_disable, + ethsw_id_key_end, + }, + .cmd_func_offset = offsetof(struct ethsw_command_func, + port_ingr_filt_set), + .keyword_function = NULL, }, };
@@ -596,6 +654,12 @@ struct keyword_def { }, { .keyword_name = "private", .match = &keyword_match_gen, + }, { + .keyword_name = "ingress", + .match = &keyword_match_gen, + }, { + .keyword_name = "filtering", + .match = &keyword_match_gen, }, };
@@ -957,4 +1021,5 @@ U_BOOT_CMD(ethsw, ETHSW_MAX_CMD_PARAMS, 0, do_ethsw,ETHSW_PORT_UNTAG_HELP "\n" ETHSW_EGR_VLAN_TAG_HELP "\n" ETHSW_VLAN_FDB_HELP "\n" +ETHSW_PORT_INGR_FLTR_HELP "\n" );
drivers/net/vsc9953.c +86 -0
104 lines not on this page · raw message
include/ethsw.h +4 -0
@@ -39,6 +39,8 @@ enum ethsw_keyword_id { ethsw_id_classified, ethsw_id_shared, ethsw_id_private, + ethsw_id_ingress, + ethsw_id_filtering, ethsw_id_count, /* keep last */ };
@@ -84,6 +86,8 @@ struct ethsw_command_func {int (*port_egr_vlan_set)(struct ethsw_command_def *parsed_cmd);int (*vlan_learn_show)(struct ethsw_command_def *parsed_cmd);int (*vlan_learn_set)(struct ethsw_command_def *parsed_cmd); +int (*port_ingr_filt_show)(struct ethsw_command_def *parsed_cmd); +int (*port_ingr_filt_set)(struct ethsw_command_def *parsed_cmd); };int ethsw_define_functions (const struct ethsw_command_func *cmd_func);
Signature · 1 line
1.9.3
PATCH v3 15/16 drivers/net/vsc9953: Add commands for VLAN ingress filtering
Hi Codrin,
Quoted 21 lines · Codrin Ciubotariu
The command:
ethsw [port <port_no>] ingress filtering{ [help] | show | enable | disable }- enable/disable VLAN ingress filtering on port
can be used to enable/disable/show VLAN ingress filtering on a port. This command has also been added to the ethsw generic parser from
common/cmd_ethsw.cSigned-off-by Johnson Leung <[email protected]>Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v2:
- removed Change-id field;Changes for v3:
- replaced values returned by functions called by the parser with CMD_RET_* macros;
- each variabled is declared on a separate line, with one space instead of tab(s);
-vsc9953_port_ingress_filtering_get()returns "enabled" value;
Quoted 4 lines
common/cmd_ethsw.c | 65 ++++++++++++++++++++++++++++++++++++++ drivers/net/vsc9953.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/ethsw.h | 4 +++ 3 files changed, 155 insertions(+)
PATCH v3 16/16 drivers/net/vsc9953: Add GPL-2.0+ SPDX-License-Identifier
In reply to Codrin Ciubotariu---
Changes for v2:
- removed Change-id field;
Changes for v3:
- this patch also includes the Copyright year updates for the modified values;
drivers/net/vsc9953.c | 2 +- include/vsc9953.h | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-)
drivers/net/vsc9953.c +1 -1
@@ -1,5 +1,5 @@/* -* Copyright 2014 Freescale Semiconductor, Inc. +* Copyright 2014 - 2015 Freescale Semiconductor, Inc. * * SPDX-License-Identifier: GPL-2.0+ *
include/vsc9953.h +3 -8
@@ -1,14 +1,9 @@/* -* vsc9953.h +* Copyright 2013, 2015 Freescale Semiconductor, Inc. * -* Driver for the Vitesse VSC9953 L2 Switch -* -* This software may be used and distributed according to the -* terms of the GNU Public License, Version 2, incorporated -* herein by reference. -* -* Copyright 2013 Freescale Semiconductor, Inc. +* SPDX-License-Identifier: GPL-2.0+ * +* Driver for the Vitesse VSC9953 L2 Switch */ #ifndef _VSC9953_H_
Signature · 1 line
1.9.3
PATCH v3 16/16 drivers/net/vsc9953: Add GPL-2.0+ SPDX-License-Identifier
Hi Codrin,
Quoted 6 lines · Codrin Ciubotariu
Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes for v2:
- removed Change-id field;
Quoted 6 lines
Changes for v3:
- this patch also includes the Copyright year updates for the modified values;drivers/net/vsc9953.c | 2 +- include/vsc9953.h | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-)
PATCH v3 4/16 drivers/net/vsc9953: Fix missing reserved register
In reply to Codrin CiubotariuHi Codrin,
Quoted 7 lines · Codrin Ciubotariu
The VSC9953 DS reserves a register between
vlan_maskandanag_efilregisters.Signed-off-by Johnson Leung <[email protected]>Signed-off-by Codrin Ciubotariu <[email protected]>---
Quoted 8 lines
Changes for v2:
- removed Change-id field;Changes for v3:
- added signature;include/vsc9953.h | 1 + 1 file changed, 1 insertion(+)