From patchwork Sun Sep 11 19:43:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 15760 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id EA1F74A59; Mon, 12 Sep 2016 04:45:29 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id C2692292D for ; Mon, 12 Sep 2016 04:45:25 +0200 (CEST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP; 11 Sep 2016 19:45:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,320,1470726000"; d="scan'208";a="7271751" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.129.103]) by fmsmga006.fm.intel.com with ESMTP; 11 Sep 2016 19:45:24 -0700 From: Zhang Qi To: jingjing.wu@intel.com, helin.zhang@intel.com Cc: dev@dpdk.org, Zhang Qi Date: Mon, 12 Sep 2016 03:43:53 +0800 Message-Id: <1473623034-8433-2-git-send-email-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473623034-8433-1-git-send-email-qi.z.zhang@intel.com> References: <1473623034-8433-1-git-send-email-qi.z.zhang@intel.com> Subject: [dpdk-dev] [PATCH 1/2] net/i40e: add func to check link speed X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add a help function to check link speed by device ID. Replace macro "i40e_is_40G_device" with the new function. Signed-off-by: Zhang Qi --- drivers/net/i40e/i40e_ethdev.c | 19 ++++++++++++------- drivers/net/i40e/i40e_ethdev.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 7 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index acc25a2..fc7e128 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -1642,7 +1642,7 @@ i40e_apply_link_speed(struct rte_eth_dev *dev) uint8_t abilities = 0; struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct rte_eth_conf *conf = &dev->data->dev_conf; - + enum i40e_aq_link_speed link_speed = i40e_get_link_speed_by_devid(hw->device_id); speed = i40e_parse_link_speeds(conf->link_speeds); abilities |= I40E_AQ_PHY_ENABLE_ATOMIC_LINK; if (!(conf->link_speeds & ETH_LINK_SPEED_FIXED)) @@ -1650,7 +1650,7 @@ i40e_apply_link_speed(struct rte_eth_dev *dev) abilities |= I40E_AQ_PHY_LINK_ENABLED; /* Skip changing speed on 40G interfaces, FW does not support */ - if (i40e_is_40G_device(hw->device_id)) { + if (link_speed == I40E_LINK_SPEED_40GB) { speed = I40E_LINK_SPEED_UNKNOWN; abilities |= I40E_AQ_PHY_AN_ENABLED; } @@ -2554,6 +2554,7 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct i40e_vsi *vsi = pf->main_vsi; + enum i40e_aq_link_speed link_speed = I40E_LINK_SPEED_UNKNOWN; dev_info->max_rx_queues = vsi->nb_qps; dev_info->max_tx_queues = vsi->nb_qps; @@ -2624,8 +2625,9 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->max_rx_queues += dev_info->vmdq_queue_num; dev_info->max_tx_queues += dev_info->vmdq_queue_num; } - - if (i40e_is_40G_device(hw->device_id)) + + link_speed = i40e_get_link_speed_by_devid(hw->device_id); + if (link_speed == I40E_LINK_SPEED_40GB) /* For XL710 */ dev_info->speed_capa = ETH_LINK_SPEED_40G; else @@ -2845,6 +2847,7 @@ i40e_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) [RTE_FC_TX_PAUSE] = I40E_FC_TX_PAUSE, [RTE_FC_FULL] = I40E_FC_FULL }; + enum i40e_aq_link_speed link_speed = I40E_LINK_SPEED_UNKNOWN; /* high_water field in the rte_eth_fc_conf using the kilobytes unit */ @@ -2872,8 +2875,9 @@ i40e_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) err = i40e_set_fc(hw, &aq_failure, true); if (err < 0) return -ENOSYS; - - if (i40e_is_40G_device(hw->device_id)) { + + link_speed = i40e_get_link_speed_by_devid(hw->device_id); + if (link_speed == I40E_LINK_SPEED_40GB) { /* Configure flow control refresh threshold, * the value for stat_tx_pause_refresh_timer[8] * is used for global pause operation. @@ -8069,10 +8073,11 @@ i40e_configure_registers(struct i40e_hw *hw) uint64_t reg; uint32_t i; int ret; + enum i40e_aq_link_speed link_speed = i40e_get_link_speed_by_devid(hw->device_id); for (i = 0; i < RTE_DIM(reg_table); i++) { if (reg_table[i].addr == I40E_GL_SWR_PM_UP_THR) { - if (i40e_is_40G_device(hw->device_id)) /* For XL710 */ + if (link_speed == I40E_LINK_SPEED_40GB) /* For XL710 */ reg_table[i].val = I40E_GL_SWR_PM_UP_THR_SF_VALUE; else /* For X710 */ diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h index 92c8fad..633bcdf 100644 --- a/drivers/net/i40e/i40e_ethdev.h +++ b/drivers/net/i40e/i40e_ethdev.h @@ -712,4 +712,46 @@ i40e_calc_itr_interval(int16_t interval) (pctype) == I40E_FILTER_PCTYPE_NONF_IPV6_OTHER || \ (pctype) == I40E_FILTER_PCTYPE_L2_PAYLOAD) +static inline enum i40e_aq_link_speed +i40e_get_link_speed_by_devid(u16 dev_id) +{ + switch (dev_id) { + case I40E_DEV_ID_10G_BASE_T: + case I40E_DEV_ID_10G_BASE_T4: +#ifdef X722_SUPPORT +#ifdef X722_A0_SUPPORT + case I40E_DEV_ID_X722_A0: +#if defined(INTEGRATED_VF) || defined(VF_DRIVER) + case I40E_DEV_ID_X722_A0_VF: +#endif +#endif + case I40E_DEV_ID_KX_X722: + case I40E_DEV_ID_QSFP_X722: + case I40E_DEV_ID_SFP_X722: + case I40E_DEV_ID_1G_BASE_T_X722: + case I40E_DEV_ID_10G_BASE_T_X722: + case I40E_DEV_ID_SFP_I_X722: +#define I40E_DEV_ID_QSFP_I_X722 0x37D4 +#if defined(INTEGRATED_VF) || defined(VF_DRIVER) || defined(I40E_NDIS_SUPPORT) + case I40E_DEV_ID_X722_VF: + case I40E_DEV_ID_X722_VF_HV: +#endif +#endif + return I40E_LINK_SPEED_10GB; + case I40E_DEV_ID_20G_KR2: + case I40E_DEV_ID_20G_KR2_A: + return I40E_LINK_SPEED_20GB; + case I40E_DEV_ID_25G_B: + case I40E_DEV_ID_25G_SFP28: + return I40E_LINK_SPEED_25GB; + case I40E_DEV_ID_QSFP_A: + case I40E_DEV_ID_QSFP_B: + case I40E_DEV_ID_QSFP_C: + return I40E_LINK_SPEED_40GB; + default: + return I40E_LINK_SPEED_UNKNOWN; + } +} + + #endif /* _I40E_ETHDEV_H_ */