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 85F3C5F5B for ; Wed, 21 Mar 2018 12:07:48 +0100 (CET) Received: by mail-wr0-f195.google.com with SMTP id c24so4762294wrc.6 for ; Wed, 21 Mar 2018 04:07:48 -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=Epp0jQScBgfETgwVjvmfKKDt1PvbtXj/HnI8I0HX7HE=; b=L5ig/pp5DVFbnO1TxfeyC7o3QsuQ3GmM8ojmYxk7CpmXzRkxvYlYvWoO/ABd8t2auy QSlXRU8odl0ubxGfinb5o7U/rTM4FyrSPamBdtmkXibSslPjEyCAH7GdLJlnEwYf2WRb KoMRXSFkXJ0KfY+K9ZWXl2ETfBbVRy+HLhmBoWnGXKn/I54Z/t9C1ZMas/F8V9XFrvc4 Dnol8OtVK/ORMmW/5JOowwFlf6IpAxYZBTbSfAqm56r6m19BpLkns+x9EsQZGsuAWdV0 FYFqHYr/O+ilOxrTtEnZ6e8D6TH8mToKw1Gfrk+y7pWMe0ffLvxy+m0PBdkoF/mHJWX9 aheA== 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=Epp0jQScBgfETgwVjvmfKKDt1PvbtXj/HnI8I0HX7HE=; b=W3CMnZdtXcy6HeOYhQfGJcjmahIi6pwoRGrzRXMoen3NB7yT9S7LhWogf/orprHRD6 nyErim28TttRJ7tU55nIsj6Pph65r9ommJYMOUGY3Ie/WT4lAGPTy7kIZ2Tz5+MHrR/5 udZTCBofmda3RlT/YWF1l3SBjWDh487dSajGxPtODd0L1IlYZgb9wryM7Q5IT9e5gKza U77MpXS0mlhRxY+CcDGCia2OU/9sQS9cjrzvfkbIDkpg3f1xIYoDPQnz/vIP9MN4w3x8 PhKOJq0QGsww5STCb19dCBfa354esFQ2NQoh55n/4yaQf3x8A1/QZr1AWeUKfz08ydsj rS1w== X-Gm-Message-State: AElRT7E5czZLJnNDLoPnTEZRyxMc6BQggYZ54ioO3LYPVHPLKPSRwiE3 AdUTfzwjjvaThwIunlUGVSF3oW91P2U= X-Google-Smtp-Source: AG47ELsynPR72lgY8WAYOB2ewgK1Ein9pEehNqIC20matabOYZb7SpEqhGLOd5TO7NJMhNN84EQT+Q== X-Received: by 10.223.166.179 with SMTP id t48mr15874018wrc.161.1521630467998; Wed, 21 Mar 2018 04:07:47 -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.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Mar 2018 04:07:47 -0700 (PDT) From: Zijie Pan To: dev@dpdk.org Cc: remy.horton@intel.com, wenzhuo.lu@intel.com, konstantin.ananyev@intel.com Date: Wed, 21 Mar 2018 12:06:17 +0100 Message-Id: <1521630379-9554-4-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 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: Wed, 21 Mar 2018 11:07:48 -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 Acked-by: Remy Horton --- Cc: remy.horton@intel.com Cc: wenzhuo.lu@intel.com Cc: konstantin.ananyev@intel.com drivers/net/ixgbe/ixgbe_ethdev.c | 79 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 4483258..28f09d3 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,78 @@ 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