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 58C9CA051C for ; Tue, 11 Feb 2020 12:25:13 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 501DC1BFA9; Tue, 11 Feb 2020 12:25:13 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 9B5861BFAD for ; Tue, 11 Feb 2020 12:25:11 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id g3so10786445wrs.12 for ; Tue, 11 Feb 2020 03:25:11 -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=3Ilt6ho4gm0Mub53YcPMs4Ph8CB54qJ+6xLdjhEWrFw=; b=NejOns7VEj2ZiXyDr3SG2YFgmQUsy49hT+xuYiS6oqiQj8V+FQo3i3A94xabU/XvYZ WaMABJM4dY7qjEO6r0GsID/6f9XwlmO3XOjv/6ZawcoyeK3lSVxcx2es/iuINCsl6jEc I6r5lGiDFc6TgsW9w8TJ2iDCndOfjvY6IJXoWqD7HDjtsS94hFX6a8mJ+hmLdwAY2Z2Z WY+ggs2+SybgNZfae5hHMSw/LMeW50KxnVkUZ76y5vv+5YRv5b3oadUp6vOfzCpbMVTT BBy+6nx410jTqJTZV4UdwyL4ti8nO3sXdr5JmXxTG1AOupsYuPwp/IwtQydTFOM8pKY2 2Tsw== 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=3Ilt6ho4gm0Mub53YcPMs4Ph8CB54qJ+6xLdjhEWrFw=; b=fo57/aPc5z08pGosoanE+Z/375Q4xiv/to+yqJeXMlplqEnF02zqBhugcKFKhuo0KR MivIzL8ZHzcADWUUWwFiblWVTzqEJ2R5Jq7H4h2ukZ/FupZQYtPVpdd3jlesOw9nZLkF u1dYSXo3Tvfwbzsc3oir83UsHVar4vct4caGFet1FrhB/OSJMDCiFlWlr7tYqKgIZTmK F4mGH8/d86it9tQjGmQheLf2ONKnQtDyz+jpRwM0396Qj0kzOUBW+R1h4Ze35iJn70U0 Q7az7/oDaXjLuBKc9Qq+aVMbbmPStvxn29sw4S9j/KGD7eyh2VgCJvQJqToAOK++5FnD iEEQ== X-Gm-Message-State: APjAAAVDf1BfPWrqqKMmkOT96ah/bpwrx6aIjA2nEdEZAeqrsXSHpViw 1wxBWn37kkr8OrB0Hb8kkQcfTFjsgfc= X-Google-Smtp-Source: APXvYqwy8AwN5ucjEduGwiYu6kcEcBeFMbJ2X+KhyfznZN5tubiMKeWTMsiucNUM0Uk67x7IufjTug== X-Received: by 2002:adf:e80e:: with SMTP id o14mr8045292wrm.212.1581420311360; Tue, 11 Feb 2020 03:25:11 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z25sm3404943wmf.14.2020.02.11.03.25.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:25:10 -0800 (PST) From: luca.boccassi@gmail.com To: Beilei Xing Cc: Jingjing Wu , dpdk stable Date: Tue, 11 Feb 2020 11:19:52 +0000 Message-Id: <20200211112216.3929-46-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/ice: fix VSI context' 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 549b16da5630940f51985115d6db34311c7468bb Mon Sep 17 00:00:00 2001 From: Beilei Xing Date: Sat, 14 Dec 2019 14:14:17 +0800 Subject: [PATCH] net/ice: fix VSI context [ upstream commit a9faa2223aa84ed8a09a0ea4d5e16bd05b588059 ] There'll always be a MDD event triggered when adding a FDIR rule. The root cause is 'LAN enable' is not configured during control VSI setup. Besides, correct FDIR fields for both main VSI and control VSI. Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine") Signed-off-by: Beilei Xing Acked-by: Jingjing Wu --- drivers/net/ice/ice_ethdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index de189daba9..8b34ed9c71 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -1573,7 +1573,7 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type) cfg = ICE_AQ_VSI_PROP_SECURITY_VALID | ICE_AQ_VSI_PROP_FLOW_DIR_VALID; vsi_ctx.info.valid_sections |= rte_cpu_to_le_16(cfg); - cfg = ICE_AQ_VSI_FD_ENABLE | ICE_AQ_VSI_FD_PROG_ENABLE; + cfg = ICE_AQ_VSI_FD_ENABLE; vsi_ctx.info.fd_options = rte_cpu_to_le_16(cfg); vsi_ctx.info.max_fd_fltr_dedicated = rte_cpu_to_le_16(hw->func_caps.fd_fltr_guar); @@ -1601,9 +1601,10 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type) cfg = ICE_AQ_VSI_PROP_FLOW_DIR_VALID; vsi_ctx.info.valid_sections |= rte_cpu_to_le_16(cfg); - cfg = ICE_AQ_VSI_FD_ENABLE | ICE_AQ_VSI_FD_PROG_ENABLE; + cfg = ICE_AQ_VSI_FD_PROG_ENABLE; vsi_ctx.info.fd_options = rte_cpu_to_le_16(cfg); vsi_ctx.info.sw_id = hw->port_info->sw_id; + vsi_ctx.info.sw_flags2 = ICE_AQ_VSI_SW_FLAG_LAN_ENA; ret = ice_vsi_config_tc_queue_mapping(vsi, &vsi_ctx.info, ICE_DEFAULT_TCMAP); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:40.698571000 +0000 +++ 0046-net-ice-fix-VSI-context.patch 2020-02-11 11:17:38.400001347 +0000 @@ -1,8 +1,10 @@ -From a9faa2223aa84ed8a09a0ea4d5e16bd05b588059 Mon Sep 17 00:00:00 2001 +From 549b16da5630940f51985115d6db34311c7468bb Mon Sep 17 00:00:00 2001 From: Beilei Xing Date: Sat, 14 Dec 2019 14:14:17 +0800 Subject: [PATCH] net/ice: fix VSI context +[ upstream commit a9faa2223aa84ed8a09a0ea4d5e16bd05b588059 ] + There'll always be a MDD event triggered when adding a FDIR rule. The root cause is 'LAN enable' is not configured during control VSI setup. @@ -10,7 +12,6 @@ control VSI. Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine") -Cc: stable@dpdk.org Signed-off-by: Beilei Xing Acked-by: Jingjing Wu @@ -19,10 +20,10 @@ 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c -index 2cbd82c946..cf99fc358e 100644 +index de189daba9..8b34ed9c71 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c -@@ -1576,7 +1576,7 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type) +@@ -1573,7 +1573,7 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type) cfg = ICE_AQ_VSI_PROP_SECURITY_VALID | ICE_AQ_VSI_PROP_FLOW_DIR_VALID; vsi_ctx.info.valid_sections |= rte_cpu_to_le_16(cfg); @@ -31,7 +32,7 @@ vsi_ctx.info.fd_options = rte_cpu_to_le_16(cfg); vsi_ctx.info.max_fd_fltr_dedicated = rte_cpu_to_le_16(hw->func_caps.fd_fltr_guar); -@@ -1604,9 +1604,10 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type) +@@ -1601,9 +1601,10 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type) cfg = ICE_AQ_VSI_PROP_FLOW_DIR_VALID; vsi_ctx.info.valid_sections |= rte_cpu_to_le_16(cfg);