From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by dpdk.org (Postfix) with ESMTP id 52AA72C01 for ; Mon, 12 Mar 2018 05:17:58 +0100 (CET) Received: by mail-wm0-f66.google.com with SMTP id x7so13452413wmc.0 for ; Sun, 11 Mar 2018 21:17:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=2S1aT0aRIuLfOKcMw8nie6etQSYA5ElFoAC6qxlVfxQ=; b=xtQ/WOQFFt6EoFWPdFREhV7GTOm8DdC+8i6M+wixXkqEDKp8xxXtxVaHLeF0qB8+ih r97BAAhpaxKMJ48ytnoPyvlYSf31cA8kTVONfHK1KrF5gj5e4qDSgxrjm6S4WuBmhoDw rHpsUferqDoj7IYVOc6VwDgUifoy6on8N27l1x8MUZz1w9g3m5z+c3YP2hTtgdIPvWyD Iyzyx740TxmqKbZ7kuLA3jZXXpOk044nEiyy8U+HIQhbI5txrDsMIBPcY71zUM8g1FyV zZwsc/ja42/+XNq7OWMZvM2yr99jRzTLXqL09cFs8VbiyJ2XBkI/VJJkhM7UwhgFsdhC beVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=2S1aT0aRIuLfOKcMw8nie6etQSYA5ElFoAC6qxlVfxQ=; b=Gm2E4TVLENvgPBHNsW2Onw95AcS0xYBV5C8tcet4VP18aD6HNm+glgA0quBfXp49PM l89s10G/bur4LpjaM9bIkwR1UMMjlKFLnoOrXENSgw257I2WnpfqZuWigb+DTm8pg619 FUKxCcX/vZpa9B4W30RWPalURNlVmT6wrnusfa4PK9CbBlhz62fQ89QeoR6EV4dB5/uK hVmNpviZY6Hk5Z0380N+KC/1FwtCfbHLmDVgSMQgkqC6nJEg7VAdB6kNuNRs2OYco4yJ OAgFt/weuTRJCHCge0hJ7bEqTawSMfgceL83ng31q49K7BkmLDbM7jQz5J2Lzp5c1GHq XBJw== X-Gm-Message-State: AElRT7ED6pMk/y7eZ/l8Xjct6aNiaJ3b249NemPpsy7oKr7e5EMD02QI PVEItaQERf8XWxDsRtXt+m/9FNlW X-Google-Smtp-Source: AG47ELtHqqgLX6h6pvjIaP0+DD0jDvSPwXb5oZd3iG29R8tR5Gj0Tk2nhrn8JUx0GRFXUPF13t/+2Q== X-Received: by 10.28.192.24 with SMTP id q24mr4345653wmf.91.1520828277895; Sun, 11 Mar 2018 21:17:57 -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 t91sm13113866wrc.21.2018.03.11.21.17.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Mar 2018 21:17:57 -0700 (PDT) From: Zijie Pan To: dev@dpdk.org Date: Mon, 12 Mar 2018 05:17:21 +0100 Message-Id: <1520828243-25191-4-git-send-email-zijie.pan@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1520828243-25191-1-git-send-email-zijie.pan@6wind.com> References: <1520828243-25191-1-git-send-email-zijie.pan@6wind.com> X-Mailman-Approved-At: Tue, 13 Mar 2018 13:55:53 +0100 Subject: [dpdk-dev] [PATCH 3/5] net/ixgbe: add module EEPROM callbacks for ixgbe 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: Mon, 12 Mar 2018 04:17:58 -0000 Add new callbacks for eth_dev_ops of ixgbe to get the information and data of plugin module eeprom. Signed-off-by: Zijie Pan --- drivers/net/ixgbe/ixgbe_ethdev.c | 76 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 4483258..22a2270 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -328,6 +328,11 @@ static int ixgbe_get_eeprom(struct rte_eth_dev *dev, static int ixgbe_set_eeprom(struct rte_eth_dev *dev, struct rte_dev_eeprom_info *eeprom); +static int ixgbe_get_module_info(struct rte_eth_dev *dev, + struct rte_dev_module_info *modinfo); +static int ixgbe_get_module_eeprom(struct rte_eth_dev *dev, + struct rte_dev_eeprom_info *info); + static int ixgbevf_get_reg_length(struct rte_eth_dev *dev); static int ixgbevf_get_regs(struct rte_eth_dev *dev, struct rte_dev_reg_info *regs); @@ -565,6 +570,8 @@ static int ixgbe_dev_udp_tunnel_port_del(struct rte_eth_dev *dev, .get_eeprom_length = ixgbe_get_eeprom_length, .get_eeprom = ixgbe_get_eeprom, .set_eeprom = ixgbe_set_eeprom, + .get_module_info = ixgbe_get_module_info, + .get_module_eeprom = ixgbe_get_module_eeprom, .get_dcb_info = ixgbe_dev_get_dcb_info, .timesync_adjust_time = ixgbe_timesync_adjust_time, .timesync_read_time = ixgbe_timesync_read_time, @@ -7166,6 +7173,75 @@ static void ixgbevf_set_vfta_all(struct rte_eth_dev *dev, bool on) return eeprom->ops.write_buffer(hw, first, length, data); } +static int +ixgbe_get_module_info(struct rte_eth_dev *dev, + struct rte_dev_module_info *modinfo) +{ + struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint32_t status; + uint8_t sff8472_rev, addr_mode; + bool page_swap = false; + + /* Check whether we support SFF-8472 or not */ + status = hw->phy.ops.read_i2c_eeprom(hw, + IXGBE_SFF_SFF_8472_COMP, + &sff8472_rev); + if (status != 0) + return -EIO; + + /* addressing mode is not supported */ + status = hw->phy.ops.read_i2c_eeprom(hw, + IXGBE_SFF_SFF_8472_SWAP, + &addr_mode); + if (status != 0) + return -EIO; + + if (addr_mode & IXGBE_SFF_ADDRESSING_MODE) { + PMD_DRV_LOG(ERR, "Address change required to access page 0xA2, but not supported. Please report the module type to the driver maintainers."); + page_swap = true; + } + + if (sff8472_rev == IXGBE_SFF_SFF_8472_UNSUP || page_swap) { + /* We have a SFP, but it does not support SFF-8472 */ + modinfo->type = ETH_MODULE_SFF_8079; + modinfo->eeprom_len = ETH_MODULE_SFF_8079_LEN; + } else { + /* We have a SFP which supports a revision of SFF-8472. */ + modinfo->type = ETH_MODULE_SFF_8472; + modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN; + } + + return 0; +} + +static int +ixgbe_get_module_eeprom(struct rte_eth_dev *dev, + struct rte_dev_eeprom_info *info) +{ + struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint32_t status = IXGBE_ERR_PHY_ADDR_INVALID; + uint8_t databyte = 0xFF; + uint8_t *data = info->data; + uint32_t i = 0; + + if (info->length == 0) + return -EINVAL; + + for (i = info->offset; i < info->offset + info->length; i++) { + if (i < ETH_MODULE_SFF_8079_LEN) + status = hw->phy.ops.read_i2c_eeprom(hw, i, &databyte); + else + status = hw->phy.ops.read_i2c_sff8472(hw, i, &databyte); + + if (status != 0) + return -EIO; + + data[i - info->offset] = databyte; + } + + return 0; +} + uint16_t ixgbe_reta_size_get(enum ixgbe_mac_type mac_type) { switch (mac_type) { -- 1.7.10.4