smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers/net/vsc9953: Add commands to manipulate the FDB for VSC9953

Browse Source 
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
from cmd_ethsw.c.

Signed-off-by: Johnson Leung <johnson.leung@freescale.com>
Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@freescale.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: York Sun <yorksun@freescale.com>
This commit is contained in:
Codrin Ciubotariu
2015-09-09 18:00:52 +03:00
committed by York Sun
parent 0118e83ba4
commit 22449858f8
4 changed files with 693 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

178
common/cmd_ethsw.c
View File

@@ -9,6 +9,7 @@
#include <common.h>
#include <command.h>
#include <errno.h>
#include <env_flags.h>
#include <ethsw.h>
static const char *ethsw_name;
@@ -34,6 +35,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 +143,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 = &ethsw_fdb_help_key_func,
}, {
.cmd_keyword = {
ethsw_id_fdb,
ethsw_id_help,
ethsw_id_key_end,
},
.cmd_func_offset = -1,
.keyword_function = &ethsw_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 +208,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 +231,12 @@ static int keyword_match_gen(enum ethsw_keyword_id key_id, int argc, char
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);
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 +274,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 +360,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)
@@ -416,7 +589,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 " */
@@ -446,4 +623,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"
);