From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id CBFDF7EBB for ; Wed, 25 Apr 2018 16:02:37 +0200 (CEST) Received: by mail-wm0-f67.google.com with SMTP id j5so7058418wme.5 for ; Wed, 25 Apr 2018 07:02:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FrMMmyNY+cra6IhMlY2/eEy1EWKo/z2uhRkv8b6+8yA=; b=BMBPbXFugLpSwCOAk1JvFXluMHskm/GZRprvNa0NAz5S/WVpJO2r/LtKzqcJxFEuSi M0RJCzGReGr6eTy0OPyzA0VVPiRFejfvtjIf+4WMD/ASWi3hl5HP5mgyKCuMb02lDGyM AIhGkwSUFrsLMkY7foo/gn+ThRPMcli91sOd6K7T2h1bOUTJrC5d2Uzl2apLPM2ckq/v ouhYxB+nDIz2rrjCruV2HUUuYPEnWux3Dop1LQUHyOmfr6+0plJj4dJynlhMBEeAxKQJ Vq2CM+lQjR8TUCa6ZD5Wsv/ZuJVzqU5kax2zHBKp/Xr+vOOPpymjI02Tq4SLzctxn3cN 7drg== 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:in-reply-to :references; bh=FrMMmyNY+cra6IhMlY2/eEy1EWKo/z2uhRkv8b6+8yA=; b=o8pzWgob7YpRY+rdn5FiW9pNZrqNwZXkz5D6Eqi0kavkpDJiAsk8GOCUgpoZn1dvEO b93kBWmqDfZkyK/aLHJevhz0TAXtxMMrzYEV79Noqe6O3gcyeYFcXBmCvRP9lZau08I0 e8UMa9oMa700EX+CzosS60ZJjUykCTJDFBayZ9A73IMbidfuEfI7GKVAa4yJam6KTobD aBuUvgwJvAJyizNEYiLbIuQ3CXcSGhwjFq5TMsV7hjQRXfCw3rtJY5Njo40elhNKLHhN 0KH/Wgafv4DfapSTNuJRiUF1uADegwymPknqJWtwFBZ55iGjXPE2QiMxOp8pqn62G44b 9Zlg== X-Gm-Message-State: ALQs6tBVjbWeOfkNTjzf9JdeQpda84P+9+mh/qi4pg8D8jJexc0u3t2J QvAFcQWE6NPVIrIu7ARAXHiiT7fdm+c= X-Google-Smtp-Source: AIpwx4/M8uBN1/PQ5izKzpdQO5TD7LUGPOYooSolKfrHTQzB08qC2ZL2iJPctjguLZOd+xkZ9S8qOg== X-Received: by 10.28.69.154 with SMTP id l26mr15413797wmi.95.1524664957332; Wed, 25 Apr 2018 07:02:37 -0700 (PDT) Received: from cougar.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id x65sm2584552wme.31.2018.04.25.07.02.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Apr 2018 07:02:36 -0700 (PDT) From: Zijie Pan To: dev@dpdk.org Cc: remy.horton@intel.com, ferruh.yigit@intel.com, thomas@monjalon.net, john.mcnamara@intel.com, marko.kovacevic@intel.com Date: Wed, 25 Apr 2018 16:02:02 +0200 Message-Id: <1524664926-938-2-git-send-email-zijie.pan@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1524664926-938-1-git-send-email-zijie.pan@6wind.com> References: <1524650515-26659-1-git-send-email-zijie.pan@6wind.com> <1524664926-938-1-git-send-email-zijie.pan@6wind.com> Subject: [dpdk-dev] [PATCH v7 1/5] ethdev: add access to eeprom 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: , X-List-Received-Date: Wed, 25 Apr 2018 14:02:38 -0000 add new APIs: - rte_eth_dev_get_module_info - rte_eth_dev_get_module_eeprom Signed-off-by: Zijie Pan Acked-by: Remy Horton Acked-by: Thomas Monjalon --- Cc: remy.horton@intel.com Cc: john.mcnamara@intel.com Cc: marko.kovacevic@intel.com Cc: thomas@monjalon.net doc/guides/nics/features.rst | 11 ++++++++ doc/guides/nics/features/default.ini | 1 + lib/librte_ether/rte_dev_info.h | 18 +++++++++++++ lib/librte_ether/rte_ethdev.c | 26 +++++++++++++++++++ lib/librte_ether/rte_ethdev.h | 43 +++++++++++++++++++++++++++++++ lib/librte_ether/rte_ethdev_core.h | 12 +++++++++ lib/librte_ether/rte_ethdev_version.map | 2 ++ 7 files changed, 113 insertions(+) diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst index 1b4fb97..bb183e2 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -749,6 +749,17 @@ Supports getting/setting device eeprom data. ``rte_eth_dev_set_eeprom()``. +.. _nic_features_module_eeprom_dump: + +Module EEPROM dump +------------------ + +Supports getting information and data of plugin module eeprom. + +* **[implements] eth_dev_ops**: ``get_module_info``, ``get_module_eeprom``. +* **[related] API**: ``rte_eth_dev_get_module_info()``, ``rte_eth_dev_get_module_eeprom()``. + + .. _nic_features_register_dump: Registers dump diff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini index dae2ad7..7dfe56c 100644 --- a/doc/guides/nics/features/default.ini +++ b/doc/guides/nics/features/default.ini @@ -63,6 +63,7 @@ Extended stats = Stats per queue = FW version = EEPROM dump = +Module EEPROM dump = Registers dump = LED = Multiprocess aware = diff --git a/lib/librte_ether/rte_dev_info.h b/lib/librte_ether/rte_dev_info.h index 6b68584..fea5da8 100644 --- a/lib/librte_ether/rte_dev_info.h +++ b/lib/librte_ether/rte_dev_info.h @@ -28,4 +28,22 @@ struct rte_dev_eeprom_info { uint32_t magic; /**< Device-specific key, such as device-id */ }; +/** + * Placeholder for accessing plugin module eeprom + */ +struct rte_eth_dev_module_info { + uint32_t type; /**< Type of plugin module eeprom */ + uint32_t eeprom_len; /**< Length of plugin module eeprom */ +}; + +/* EEPROM Standards for plug in modules */ +#define RTE_ETH_MODULE_SFF_8079 0x1 +#define RTE_ETH_MODULE_SFF_8079_LEN 256 +#define RTE_ETH_MODULE_SFF_8472 0x2 +#define RTE_ETH_MODULE_SFF_8472_LEN 512 +#define RTE_ETH_MODULE_SFF_8636 0x3 +#define RTE_ETH_MODULE_SFF_8636_LEN 256 +#define RTE_ETH_MODULE_SFF_8436 0x4 +#define RTE_ETH_MODULE_SFF_8436_LEN 256 + #endif /* _RTE_DEV_INFO_H_ */ diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 7821a88..100cbd8 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -3947,6 +3947,32 @@ int rte_eth_set_queue_rate_limit(uint16_t port_id, uint16_t queue_idx, return eth_err(port_id, (*dev->dev_ops->set_eeprom)(dev, info)); } +int __rte_experimental +rte_eth_dev_get_module_info(uint16_t port_id, + struct rte_eth_dev_module_info *modinfo) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + + dev = &rte_eth_devices[port_id]; + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_module_info, -ENOTSUP); + return (*dev->dev_ops->get_module_info)(dev, modinfo); +} + +int __rte_experimental +rte_eth_dev_get_module_eeprom(uint16_t port_id, + struct rte_dev_eeprom_info *info) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + + dev = &rte_eth_devices[port_id]; + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_module_eeprom, -ENOTSUP); + return (*dev->dev_ops->get_module_eeprom)(dev, info); +} + int rte_eth_dev_get_dcb_info(uint16_t port_id, struct rte_eth_dcb_info *dcb_info) diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 7e4e57b..4852246 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -3311,6 +3311,49 @@ int rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t queue_id, int rte_eth_dev_set_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info); /** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Retrieve the type and size of plugin module EEPROM + * + * @param port_id + * The port identifier of the Ethernet device. + * @param modinfo + * The type and size of plugin module EEPROM. + * @return + * - (0) if successful. + * - (-ENOTSUP) if hardware doesn't support. + * - (-ENODEV) if *port_id* invalid. + * - (-EIO) if device is removed. + * - others depends on the specific operations implementation. + */ +int __rte_experimental +rte_eth_dev_get_module_info(uint16_t port_id, + struct rte_eth_dev_module_info *modinfo); + +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Retrieve the data of plugin module EEPROM + * + * @param port_id + * The port identifier of the Ethernet device. + * @param info + * The template includes the plugin module EEPROM attributes, and the + * buffer for return plugin module EEPROM data. + * @return + * - (0) if successful. + * - (-ENOTSUP) if hardware doesn't support. + * - (-ENODEV) if *port_id* invalid. + * - (-EIO) if device is removed. + * - others depends on the specific operations implementation. + */ +int __rte_experimental +rte_eth_dev_get_module_eeprom(uint16_t port_id, + struct rte_dev_eeprom_info *info); + +/** * Set the list of multicast addresses to filter on an Ethernet device. * * @param port_id diff --git a/lib/librte_ether/rte_ethdev_core.h b/lib/librte_ether/rte_ethdev_core.h index 55eb2b0..33d12b3 100644 --- a/lib/librte_ether/rte_ethdev_core.h +++ b/lib/librte_ether/rte_ethdev_core.h @@ -337,6 +337,14 @@ typedef int (*eth_set_eeprom_t)(struct rte_eth_dev *dev, struct rte_dev_eeprom_info *info); /**< @internal Program eeprom data */ +typedef int (*eth_get_module_info_t)(struct rte_eth_dev *dev, + struct rte_eth_dev_module_info *modinfo); +/**< @internal Retrieve type and size of plugin module eeprom */ + +typedef int (*eth_get_module_eeprom_t)(struct rte_eth_dev *dev, + struct rte_dev_eeprom_info *info); +/**< @internal Retrieve plugin module eeprom data */ + typedef int (*eth_l2_tunnel_eth_type_conf_t) (struct rte_eth_dev *dev, struct rte_eth_l2_tunnel_conf *l2_tunnel); /**< @internal config l2 tunnel ether type */ @@ -467,6 +475,10 @@ struct eth_dev_ops { eth_get_eeprom_t get_eeprom; /**< Get eeprom data. */ eth_set_eeprom_t set_eeprom; /**< Set eeprom. */ + eth_get_module_info_t get_module_info; + /** Get plugin module eeprom attribute. */ + eth_get_module_eeprom_t get_module_eeprom; + /** Get plugin module eeprom data. */ eth_filter_ctrl_t filter_ctrl; /**< common filter control. */ diff --git a/lib/librte_ether/rte_ethdev_version.map b/lib/librte_ether/rte_ethdev_version.map index 8fe0788..b8e7566 100644 --- a/lib/librte_ether/rte_ethdev_version.map +++ b/lib/librte_ether/rte_ethdev_version.map @@ -208,6 +208,8 @@ EXPERIMENTAL { rte_eth_dev_count_avail; rte_eth_dev_count_total; + rte_eth_dev_get_module_info; + rte_eth_dev_get_module_eeprom; rte_eth_dev_is_removed; rte_eth_dev_owner_delete; rte_eth_dev_owner_get; -- 1.7.10.4