From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0055.outbound.protection.outlook.com [104.47.1.55]) by dpdk.org (Postfix) with ESMTP id C7D181C01 for ; Fri, 27 Jul 2018 04:23:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=X/SRyMOLvR3AnOFgfyJpfkQTYpX2WA3VZIqHcbtto6U=; b=nV29YRWC3qr90/UxcbV9/UAoovO66lX9QSAsdXivwGEkmUizFFTm7IwYa+y5RH36hHPvtivgmAgA7ptYMfgPTYG1Ebz5+oyuyRdOf1HezJvcwa6CFFuofiT0Y/631SlKjgn0Nt3ijIUwEPndORtvEVq40dKFGLFeEAHNykdqpg4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by AM5PR0501MB2034.eurprd05.prod.outlook.com (2603:10a6:203:1a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.21; Fri, 27 Jul 2018 02:23:47 +0000 From: Yongseok Koh To: Somnath Kotur Cc: Ajit Khaparde , dpdk stable Date: Thu, 26 Jul 2018 19:23:16 -0700 Message-Id: <20180727022316.37976-1-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: BN6PR03CA0009.namprd03.prod.outlook.com (2603:10b6:404:23::19) To AM5PR0501MB2034.eurprd05.prod.outlook.com (2603:10a6:203:1a::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f1fa3a94-3759-4ed6-5202-08d5f367fc35 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600074)(711020)(4618075)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:AM5PR0501MB2034; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2034; 3:3McgWhQ9TxwNIpdTXc+h2q3cf1tr7v23cn4DzZYbZmzzC6AtCYEzZhNCbrYWxgH9j1HS+RcEefiiPbNkHZvjGvp/HuxmC3XSpJ9BYXlLhmUtD1yb3o3hcBUWZJjHnn0kEfRJVO9Yz/RRXY8CMYES9K0i18IgW3p3j8fZDLonePTop8buQx+RgsGGAPQ5oXNAdpg87iKN7Rie1BBlIdqoruMPUceVKGL5VNuDq1U0IxoNEfrv31LZ3nq4yX40ekoC; 25:YWsL6T5kz/aI5N6SPxgC9hXlCLDfTJzafoUHabwdHUXbwQBjO+pdH0KmP0FQqzMLa9gCaRHihG3VoI+CXS8G67OazbinTF9QDAjKcIecghFjXQSun3RpQGqc6iFljxei3s/A5+5AnzT9jPmfg1df8fY/YHcvf4lUiKRgnfT0w1lOEmnhqb3wulQy3fXiv+Ipumo+qE9wqW7dLXZwkrDz7hK5t3xFw5AO+aim3qhzBh8YueoaxAHwaTiYunCG3C1hrY1X4I2d9LDArOlJLz1Gd3hIRGoeV3ITfxMmMCs0ge3789EZQrpi2zuwsQXf/MCDjrt3uV6JmDIrCE8awOwirA==; 31:dh98vOaD7vuJ1OzF9uqCBqyC9jMHO82WVllY4bWpCFQOJPXLI+ermgVdgb9pxK7XjiulkVQcWCRsOL8hnI+KyLlNAtKtxeLtMBx2ta3Bxl93pB1KZGabFh9kzJQKzH1Wgkj0vVRgRALGhblCnml898AvyRSWoYZWSW2k91wBSWkzOUCw7wCNQxCxyn4TMSWAPHWrJ7yBvQxcZ/D3LEdBmU9M7C96D9moET6t3B6wZPA= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2034: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2034; 20:zwTO3XZRfB39awO3pqjiu1wxdtUuBZ6ZuG+gDjTJ4ILWrur9+XUnrEv3amXFHPzYyI1+KKPJ2zCOCHe03p9U1w4jb1e1xjxRfMBdKiy/99N7oBhsNDT2zv3WYyjLxC34Wfr+d121ppULTEVeJZ7f4TrK1XEzUy5SlKbnjY7IQ8bu1TrQcLv2nUBuxuWH8zA4QF9+i+/2OOQpp/9rZ2XSAbPLPwbmBGj1HCjML2S/oVgiHmM91g1T+/0xv7HoRn2aXXWbnax19nMowcaSNV+ZRcNGIO2kmzHBlTxVAQTRk4QAgCw7JdgR2R4sWfVU37j6gmq8lyjsc3EYi+3Ea4II3wbRtqlfZtqcER8DurjVRRGxcEfNKw33zv3TEwIq+VKy5pnjvub1H9A5M7G1MvB71+SnhJVd0+ShR4Y9tqpALggHbOlnf0yJchF1j61naoMhEBt18LJV5VkIizPVRVTEl0qE4a10eimL+77wye3+hw6SSYhg+DS7WJHCnAdUQkxs; 4:O7JEcflc31dtBhiOLoWg75qN/a957ImOL1pKtGGhW2BYGk0N0KRQvBBdPAN/u0gQZ8YfFPy3sGR4nmgOOi5LdbzA2w8a7os5AFjYhPJSQ8jmz7KeE0qooDQtqXw4NFA+UG1RbH9OGMbY4jXduuyCYWbaEs8yWm/TUuu9DlxcqpEbK6waJ7685VHOXuzP1Dy4nCWzcl0FC2wBUFokZNIgZfut0IdbJnNEaTVse51IG43i7RyrKUbGyF/QZTMxGgXWtri3ojEt7Xj4p9bwZI3MPMyfgXVSvLt8b8To1nwjsVQOu1NIdlGVbjUGID4DRQiw X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(208715162771679); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:AM5PR0501MB2034; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2034; X-Forefront-PRVS: 07467C4D33 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(136003)(346002)(366004)(376002)(396003)(39860400002)(69234005)(189003)(199004)(28163001)(97736004)(16586007)(54906003)(48376002)(50466002)(2906002)(5660300001)(316002)(386003)(7696005)(81156014)(8676002)(51416003)(575784001)(52116002)(86362001)(6916009)(8936002)(25786009)(66066001)(47776003)(36756003)(53546011)(7736002)(305945005)(81166006)(6666003)(478600001)(966005)(486006)(956004)(68736007)(106356001)(53376002)(53936002)(476003)(16526019)(26005)(186003)(2616005)(4326008)(50226002)(1720100001)(55016002)(3846002)(21086003)(105586002)(6116002)(6306002)(1076002)(69596002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2034; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0501MB2034; 23:8bDKfF2XzWfcClXHFhF2+Em3liamFdt7QsAOWRG?= =?us-ascii?Q?RCgfXLA0BVfcWKOu2qBltY+SAiJMJc4cqHGQCiCF2J7StC5hm9s9t6Z4r6n9?= =?us-ascii?Q?5ay8ArozMRr3bTrJOG6LN+JpfKdCb6huF2akJsuf39kClRddTGBcLvhWzYvR?= =?us-ascii?Q?86SXoclihm2QvSMLVuIhBmAekCTSRIwWDqrJFKyQnCAq76/0rV68p8YeDBfm?= =?us-ascii?Q?EA2EhJAjUZELeezQFkP3qk7F0oZ1mbkyFbhcfz1SLkYkBlQa9vUCnLLv85L/?= =?us-ascii?Q?W94VPu+r/3zOR2tg282Gl+uFvmrMed1v5iioxj87jf23tMMJ9FiZQ21nPey1?= =?us-ascii?Q?Z170B/I5KAJPECNNLrsPvSzunaGcxQO7Y7+fEU7qbN6VxRMmp9WH9FiWyX1U?= =?us-ascii?Q?s7Nbe7j6ISntNYJP4qnJKqUGnYXTqUvbeYp6dtAj3l4M4xqhURidpSH7OtM7?= =?us-ascii?Q?Bvae/q/szn8GDAb99B17lDp/oADcS8hCAEH8yXdNjD4LTvjwsyDiEVziPGuH?= =?us-ascii?Q?4FlyV7pPKsdFbkVAJDujdl/e0YyUOZhGl6IenEHD6ROccgeBrqKVhfoQG9cM?= =?us-ascii?Q?xGTPKnPzbYbABtL9h+rjaZMqsZ4lquw7tNkimAQ9LShBpIawWLo1z9FPw6C3?= =?us-ascii?Q?E28Z2aknJo337YLmMOdgboqP+Wudd6fMgBsNYEmAnkLnv1hRIA9VbRXak2RG?= =?us-ascii?Q?1rI9sPRqMZXOn4AtnJH0G3id68AgNd/KTlGisaKeRtDyDzBz/5dqOdWGu/cA?= =?us-ascii?Q?LeY6FYPu0XZDFaFXTNElktJyUHbpvtUSVKVZaxwnldWs/KbyxZei4fvI7fAO?= =?us-ascii?Q?ezDYhOrhajVULutg55zrNR7bRSQjkLWeUUlmrswzgc6EcmmAUgp+WVDDI59W?= =?us-ascii?Q?MkxbV1hcxh2wgBTHuSclabIpue0nJ/ovcxdcmUaAzFdMhPyLp9+8y+G3//Xm?= =?us-ascii?Q?vL+0xqks8+aY7ZSvhsb0et/cHxrrFdmflv+MQpgs17mXI0uzQXdOB08NY4UD?= =?us-ascii?Q?iNnoF8PngYHu10bwMPdCKLCfYO4IOOT89osHIZtHXYCTFrWdob3JnJKIsEbT?= =?us-ascii?Q?67i6adZ0ZCWdQ4yw4yhTpTW8NNX/2MwU03lmXWILKx2j4hnWiEItWwxvDHQ3?= =?us-ascii?Q?1ZniRmDE741V9LOggNuzB8lO6sQacEkV+MvZvtzdhvWzxVfnnRK/t6CX5eLa?= =?us-ascii?Q?qxANosXvkrZ0gjMoghC42lmhFbUKX+t6e107dAz0DLMgXXF+gKd2XKg0x/8l?= =?us-ascii?Q?IUndmfvJu8VI8cDCLAgJ7YnjOt6gW0UEuln99wJMycyJ1kl9u8ghfUWmutEr?= =?us-ascii?Q?Ez/d8W274tHwBzLHmU3FApoHzWx+vMrfZDo+Xhc0/xDRGB/Pk0nA03AV/ZNe?= =?us-ascii?Q?7dRBT1g=3D=3D?= X-Microsoft-Antispam-Message-Info: cvUG6oilZ1JyYZ8ANl1MDdo+VIyuTzEP06GrkUZNXZsZiRDlZz1tQMbm7i1ZTgyxxEROjDy8U/814ueiFGqc+Mujq9V3Bfrnc1xYN9PGTHYFGzhre/M/WCzVrn8i2E/4qFMsgVbBITQpakcgqza4QIUo81qNrwfAnH0f7z6UEDHm9WAbYkYQMY35k9FlMKRAJaAQ1K2qcj4M5VOJwiT2KbzzD1+TB/8rJ3qkkyHF0tdpw6qAFo0CsbhoV8e6/jWSMnaVwl7eedqJs32xm5lpLii4T16f1w80FjiVcMFbdsBVMuy1chlHOqwoYdKALCTek9/FwnvkPIBpZmHpNEJo7QjhdWm5t+4FlgRccIFk4a0= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2034; 6:0Ryjcu0J+PCsv+g50KOoUgLybsweLMOK1r1pz6QHK9i6QVUCRXKJQIKy7pMdWZlubBG4q6wMGbIeLomxn5qUAh8gv8qNZ9bvHK6xyr0eT/XygJRZucjJcPJa5UG68LtP4Boex/tdntX6d/dDgF5EqZuc5zdUi7Jqs5If0ja+WqX5Fqp0VW5PxVa6Up9YbES3JdTzLrNkH5OD4KJIvlXKQsqBeLzfHh6Z9qU2n7AlncvHvmcwpXESL47t6O/JUsoQXAlK0D+0zom9RlVCLuBSUFRcP3KjITLof6ItBFKtnXTRd01aJq8kscdddoPzw5uGGLVPI0Hv+qhpFzrxTWwjLK14eSEDsEDk7r+uaFMyPB0VmhgfPY2cn/pnawCso6DZ5wK9d1ZIKPqdfWrm1DK0xzzduXQqfz1U8HIyvjg7MRlnnnSV42n8I/NzOe6+zbVXvTNNq+NVkUq8WpO2m5N7Fw==; 5:fgxmB4uk7W4qWL1FTRWgv6b+KxGP4gjfRr0MZoxeMHUeRKUR1YKXWXEcnOJJooht24+E1txc9GEL7YijGe9FLy9eXXvbWjwvlRDLXi/QR5rRCr+hClZR8Rf+zQ1FEK55N3w+zhGFNZYEa4MDO9IJqhiWXz/o/uxgYPfeNESbueQ=; 7:ytFwBeUqNcC022Y+Hn/ReleLlzmrbJGtC1SFdOlsheNV7qNxfyH7cdIEe7A4Nc7iOhSBbnkI8ETqx3uTwzj3q7Zz5sgNS6cEUrzYQB3xhr0ilTlnIi8JRKqGb9GoGN51jwB618PdKjgw8NB/IUY0QVrEnfANi8yI/nuIczDPaoKpcBHQ8rl8LYS78cBpfBlbe/DZ4LTcSbg1hSpzrTO4KbfAxhbJXVwMFVwpLGuA8M27IM0o2UEjwZgNHMaBWx/u SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2018 02:23:47.2009 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f1fa3a94-3759-4ed6-5202-08d5f367fc35 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2034 Subject: [dpdk-stable] patch 'net/bnxt: use correct flags during VLAN configuration' has been queued to LTS release 17.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: , X-List-Received-Date: Fri, 27 Jul 2018 02:23:50 -0000 Hi, FYI, your patch has been queued to LTS release 17.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/28/18. So please shout if anyone has objections. Thanks. Yongseok --- >>From 397cc4c2623571f4823aca158e211704a425e4a7 Mon Sep 17 00:00:00 2001 From: Somnath Kotur Date: Thu, 28 Jun 2018 13:15:49 -0700 Subject: [PATCH] net/bnxt: use correct flags during VLAN configuration [ upstream commit 246c5cc5f05e337782aed9afcf8dc61fe971fa52 ] Setting of VLAN filter cmd was being done with incorrect flag value. We need to use inner vlan fields instead of outer vlan. Fixes: 7fe5668d2ea3 ("net/bnxt: support VLAN filter and strip") Signed-off-by: Somnath Kotur Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 10 +++++----- drivers/net/bnxt/bnxt_hwrm.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index c4846da95..5b0bf80e3 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1279,9 +1279,9 @@ static int bnxt_add_vlan_filter(struct bnxt *bp, uint16_t vlan_id) struct bnxt_vnic_info *vnic; unsigned int i; int rc = 0; - uint32_t en = HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN | - HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN_MASK; - uint32_t chk = HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN; + uint32_t en = HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_IVLAN | + HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_IVLAN_MASK; + uint32_t chk = HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_IVLAN; /* Cycle through all VNICs */ for (i = 0; i < bp->nr_vnics; i++) { @@ -1328,8 +1328,8 @@ static int bnxt_add_vlan_filter(struct bnxt *bp, uint16_t vlan_id) memcpy(new_filter->l2_addr, filter->l2_addr, ETHER_ADDR_LEN); /* MAC + VLAN ID filter */ - new_filter->l2_ovlan = vlan_id; - new_filter->l2_ovlan_mask = 0xF000; + new_filter->l2_ivlan = vlan_id; + new_filter->l2_ivlan_mask = 0xF000; new_filter->enables |= en; rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index f34358d44..f94c27bd7 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -406,13 +406,13 @@ int bnxt_hwrm_set_l2_filter(struct bnxt *bp, req.l2_ovlan = filter->l2_ovlan; if (enables & HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_IVLAN) - req.l2_ovlan = filter->l2_ivlan; + req.l2_ivlan = filter->l2_ivlan; if (enables & HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN_MASK) req.l2_ovlan_mask = filter->l2_ovlan_mask; if (enables & HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_IVLAN_MASK) - req.l2_ovlan_mask = filter->l2_ivlan_mask; + req.l2_ivlan_mask = filter->l2_ivlan_mask; if (enables & HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_SRC_ID) req.src_id = rte_cpu_to_le_32(filter->src_id); if (enables & HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_SRC_TYPE) -- 2.11.0