From patchwork Wed Apr 20 07:00:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Zhang X-Patchwork-Id: 109898 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 61476A00BE; Wed, 20 Apr 2022 09:05:38 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 54093427E9; Wed, 20 Apr 2022 09:05:38 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id BDB504161A for ; Wed, 20 Apr 2022 09:05:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1650438336; x=1681974336; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OQks9z2fBPtp1Xgk22TTY14fmhCnwasiG+BhqlsDTJA=; b=bqdxNdowEYXRWeLp8PwsA6zOwsFwvnJC/NlOfOTAhQDhpIw6tyoRLD6v 9C1MzOmlAx/792nKy3vjpTaChP1klkQIn4Q9cJvFs4G8FKDllP2bQcehE jle75yfyDNd3HedLwBxOp7S4N0c557++83CUURMiourzzJIvDc1cxvp3Q 0lWoJ74m/WtlpbKYyl93/1j6RRD3ouLB+2qeLbJ/XqGfecuDTXJTm58Pm vyNLxToYAvc5OmJ6HqDOK0D+cIO7541f5EmAOzGjoNEMJHtGt6fYdKYSO cW6ElN52h98cFsjUPiE4SnQxtVjXrcsbQQ1RISF5A3UqFgPqxxbYpDryM w==; X-IronPort-AV: E=McAfee;i="6400,9594,10322"; a="263421219" X-IronPort-AV: E=Sophos;i="5.90,274,1643702400"; d="scan'208";a="263421219" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2022 00:05:35 -0700 X-IronPort-AV: E=Sophos;i="5.90,274,1643702400"; d="scan'208";a="529631844" Received: from intel-cd-odc-robin.cd.intel.com ([10.240.178.191]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2022 00:05:32 -0700 From: Robin Zhang To: dev@dpdk.org Cc: qiming.yang@intel.com, qi.z.zhang@intel.com, stevex.yang@intel.com, thomas@monjalon.net, andrew.rybchenko@oktetlabs.ru, bruce.richardson@intel.com, david.marchand@redhat.com, Robin Zhang Subject: [PATCH v3 1/5] ethdev: add telemetry command for module EEPROM Date: Wed, 20 Apr 2022 07:00:13 +0000 Message-Id: <20220420070017.119739-2-robinx.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220420070017.119739-1-robinx.zhang@intel.com> References: <20220215101853.919735-1-robinx.zhang@intel.com> <20220420070017.119739-1-robinx.zhang@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add a new telemetry command /ethdev/module_eeprom to dump the module EEPROM of each port. The format of module EEPROM information follows the SFF(Small Form Factor) Committee specifications. Current the format support SFP(Small Formfactor Pluggable)/SFP+/ QSFP+(Quad Small Formfactor Pluggable)/QSFP28 with specs SFF-8079/ SFF-8472/SFF-8024/SFF-8636. Signed-off-by: Robin Zhang --- lib/ethdev/ethdev_sff_telemetry.c | 135 ++++++++++++++++++++++++++++++ lib/ethdev/ethdev_sff_telemetry.h | 42 ++++++++++ lib/ethdev/meson.build | 5 ++ lib/ethdev/rte_ethdev.c | 3 + 4 files changed, 185 insertions(+) create mode 100644 lib/ethdev/ethdev_sff_telemetry.c create mode 100644 lib/ethdev/ethdev_sff_telemetry.h diff --git a/lib/ethdev/ethdev_sff_telemetry.c b/lib/ethdev/ethdev_sff_telemetry.c new file mode 100644 index 0000000000..60dc19c206 --- /dev/null +++ b/lib/ethdev/ethdev_sff_telemetry.c @@ -0,0 +1,135 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018 Cavium, Inc + */ + +#include +#include +#include "ethdev_sff_telemetry.h" + +static void +sff_port_module_eeprom_display(uint16_t port_id, sff_item *items) +{ + struct rte_eth_dev_module_info minfo; + struct rte_dev_eeprom_info einfo; + int ret; + + ret = rte_eth_dev_get_module_info(port_id, &minfo); + if (ret != 0) { + switch (ret) { + case -ENODEV: + fprintf(stderr, "port index %d invalid\n", port_id); + break; + case -ENOTSUP: + fprintf(stderr, "operation not supported by device\n"); + break; + case -EIO: + fprintf(stderr, "device is removed\n"); + break; + default: + fprintf(stderr, "Unable to get module EEPROM: %d\n", + ret); + break; + } + return; + } + + einfo.offset = 0; + einfo.length = minfo.eeprom_len; + einfo.data = calloc(1, minfo.eeprom_len); + if (!einfo.data) { + fprintf(stderr, + "Allocation of port %u eeprom data failed\n", + port_id); + return; + } + + ret = rte_eth_dev_get_module_eeprom(port_id, &einfo); + if (ret != 0) { + switch (ret) { + case -ENODEV: + fprintf(stderr, "port index %d invalid\n", port_id); + break; + case -ENOTSUP: + fprintf(stderr, "operation not supported by device\n"); + break; + case -EIO: + fprintf(stderr, "device is removed\n"); + break; + default: + fprintf(stderr, "Unable to get module EEPROM: %d\n", + ret); + break; + } + free(einfo.data); + return; + } + + switch (minfo.type) { + case RTE_ETH_MODULE_SFF_8079: + sff_8079_show_all(einfo.data, items); + break; + case RTE_ETH_MODULE_SFF_8472: + sff_8079_show_all(einfo.data, items); + sff_8472_show_all(einfo.data, items); + break; + case RTE_ETH_MODULE_SFF_8436: + case RTE_ETH_MODULE_SFF_8636: + sff_8636_show_all(einfo.data, einfo.length, items); + break; + default: + break; + } + printf("Finish -- Port: %d MODULE EEPROM length: %d bytes\n", port_id, einfo.length); + free(einfo.data); +} + +void +add_item_string(sff_item *items, const char *name_str, const char *value_str) +{ + /* append different values for same keys */ + if (sff_item_count > 0 && + (strcmp(items[sff_item_count - 1].name, name_str) == 0)) { + strcat(items[sff_item_count - 1].value, "; "); + strcat(items[sff_item_count - 1].value, value_str); + return; + } + + sprintf(items[sff_item_count].name, "%s", name_str); + sprintf(items[sff_item_count].value, "%s", value_str); + sff_item_count++; +} + +int +eth_dev_handle_port_module_eeprom(const char *cmd __rte_unused, const char *params, + struct rte_tel_data *d) +{ + char *end_param; + int port_id, i; + sff_item *items; + sff_item_count = 0; + + if (params == NULL || strlen(params) == 0 || !isdigit(*params)) + return -1; + + port_id = strtoul(params, &end_param, 0); + if (*end_param != '\0') + RTE_ETHDEV_LOG(NOTICE, + "Extra parameters passed to ethdev telemetry command, ignoring"); + + items = (sff_item *)malloc(SFF_ITEM_SIZE * SFF_ITEM_MAX_COUNT); + if (items == NULL) { + printf("Error allocating memory of items\n"); + free(items); + return -1; + } + + sff_port_module_eeprom_display(port_id, items); + + rte_tel_data_start_dict(d); + for (i = 0; i < sff_item_count; i++) + rte_tel_data_add_dict_string(d, items[i].name, items[i].value); + + free(items); + return 0; +} + diff --git a/lib/ethdev/ethdev_sff_telemetry.h b/lib/ethdev/ethdev_sff_telemetry.h new file mode 100644 index 0000000000..fd032407c8 --- /dev/null +++ b/lib/ethdev/ethdev_sff_telemetry.h @@ -0,0 +1,42 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018 Cavium, Inc + */ + +#ifndef ETHDEV_SFF_H_ +#define ETHDEV_SFF_H_ + +#include +#include + +#define ARRAY_SIZE(arr) RTE_DIM(arr) + +#define SFF_ITEM_NAME_SIZE 64 +#define SFF_ITEM_VALUE_SIZE 256 +#define SFF_ITEM_MAX_COUNT 256 +#define TMP_STRING_SIZE 64 + +typedef struct sff_module_info_item { + char name[SFF_ITEM_NAME_SIZE]; /* The item name. */ + char value[SFF_ITEM_VALUE_SIZE]; /* The item value. */ +} sff_item; + +#define SFF_ITEM_SIZE sizeof(sff_item) + +uint16_t sff_item_count; + +/* SFF-8079 Optics diagnostics */ +void sff_8079_show_all(const uint8_t *id, sff_item *items); + +/* SFF-8472 Optics diagnostics */ +void sff_8472_show_all(const uint8_t *id, sff_item *items); + +/* SFF-8636 Optics diagnostics */ +void sff_8636_show_all(const uint8_t *id, uint32_t eeprom_len, sff_item *items); + +int eth_dev_handle_port_module_eeprom(const char *cmd __rte_unused, + const char *params, + struct rte_tel_data *d); + +void add_item_string(sff_item *items, const char *name_str, const char *value_str); + +#endif /* ETHDEV_SFF_H_ */ diff --git a/lib/ethdev/meson.build b/lib/ethdev/meson.build index a094585bf7..88ceeb12b9 100644 --- a/lib/ethdev/meson.build +++ b/lib/ethdev/meson.build @@ -11,6 +11,11 @@ sources = files( 'rte_flow.c', 'rte_mtr.c', 'rte_tm.c', + 'ethdev_sff_telemetry.c', + 'sff_common.c', + 'sff_8079.c', + 'sff_8472.c', + 'sff_8636.c', ) headers = files( diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 29a3d80466..2b87df1b32 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -39,6 +39,7 @@ #include "ethdev_driver.h" #include "ethdev_profile.h" #include "ethdev_private.h" +#include "ethdev_sff_telemetry.h" struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS]; @@ -5876,4 +5877,6 @@ RTE_INIT(ethdev_init_telemetry) "Returns the link status for a port. Parameters: int port_id"); rte_telemetry_register_cmd("/ethdev/info", eth_dev_handle_port_info, "Returns the device info for a port. Parameters: int port_id"); + rte_telemetry_register_cmd("/ethdev/module_eeprom", eth_dev_handle_port_module_eeprom, + "Returns module EEPROM info with SFF specs. Parameters: int port_id"); }