From patchwork Tue Sep 1 18:56:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dliu X-Patchwork-Id: 76274 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CDCC2A04AC; Tue, 1 Sep 2020 20:57:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 28F571C0AC; Tue, 1 Sep 2020 20:57:15 +0200 (CEST) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by dpdk.org (Postfix) with ESMTP id 62C8C5B30 for ; Tue, 1 Sep 2020 20:57:13 +0200 (CEST) Received: by mail-qt1-f175.google.com with SMTP id e5so1750636qth.5 for ; Tue, 01 Sep 2020 11:57:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; h=from:to:cc:subject:date:message-id; bh=UuB3Ot1CmKV2TX67OFpIGBEUj1ge76qqqw6e+6piF1A=; b=aReI5cYV7vVOQ7em8ZqZbIui0+/SYTTRD9WqaRsrHIZGK9oRJnKQLuPqXZTuW7m+ky OrRT6vsyTKFJQfDRUsT7bobLb2HAApc4LqvWYIl6IKk+exxp85a59zyrC7tlvbR61ZaD oSJ5IEN9D3u6vrGEafioDINPaOQorTRE6Im8E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=UuB3Ot1CmKV2TX67OFpIGBEUj1ge76qqqw6e+6piF1A=; b=aepZv37Reczg5JzvhT1i+xIaNtBsPrpAPJgHx9NNjF3Sow2G2kEoRduKdjaZpMMG50 kgfQB6I+EWkRRMtunp3IREm8HenN3Sz3aTscxF7kyrUGtn+Gt37v0smeDo9Z7cVDdRkK eiv40JoJi04WKgG7PEKYRgPk/xXnLU7mwSzZuMLhss5RawvnVqPVfipFBN7W3FeFxl8j 5QqF9nDrMoA8245y87nGmZcVSRVLiwtbxM8l5yHsEd/DWdUXyI+8JgkYE8ASDRAFvJB8 V3xOq5oTI+l85vVao6BhXyOAp0ircP3tLzdpIaI5SGtyq6YRqkiwDMFpIBNkF3xoIHeZ LP+A== X-Gm-Message-State: AOAM532VL3yhePlSU6YeyTAV8sl1jhfUWqIByDEkXJjcNHV82d5meUbR y3naUc/4bXYd0wexCuLzF/NqYg== X-Google-Smtp-Source: ABdhPJzea/e6j35LfT3P/JiIUXJbVqZP4gXmSnaxKU8zI/SC9tcctGI11ydx2UpaotpAdk9g8YMo8w== X-Received: by 2002:ac8:ec7:: with SMTP id w7mr3294226qti.118.1598986632652; Tue, 01 Sep 2020 11:57:12 -0700 (PDT) Received: from traffictester.opnfv.iol.unh.edu (opnfv-vpn.iol.unh.edu. [132.177.125.250]) by smtp.gmail.com with ESMTPSA id s20sm2599305qkg.65.2020.09.01.11.57.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 11:57:11 -0700 (PDT) From: David Liu To: ferruh.yigit@intel.com Cc: dev@dpdk.org, lylavoie@iol.unh.edu, tmonjalon@nvidia.com, David Liu Date: Tue, 1 Sep 2020 14:56:54 -0400 Message-Id: <20200901185654.76346-1-dliu@iol.unh.edu> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH V1] testpmd: add eeprom/module eeprom display X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add EEPROM dump command "show port eeprom" Add module EEPROM dump command "show port module_eeprom" Commands will dump the content of the EEPROM/module EEPROM for the selected port. Signed-off-by: David Liu --- app/test-pmd/cmdline.c | 87 ++++++++++++++ app/test-pmd/config.c | 126 ++++++++++++++++++++ app/test-pmd/testpmd.h | 2 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 14 +++ 4 files changed, 229 insertions(+) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index a037a55c6..71c98dd96 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -166,6 +166,12 @@ static void cmd_help_long_parsed(void *parsed_result, "show port (info|stats|summary|xstats|fdir|stat_qmap|dcb_tc|cap) (port_id|all)\n" " Display information for port_id, or all.\n\n" + "show port (port_id) eeprom \n" + " Display the EEPROM infomation for port x.\n\n" + + "show port (port_id) module_eeprom \n" + " Display the port moudle EEPROM infomation for port x.\n\n" + "show port X rss reta (size) (mask0,mask1,...)\n" " Display the rss redirection table entry indicated" " by masks on port X. size is used to indicate the" @@ -7594,6 +7600,85 @@ cmdline_parse_inst_t cmd_showdevice = { NULL, }, }; + +/* ** SHOW EEPROM INFO *** */ +struct cmd_showeeprom_result { + cmdline_fixed_string_t show; + cmdline_fixed_string_t port; + cmdline_fixed_string_t type; + uint16_t portnum; +}; + +static void cmd_showeeprom_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_showeeprom_result *res = parsed_result; + + port_eeprom_display(res->portnum); +} + +cmdline_parse_token_string_t cmd_showeeprom_show = + TOKEN_STRING_INITIALIZER(struct cmd_showeeprom_result, show, "show"); +cmdline_parse_token_string_t cmd_showeeprom_port = + TOKEN_STRING_INITIALIZER(struct cmd_showeeprom_result, port, "port"); +cmdline_parse_token_num_t cmd_showeeprom_portnum = + TOKEN_NUM_INITIALIZER(struct cmd_showeeprom_result, portnum, UINT16); +cmdline_parse_token_string_t cmd_showeeprom_type = + TOKEN_STRING_INITIALIZER(struct cmd_showeeprom_result, type, "eeprom"); + +cmdline_parse_inst_t cmd_showeeprom = { + .f = cmd_showeeprom_parsed, + .data = NULL, + .help_str = "show port eeprom", + .tokens = { + (void *)&cmd_showeeprom_show, + (void *)&cmd_showeeprom_port, + (void *)&cmd_showeeprom_portnum, + (void *)&cmd_showeeprom_type, + NULL, + }, +}; + +/* ** SHOW module EEPROM INFO *** */ +struct cmd_showmoduleeeprom_result { + cmdline_fixed_string_t show; + cmdline_fixed_string_t port; + cmdline_fixed_string_t type; + uint16_t portnum; +}; + +static void cmd_showmoduleeeprom_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_showmoduleeeprom_result *res = parsed_result; + + port_module_eeprom_display(res->portnum); +} + +cmdline_parse_token_string_t cmd_showmoduleeeprom_show = + TOKEN_STRING_INITIALIZER(struct cmd_showmoduleeeprom_result, show, "show"); +cmdline_parse_token_string_t cmd_showmoduleeeprom_port = + TOKEN_STRING_INITIALIZER(struct cmd_showmoduleeeprom_result, port, "port"); +cmdline_parse_token_num_t cmd_showmoduleeeprom_portnum = + TOKEN_NUM_INITIALIZER(struct cmd_showmoduleeeprom_result, portnum, UINT16); +cmdline_parse_token_string_t cmd_showmoduleeeprom_type = + TOKEN_STRING_INITIALIZER(struct cmd_showmoduleeeprom_result, type, "module_eeprom"); + +cmdline_parse_inst_t cmd_showmoduleeeprom = { + .f = cmd_showmoduleeeprom_parsed, + .data = NULL, + .help_str = "show port module_eeprom", + .tokens = { + (void *)&cmd_showmoduleeeprom_show, + (void *)&cmd_showmoduleeeprom_port, + (void *)&cmd_showmoduleeeprom_portnum, + (void *)&cmd_showmoduleeeprom_type, + NULL, + }, +}; + /* *** SHOW QUEUE INFO *** */ struct cmd_showqueue_result { cmdline_fixed_string_t show; @@ -19325,6 +19410,8 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_load_from_file, (cmdline_parse_inst_t *)&cmd_showport, (cmdline_parse_inst_t *)&cmd_showqueue, + (cmdline_parse_inst_t *)&cmd_showeeprom, + (cmdline_parse_inst_t *)&cmd_showmoduleeeprom, (cmdline_parse_inst_t *)&cmd_showportall, (cmdline_parse_inst_t *)&cmd_showdevice, (cmdline_parse_inst_t *)&cmd_showcfg, diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 8cf84ccd3..ea026a8eb 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -49,6 +49,7 @@ #include #endif #include +#include #include "testpmd.h" @@ -710,6 +711,131 @@ port_summary_display(portid_t port_id) (unsigned int) link.link_speed); } +void +port_eeprom_display(portid_t port_id) +{ + struct rte_dev_eeprom_info einfo; + int ret; + + if (port_id_is_invalid(port_id, ENABLED_WARN)) { + print_valid_ports(); + return; + } + + int len_eeprom = rte_eth_dev_get_eeprom_length(port_id); + + if(len_eeprom < 0) { + switch (len_eeprom) { + case -ENODEV: + printf("port index %d invalid\n", port_id); + break; + case -ENOTSUP: + printf("operation not supported by device\n"); + break; + case -EIO: + printf("device is removed\n"); + break; + default: + printf("Unable to get module EEPROM: %d\n", ret); + break; + } + return; + } + + char buf[len_eeprom]; + printf("\nPort: %d\nModule EEPROM:\n", port_id); + + einfo.offset = 0; + einfo.length = len_eeprom; + einfo.data = buf; + + ret = rte_eth_dev_get_eeprom(port_id, &einfo); + if (ret != 0) { + switch (ret) { + case -ENODEV: + printf("port index %d invalid\n", port_id); + break; + case -ENOTSUP: + printf("operation not supported by device\n"); + break; + case -EIO: + printf("device is removed\n"); + break; + default: + printf("Unable to get module EEPROM: %d\n", ret); + break; + } + return; + } + + rte_hexdump(stdout, "hexdump", einfo.data, einfo.length); + printf("Finish -- Total EEPROM length: %i bytes\n", len_eeprom); +} + +void +port_module_eeprom_displao(portid_t port_id) +{ + struct rte_eth_dev_module_info minfo; + struct rte_dev_eeprom_info einfo; + int ret; + + if (port_id_is_invalid(port_id, ENABLED_WARN)) { + print_valid_ports(); + return; + } + + ret = rte_eth_dev_get_module_info(port_id, &minfo); + if (ret != 0) { + switch (ret) { + case -ENODEV: + printf("port index %d invalid\n", port_id); + break; + case -ENOTSUP: + printf("operation not supported by device\n"); + break; + case -EIO: + printf("device Iis removed\n"); + break; + default: + printf("Unable to get module info: %d\n", ret); + break; + } + return; + } + + if (minfo.eeprom_len < 0){ + printf("invalid module eeprom length"); + return; + } + + char buf[minfo.eeprom_len]; + einfo.offset = 0; + einfo.length = minfo.eeprom_len; + einfo.data = buf; + + ret = rte_eth_dev_get_module_eeprom(port_id, &einfo); + if (ret != 0) { + switch (ret) { + case -ENODEV: + printf("port index %d invalid\n", port_id); + break; + case -ENOTSUP: + printf("operation not supported by device\n"); + break; + case -EIO: + printf("device Iis removed\n"); + break; + default: + printf("Unable to get module EEPROM: %d\n", ret); + break; + } + return; + } + + printf("\nPort: %d\nEEPROM:\n", port_id); + rte_hexdump(stdout, "hexdump", einfo.data, einfo.length); +} + void port_offload_cap_display(portid_t port_id) { diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 7a7c73f79..e3a0d17e5 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -714,6 +714,8 @@ void nic_stats_mapping_display(portid_t port_id); void device_infos_display(const char *identifier); void port_infos_display(portid_t port_id); void port_summary_display(portid_t port_id); +void port_eeprom_display(portid_t port_id); +void port_module_eeprom_display(portid_t port_id); void port_summary_header_display(void); void port_offload_cap_display(portid_t port_id); void rx_queue_infos_display(portid_t port_idi, uint16_t queue_id); diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 5103ff925..f3e2211ab 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -218,6 +218,20 @@ For example: nvgre vxlan-gpe +show port eeprom +~~~~~~~~~~~~~~~~ + +Display the EEPROM informatioon for port X:: + + testpmd> show port (port_id) eeprom + +show port module eeprom +~~~~~~~~~~~~~~~~~~~~~~~ + +Display the module EEPROM informatioon for port X:: + + testpmd> show port (port_id) module_eeprom + show port rss reta ~~~~~~~~~~~~~~~~~~