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 91D085F17 for ; Wed, 21 Mar 2018 12:07:42 +0100 (CET) Received: by mail-wm0-f67.google.com with SMTP id f125so8975911wme.4 for ; Wed, 21 Mar 2018 04:07:42 -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=OQ4DaN1GxUGwyBW4AEF74v24gibFvvvGeO9qGYIs7lM=; b=p5K+K+9IxjQX6ovo46jNxFHkRBsDzWhyOLVHQQXt8VjU0/ghqOaU40j0XNMpDB+KAE JfcIRNTzCsuUd5f4ElmyRIksSjHcIng7lnjE/NnjvHidw/1Kd15Wov/zzxR7nettYR1f C6gyXi4bm9s8wK9KoHsJhrPW4EOXSWIzFsDC8GgDRh3fBBfy/vl+hj92X1MNyDVNN6K3 qju5vb7tuEuaKvbDR1e56Dydlvr5EDImnRZAPhJDKN87Woa7BziW2wM4z5MRBq7+K8EB +A0cqf5XIo6p/4Q7mgedCDlxiGQFldaX3/KrIhgszNhTKCxIa72KW2LJuwmJn0Ia/ExV ZyxA== 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=OQ4DaN1GxUGwyBW4AEF74v24gibFvvvGeO9qGYIs7lM=; b=kfj7Yi2qGBBiScOBTc2TOyn7rKDLkWQyEv506XRWINj/Ud7I1oIJM5lEEVqYgR3vJe cyTnETX0OhigfWKmDCwg0AKc/KeHDvjIwCHtblvfQLiJwjKBwIkq5kYRCMjcFUa/z1Xx nzqOuu04h1oS8VJlF34B5AD6O6PUnIuNEXMk213L1jKyfmWsA5WWtAeu70OhXhZUKuBO lOypPPmThKZ2I0OJWqxhwtnQtYm/PT5XDTXJF2KT2ETYdY7VgDwN+y6Wsyx+gxoZhCGj qGq8YcyW0KwiNQndRuF9XdVuOBnvUpeQQknlYUeUbesLLPFHck2d4skTIXZGEbL+bHPh NuEg== X-Gm-Message-State: AElRT7EpN9iY1fRWz//J6c+rpLp8uEpIqiQSyJF859oXzLBnwgaUGl47 jA52WYVILT39jvuAQ8RfVWSUwvae4sg= X-Google-Smtp-Source: AG47ELt2YA+kYLnMlcr7f/aqV/SPsByPJefR48RlU2ki7VCvSqYAhgXHak/T4AezHhBdB+w7/qIE1A== X-Received: by 10.28.193.65 with SMTP id r62mr2246044wmf.83.1521630462031; Wed, 21 Mar 2018 04:07:42 -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 n23sm3708482wra.14.2018.03.21.04.07.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Mar 2018 04:07:41 -0700 (PDT) From: Zijie Pan To: dev@dpdk.org Cc: remy.horton@intel.com, john.mcnamara@intel.com, marko.kovacevic@intel.com, thomas@monjalon.net Date: Wed, 21 Mar 2018 12:06:15 +0100 Message-Id: <1521630379-9554-2-git-send-email-zijie.pan@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1521630379-9554-1-git-send-email-zijie.pan@6wind.com> References: <1521193010-25050-1-git-send-email-zijie.pan@6wind.com> <1521630379-9554-1-git-send-email-zijie.pan@6wind.com> Subject: [dpdk-dev] [PATCH v3 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, 21 Mar 2018 11:07:42 -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 | 35 +++++++++++++++++++++++++++++++ lib/librte_ether/rte_ethdev_core.h | 12 +++++++++++ lib/librte_ether/rte_ethdev_version.map | 2 ++ 6 files changed, 104 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..c15a0fa 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_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 ETH_MODULE_SFF_8079 0x1 +#define ETH_MODULE_SFF_8079_LEN 256 +#define ETH_MODULE_SFF_8472 0x2 +#define ETH_MODULE_SFF_8472_LEN 512 +#define ETH_MODULE_SFF_8636 0x3 +#define ETH_MODULE_SFF_8636_LEN 256 +#define ETH_MODULE_SFF_8436 0x4 +#define 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 0590f0c..b83643d 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -4044,6 +4044,32 @@ int rte_eth_set_queue_rate_limit(uint16_t port_id, uint16_t queue_idx, } int +rte_eth_dev_get_module_info(uint16_t port_id, + struct rte_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_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 0361533..e8b1d94 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -3262,6 +3262,41 @@ 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); /** + * 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_eth_dev_get_module_info(uint16_t port_id, + struct rte_dev_module_info *modinfo); + +/** + * 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_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 e5681e4..26b5704 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_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 87f02fb..ae4b2ad 100644 --- a/lib/librte_ether/rte_ethdev_version.map +++ b/lib/librte_ether/rte_ethdev_version.map @@ -201,6 +201,8 @@ DPDK_18.02 { global: rte_eth_dev_filter_ctrl; + rte_eth_dev_get_module_info; + rte_eth_dev_get_module_eeprom; } DPDK_17.11; -- 1.7.10.4