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 B0183A051C for ; Tue, 11 Feb 2020 12:28:18 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A68D82B9C; Tue, 11 Feb 2020 12:28:18 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id D3D931BFA1 for ; Tue, 11 Feb 2020 12:28:16 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id y11so11894258wrt.6 for ; Tue, 11 Feb 2020 03:28:16 -0800 (PST) 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=4JYBjTsU+tiY4mm1XmmTfzyQE6bfvAVDBjZA4J8wH1c=; b=tibygk6B3foRn4L2vY9e/7szoB21+XSnajIHDu4yKzMoGlZexDiuMN0vSEO5pa12Nd S8o0lPxlbGdDmO/oEsTqipkFbHcQX8lLuGZnpLEu2j/95UEeAyARH/843soAIZ9N/nyU O4slqzwuiDh2WBv4tProu3gJUBia1Gd4SwQuP3MJV85PC//p8pBMhFdQ6uR1Wgs62bcI wmVyhRWzX2FyLGYMkQYzhYq7GPHT6NDmBZWfNAI1AMBJedzLfLSRyqv7GwUmtJxAzLk6 v4CNxkPVYNWh6LMPcwMwUNYYsa94bTm3NCHQapd1UmIwLomYZvyaWHJBa/MCiDpQJKWe KrIg== 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=4JYBjTsU+tiY4mm1XmmTfzyQE6bfvAVDBjZA4J8wH1c=; b=Onx11a8yexKtCW+F9WjP4eu8ZxHFofWyj2/ekKxquuGIfsViXWJfsb76iYZySpyzoM bCF1ccixT+A8XnnRap6G2Hn+rbg5j9T059J45dXNMqGON2/ySUhJOshRCcFqW67dvgzW jX8myen6DsSY0tlJ1/+nllY2NNnANT8VlIUgnMGsuHF4IqcPR4f2J3AHK4IEvOsUgh1c gx/Oy0zTBluY1sutCHLbp8IOAT/p/VMgUsxECYF17jFU8evfnaA7PZXXskEMvWF2Mo6+ oS9+MborC6BzXNBUMDSwZC6BxMOtmthW+bcQg964i+KunJAllpBjm8JZ7fvysVq3pG2W GPbg== X-Gm-Message-State: APjAAAWwjm7ruzavynbdw0Y2HUzWsB+fYrtACy46XXwzJICTLKKKLRgC w/0u4y16euCuU6o4eDElD98= X-Google-Smtp-Source: APXvYqwAAgY8gv8bPYWdca4coW7Oyz7irS+EXFUY2OWkx4RLOtSC8nr916oN+tJGYlSZQ1eNQZmH0w== X-Received: by 2002:a5d:40d1:: with SMTP id b17mr7852557wrq.93.1581420496521; Tue, 11 Feb 2020 03:28:16 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id s8sm3298021wmh.26.2020.02.11.03.28.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:28:16 -0800 (PST) From: luca.boccassi@gmail.com To: Xiaolong Ye Cc: Aleksandr Loktionov , Qi Zhang , Beilei Xing , dpdk stable Date: Tue, 11 Feb 2020 11:20:19 +0000 Message-Id: <20200211112216.3929-73-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e/base: add new link speed constants' has been queued to stable release 19.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/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 f71205bc4516e06a26137ba5996e8be285f2e134 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Mon, 13 Jan 2020 10:39:48 +0800 Subject: [PATCH] net/i40e/base: add new link speed constants [ upstream commit 03ef7d47f7bbf441000691105bfd411aa6929a4b ] This patch fixes 'NIC Link is Up, Unknown bps' message in dmesg for 2.5Gb/5Gb speeds. This problem is fixed by adding constants for VIRTCHNL_LINK_SPEED_2_5GB and VIRTCHNL_LINK_SPEED_5GB. Fixes: a58860f68929 ("net/i40e/base: use new virtchnl header file") Signed-off-by: Aleksandr Loktionov Signed-off-by: Xiaolong Ye Acked-by: Qi Zhang Acked-by: Beilei Xing --- drivers/net/i40e/base/i40e_prototype.h | 4 ++++ drivers/net/i40e/base/virtchnl.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/drivers/net/i40e/base/i40e_prototype.h b/drivers/net/i40e/base/i40e_prototype.h index 0cf006dadc..7e6ba3fd7a 100644 --- a/drivers/net/i40e/base/i40e_prototype.h +++ b/drivers/net/i40e/base/i40e_prototype.h @@ -496,6 +496,10 @@ i40e_virtchnl_link_speed(enum i40e_aq_link_speed link_speed) return VIRTCHNL_LINK_SPEED_100MB; case I40E_LINK_SPEED_1GB: return VIRTCHNL_LINK_SPEED_1GB; + case I40E_LINK_SPEED_2_5GB: + return VIRTCHNL_LINK_SPEED_2_5GB; + case I40E_LINK_SPEED_5GB: + return VIRTCHNL_LINK_SPEED_5GB; case I40E_LINK_SPEED_10GB: return VIRTCHNL_LINK_SPEED_10GB; case I40E_LINK_SPEED_40GB: diff --git a/drivers/net/i40e/base/virtchnl.h b/drivers/net/i40e/base/virtchnl.h index 88096cb45c..0b6f55e49d 100644 --- a/drivers/net/i40e/base/virtchnl.h +++ b/drivers/net/i40e/base/virtchnl.h @@ -47,12 +47,14 @@ enum virtchnl_status_code { VIRTCHNL_STATUS_NOT_SUPPORTED = -64, }; +#define VIRTCHNL_LINK_SPEED_2_5GB_SHIFT 0x0 #define VIRTCHNL_LINK_SPEED_100MB_SHIFT 0x1 #define VIRTCHNL_LINK_SPEED_1000MB_SHIFT 0x2 #define VIRTCHNL_LINK_SPEED_10GB_SHIFT 0x3 #define VIRTCHNL_LINK_SPEED_40GB_SHIFT 0x4 #define VIRTCHNL_LINK_SPEED_20GB_SHIFT 0x5 #define VIRTCHNL_LINK_SPEED_25GB_SHIFT 0x6 +#define VIRTCHNL_LINK_SPEED_5GB_SHIFT 0x7 enum virtchnl_link_speed { VIRTCHNL_LINK_SPEED_UNKNOWN = 0, @@ -62,6 +64,8 @@ enum virtchnl_link_speed { VIRTCHNL_LINK_SPEED_40GB = BIT(VIRTCHNL_LINK_SPEED_40GB_SHIFT), VIRTCHNL_LINK_SPEED_20GB = BIT(VIRTCHNL_LINK_SPEED_20GB_SHIFT), VIRTCHNL_LINK_SPEED_25GB = BIT(VIRTCHNL_LINK_SPEED_25GB_SHIFT), + VIRTCHNL_LINK_SPEED_2_5GB = BIT(VIRTCHNL_LINK_SPEED_2_5GB_SHIFT), + VIRTCHNL_LINK_SPEED_5GB = BIT(VIRTCHNL_LINK_SPEED_5GB_SHIFT), }; /* for hsplit_0 field of Rx HMC context */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:41.533076868 +0000 +++ 0073-net-i40e-base-add-new-link-speed-constants.patch 2020-02-11 11:17:38.492003067 +0000 @@ -1,8 +1,10 @@ -From 03ef7d47f7bbf441000691105bfd411aa6929a4b Mon Sep 17 00:00:00 2001 +From f71205bc4516e06a26137ba5996e8be285f2e134 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Mon, 13 Jan 2020 10:39:48 +0800 Subject: [PATCH] net/i40e/base: add new link speed constants +[ upstream commit 03ef7d47f7bbf441000691105bfd411aa6929a4b ] + This patch fixes 'NIC Link is Up, Unknown bps' message in dmesg for 2.5Gb/5Gb speeds. This problem is fixed by adding constants for VIRTCHNL_LINK_SPEED_2_5GB and VIRTCHNL_LINK_SPEED_5GB. @@ -19,10 +21,10 @@ 2 files changed, 8 insertions(+) diff --git a/drivers/net/i40e/base/i40e_prototype.h b/drivers/net/i40e/base/i40e_prototype.h -index 0f06e3262b..d8ab3ea0a4 100644 +index 0cf006dadc..7e6ba3fd7a 100644 --- a/drivers/net/i40e/base/i40e_prototype.h +++ b/drivers/net/i40e/base/i40e_prototype.h -@@ -505,6 +505,10 @@ i40e_virtchnl_link_speed(enum i40e_aq_link_speed link_speed) +@@ -496,6 +496,10 @@ i40e_virtchnl_link_speed(enum i40e_aq_link_speed link_speed) return VIRTCHNL_LINK_SPEED_100MB; case I40E_LINK_SPEED_1GB: return VIRTCHNL_LINK_SPEED_1GB; @@ -34,12 +36,12 @@ return VIRTCHNL_LINK_SPEED_10GB; case I40E_LINK_SPEED_40GB: diff --git a/drivers/net/i40e/base/virtchnl.h b/drivers/net/i40e/base/virtchnl.h -index c613d47616..92515bf340 100644 +index 88096cb45c..0b6f55e49d 100644 --- a/drivers/net/i40e/base/virtchnl.h +++ b/drivers/net/i40e/base/virtchnl.h -@@ -53,12 +53,14 @@ enum virtchnl_status_code { - #define VIRTCHNL_ERR_PARAM VIRTCHNL_STATUS_ERR_PARAM - #define VIRTCHNL_STATUS_NOT_SUPPORTED VIRTCHNL_STATUS_ERR_NOT_SUPPORTED +@@ -47,12 +47,14 @@ enum virtchnl_status_code { + VIRTCHNL_STATUS_NOT_SUPPORTED = -64, + }; +#define VIRTCHNL_LINK_SPEED_2_5GB_SHIFT 0x0 #define VIRTCHNL_LINK_SPEED_100MB_SHIFT 0x1 @@ -52,7 +54,7 @@ enum virtchnl_link_speed { VIRTCHNL_LINK_SPEED_UNKNOWN = 0, -@@ -68,6 +70,8 @@ enum virtchnl_link_speed { +@@ -62,6 +64,8 @@ enum virtchnl_link_speed { VIRTCHNL_LINK_SPEED_40GB = BIT(VIRTCHNL_LINK_SPEED_40GB_SHIFT), VIRTCHNL_LINK_SPEED_20GB = BIT(VIRTCHNL_LINK_SPEED_20GB_SHIFT), VIRTCHNL_LINK_SPEED_25GB = BIT(VIRTCHNL_LINK_SPEED_25GB_SHIFT),