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 30889A0518 for ; Fri, 24 Jul 2020 14:04:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 283FC1C039; Fri, 24 Jul 2020 14:04:44 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 37A571C039 for ; Fri, 24 Jul 2020 14:04:43 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id o2so8059911wmh.2 for ; Fri, 24 Jul 2020 05:04:43 -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=1NqsX1s2DxuMr7w3CzmpqKhb9bOLYBoY4D3zQr+ENxM=; b=Y72ttncPhf512lI65ILS5gpWCfJJh/OIPugbgzCcgde3z3ga72wIQt0EXVXuC/nDAx gYyVe2ibHAthwMpdN/sddXjrfDgVT0MeqJff73sol75aq99QvvhX2LRcD7ewSecbZz13 tjc0emiCXl/pHnkZp/YzuwC3fQxgYmxw3oV2gQsiJ5zvq1MxHrlN0jgVW9728uDKmUOy uCcdNQFVkEhacG/Mcafvn+fx0XjhkCZWnXKTCjGKj0xRDqFVIBEcaSzeplRRu8mQcmaa I7jCwtmidkrYM9m4QE7fKHAlmYU2Wz+jYbqWlL13mZYAAyafTzcLjhnWCNEUYH9W7D9j eUpA== 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=1NqsX1s2DxuMr7w3CzmpqKhb9bOLYBoY4D3zQr+ENxM=; b=CVNOOcBH2rqFsMCxwztmWJ9lUXjvY9WZR9IpupF85V4OzLEsibOBLMp2tNrNpViCYd e0wp083xRlf1WIwYycAnBEDlPkI+Wg4I1lBANj0SOSTctsK+B340O8FJusPFcV7byQJJ rmvxmeaXO0vpF7i5e8c5plBV4+k5J6ulhAJy50haHXgxY7c3EosNSkpaWAhku3Xh6UXF H45Ep2NWw9UPjz4fqG+lPfwQt4bqy2O/sIpAFVXYRN6MxHjRaYIURb2DAcplxNgfOIkC ilfaB1ZQPMmNF02RQMXB5efKGFwOBIGAQQUnqxHrFdoHT60hm0KkscgKXMIUiw2cNMxi l4Nw== X-Gm-Message-State: AOAM532hjUAf2/EaVcjXNLvS+6M9Gn9hRWdBwAZ+Z4eNetGy99deI1Cz gWWeGNU/AL5Ehp6oaPkuuN7U+6OQIeEEag== X-Google-Smtp-Source: ABdhPJzrJ9+hoyogdAE0+99UdDXITPuQ0SBPJ81ijeHRFWFEffbQGK8g593Qu+Y+rovEtjTCLNdkTQ== X-Received: by 2002:a1c:9c0c:: with SMTP id f12mr8385290wme.179.1595592282884; Fri, 24 Jul 2020 05:04:42 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t2sm6860549wmb.28.2020.07.24.05.04.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:04:41 -0700 (PDT) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Kiran Patil , Paul M Stillwell Jr , Qiming Yang , dpdk stable Date: Fri, 24 Jul 2020 12:58:17 +0100 Message-Id: <20200724120030.1863487-59-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice/base: fix VSI ID mask to 10 bits' has been queued to stable release 19.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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 d4d6d0560a9fb1ce894bb37a389b912b35cb5743 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Thu, 11 Jun 2020 16:43:29 +0800 Subject: [PATCH] net/ice/base: fix VSI ID mask to 10 bits [ upstream commit 072158c6527c02277ea2a03f844f9b2103c33d42 ] set_rss_lut failed due to incorrect vsi_id mask. vsi_id is 10 bit but mask was 0x1FF whereas it should be 0x3FF. For vsi_num >= 512, FW set_rss_lut has been failing with return code EACCESS (vsi ownership issue) because software was providing incorrect vsi_num (dropping 10th bit due to incorrect mask) for set_rss_lut admin command Fixes: a90fae1d0755 ("net/ice/base: add admin queue structures and commands") Signed-off-by: Kiran Patil Signed-off-by: Paul M Stillwell Jr Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_adminq_cmd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_adminq_cmd.h b/drivers/net/ice/base/ice_adminq_cmd.h index d196434f4..2118247a7 100644 --- a/drivers/net/ice/base/ice_adminq_cmd.h +++ b/drivers/net/ice/base/ice_adminq_cmd.h @@ -1935,7 +1935,7 @@ struct ice_aqc_get_set_rss_keys { struct ice_aqc_get_set_rss_lut { #define ICE_AQC_GSET_RSS_LUT_VSI_VALID BIT(15) #define ICE_AQC_GSET_RSS_LUT_VSI_ID_S 0 -#define ICE_AQC_GSET_RSS_LUT_VSI_ID_M (0x1FF << ICE_AQC_GSET_RSS_LUT_VSI_ID_S) +#define ICE_AQC_GSET_RSS_LUT_VSI_ID_M (0x3FF << ICE_AQC_GSET_RSS_LUT_VSI_ID_S) __le16 vsi_id; #define ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_S 0 #define ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_M \ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:50.874068911 +0100 +++ 0059-net-ice-base-fix-VSI-ID-mask-to-10-bits.patch 2020-07-24 12:53:48.279006311 +0100 @@ -1,8 +1,10 @@ -From 072158c6527c02277ea2a03f844f9b2103c33d42 Mon Sep 17 00:00:00 2001 +From d4d6d0560a9fb1ce894bb37a389b912b35cb5743 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Thu, 11 Jun 2020 16:43:29 +0800 Subject: [PATCH] net/ice/base: fix VSI ID mask to 10 bits +[ upstream commit 072158c6527c02277ea2a03f844f9b2103c33d42 ] + set_rss_lut failed due to incorrect vsi_id mask. vsi_id is 10 bit but mask was 0x1FF whereas it should be 0x3FF. @@ -12,7 +14,6 @@ set_rss_lut admin command Fixes: a90fae1d0755 ("net/ice/base: add admin queue structures and commands") -Cc: stable@dpdk.org Signed-off-by: Kiran Patil Signed-off-by: Paul M Stillwell Jr @@ -23,10 +24,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_adminq_cmd.h b/drivers/net/ice/base/ice_adminq_cmd.h -index eaf6c3d0e..9ee5b4eb5 100644 +index d196434f4..2118247a7 100644 --- a/drivers/net/ice/base/ice_adminq_cmd.h +++ b/drivers/net/ice/base/ice_adminq_cmd.h -@@ -1992,7 +1992,7 @@ struct ice_aqc_get_set_rss_keys { +@@ -1935,7 +1935,7 @@ struct ice_aqc_get_set_rss_keys { struct ice_aqc_get_set_rss_lut { #define ICE_AQC_GSET_RSS_LUT_VSI_VALID BIT(15) #define ICE_AQC_GSET_RSS_LUT_VSI_ID_S 0