From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B6A38A00C3 for ; Tue, 19 Apr 2022 10:39:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A9BCF4113C; Tue, 19 Apr 2022 10:39:24 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2093.outbound.protection.outlook.com [40.107.223.93]) by mails.dpdk.org (Postfix) with ESMTP id 6A42F40687; Tue, 19 Apr 2022 10:39:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q3tr2d+Td834u2m3govBDA7UCX1bDncK/4AX7Mr2MBnlZ8+ec5wLdJ7EPPZ1fDE7e779eeh3ZyC0HOKYiGJ/f/cc2Ti9Vf/RyF5LvxEIpySwKLzYnVFXzTiKr5/j0Xt1X6XzBeMaQ0ypWd+GWvjUjw0en88jMV6EbjZfW5Ms9mltnd3qQCVO+la9NLJH8YEk9HaIuy1N8jCVXnPEB3kf3cA9tkd/KtBg1Lj3e5uK2UC4W4RFXyAmhBYZ6gvEEOs+2Oy7EdCKJx9epme0huDVbHfi3IUif/RJidUmefuit9J+YBtXDor4poM+HWPuPw7USGAlmB82hbQrr4RtsIB5fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WUVS+kmVl57ZjEGch/ONKV993rkOHfg8i58oDRnDju0=; b=D5kXqn43nJtYpGE4/cJ+Ed5QV721E7GwQWPgQePCoYyV4IHExul1CQvxlU+s7ZAKLYP5O0VXFJVEBk0i+F7Qf8vQxenNzbkA9KAhDVkYTmKPIa6ayj/fmzVh5UZpaW/yQh+ClTgUAmBbLD39r8si2mXer7GWTbRSj+mB1FEr1MZ8XhTUFacUzcsor13yRMvwyqr706UMI0tsBcFK21sXH2V25sSY5hGDPcvPDHyitMMro9Yj4vQ52l8ZIHA1+rhxCtAnygAh9aXv5P0Auxqqx9hAnIp9oAclSB2IV6nOMyQ7T1NeMSKaLZrei6/ukfACU7qCyQuVHdvO5TYN43hQkw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WUVS+kmVl57ZjEGch/ONKV993rkOHfg8i58oDRnDju0=; b=mZdeXdW4rdTI6kDvVKKcZMNb0aWkYL8X3srsuOrXViRUFqUrY27Pr+2S7Xag1Ykqjm/NfApSViKqU0Zh8FgF5F+sy9IQruWt2cJdPVRpb/YsT7kHmp7IJnucxPd946ImcI+uvKPbVtte1mNvuwRdngbHljTYRL5rwx2dKMqRdV4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from DM5PR1301MB1994.namprd13.prod.outlook.com (2603:10b6:4:2d::36) by DM5PR13MB1866.namprd13.prod.outlook.com (2603:10b6:3:13c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13; Tue, 19 Apr 2022 08:39:21 +0000 Received: from DM5PR1301MB1994.namprd13.prod.outlook.com ([fe80::110f:5e45:c047:2ce1]) by DM5PR1301MB1994.namprd13.prod.outlook.com ([fe80::110f:5e45:c047:2ce1%7]) with mapi id 15.20.5186.013; Tue, 19 Apr 2022 08:39:20 +0000 From: Peng Zhang To: dev@dpdk.org Cc: niklas.soderlund@corigine.com, Peng Zhang , stable@dpdk.org, Yong Xu , Chaoyong He Subject: [PATCH] net/nfp: fix the issue about set the vlan strip offload off Date: Tue, 19 Apr 2022 10:38:57 +0200 Message-Id: <20220419083857.409261-1-peng.zhang@corigine.com> X-Mailer: git-send-email 2.27.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: LO2P265CA0272.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a1::20) To DM5PR1301MB1994.namprd13.prod.outlook.com (2603:10b6:4:2d::36) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b36b4ede-846c-4e92-e3ab-08da21e01916 X-MS-TrafficTypeDiagnostic: DM5PR13MB1866:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kiLjuXt+68ZVMv3nWCmTtqLccV2629n3ZojdIAH+R2C4g6FQKpnKaFqBPON1Cn+nj2a1+Qnr5PuLctJiBE5FqYZus+RheEE0pAm1HEp1b5PEomaOMurUVwLGxp+eFXIOWOkX2zJf0dzYScfxKdlBzOOBvHpN6yos138oSpl2fBBUF9BLq2Dhc2WXpDawbb/CIX+EYuEYQ5jfbwpAN4RhzjSP3DqAuAzlXCFwYjHMVwt8uL6KNCNfGKGhVE/QfBF+vAcyMQjSWL9rvm0KUldc4WHSoouZqDNgJ/9123TZJe7FtkIULgeOflUmfcxJueiuULOGS0KGf+IhABrS+DMgGtlG0y+U/Zw40Fv5+ZX9NfTruZIv3VhVcZ1cNwfAxXWAjg23Hs+kPD9Mj4mvHy6+zSVYMgH2pnAl/X0MrNkiPzTv55u6GTpnRlPpj0zgFb1fLFOzG5Jxq1+VZG6GoBRpWlpDl/GZmd4BQ9w/0TH28hNi+zLP4LmjGlr5HU7xin03qXUPV9/D9Rt59XeIUCLS/zHBLQiX7bfgI0r6y+McTuNv1N6KpEgwg5EcAW7II303PMbjOyyXDexIX1DLCEti6EHnYrselfDeTwSdXMvjF5/IRA1r0r6ax2fqeEWL77+l0Tl928mX2Ov5KS8i8diMF0jGsz2M4x6C+uP6cnxyNecwGVMzMK8SaFJSr+virEGsv6r6cRqWJ4S/2ZQlAUcrdw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR1301MB1994.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(136003)(39830400003)(376002)(346002)(396003)(366004)(2906002)(6512007)(83380400001)(508600001)(450100002)(6486002)(66556008)(66476007)(1076003)(8676002)(44832011)(26005)(186003)(107886003)(4326008)(66946007)(6666004)(8936002)(5660300002)(6506007)(52116002)(86362001)(2616005)(38350700002)(38100700002)(54906003)(36756003)(6916009)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ynwkt6AZ9aCi8Uz/U0G6Zd9eJoJqlU1aUJaQjow4AHPdCZAgzOvo7xi0nq7N?= =?us-ascii?Q?XNM8+t0P+f23XGeWNml7aIu0rRl/wCUF//RyZT/TBMQnR+kkFL681v3nD5cq?= =?us-ascii?Q?z/2Bosft1tA5ZO4OLCH6u6RR730BpT/dLVWh2teJi0Sges4x2EHPX0espr6p?= =?us-ascii?Q?rUqQn0Tnw53MOA+Dfn3aw3sMe0CKvzefiUlfDaJ/kIeJ0dvtKgRje5w8zqZR?= =?us-ascii?Q?tmhIwOF+V4yzpNaShkXInn+2Vi11cJQ1t2icmRVrk0y6RmImUx+pkQNt8sgd?= =?us-ascii?Q?LijpafReU7QdoW/1jCk2DnCs9yjx2PGfozRG/P+Dsk9MtDQ19gB9gO1fgV2z?= =?us-ascii?Q?IaZh7AW+WFOosxdVdER3TeO97valm2F0YMj+7q9Q//Xk+oSMopBep53I5AHj?= =?us-ascii?Q?l9/zfwBUiNASftAOFyjp8r/LjKQalOVizFKl5IKJJs/IDxABU9KbQimDPud4?= =?us-ascii?Q?671VvSv9EZvrJjwuA+ZDroFjORfmJ32kSqPNB06F7ZDJgPJc0s8EnUVbfp7F?= =?us-ascii?Q?gx+3dH70ZHKSPq69vx9qKc7RzJ9H2gsFdLpxtZ+YcYlrzb2uvGA/NuoyvGxq?= =?us-ascii?Q?ZOLkUSzO30+ZEneX1UBdwMl4qH3pmQWUzHJ5qBaPWWJ+greJyJTD3IDnzKLY?= =?us-ascii?Q?Leo+AxEnsk0iQ5QpH0Xfhat8PFPMyzoHaBiTBWo+8yMiZcSI7QB1lXTpfhDf?= =?us-ascii?Q?Ve4J9BAsGbn5meNICYTNdOhM5RADDmtuDY0TlMFGqy0pb54VLsznmJ2ADzSW?= =?us-ascii?Q?esc30aPOxi0xvbTzG/lVZx/9yYMDrJK8cp5BfEnuX15lm9RxtoYoN4ShUwgy?= =?us-ascii?Q?w/7CEt/WhECt7Q/ytt80toL/tyZTEwJS+Dsi4adS7MjenDeayFNWnn85FoBq?= =?us-ascii?Q?/a0Z6Vbu+Ej144MMm0xDpnGHTUxns2SvDVg06BzZWvAjKGxkWMaPaaF0+JGa?= =?us-ascii?Q?IChbPCoBYZ8fDfEj+dihrqxtUQDjHzoLLZxsl7uYTwp/z1f2q0d8ARPwzvUR?= =?us-ascii?Q?gLSqv+5xFxB/8xO20HZX6LuB3r/3DQfFN6G+1Xj09gJ3hdEIxGUCYg30Ai0q?= =?us-ascii?Q?pDM4h7DWgkLAikvY1HMJW4jBTygBsuGsltyled54SnF0TTOzpLC6JgiDSnQ3?= =?us-ascii?Q?qHWf3hrGU0sqz3VBF4DXSTYOc/fEOM5yHKyvEhUFLhYw4uRVNFty97t4SpOe?= =?us-ascii?Q?pjOnbRLKndmSmMIlRFvzrkKPyklg0Dhzkbdc90MvGZN45Gaik35J8ahnIXAp?= =?us-ascii?Q?ntxYAxyMdd8kdFuVm9K7to/90WdwFOxXumIT4JYdPqw2ESqY2rWVCJhI2KlL?= =?us-ascii?Q?yqY1Dh/LleUv8zCYoiIdamXGaH9lFTnHCV2cx9ENM8LBxp814gujWkb08FF4?= =?us-ascii?Q?g+EZygRyec6s9HVNmlGL5+pOr9WO5I7/iSBqKkOt2Rs7xP0YeC9Sv+2YA3+d?= =?us-ascii?Q?dStnU5a9hbMdAk4XYzAqKEM6WxGq9wHbFmznK+C7uXFhuIoKLkfWUUHuwX4w?= =?us-ascii?Q?b492fkZQE/XiozpQ3dOxzcHryMEk8HlS+BuqkxO67uHvIO7GnNptobyAY1ZX?= =?us-ascii?Q?tQqaLT29psBauLPk3H2AxTo2qge/Oi/5J7BL+fDsSWlHMgvjMthuAo/5rqWw?= =?us-ascii?Q?lPtp1bABtgPTU/KcvMOWODohzQ7AyWSCK9mo5nK17SZoh1P4bancgXQIt+4k?= =?us-ascii?Q?dX7ROZtFF6USqRi6TGjtgbIr9L4wJI+HUKHmI0H0yPtyO0V/NBgCtvbzJe2R?= =?us-ascii?Q?DJnG1H2qwpXs224kCkMFtXiob9JCqDk=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b36b4ede-846c-4e92-e3ab-08da21e01916 X-MS-Exchange-CrossTenant-AuthSource: DM5PR1301MB1994.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2022 08:39:20.8042 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: eBTfQX97bR/p2O/ly7aDVHVeBKf2jDhqOBAWuRfTJqszrWA4bhfAfUSeShyrHIw2MVrXtTdBiVqsgHN6CmBM8g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR13MB1866 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 When set the vlan_strip_offload off, it doesn't work. Because we can't update the msg in the nic. This patch will fix this error. Fixes: d4a27a3b092a ("nfp: add basic features") Cc: stable@dpdk.org Signed-off-by: Peng Zhang Signed-off-by: Yong Xu Signed-off-by: Chaoyong He --- drivers/net/nfp/nfp_common.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index b26770dbfb..ab4cfda389 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -968,19 +968,18 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev, int mask) int ret; hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); - new_ctrl = 0; + new_ctrl = hw->ctrl; - /* Enable vlan strip if it is not configured yet */ - if ((mask & RTE_ETH_VLAN_STRIP_OFFLOAD) && - !(hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN)) - new_ctrl = hw->ctrl | NFP_NET_CFG_CTRL_RXVLAN; - - /* Disable vlan strip just if it is configured */ - if (!(mask & RTE_ETH_VLAN_STRIP_OFFLOAD) && - (hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN)) - new_ctrl = hw->ctrl & ~NFP_NET_CFG_CTRL_RXVLAN; + if (mask & RTE_ETH_VLAN_STRIP_OFFLOAD) { + /* Disable vlan strip just if it is configured */ + if (hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN) + new_ctrl = new_ctrl & ~NFP_NET_CFG_CTRL_RXVLAN; + /* Enable vlan strip if it is not configured yet */ + else + new_ctrl = new_ctrl | NFP_NET_CFG_CTRL_RXVLAN; + } - if (new_ctrl == 0) + if (new_ctrl == hw->ctrl) return 0; update = NFP_NET_CFG_UPDATE_GEN; -- 2.27.0