From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 309C0A0093 for ; Tue, 19 May 2020 15:15:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1DF0B1D94F; Tue, 19 May 2020 15:15:45 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 208CB1D94A for ; Tue, 19 May 2020 15:15:44 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id h4so3010161wmb.4 for ; Tue, 19 May 2020 06:15:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=877GGdqzveNiodoAO9NKX/RyyKQRmsA5HYVK3o6SPPA=; b=fx7qDaLjRTWV7MRFPYzm0ERlSOoPfdRstAaUrFiV/e2PiERO+vib17nHV5OVN5IO2q +UeLLtONAZJcDDbLekhOlkg32y6bzzhbzzC2ZqfwAs3MZGa3sBA/ejU+SCq2NjJXcRVW YqqMVh1rghiB3Dcy38imSS5tr3/5MTdBbZdpNtfPGlHn5Adn2bEncDdlkH1XCtOtnwl7 TJnfwqZl8zM2ovSUHH6d6TKNKBzslVT5o12pdKYcs7sYjQmX+xI/zp10J8u79l1YI4sM A72IUjhuRujYs8SeP352wEtufrbrXtK4zz9JvkJZznQDXdAOVg/1Xy8iuqM2ANggaea4 PQpQ== 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:mime-version:content-transfer-encoding; bh=877GGdqzveNiodoAO9NKX/RyyKQRmsA5HYVK3o6SPPA=; b=rnOMlOXjPjJN99LSNVT38h6sIt5HMGzHJM8p7/K3mKIm2vitazlDXMzQI7aZK73O8+ zRmWIrHk1iRntXvV+cuCpB6uU6HGFvsNmZP0KuVIQT3sZIaMbgvaZC9Gy/d79snqTVal tSp489gfdOuh4uEJl0Z88jhobjcUYSOOvjoPv7QcQgLpq1e/mbqBcIe4KMxxBhtmVb3X SxMLVdhYitANKJ8E7fuLewu6U/BFbgQ+cjXhagc/T1k0HsI5cZIK/HMnaonJOxReRG6g XecWPmAINTtVId2uYLBzCp33auyEWS2xZ4S5FdfzVhlp0WhvMesvpTg9nKBab7scnzmp +Lxw== X-Gm-Message-State: AOAM531awhkLgimwPUeA2twAIQzg7P7UcFHIEB0mYdkmu8EeZBi9ya5S 1GWL/9glFSVi7/Os3TbA+d4= X-Google-Smtp-Source: ABdhPJxtAD3Ne0HYamRbpHxnDN3aA/O2V1xGxnHk4GzOKi6oNmaDa5cus7CAwg8C30iw/F3iunq86Q== X-Received: by 2002:a05:600c:2c4e:: with SMTP id r14mr5744474wmg.118.1589894143879; Tue, 19 May 2020 06:15:43 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t7sm20422586wrq.39.2020.05.19.06.15.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:15:43 -0700 (PDT) From: luca.boccassi@gmail.com To: Alvin Zhang Cc: Beilei Xing , dpdk stable Date: Tue, 19 May 2020 14:05:23 +0100 Message-Id: <20200519130549.112823-188-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix link speed' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From b639786c5f18b036a2dbe95637281ad75083ccad Mon Sep 17 00:00:00 2001 From: Alvin Zhang Date: Thu, 30 Apr 2020 11:21:11 +0800 Subject: [PATCH] net/iavf: fix link speed [ upstream commit 5330b042977c61b1600700013c6ef2509d496b16 ] If the PF driver does not support the new speed reporting capabilities then use link_event instead of link_event_adv to get the speed. Fixes: 48de41ca11f0 ("net/avf: enable link status update") Signed-off-by: Alvin Zhang Acked-by: Beilei Xing --- drivers/net/iavf/iavf_vchnl.c | 41 ++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index cf0f6458ed..149673b9b3 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -132,6 +132,38 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args) return err; } +static uint32_t +iavf_convert_link_speed(enum virtchnl_link_speed virt_link_speed) +{ + uint32_t speed; + + switch (virt_link_speed) { + case VIRTCHNL_LINK_SPEED_100MB: + speed = 100; + break; + case VIRTCHNL_LINK_SPEED_1GB: + speed = 1000; + break; + case VIRTCHNL_LINK_SPEED_10GB: + speed = 10000; + break; + case VIRTCHNL_LINK_SPEED_40GB: + speed = 40000; + break; + case VIRTCHNL_LINK_SPEED_20GB: + speed = 20000; + break; + case VIRTCHNL_LINK_SPEED_25GB: + speed = 25000; + break; + default: + speed = 0; + break; + } + + return speed; +} + static void iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg, uint16_t msglen) @@ -153,7 +185,14 @@ iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg, 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_adv.link_speed; + if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_CAP_ADV_LINK_SPEED) { + vf->link_speed = + pf_msg->event_data.link_event_adv.link_speed; + } else { + enum virtchnl_link_speed speed; + speed = pf_msg->event_data.link_event.link_speed; + vf->link_speed = iavf_convert_link_speed(speed); + } iavf_dev_link_update(dev, 0); _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:52.225467416 +0100 +++ 0188-net-iavf-fix-link-speed.patch 2020-05-19 14:04:44.536654173 +0100 @@ -1,25 +1,26 @@ -From 5330b042977c61b1600700013c6ef2509d496b16 Mon Sep 17 00:00:00 2001 +From b639786c5f18b036a2dbe95637281ad75083ccad Mon Sep 17 00:00:00 2001 From: Alvin Zhang Date: Thu, 30 Apr 2020 11:21:11 +0800 Subject: [PATCH] net/iavf: fix link speed +[ upstream commit 5330b042977c61b1600700013c6ef2509d496b16 ] + If the PF driver does not support the new speed reporting capabilities then use link_event instead of link_event_adv to get the speed. Fixes: 48de41ca11f0 ("net/avf: enable link status update") -Cc: stable@dpdk.org Signed-off-by: Alvin Zhang Acked-by: Beilei Xing --- - drivers/net/iavf/iavf_vchnl.c | 47 ++++++++++++++++++++++++++++++++++- - 1 file changed, 46 insertions(+), 1 deletion(-) + drivers/net/iavf/iavf_vchnl.c | 41 ++++++++++++++++++++++++++++++++++- + 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c -index 2a0cdd927f..5b8d32ee24 100644 +index cf0f6458ed..149673b9b3 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c -@@ -130,6 +130,44 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args) +@@ -132,6 +132,38 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args) return err; } @@ -47,12 +48,6 @@ + case VIRTCHNL_LINK_SPEED_25GB: + speed = 25000; + break; -+ case VIRTCHNL_LINK_SPEED_2_5GB: -+ speed = 2500; -+ break; -+ case VIRTCHNL_LINK_SPEED_5GB: -+ speed = 5000; -+ break; + default: + speed = 0; + break; @@ -64,7 +59,7 @@ static void iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg, uint16_t msglen) -@@ -151,7 +189,14 @@ iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg, +@@ -153,7 +185,14 @@ iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg, 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;