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 77181A0032 for ; Mon, 11 Jul 2022 10:27:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6CA094021F; Mon, 11 Jul 2022 10:27:31 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2110.outbound.protection.outlook.com [40.107.102.110]) by mails.dpdk.org (Postfix) with ESMTP id BFA944021F for ; Mon, 11 Jul 2022 10:27:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TuBzAb+vcgr1+wNVGWKaJvBGTE5muc6EmCQwy2gGuu2fQe6jd2EY+T4Sdk5IOyA/d3D1bHHQlvsW4aS/4iMzE3WQd3k0Ftr35hTI+f/u8V+knhNXDJzOYIywdc/0O2RtYzStkjhPJ5DzoM8rZpq+IvjHJrdks5fR3M0LgbYQEvqDVIxoDcATVJbkuZXu7QVWuqHToya2BVo0AUtkW2HC2lAgl7oIuBCghkDcN0QiPL/e6GOsoXKZjkSlFTi0CBGRgOJ8HVUNu2+bXuGGGRhcjjWq+++FokVWdnCoUQZOvwuJiXnLtBSe5W4fDYiB8EzATyZt7W5vyHUNLOI/6oEPbg== 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=4aCgjeP+uOCoATcT23+Lx0+C3MpyrPucdKybfbdR7PY=; b=ZR8kA5ZMySLEMunKMbbjbNOoJS16m7NRqaTn/ItxD6wDSTLLA+YtosRkEuNQyr8B8/MTpclv3yK/lUk1dhTXpph3GmIg3gURsc48a24pvBm7XZXn0kxatC1tGv6EY6tVGIpeVGn9bW514+0vIYX/iuQHdcS5Q1NtmceXfzFZnllv73nIKyy9SdPFTTafvYy0qwmrxlHkJwRHLO2NTj6rUehsyVU1IxT2smffGfiS7+TK3gb+nD95Cthf9I1mvZEgIX0N9VrkDxv3DzRuG/PdB2XYPZtNshGsXnFPmQImcKzAxFYObGMqp/ymGKiyuWkeQciiLRI2YstVmRcdWTUn8A== 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=4aCgjeP+uOCoATcT23+Lx0+C3MpyrPucdKybfbdR7PY=; b=YRDlBIuR0r62HIhoUwitnJftLR8lpR1/lCPyDubV0VY5o78qSNavct2VwJDtHIoWoV2Pgz8cKc63pRvov6Qaheg/7n5zzGzR1sA/vQYTTka+uKiCDtUe/cu97lqJu26xYm2lxaCXIt9wXgdaBte3Avb+c/FJg1YrhwghoVQOTNQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from BY5PR13MB4423.namprd13.prod.outlook.com (2603:10b6:a03:1de::15) by MN2PR13MB3085.namprd13.prod.outlook.com (2603:10b6:208:137::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.10; Mon, 11 Jul 2022 08:27:29 +0000 Received: from BY5PR13MB4423.namprd13.prod.outlook.com ([fe80::ed47:b485:2a26:e17b]) by BY5PR13MB4423.namprd13.prod.outlook.com ([fe80::ed47:b485:2a26:e17b%7]) with mapi id 15.20.5417.024; Mon, 11 Jul 2022 08:27:28 +0000 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= To: stable@dpdk.org, christian.ehrhardt@canonical.com Cc: oss-drivers@corigine.com, Peng Zhang , Yong Xu , Chaoyong He , =?UTF-8?q?Niklas=20S=C3=B6derlund?= Subject: [PATCH 19.11] net/nfp: fix disabling VLAN stripping Date: Mon, 11 Jul 2022 10:23:50 +0200 Message-Id: <20220711082350.2562727-1-niklas.soderlund@corigine.com> X-Mailer: git-send-email 2.36.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: FR0P281CA0047.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::18) To BY5PR13MB4423.namprd13.prod.outlook.com (2603:10b6:a03:1de::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d380ae02-be2d-45b3-9e29-08da63173130 X-MS-TrafficTypeDiagnostic: MN2PR13MB3085:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qBX/ohkdWHSUltYYPVxp54IkEWSPfxOq3WDaHU+gf0E9V7JA2Qa40a/cNodcabP1Lnh16Lv7JYBj0DH8z6u1593M6ZsizaydDjqCW5Hjj+h6uCQrukKVvylYSYglxN59z1IXMXlJAnpGklvDVGEeqUkXTJdi9tdz8hoqWC0zw4PdmESyOWdamaNWVdAhHHHwCdZ4MRs1X86mplmuUFkQwsaWhWbXekikWd1spAmivZwVHI/cPBqHcr2UOgdy0nchjInZ6qCMjx2/Qyno3+N3kYdbtRMAyhF1MbiT++NukRXDjduXonrVmmrB2Ht2E4MEawGypzlVqCvnuVtXZo6PuJfWngOA6NKFuUjNV4QPFdUr7QJqKZsY2JMcnsqkGwjNh7uF4HT2vlUTH3X/GiFfdevMF3vnOn7+wKeRLwX6hP18RHkzw9yQajiQLb+200fQmFFZZHCuzHtAUPcuIVhd9xP6ZfJQgRSX5Dunb5KLeeAlvULymsC5GiGyGVx0kSXD3I3bUCxcskBx/uka8ipbEiDEEYhaBGNF/gtJP4CcdG+C4mqkiUb5nUPyXCXZySzMg09ehb8T0FBKpG0bkjlOawALqNcFZiuyhJks8SPuzzggWiT2/7PIXTDIyDBCTQ6J19iL7faBO1nUGgWJQ9YtLRy0V2os6RmVANVBtAUqPTMMpkVddNLz7pkFsNKTmnaVQQtChwjVQgy/eZIdjyRHabFMgbXZ0QMpUNhGA3Bxc1OSn+0g1lDKA9K/kKnCEa5HDlFclUEx7ZdZNULiC1xOKXjdjPUPE6yTFo1EyfXns7aBRi2wvD8LTMWV4xLE4AMU8rBfG6aX24OXIs0zfo2d4SpC58m4YBoowxJdDzYSFcZikH+dBZyumnRjI+HmHXHh X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BY5PR13MB4423.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(136003)(346002)(376002)(366004)(39830400003)(396003)(4326008)(6512007)(1076003)(66574015)(66946007)(8936002)(8676002)(86362001)(6506007)(66476007)(41300700001)(186003)(66556008)(6666004)(52116002)(107886003)(26005)(2616005)(54906003)(36756003)(478600001)(6486002)(38350700002)(38100700002)(2906002)(83380400001)(5660300002)(316002)(168613001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VFd2clpHcjZyK0NlK0lvbk5WS0hhekNIVG9nY295blBtanRSNy9aM3k2MTlB?= =?utf-8?B?UUxZSkorVmlXTWRvRVRFazk2N2dXaW9jNFNMTDQ3SUovSjdPc1lwVnNiUk9R?= =?utf-8?B?T01IM2pZc1cvSkMwYy9tV1dYVGJIVzlLRG1MUENFQmc0aDNPbml2d2dCbmJq?= =?utf-8?B?S0xXNHJhYndiTHB5VjFpcWZaSHkrM1l2V25BRFl5N1c4OHA1U1RibjZrWGdi?= =?utf-8?B?ZW5PekpLRHhDNW0zK0JxcUpLdjFYTTQ1V0lBa1ZGaGlWQ0ZwRFdWUGF5dytj?= =?utf-8?B?WUowS0RVZUNnb2YrTmhwd3lVem1uakU0UHlWbE40eEhpT3JSTUdVSzlndDl4?= =?utf-8?B?N0NuMTdEMmZENnA5NXMxUExYTEdjalVVMEtIdjdSSndYWGxLWHdiMjBTTE9k?= =?utf-8?B?Vk5qcjNQMVhRWXpEOVEzblVSb3JpdlZPVXpxRjRHazZ2VUhxeWo2cEVENnd6?= =?utf-8?B?MmZ4allhQm8xYkJBZExiR2lCdWdPWlRUY1JIYk1tNXphMzlNcVMvM2hZellZ?= =?utf-8?B?eDdTdm90UlF0VmR0bEt0MGV6bTQ1Y3huL2xiTWV3UkpmaG14NGJIWnJzMlc3?= =?utf-8?B?UEpkcDIxa2xMdEhQTlo5b3hTWDRlQkppU242cUttazBndUpxcmFRZEpzOUNK?= =?utf-8?B?N2N0VFh3aHlWaHVFSm1tUWIzQlVxUFpaMVB2aFRNKzRVNEc2K093QXhjYXJm?= =?utf-8?B?M1c4WENSYlJGRG5GanZLTENiTE05bS9PdkpiRXpEVVd4V1VmSEcweTgvY3A1?= =?utf-8?B?OXFyS1c0NmpsSEg5YXdYY1FKUmpJdXRmWFR2dlJKNEV3cXVSUFUxOEp1dldX?= =?utf-8?B?N3lRLzFSZVAvOXFUSVNENjlxTS8xSWVFZ3hQVW50UVdIcmppRndYemRQVDdq?= =?utf-8?B?MXViTVIwOTcvQzM5RENSWUpjRUxJOE1GYzNzdFExakNBbERXVXNBMUFnUEVa?= =?utf-8?B?YVdTYkYzR1QxVTRmQ1ZFV1h6NS9zcElUbktGNWRaYW5WSG9uakQ1dHg5Tmkx?= =?utf-8?B?NFZqajVvcmd6NG9TaHVuWWZJbndBZVJUaElpek1jYWd0WTNHZURiY3FZamNB?= =?utf-8?B?K3FSdzN4VXlueWZYWmpzTDduM1U2bzVzQS9hYmJNWlg0aDRVMDVxZFBicXBh?= =?utf-8?B?M1cvSEpFNzBaYWxEWFJtZ0NKUGVML05qYlpHa3A5SlhEOVRMMHNGZVd0dDVk?= =?utf-8?B?T2V1ZTB0NHF3eVl5MDRTWVo0Q0tRTXIwZ0dKWjJSSmZkK1U4QnVrOWR2Sm9j?= =?utf-8?B?V1dRQ0VwcVZLOHBqQ0VuUEJhaEtYbmZBU1BuQkNuVzM0akk5WHJhZk5QdExv?= =?utf-8?B?Q0ZIMHdHWVNkWHQyeTh0MzBTYjlMV2J2T3k5Ry9oaStBMk00UHFmK1U3MG5E?= =?utf-8?B?bXY0dFM1NklRM3pjRU5FcVMzUndwalN2MHFBcVRERXljRkNtZXVkb0dGVFNa?= =?utf-8?B?WEtKMWsydE1OdkVnaW9jek5sWmlqNnA0Rk1ITVd0VElxU2RXd0M2MnpvTTh0?= =?utf-8?B?bDFsQ0tTemU2aW10N3B6TTFseUhudUpOcFE0Q204ZlNyS2drWjBxT0VpWCtF?= =?utf-8?B?WXlBaVVZc2JVVWE5VmlzRXdKT0R4RXRtckE4ZnRuMCt1R1k1UXQ4Rk1wNzBx?= =?utf-8?B?NXhJNmwrYUVJOHpsMWN2VDhkVjhuY1lKcWFJc0lhQm5zTWNhVkVhTDFHdU54?= =?utf-8?B?d2FEWEdKekhxVXVlZjBpblMvN20xbWdUdjArdloyVUoyVVVYTHVKcmprWS82?= =?utf-8?B?elUyNEhwS05Lait0UmxkSzBiK1R2ajJwWldqUWR6bkdicWRJN0Z6ZWVyNno4?= =?utf-8?B?bXJ5cGhPaW1YaGdESXVnSFlXeDBnaVRWMXJCa2hUek9GL3l3NDdhbmE1T3hH?= =?utf-8?B?QzltTjJIclNRVXAxd2duWDRENElqQjJMSVpnM3NBSEYrQys4MGpKWTdvYU1C?= =?utf-8?B?OVUzeS9MaXV3eGlZa3Z6dWRyM29kNlFwY2Q5S3VwS2ZaQ2x6MFhFYXFtQi9z?= =?utf-8?B?Rm81UEdaRU1FNnpPalVqU0QwVXk5Yi8yZVlLdWdGaEsxWU5VK2o4emhHcyti?= =?utf-8?B?Y1JINFJ2VnRITTIwRHZuU2FrMGVjL2lmWEtYdEh0ZEFTazB0Sm9SSTRaTStn?= =?utf-8?B?V3lnNHVlQVJFL1NNL1htdU5JVW1mVmpITWRlakZxU29wVWRDRmZFNkx5YzlS?= =?utf-8?B?MkE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: d380ae02-be2d-45b3-9e29-08da63173130 X-MS-Exchange-CrossTenant-AuthSource: BY5PR13MB4423.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2022 08:27:28.8888 (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: P/2oKMO65odigRWbtZ0mtZ4zNjYMpUCEmi3vrIAQJPOVAxXz27DUDHSRCIHwFLrdWRzRFl57SP7qEDocbZUvGpFQTAqSQ5Y4pr4K+dUxWUY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR13MB3085 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 From: Peng Zhang [ upstream commit 7988cdca98940faa80d3e030c1b9811bcdd4c67d ] "vlan set strip off 0" can't work, due to the incorrect usage of the mask, it just represent that the status is changed or not, not represent offloaded or not, so that the driver send the error control message to the nic. Now, by first inspect the mask of things that changed, and then change the requested state if VLAN stripping according the requested offload status. So this change can fix this bug. Fixes: d4a27a3 ("nfp: add basic features") Cc: stable@dpdk.org Signed-off-by: Peng Zhang Signed-off-by: Yong Xu Signed-off-by: Chaoyong He Signed-off-by: Niklas Söderlund --- drivers/net/nfp/nfp_net.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index 46e1872927518ad7..f427fad4875fe4f6 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -2373,22 +2373,25 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev, int mask) { uint32_t new_ctrl, update; struct nfp_net_hw *hw; + struct rte_eth_conf *dev_conf; int ret; hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); - new_ctrl = 0; + dev_conf = &dev->data->dev_conf; + new_ctrl = hw->ctrl; - /* Enable vlan strip if it is not configured yet */ - if ((mask & ETH_VLAN_STRIP_OFFLOAD) && - !(hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN)) - new_ctrl = hw->ctrl | NFP_NET_CFG_CTRL_RXVLAN; + /* + * Vlan stripping setting + * Enable or disable VLAN stripping + */ + if (mask & ETH_VLAN_STRIP_MASK) { + if (dev_conf->rxmode.offloads & DEV_RX_OFFLOAD_VLAN_STRIP) + new_ctrl |= NFP_NET_CFG_CTRL_RXVLAN; + else + new_ctrl &= ~NFP_NET_CFG_CTRL_RXVLAN; + } - /* Disable vlan strip just if it is configured */ - if (!(mask & ETH_VLAN_STRIP_OFFLOAD) && - (hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN)) - new_ctrl = hw->ctrl & ~NFP_NET_CFG_CTRL_RXVLAN; - - if (new_ctrl == 0) + if (new_ctrl == hw->ctrl) return 0; update = NFP_NET_CFG_UPDATE_GEN; -- 2.36.1