From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 99137A04B1; Tue, 8 Sep 2020 23:03:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6E7111C114; Tue, 8 Sep 2020 23:03:27 +0200 (CEST) Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) by dpdk.org (Postfix) with ESMTP id 361EE1C112 for ; Tue, 8 Sep 2020 23:03:26 +0200 (CEST) Received: by mail-qt1-f170.google.com with SMTP id 19so371678qtp.1 for ; Tue, 08 Sep 2020 14:03:26 -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=HPUUPtFD0788Z9KCRUSSad5aRyXv4YZlNaa/nrBBMJM=; b=Q+UPFCKHPPdeuMqzzZ3tBkvT+NZnVt5lg4ZyqVV0T+xqRO5rWcUbMj0gzfKkgXFOdu 5qEEBUAFZma5M6BmefJnANXKScQXqf5vBJNg6M5zAiGFmWROwxRhKL4IIs6UXaCE5qru EV8K/qHvtu9HhXI+ZXodzDSqReKaEZheiqw8w= 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=HPUUPtFD0788Z9KCRUSSad5aRyXv4YZlNaa/nrBBMJM=; b=bTA6P3uMpK103CowjuASMPLsHHQJsty9OsjIyieeRGtmxFD7WnBpnLZHPG2Muuz9CE wnUgbt353kXyHwVuNTZts16e97/uAG37dllimY9HdHG1GXOGXrHOVEeWAuiQx26U2j0q W6s3sGhN2sOvvMOAidkx5A9M3gRQFF9KdMC/pVewSs1jwR27BYbpIUmvzhef5dTnhI74 rG7cqIMSSMpguQbwsoK06DGkX+bqIw190kQfHMAoSkxk1YFBTNVWfR3JEc9i8uhHVXI0 2dGl6wIBF5QMFKd+eyprltAhHXTQ+C4JysMMmR1aU2mruLHY2lDDBXf//qUahJ1oGjhI U0YQ== X-Gm-Message-State: AOAM533ucBbcC2nMjRChFBCGNF0VRmH2ypj2cpo1TL3r+e7V1j4MBT5u HDyRrUqWD1t2tUHaK6bd6D9SIg== X-Google-Smtp-Source: ABdhPJy6NBRI65N1r/10mpU34xnHoQJu97BnWZtSqAH8q6jWdi68ekmJRSeuB30ROc3cjy6VKKufNQ== X-Received: by 2002:ac8:f57:: with SMTP id l23mr357755qtk.166.1599599005465; Tue, 08 Sep 2020 14:03:25 -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 l19sm736027qtu.16.2020.09.08.14.03.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 14:03:24 -0700 (PDT) From: David Liu To: ferruh.yigit@intel.com Cc: dts@dpdk.org, lylavoie@iol.unh.edu, thomas@monjalon.net, David Liu Date: Tue, 8 Sep 2020 17:03:04 -0400 Message-Id: <20200908210304.31921-1-dliu@iol.unh.edu> X-Mailer: git-send-email 2.17.1 Subject: [dts] [dpdk-dev] [PATCH V1] testpmd: add eeprom/module eeprom display X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Add module EEPROM/EEPROM dump command "show port (module_eeprom|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 | 50 ++++++++ app/test-pmd/config.c | 121 ++++++++++++++++++++ app/test-pmd/testpmd.h | 2 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 7 ++ 4 files changed, 180 insertions(+) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index a037a55c6..1195804b1 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -166,6 +166,9 @@ 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 (module_eeprom|eeprom)\n" + " Display the module EEPROM or EEPROM information for port_id.\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 +7597,51 @@ cmdline_parse_inst_t cmd_showdevice = { NULL, }, }; + +/* *** SHOW MODULE EEPROM/EEPROM port INFO *** */ +struct cmd_showeeprom_result { + cmdline_fixed_string_t show; + cmdline_fixed_string_t port; + uint16_t portnum; + cmdline_fixed_string_t type; +}; + +static void cmd_showeeprom_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_showeeprom_result *res = parsed_result; + + if (!strcmp(res->type, "eeprom")) + port_eeprom_display(res->portnum); + else if(!strcmp(res->type, "module_eeprom")) + port_module_eeprom_display(res->portnum); + else + printf("Unknown argument\n"); +} + +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, "module_eeprom#eeprom"); + +cmdline_parse_inst_t cmd_showeeprom = { + .f = cmd_showeeprom_parsed, + .data = NULL, + .help_str = "show port module_eeprom|eeprom", + .tokens = { + (void *)&cmd_showeeprom_show, + (void *)&cmd_showeeprom_port, + (void *)&cmd_showeeprom_portnum, + (void *)&cmd_showeeprom_type, + NULL, + }, +}; + /* *** SHOW QUEUE INFO *** */ struct cmd_showqueue_result { cmdline_fixed_string_t show; @@ -19325,6 +19373,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..9f319208d 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,126 @@ 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 EEPROM: %d\n", len_eeprom); + break; + } + return; + } + + char buf[len_eeprom]; + + 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 EEPROM: %d\n", ret); + break; + } + return; + } + + rte_hexdump(stdout, "hexdump", einfo.data, einfo.length); + printf("Finish -- Port: %d EEPROM length: %d bytes\n", port_id, 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; + } + + 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; + } + + rte_hexdump(stdout, "hexdump", einfo.data, einfo.length); + printf("Finish -- Port: %d MODULE EEPROM length: %d bytes\n", port_id, 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..6a2e1c0f2 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -218,6 +218,13 @@ For example: nvgre vxlan-gpe +show port (module_eeprom|eeprom) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Display the module EEPROM/EEPROM informatioon for port_id:: + + testpmd> show port (port_id) (module_eeprom|eeprom) + show port rss reta ~~~~~~~~~~~~~~~~~~ -- 2.17.1