From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by dpdk.org (Postfix) with ESMTP id E6F194CA1 for ; Wed, 25 Apr 2018 12:02:17 +0200 (CEST) Received: by mail-wr0-f195.google.com with SMTP id o15-v6so52704251wro.11 for ; Wed, 25 Apr 2018 03:02:17 -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=lBfqb7DWGugbouZhIHClBkX01TPIIRKSY5Et8EUtruY=; b=pXyU+BmOJVIESPkf7DVzskannC6oyTuMfnjj0T1AvUl/8RjHvJfu9mhr1XOQD2HHD+ XuHuCuRDQ83tD55203uK56rLvdrKHPjpiHdNfHrcr2Pb7K8WfqxDnxPO5kHlZXUtar8u OwJWtjH1VDQwBLTOa77MQgjAKOoJTVuaOwLwjj/PgYd9gNQDIiVnk1VdW1b0zgt+h+fi NSkrfLtQC5DwVOZ3rsdAorBQDnmI17ZcfVenc7LDjTMi+iwZhtOwEtyJepumiuLdLhYX aSobvW3/uQA7kTBmx2qgoSPN9xy/uBXSB1yj5CZOziBaNLVhtnWE5XrV4zQO0X6Qbq6h uHLg== 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=lBfqb7DWGugbouZhIHClBkX01TPIIRKSY5Et8EUtruY=; b=S6GtQ0o1wYP4fn9O7E/tNHGzfy7POjWdnJt9kqo8DYye1WnFZ1JCwJ/QBE4vyf/AgB 95sjWjxdW28wnwe2IZiXoKWJg67Nstt2b0kTKxzak6fyXXgfK6J1PaWhHxR2OzM5x7f0 Z/2Pa3sBVM6UcaOm9YGw7KjfGfePVDOy93cbS6+n7cJZK0V3fTjaARJMAcRRh+IIR6dT SKo46QVkYCHZnNIAEWLzFEGE9mJi6DmmCZyJu/1CEmuq1Eg+uyDxxw2+0Ms+6/JHT5+o WgMcIQWxiTip3xg4S7Gg68LXvpkKOTLo3vpMaTC0ZZc1raLMuKkJKzFfS7L8UGbGaHS3 My6w== X-Gm-Message-State: ALQs6tD9vIza9XOK/Z2xH7Vt/WSeBRKZaDfN1FB5jAA6WRH5y7lZERWm o3VhOEqvKP6OP4q9jZaKXCmt/fD1DVs= X-Google-Smtp-Source: AIpwx484v8Bw4BEe4gQX5Sw32WLea1KhavlIG+LsvK/l2yJ036uUcRV019qWoVrmjep4RPukntESYA== X-Received: by 2002:adf:d10f:: with SMTP id a15-v6mr13615540wri.165.1524650537512; Wed, 25 Apr 2018 03:02:17 -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 n143sm14100363wmd.29.2018.04.25.03.02.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Apr 2018 03:02:16 -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 12:01:51 +0200 Message-Id: <1524650515-26659-2-git-send-email-zijie.pan@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1524650515-26659-1-git-send-email-zijie.pan@6wind.com> References: <1524647624-23005-1-git-send-email-zijie.pan@6wind.com> <1524650515-26659-1-git-send-email-zijie.pan@6wind.com> Subject: [dpdk-dev] [PATCH v6 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 10:02:18 -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 --- 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 ++++++++ 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 ++ 6 files changed, 112 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/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