From patchwork Tue Jun 23 16:48:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Codrin Ciubotariu X-Patchwork-Id: 487727 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 6A80A1401AD for ; Wed, 24 Jun 2015 02:50:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D681F4B632; Tue, 23 Jun 2015 18:49:43 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j6c4mzSvw_eb; Tue, 23 Jun 2015 18:49:43 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0C82D4B67B; Tue, 23 Jun 2015 18:49:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 562CB4B639 for ; Tue, 23 Jun 2015 18:49:21 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wKgnWNDc2X94 for ; Tue, 23 Jun 2015 18:49:21 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bbn0104.outbound.protection.outlook.com [157.56.111.104]) by theia.denx.de (Postfix) with ESMTPS id 05F7E4B617 for ; Tue, 23 Jun 2015 18:49:09 +0200 (CEST) Received: from CO2PR03CA0027.namprd03.prod.outlook.com (10.141.194.154) by BN3PR0301MB1202.namprd03.prod.outlook.com (10.161.207.155) with Microsoft SMTP Server (TLS) id 15.1.195.15; Tue, 23 Jun 2015 16:49:06 +0000 Received: from BY2FFO11FD016.protection.gbl (2a01:111:f400:7c0c::161) by CO2PR03CA0027.outlook.office365.com (2a01:111:e400:1414::26) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Tue, 23 Jun 2015 16:49:06 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD016.mail.protection.outlook.com (10.1.14.148) with Microsoft SMTP Server (TLS) id 15.1.201.10 via Frontend Transport; Tue, 23 Jun 2015 16:49:05 +0000 Received: from fsr-fed2064-105.ea.freescale.net (fsr-fed2064-105.ea.freescale.net [10.171.73.172]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t5NGmum3027924; Tue, 23 Jun 2015 09:49:03 -0700 From: Codrin Ciubotariu To: Date: Tue, 23 Jun 2015 19:48:49 +0300 Message-ID: <1435078136-22809-5-git-send-email-codrin.ciubotariu@freescale.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1435078136-22809-1-git-send-email-codrin.ciubotariu@freescale.com> References: <1435078136-22809-1-git-send-email-codrin.ciubotariu@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD016; 1:CHtTs1ySBF7RwdIkaC72PivBrrA64bV3IpKmWMQH/qbI/Z/i0hUGiY3Q5BPQZsBLG0JpLANCj78vbvxFBIDJMsHlPPS78qVtS1VQIR7BumTOxvTHxJ8J6TObfT3CihhQAMmFhjAs3c56bb8HwcdG78+SItdwceUokD5qsq/JdPSMzTICjeX5Imm/28hSiVwpaPjfjDrW/Tw592j/FGj9CeKNC2xE8f8famnQPphLczohvFG6qMc43W754QatkzvvKguFixyoh+65ihEUXZo7e1P6optea6Gn+ztpB5O3UcsIe/q/7k0uIs6ATaaHDfe1mYbIg0dY9fCaal99+P/pBw== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(199003)(189002)(33646002)(189998001)(36756003)(105606002)(104016003)(92566002)(2950100001)(106466001)(2351001)(110136002)(107886002)(229853001)(77096005)(5001960100002)(6806004)(77156002)(47776003)(62966003)(19580395003)(87936001)(19580405001)(46102003)(76176999)(50986999)(48376002)(50466002)(86362001)(50226001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR0301MB1202; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1202; 2:YZYASbrEmZ901Qq3GNVr8qIcTojJnK1wbNuX67JJglOT5zupx5y1A/EuGnYLiWgZ; 3:tSYVC/Pqo0QVsueShI8CR22ptkyW18qVjgCl6YHTyaWiND+jHmWQoHhbw6zkHD1hX0rEC07H3DzVYwHT1KwhhgERaMOeUbXl6rItshdIuWpxICfPS4QNr53P+eR8WJEl/9KZaiw1C6GveuuaV7qmQu3PlbtyscQ/lvGRaGe80VeVHH3D5JzWDnang3VBbXVKL+N6tsVkkM9KXXlSVSwhtSDbJnapJQNRsw16DM3SSvo=; 20:lLY3Gjamvzhm3dTVlx3G/RWwnKoNt5JXEPYEAUnuna1IAfjNnlehigWmjf3nLBZrG4pSVqknB8m8sd8fUUsqwocW5u9qWF/i0y+gFHejT99WTVM+A+cYNmXsi87Lh6YSYDTN8SIyRZiUyEiGbtzWQafHXfnv2eLgBCET8UvTgvY7l++G8CZNS8ytNRtJrPuJ6OFUNuPY1Ff+ensQB11erUUxa4ofmNVRs2VJoVz1YI4U5CINcjc26OD1D6zubbJkov2q1rN2SkPpOLc8M3V7AfTs/pqYjj4uq98rCCwrTvgSYbhNLkxNv+s3lvfELKco8UcYCJk+KiH/fOdmukZNSXMs82miE/w7PGet1M0AjUA= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR0301MB1202; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BN3PR0301MB1202; BCL:0; PCL:0; RULEID:; SRVR:BN3PR0301MB1202; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1202; 4:e9ueva75dYA54Q3O5DPWqmldgfleZ/XMzXgkqoB+YfN1vjD355grqVIb9wiQoe+6Nw1W/0kOubLnnbBGnk/jZC8ejxVh42JC0Is+5qsJRXVNdDnDq/wuZNk2MpM9maePTjcyn8ZiMKDkXDB3sYoZoBD2InS9AmAPXAJSz0Gw9TnPgocjlUY8yUxHxND/akgKgDDdv+WaTxqLIPyGeq17R/ou5+a+Uerc1FGpwaZIF33OFCKQA2MwyLjyZ6n/HPK3KPvHyoJtYBb1Ii3yQkLbyXjDKe3qhOd2AiMyaW63Zsw= X-Forefront-PRVS: 06167FAD59 X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1202; 23:F7BJGy4Ex+rRhtUQKIITHRDYQPR9iSl0Cl1ASZveNrBnM7a7N6xWnSrEDEI+sSPeZ3fpzVzQ3vj4dDCnlIfwNZf3pUHt1zUmBMHU4WWdbZ8AWB7QiP8zICXrzWTyyjElt1wg67Nv/1cXisGUKp7+BM0X4QtBv6GYzvg8MNt0+aszRldcHfeRZSHmhj4rP7gwtZbfxak5nvngntA5QAbBUo1dsC/r2gzWOy/pOSs00sxA/NePfSNvCBAw92YauvbV08NsB2MjIjZC1qMM8x6QXvyuuK0K/JMwCgKf1a9/kQ+hmYdzGN9lzCDowneICmpDTVtUaxDl0auoegkR2W+DJVpx6lEfDMbx7xyXoXWC4Y6eIUbKOu8l2vstllD39q4ufJe8lq/U+T+P0u3PXxrUk2LeQZEGWXfL9BZ15eU3uOQV7q5Eb5cm+7aOblESeRqeu8TIdgPQdKHOzZ51nVhG/fkcK4iaASftN8jdPQh0q8BurvZvdTQK4NQq5UTFoH8Ou6Kxqb0UG2QZDSWuG+hBUMydcvCnfEEEC3DHRvH/JZcMG7qgnS2O83fWiOlN3QcbmG7FIsrRD/VLM36ma7s1YIWiFvQxfYYyH8OmeoIJuqO0SdgnsdKW8SGp+NLtCf7mf+lR4uTEg3lr7BFtBZtv8SNyQW+FeUdS2cw13ZXtTxC2SNKvNOTEiS+uIkfDzWFYfm8jFq+VehlZnE2SJZMTptPB3tKfBZRVd46BpiwJMVIiFIi2l5MfWy9WZcc/fFfXgOU8RnkpHqCZjNinegrUOXopQy/XdN5hxzK0TjDBK0ZjpxnS84lRHASxVODyDx+5ydUFMvXN8pRh4VMQigJ1tbXRrj9e3vl6RfzWGan++zZWH/XjY4JEzrM6fbkA2Mt9IXvLPX7V6V4Lsb2FYE2oAg== X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1202; 5:Yu2UxQZz68il1MhAJPf4NSHHOrhWBZxSu2+rhKKmXjH4OyZlARByQsVtMeQKDWOSKTJ4yFB4eHSu/i5pOrbk9fnitcuU4o+jZf5uPasQvCdWXTCSCRL2384gMN+DCayO0xgpRlvqegSwSKx0N92CXA==; 24:BdnYorKFE7lJJEKI7WT/kSK+nWTywSDJmhzPSEwD5laplXUC+rs9wLqb8BW1Ef+SMFGWVbpmSbzw/u0nIhFTEWePG6N6/61GYBaX91WJJ+o=; 20:6uaaCIMON64xG6P8iIgyrZzHpG1KpC5+7QhSn+GOcgyfRhveg8A950k7nvVXGZGFEZkvmlXSJ0dJMbrrhVOxqw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2015 16:49:05.2680 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0301MB1202 Cc: joe.hershberger@ni.com, yorksun@freescale.com Subject: [U-Boot] [PATCH 04/11 v2] drivers/net/vsc9953: Refractor the parser for VSC9953 commands X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" In order to support multiple commands to configure the VSC9953 L2 Switch, the parser needs to be changed to be more flexible and to support more complex commands. This patch adds a parser that searches for defined 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. The already defined commands are also changed a bit to: ethsw [port ] { enable | disable | show } Signed-off-by: Codrin Ciubotariu --- Changes for v2: - removed Change-id field; drivers/net/vsc9953.c | 381 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 310 insertions(+), 71 deletions(-) diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c index 9dec683..4df751a 100644 --- a/drivers/net/vsc9953.c +++ b/drivers/net/vsc9953.c @@ -10,6 +10,7 @@ #include #include #include +#include #include static struct vsc9953_info vsc9953_l2sw = { @@ -575,6 +576,10 @@ void vsc9953_init(bd_t *bis) } #ifdef CONFIG_VSC9953_CMD + +#define VSC9953_MAX_CMD_PARAMS 20 +#define VSC9953_CMD_PORT_ALL -1 + /* Enable/disable status of a VSC9953 port */ static void vsc9953_port_status_set(int port_no, u8 enabled) { @@ -595,15 +600,6 @@ static void vsc9953_port_status_set(int port_no, u8 enabled) CONFIG_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) { @@ -615,15 +611,6 @@ static void vsc9953_phy_autoneg(int port_no) 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) { @@ -685,75 +672,327 @@ static void vsc9953_port_config_show(int port_no) printf("%8s\n", duplex == DUPLEX_FULL ? "full" : "half"); } -/* Print VSC9953 ports' configuration */ -static void vsc9953_port_all_config_show(void) -{ - int i; +/* IDs used to track keywords in a command */ +enum keyword_id { + id_key_end = -1, + id_help, + id_show, + id_port, + id_enable, + id_disable, + id_count, /* keep last */ +}; - for (i = 0; i < VSC9953_MAX_PORTS; i++) - vsc9953_port_config_show(i); -} +enum keyword_opt_id { + id_port_no = id_count + 1, + id_count_all, /* keep last */ +}; -/* function to interpret commands starting with "ethsw " */ -static int do_ethsw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +struct command_def { + int cmd_to_keywords[VSC9953_MAX_CMD_PARAMS]; + int cmd_keywords_nr; + int port; + int err; + int (*cmd_function)(struct command_def *parsed_cmd); +}; + +#define VSC9953_PORT_CONF_HELP "[port ] { enable | disable | show } " \ +"- enable/disable a port; show shows a port's configuration" + +static int vsc9953_port_status_key_func(struct command_def *parsed_cmd) { - u8 enable; - u32 port; + int i; + u8 enabled; - if (argc < 4) + /* Last keyword should tell us if we should enable/disable the port */ + if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 1] == + id_enable) + enabled = 1; + else if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 1] == + id_disable) + enabled = 0; + else { + parsed_cmd->err = 1; return -1; + } - if (strcmp(argv[1], "port")) - return -1; + if (parsed_cmd->port != VSC9953_CMD_PORT_ALL) { + vsc9953_port_status_set(parsed_cmd->port, enabled); + } else { + for (i = 0; i < VSC9953_MAX_PORTS; i++) + vsc9953_port_status_set(i, enabled); + } + + return 0; +} + +static int vsc9953_port_config_key_func(struct command_def *parsed_cmd) +{ + int i; + + if (parsed_cmd->port != VSC9953_CMD_PORT_ALL) { + 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); - 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; + 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); } - if (!strcmp(argv[2], "all")) { - vsc9953_port_all_status_set(enable); + return 0; +} + +struct keywords_to_function { + enum keyword_id cmd_keyword[VSC9953_MAX_CMD_PARAMS]; + int (*keyword_function)(struct command_def *parsed_cmd); +} cmd_def[] = { + { + .cmd_keyword = { + id_enable, + id_key_end, + }, + .keyword_function = &vsc9953_port_status_key_func, + }, { + .cmd_keyword = { + id_disable, + id_key_end, + }, + .keyword_function = &vsc9953_port_status_key_func, + }, { + .cmd_keyword = { + id_show, + id_key_end, + }, + .keyword_function = &vsc9953_port_config_key_func, + }, +}; + +struct keywords_optional { + enum keyword_id cmd_keyword[VSC9953_MAX_CMD_PARAMS]; +} cmd_opt_def[] = { + { + .cmd_keyword = { + id_port, + id_port_no, + id_key_end, + }, + }, +}; + +static int keyword_match_gen(enum keyword_id key_id, int argc, + char *const argv[], int *argc_nr, + struct command_def *parsed_cmd); +static int keyword_match_port(enum keyword_id key_id, int argc, + char *const argv[], int *argc_nr, + struct command_def *parsed_cmd); + +/* Define properties for each keyword; + * keep the order synced with enum keyword_id + */ +struct keyword_def { + const char *keyword_name; + int (*match)(enum keyword_id key_id, int argc, char *const argv[], + int *argc_nr, struct 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, + }, +}; + +/* Generic function used to match a keyword only by a string */ +static int keyword_match_gen(enum keyword_id key_id, int argc, + char *const argv[], int *argc_nr, + struct 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 keyword_id key_id, int argc, + char *const argv[], int *argc_nr, + struct command_def *parsed_cmd) +{ + unsigned long val; + + if (!keyword_match_gen(key_id, argc, argv, argc_nr, parsed_cmd)) return 0; - } else { - port = simple_strtoul(argv[2], NULL, 10); - if (!VSC9953_PORT_CHECK(port)) - return -1; - vsc9953_port_status_set(port, enable); + + if (*argc_nr + 1 >= argc) return 0; + + if (strict_strtoul(argv[*argc_nr + 1], 10, &val) != -EINVAL) { + if (!VSC9953_PORT_CHECK(val)) { + printf("Invalid port number: %lu\n", val); + return 0; + } + parsed_cmd->port = val; + (*argc_nr)++; + parsed_cmd->cmd_to_keywords[*argc_nr] = id_port_no; + return 1; + } + + return 0; +} + +/* match optional keywords */ +static void cmd_keywords_opt_check(struct command_def *parsed_cmd, + int *argc_val) +{ + int i, keyw_opt_id, argc_val_max; + + /* remember the best match */ + argc_val_max = *argc_val; + + for (i = 0; i < ARRAY_SIZE(cmd_opt_def); i++) { + keyw_opt_id = 0; + while (keyw_opt_id + *argc_val < + parsed_cmd->cmd_keywords_nr && + cmd_opt_def[i].cmd_keyword[keyw_opt_id] != id_key_end && + parsed_cmd->cmd_to_keywords[keyw_opt_id + *argc_val] == + cmd_opt_def[i].cmd_keyword[keyw_opt_id]) + keyw_opt_id++; + if (keyw_opt_id && keyw_opt_id + *argc_val <= + parsed_cmd->cmd_keywords_nr && + cmd_opt_def[i].cmd_keyword[keyw_opt_id] == id_key_end && + (*argc_val + keyw_opt_id > argc_val_max)) + argc_val_max = *argc_val + keyw_opt_id; } - return -1; + *argc_val = argc_val_max; } -U_BOOT_CMD(ethsw, 5, 0, do_ethsw, +/* get the function to call based on keywords */ +static void cmd_keywords_check(struct command_def *parsed_cmd, int *argc_val) +{ + int i, keyword_id; + + for (i = 0; i < ARRAY_SIZE(cmd_def); i++) { + keyword_id = 0; + while (keyword_id + *argc_val < parsed_cmd->cmd_keywords_nr && + cmd_def[i].cmd_keyword[keyword_id] != id_key_end && + parsed_cmd->cmd_to_keywords[keyword_id + *argc_val] == + cmd_def[i].cmd_keyword[keyword_id]) + keyword_id++; + if (keyword_id && keyword_id + *argc_val == + parsed_cmd->cmd_keywords_nr && + cmd_def[i].cmd_keyword[keyword_id] == id_key_end) { + *argc_val += keyword_id; + parsed_cmd->cmd_function = cmd_def[i].keyword_function; + return; + } + } +} + +/* find all the keywords in the command */ +static void keywords_find(int argc, char * const argv[], + struct command_def *parsed_cmd) +{ + int i, j, argc_val; + + for (i = 1; i < argc; i++) { + for (j = 0; j < id_count; j++) { + if (keyword[j].match(j, argc, argv, &i, + parsed_cmd)) + break; + } + } + + for (i = 1; i < argc; i++) + if (parsed_cmd->cmd_to_keywords[i] == -1) + parsed_cmd->err = 1; + + parsed_cmd->cmd_keywords_nr = argc; + argc_val = 1; + + /* get optional parameters first */ + cmd_keywords_opt_check(parsed_cmd, &argc_val); + + cmd_keywords_check(parsed_cmd, &argc_val); + + /* error if not all commands' parameters were matched */ + if (argc_val != parsed_cmd->cmd_keywords_nr || + !parsed_cmd->cmd_function) + parsed_cmd->err = 1; +} + +static void command_def_init(struct command_def *parsed_cmd) +{ + int i; + + for (i = 0; i < VSC9953_MAX_CMD_PARAMS; i++) + parsed_cmd->cmd_to_keywords[i] = -1; + + parsed_cmd->port = VSC9953_CMD_PORT_ALL; + parsed_cmd->err = 0; + parsed_cmd->cmd_function = NULL; +} + +static void command_def_cleanup(struct command_def *parsed_cmd) +{ + /* Nothing to do for now */ +} + +/* function to interpret commands starting with "ethsw " */ +static int do_ethsw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + struct command_def parsed_cmd; + int rc = 0; + + if (argc >= VSC9953_MAX_CMD_PARAMS) { + rc = -1; + goto __ret; + } + + command_def_init(&parsed_cmd); + + keywords_find(argc, argv, &parsed_cmd); + + if (!parsed_cmd.cmd_function) { + rc = -1; + goto __ret_cmd_cleanup; + } + + rc = parsed_cmd.cmd_function(&parsed_cmd); + + if (parsed_cmd.err) { + rc = -1; + goto __ret_cmd_cleanup; + } + +__ret_cmd_cleanup: + command_def_cleanup(&parsed_cmd); +__ret: + return rc; +} + +U_BOOT_CMD(ethsw, VSC9953_MAX_CMD_PARAMS, 0, do_ethsw, "vsc9953 l2 switch commands", - "port enable|disable\n" - " - enable/disable an l2 switch port\n" - " port_no=0..9; use \"all\" for all ports\n" - "ethsw port show\n" - " - show an l2 switch port's configuration\n" - " port_no=0..9; use \"all\" for all ports\n" + VSC9953_PORT_CONF_HELP"\n" ); + #endif /* CONFIG_VSC9953_CMD */