From patchwork Wed Apr 25 14:02:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zijie Pan X-Patchwork-Id: 38920 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1D9217EE4; Wed, 25 Apr 2018 16:02:51 +0200 (CEST) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id 664877F3C for ; Wed, 25 Apr 2018 16:02:43 +0200 (CEST) Received: by mail-wm0-f67.google.com with SMTP id j4so7394476wme.1 for ; Wed, 25 Apr 2018 07:02:43 -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=WyVqRn/21apAhR2EjZep+Xa9a3zD0K09zeuwXpF7cPg=; b=Gh273swKe28ZEIPOv7rguSzJIQ0YM05ggj2YFgviAcohxvwP7ewZDeMIxRYLSC5Cho XxV2zD4rViPHK8SWkJ5hGBkC3eXwRtkdGhQUNHFaa6o051POGlvDIgzqmLFKMO0ANirO DsKoO5Gy8zDh7oDEG90ja7CDLQ9xfDsQBDmJra6XLgP+mLI5lTSvXXnXd9wWT+bJsn6n Il8gQmgaTcDpcIDg5vtyhlzcP4BTORVlyv9on2cpcImM4dgwt0Sl2kpUJsEO2OfGeaUf gC4y/2f2k8/ZDkDQ6iQUGm+qvktNPvnGWhBOA6QlUXnViKTbPLMT0moZCpZduNDzpfIb DxUg== 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=WyVqRn/21apAhR2EjZep+Xa9a3zD0K09zeuwXpF7cPg=; b=n1gCUG5mEgMU3o/EQjfcihy3yIbQs9WPQdiRVbnRt3J/NazGMGusJ8rUQ6jfsuJSxX hEXorW/u8FEkdyIxOY25ydSzHx1kBw0JHqBZ0JOVeKSK7py9B6/LGWuDEEmT9YOltXY+ GV+tuQ5d/igkp652JGed24BLHMJsTmLSjP+dA6NiQ7WCOUtv4VxAbQIIOTyNNx6shj/m zi/8AjGienWa7SKxz+hiM56BArGUcV1pXEcVx3x7QQeTCLLM2TU5qouIhnJql8srLA/V x9ovlbmrRFvMBESkXQE1IYaIDc4GT1ATQQ8+w0Q93Y5eN+IY22bCpuWu17NuYb/1G/Rq x0bQ== X-Gm-Message-State: ALQs6tBTVpMmTVnsTArJMYIY5Iq0uFcU60pZdqaqZvn3eQF33uiMNlVi qWibvFVt6SnWwX8glzOndor4ZlDQL5A= X-Google-Smtp-Source: AB8JxZrnlujleHysQDndGeQYmUhwMMZf2/B6Qhz/QTU48jBqLrr0iUnhW9RgtAPpaY1UGSDWgXggjw== X-Received: by 10.28.139.136 with SMTP id n130mr3899874wmd.8.1524664962861; Wed, 25 Apr 2018 07:02: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 x65sm2584552wme.31.2018.04.25.07.02.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Apr 2018 07:02:42 -0700 (PDT) From: Zijie Pan To: dev@dpdk.org Cc: remy.horton@intel.com, ferruh.yigit@intel.com, thomas@monjalon.net, wenzhuo.lu@intel.com Date: Wed, 25 Apr 2018 16:02:05 +0200 Message-Id: <1524664926-938-5-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 4/5] net/e1000: add module EEPROM callbacks for e1000 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add new callbacks for eth_dev_ops of e1000 to get the information and data of plugin module EEPROM. Signed-off-by: Zijie Pan Acked-by: Remy Horton --- Cc: wenzhuo.lu@intel.com doc/guides/nics/features/igb.ini | 1 + drivers/net/e1000/base/e1000_phy.h | 8 ++++ drivers/net/e1000/igb_ethdev.c | 86 ++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+) diff --git a/doc/guides/nics/features/igb.ini b/doc/guides/nics/features/igb.ini index 33d64d9..c53fd07 100644 --- a/doc/guides/nics/features/igb.ini +++ b/doc/guides/nics/features/igb.ini @@ -41,6 +41,7 @@ Basic stats = Y Extended stats = Y FW version = Y EEPROM dump = Y +Module EEPROM dump = Y Registers dump = Y BSD nic_uio = Y Linux UIO = Y diff --git a/drivers/net/e1000/base/e1000_phy.h b/drivers/net/e1000/base/e1000_phy.h index 3e45a9e..2cd0e14 100644 --- a/drivers/net/e1000/base/e1000_phy.h +++ b/drivers/net/e1000/base/e1000_phy.h @@ -330,4 +330,12 @@ struct sfp_e1000_flags { #define E1000_SFF_VENDOR_OUI_AVAGO 0x00176A00 #define E1000_SFF_VENDOR_OUI_INTEL 0x001B2100 +/* EEPROM byte offsets */ +#define IGB_SFF_8472_SWAP 0x5C +#define IGB_SFF_8472_COMP 0x5E + +/* Bitmasks */ +#define IGB_SFF_ADDRESSING_MODE 0x4 +#define IGB_SFF_8472_UNSUP 0x00 + #endif diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 9b808a9..c35c935 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -223,6 +223,10 @@ static int eth_igb_get_eeprom(struct rte_eth_dev *dev, struct rte_dev_eeprom_info *eeprom); static int eth_igb_set_eeprom(struct rte_eth_dev *dev, struct rte_dev_eeprom_info *eeprom); +static int eth_igb_get_module_info(struct rte_eth_dev *dev, + struct rte_eth_dev_module_info *modinfo); +static int eth_igb_get_module_eeprom(struct rte_eth_dev *dev, + struct rte_dev_eeprom_info *info); static int eth_igb_set_mc_addr_list(struct rte_eth_dev *dev, struct ether_addr *mc_addr_set, uint32_t nb_mc_addr); @@ -402,6 +406,8 @@ static void eth_igb_write_ivar(struct e1000_hw *hw, uint8_t msix_vector, .get_eeprom_length = eth_igb_get_eeprom_length, .get_eeprom = eth_igb_get_eeprom, .set_eeprom = eth_igb_set_eeprom, + .get_module_info = eth_igb_get_module_info, + .get_module_eeprom = eth_igb_get_module_eeprom, .timesync_adjust_time = igb_timesync_adjust_time, .timesync_read_time = igb_timesync_read_time, .timesync_write_time = igb_timesync_write_time, @@ -5329,6 +5335,86 @@ static void igbvf_set_vfta_all(struct rte_eth_dev *dev, bool on) } static int +eth_igb_get_module_info(struct rte_eth_dev *dev, + struct rte_eth_dev_module_info *modinfo) +{ + struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); + + uint32_t status = 0; + uint16_t sff8472_rev, addr_mode; + bool page_swap = false; + + if (hw->phy.media_type == e1000_media_type_copper || + hw->phy.media_type == e1000_media_type_unknown) + return -EOPNOTSUPP; + + /* Check whether we support SFF-8472 or not */ + status = e1000_read_phy_reg_i2c(hw, IGB_SFF_8472_COMP, &sff8472_rev); + if (status) + return -EIO; + + /* addressing mode is not supported */ + status = e1000_read_phy_reg_i2c(hw, IGB_SFF_8472_SWAP, &addr_mode); + if (status) + return -EIO; + + /* addressing mode is not supported */ + if ((addr_mode & 0xFF) & IGB_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.\n"); + page_swap = true; + } + + if ((sff8472_rev & 0xFF) == IGB_SFF_8472_UNSUP || page_swap) { + /* We have an SFP, but it does not support SFF-8472 */ + modinfo->type = RTE_ETH_MODULE_SFF_8079; + modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8079_LEN; + } else { + /* We have an SFP which supports a revision of SFF-8472 */ + modinfo->type = RTE_ETH_MODULE_SFF_8472; + modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8472_LEN; + } + + return 0; +} + +static int +eth_igb_get_module_eeprom(struct rte_eth_dev *dev, + struct rte_dev_eeprom_info *info) +{ + struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); + + uint32_t status = 0; + uint16_t dataword[RTE_ETH_MODULE_SFF_8472_LEN / 2 + 1]; + u16 first_word, last_word; + int i = 0; + + if (info->length == 0) + return -EINVAL; + + first_word = info->offset >> 1; + last_word = (info->offset + info->length - 1) >> 1; + + /* Read EEPROM block, SFF-8079/SFF-8472, word at a time */ + for (i = 0; i < last_word - first_word + 1; i++) { + status = e1000_read_phy_reg_i2c(hw, (first_word + i) * 2, + &dataword[i]); + if (status) { + /* Error occurred while reading module */ + return -EIO; + } + + dataword[i] = rte_be_to_cpu_16(dataword[i]); + } + + memcpy(info->data, (u8 *)dataword + (info->offset & 1), info->length); + + return 0; +} + +static int eth_igb_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) { struct e1000_hw *hw =