From patchwork Thu Jul 30 08:25:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guinan Sun X-Patchwork-Id: 75026 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5C69FA052B; Thu, 30 Jul 2020 10:35:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 470EC11A2; Thu, 30 Jul 2020 10:35:40 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 3CB30255; Thu, 30 Jul 2020 10:35:38 +0200 (CEST) IronPort-SDR: 9T3w4HNJUULUjBew5gCnCv4b0WcYhHEzE0v6PNrZbDMJQlRNiLGoMx97UJ/y+FfHkPTrSwkoVY cAv+cLpRgHfg== X-IronPort-AV: E=McAfee;i="6000,8403,9697"; a="131119433" X-IronPort-AV: E=Sophos;i="5.75,413,1589266800"; d="scan'208";a="131119433" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2020 01:35:18 -0700 IronPort-SDR: Wrq+lReRxbGDuqi+JWPra0/gWCfoPPPYziM1XoB4EUil+X2CxG7MOXb5suVcAZKU4cIWTW9p8N D0OgAlewpk0g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,413,1589266800"; d="scan'208";a="304500668" Received: from dpdk.sh.intel.com ([10.239.255.83]) by orsmga002.jf.intel.com with ESMTP; 30 Jul 2020 01:35:15 -0700 From: Guinan Sun To: Beilei Xing , Jeff Guo , dev@dpdk.org Cc: Guinan Sun , stable@dpdk.org Date: Thu, 30 Jul 2020 08:25:39 +0000 Message-Id: <20200730082539.24104-1-guinanx.sun@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH] net/i40e: fix link status 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" The PF driver supports to use link_event_adv or link_event to get the link speed. However, when using link_event_adv to get link speed, there is a lack of logic to convert between link speed type (I40E_LINK_SPEED_XXX) and mbps type (SPEED_XXX). As a result, the mbps type is not recognized, so the link status down problem occurs. This patch is used for type replacement between speed types. Fixes: 2a73125b7041 ("i40evf: fix link info update") Cc: stable@dpdk.org Signed-off-by: Guinan Sun --- drivers/net/i40e/base/virtchnl.h | 8 +++++- drivers/net/i40e/i40e_ethdev_vf.c | 42 +++++++++++++++++++++++++++++-- drivers/net/i40e/i40e_pf.c | 4 +++ 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/base/virtchnl.h b/drivers/net/i40e/base/virtchnl.h index 4f498ca45..90c404fb8 100644 --- a/drivers/net/i40e/base/virtchnl.h +++ b/drivers/net/i40e/base/virtchnl.h @@ -240,7 +240,8 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource); #define VIRTCHNL_VF_OFFLOAD_ENCAP 0X00100000 #define VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM 0X00200000 #define VIRTCHNL_VF_OFFLOAD_RX_ENCAP_CSUM 0X00400000 - +/* Define below the capability flags that are not offloads */ +#define VIRTCHNL_VF_CAP_ADV_LINK_SPEED 0x00000080 #define VF_BASE_MODE_OFFLOADS (VIRTCHNL_VF_OFFLOAD_L2 | \ VIRTCHNL_VF_OFFLOAD_VLAN | \ VIRTCHNL_VF_OFFLOAD_RSS_PF) @@ -540,6 +541,11 @@ struct virtchnl_pf_event { enum virtchnl_link_speed link_speed; bool link_status; } link_event; + struct { + /* link_speed provided in Mbps */ + u32 link_speed; + u8 link_status; + } link_event_adv; } event_data; int severity; diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 69cab8e73..f8cf45fbe 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1386,8 +1386,46 @@ i40evf_handle_pf_event(struct rte_eth_dev *dev, uint8_t *msg, break; case VIRTCHNL_EVENT_LINK_CHANGE: PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE event"); - vf->link_up = pf_msg->event_data.link_event.link_status; - vf->link_speed = pf_msg->event_data.link_event.link_speed; + + if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_CAP_ADV_LINK_SPEED) { + vf->link_up = + pf_msg->event_data.link_event_adv.link_status; + + switch (pf_msg->event_data.link_event_adv.link_speed) { + case ETH_SPEED_NUM_100M: + vf->link_speed = I40E_LINK_SPEED_100MB; + break; + case ETH_SPEED_NUM_1G: + vf->link_speed = I40E_LINK_SPEED_1GB; + break; + case ETH_SPEED_NUM_2_5G: + vf->link_speed = I40E_LINK_SPEED_2_5GB; + break; + case ETH_SPEED_NUM_5G: + vf->link_speed = I40E_LINK_SPEED_5GB; + break; + case ETH_SPEED_NUM_10G: + vf->link_speed = I40E_LINK_SPEED_10GB; + break; + case ETH_SPEED_NUM_20G: + vf->link_speed = I40E_LINK_SPEED_20GB; + break; + case ETH_SPEED_NUM_25G: + vf->link_speed = I40E_LINK_SPEED_25GB; + break; + case ETH_SPEED_NUM_40G: + vf->link_speed = I40E_LINK_SPEED_40GB; + break; + default: + vf->link_speed = I40E_LINK_SPEED_UNKNOWN; + break; + } + } else { + vf->link_up = + pf_msg->event_data.link_event.link_status; + vf->link_speed = + pf_msg->event_data.link_event.link_speed; + } break; case VIRTCHNL_EVENT_PF_DRIVER_CLOSE: PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_PF_DRIVER_CLOSE event"); diff --git a/drivers/net/i40e/i40e_pf.c b/drivers/net/i40e/i40e_pf.c index 7bf1e7941..33af30bbb 100644 --- a/drivers/net/i40e/i40e_pf.c +++ b/drivers/net/i40e/i40e_pf.c @@ -320,6 +320,10 @@ i40e_pf_host_process_cmd_get_vf_resource(struct i40e_pf_vf *vf, uint8_t *msg, else vf->request_caps = *(uint32_t *)msg; +#ifdef VIRTCHNL_VF_CAP_ADV_LINK_SPEED + vf_res->vf_cap_flags |= VIRTCHNL_VF_CAP_ADV_LINK_SPEED; +#endif /* VIRTCHNL_VF_CAP_ADV_LINK_SPEED */ + /* enable all RSS by default, * doesn't support hena setting by virtchnnl yet. */