From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id BCACF2B91 for ; Tue, 27 Dec 2016 13:35:47 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP; 27 Dec 2016 04:35:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,416,1477983600"; d="scan'208";a="916475360" Received: from dpdk7.bj.intel.com ([172.16.182.76]) by orsmga003.jf.intel.com with ESMTP; 27 Dec 2016 04:35:46 -0800 From: Qiming Yang To: dev@dpdk.org, thomas.monjalon@6wind.com Cc: remy.horton@intel.com, ferruh.yigit@intel.com, Qiming Yang Date: Tue, 27 Dec 2016 20:30:14 +0800 Message-Id: <1482841816-54143-3-git-send-email-qiming.yang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482841816-54143-1-git-send-email-qiming.yang@intel.com> References: <1481008582-69416-1-git-send-email-qiming.yang@intel.com> <1482841816-54143-1-git-send-email-qiming.yang@intel.com> Subject: [dpdk-dev] [PATCH v3 2/4] net/e1000: add firmware version get 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: Tue, 27 Dec 2016 12:35:48 -0000 This patch adds a new function eth_igb_fw_version_get. Signed-off-by: Qiming Yang --- v3 changes: * use eth_igb_fw_version_get(struct rte_eth_dev *dev, u32 *fw_major, u32 *fw_minor, u32 *fw_minor, u32 *fw_patch, u32 *etrack_id) instead of eth_igb_fw_version_get(struct rte_eth_dev *dev, char *fw_version, int fw_length). Add statusment in /doc/guides/nics/features/igb.ini. --- --- doc/guides/nics/features/igb.ini | 1 + drivers/net/e1000/igb_ethdev.c | 43 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/doc/guides/nics/features/igb.ini b/doc/guides/nics/features/igb.ini index 9fafe72..ffd87ba 100644 --- a/doc/guides/nics/features/igb.ini +++ b/doc/guides/nics/features/igb.ini @@ -39,6 +39,7 @@ EEPROM dump = Y Registers dump = Y BSD nic_uio = Y Linux UIO = Y +FW version = Y Linux VFIO = Y x86-32 = Y x86-64 = Y diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 4a15447..25344b7 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -120,6 +120,8 @@ static int eth_igb_xstats_get_names(struct rte_eth_dev *dev, unsigned limit); static void eth_igb_stats_reset(struct rte_eth_dev *dev); static void eth_igb_xstats_reset(struct rte_eth_dev *dev); +static void eth_igb_fw_version_get(struct rte_eth_dev *dev, u32 *fw_major, + u32 *fw_minor, u32 *fw_patch, u32 *etrack_id); static void eth_igb_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info); static const uint32_t *eth_igb_supported_ptypes_get(struct rte_eth_dev *dev); @@ -389,6 +391,7 @@ static const struct eth_dev_ops eth_igb_ops = { .xstats_get_names = eth_igb_xstats_get_names, .stats_reset = eth_igb_stats_reset, .xstats_reset = eth_igb_xstats_reset, + .fw_version_get = eth_igb_fw_version_get, .dev_infos_get = eth_igb_infos_get, .dev_supported_ptypes_get = eth_igb_supported_ptypes_get, .mtu_set = eth_igb_mtu_set, @@ -1981,6 +1984,46 @@ eth_igbvf_stats_reset(struct rte_eth_dev *dev) } static void +eth_igb_fw_version_get(struct rte_eth_dev *dev, u32 *fw_major, u32 *fw_minor, + u32 *fw_patch, u32 *etrack_id) +{ + struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct e1000_fw_version fw; + + e1000_get_fw_version(hw, &fw); + + switch (hw->mac.type) { + case e1000_i210: + case e1000_i211: + if (!(e1000_get_flash_presence_i210(hw))) { + *fw_major = fw.invm_major; + *fw_minor = fw.invm_minor; + break; + } + /* fall through */ + default: + /* if option rom is valid, display its version too*/ + if (fw.or_valid) { + *fw_major = fw.eep_major; + *fw_minor = fw.eep_minor; + *etrack_id = fw.etrack_id; + *fw_patch = fw.or_patch; + /* no option rom */ + } else { + if (fw.etrack_id != 0X0000) { + *fw_major = fw.eep_major; + *fw_minor = fw.eep_minor; + *etrack_id = fw.etrack_id; + } else { + *fw_major = fw.eep_major; + *fw_minor = fw.eep_minor; + } + } + break; + } +} + +static void eth_igb_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) { struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); -- 2.7.4