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 A42B7A0A0E for ; Mon, 10 May 2021 18:21:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 99D1B4003E; Mon, 10 May 2021 18:21:36 +0200 (CEST) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-eopbgr750075.outbound.protection.outlook.com [40.107.75.75]) by mails.dpdk.org (Postfix) with ESMTP id 5BFF74003E for ; Mon, 10 May 2021 18:21:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KopXjtRBs6dwE7Xgi4WtE3y78HPSUTt5xNfL1VCz4Im4yjwxFODBEjDBcOUUVvZ4wL8N5+96fHIJga23EPArwfCW7w4E14/JLb7wZo9Jbp6cg0ER+5Vy+hFOK4C2caeyBpyPpxpuQr1lRDYKqagA5CqN+aLIxmXyaIqSK/FlWXNI4mxBZMjIlScmTA2aJsZJBsidJRQUxAnY09tD/0FFE6RKJocx76rn3xtPfiML0NQCak0xO1ocG10zZnPI0vxpAv2lgNOCuwf5+shLbTs6Ys55LblKaOlX7ZEZ4J3by1xrDcUz20HcXaseFGkIsBBKF7FATLFqR52fxp7nxgEC7A== 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-SenderADCheck; bh=xj1T3wZbkEjFiz7NGadsa2K5tqEOymTrWjF5YTK5cTo=; b=L82dEnhRYzVWPLxoDYA/e9XnkmmOhFlBKilduuRX2MF3nSFUBsmDJaPWObTvpdKeTdQOdaS89JTGwFtAVTPEnObLHhs6cH2boNrjb/EhgK6NTW90+SClcMD8gf6wTAnN/3nLm5vWeJWRiJV3GfK8jt7kF+0LwLBHuZ5KiYp7E2/kdRXtlb5qwkEDC4bdExTppetuX8pXlCnvjGo9x6bl1tPt/mhZ2BPzcp5SbcTaec8qMlc2FSoVtZq1uGCKnlnGxx4aIgV93HIwiCOo5WlTbiFPUaAauUNWZpKku9WIKDxGLfgThSEuidZkJBIREA+hG9tEZ2/pAsWFbzmM1t64zw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=xilinx.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xj1T3wZbkEjFiz7NGadsa2K5tqEOymTrWjF5YTK5cTo=; b=eVnGROEiNDSjYka4q2mrv/DUNlCmcF2vug3Ed1dHbTZwib8GjI5J5mSsNy34F8f0WNN/VfS47kfzaWpK2iQlko7QUnMWD8VpCUVk2M3mpG9whluNXa2J292nZnyLDxAJJv5edenv2EOhSz0ID6miAsbQG+z39VEeLbAa2b8Wgj0/m9reMRUYSj388qdP+jQUmMwx0Y5TbjGX1vPmeBX/265aJe6w2xnFhucb0FOOfTFmI9DgBt59P7sdjJUwPpL2hsszo8ounCkUU/rXl5iR4ZrVK6ej0dxI6LEfBuHFjcj+05PTlahzsLElLTFzcxlGkd1smiFNiQhkRnC+vgZrzQ== Received: from BN6PR16CA0016.namprd16.prod.outlook.com (2603:10b6:404:f5::26) by BL1PR12MB5077.namprd12.prod.outlook.com (2603:10b6:208:310::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.29; Mon, 10 May 2021 16:21:34 +0000 Received: from BN8NAM11FT043.eop-nam11.prod.protection.outlook.com (2603:10b6:404:f5:cafe::51) by BN6PR16CA0016.outlook.office365.com (2603:10b6:404:f5::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Mon, 10 May 2021 16:21:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; xilinx.com; dkim=none (message not signed) header.d=none;xilinx.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT043.mail.protection.outlook.com (10.13.177.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:21:34 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:21:20 +0000 From: Xueming Li To: Ivan Malov CC: Luca Boccassi , Andrew Rybchenko , Andy Moreton , dpdk stable Date: Tue, 11 May 2021 00:02:11 +0800 Message-ID: <20210510160258.30982-182-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eceea4a6-ea23-4f5f-fd5d-08d913cfadb7 X-MS-TrafficTypeDiagnostic: BL1PR12MB5077: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ir24XU3DyrqNEBpWSzcAkGaflsorz35jdbviKWy2XGzSV0PdGrFLGjGu/iKesrXT96X2VhJxawVRXlzynbdOeiQaIF40DwLGo+WjCy5dnaWZhvJrPWTtKPS+g6tHHBArF3lVSmbwdTCiZ2eTVFYguomSnbxcDdyHHNFHd9WN3BUiwF+CkRmOjPvkqhpk0jGwPNhiA2+SKVLJOaPkj52xSXjj1kp3Ohes9fR5C7bPy45r/NWUDJDL3GpM6ejscn1nqpDAJxSKPMBc/vy/aexhuUX/jjAXHoom6ivLauZiJDza397RnvukLbTHAENQQiFKcuwGdI1QU8FIOPFZ6vKMK0Fo3BbGYQclcqqAQkdpFPCYdtYtiWThZA91/RlUJiPk1DTGv2vPKFjiMsJKoz6ItUkB4+lQpV+Upt4xCtvLjmF4dFLca4wuNZygt0zqvnh3CDp8LG2RClVtPg2wWZ6iYgmuWz1TPZ6CqdopJicGwH3C05EhhmQlyN2roX9Bd2L6zyiMaFXSgb5XPSuhwUBXnVsupCYJK794DNcExIaIF9/3aEhCpI/PNdr66AOJ3HTkvOfipK6WyUdM8I/cf0DAQ7DXS5xYB/EdfYTKyKPfRmBiPrjdTE6diSJtDyO/CbNQ6HjJXojie2ib/ZkhqtEGBTiAAJseldp0+7Wdb6FKaVqxmv34MMfpuMritxbfkbkmQUdofNHd1ljvru7LbzhsX2tUW0sQM2l6vHaQ3iwgbjWj5NRckcNUqHKRxFSdei9IdX3CRDAPMWZGN4c9pCadzQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(346002)(376002)(396003)(136003)(39860400002)(36840700001)(46966006)(4326008)(82740400003)(8936002)(53546011)(2616005)(966005)(47076005)(5660300002)(8676002)(86362001)(336012)(426003)(478600001)(16526019)(6286002)(356005)(70206006)(7696005)(6916009)(7636003)(316002)(82310400003)(36756003)(36906005)(55016002)(2906002)(83380400001)(6666004)(70586007)(36860700001)(54906003)(186003)(26005)(1076003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:21:34.1381 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eceea4a6-ea23-4f5f-fd5d-08d913cfadb7 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT043.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5077 Subject: [dpdk-stable] patch 'common/sfc_efx/base: fix indication of MAE encap support' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/21. 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. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/9c9d25bce1908fc8da90e683063a6b044f04bf93 Thanks. Xueming Li --- >From 9c9d25bce1908fc8da90e683063a6b044f04bf93 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Sat, 10 Apr 2021 03:51:43 +0300 Subject: [PATCH] common/sfc_efx/base: fix indication of MAE encap support Cc: Luca Boccassi [ upstream commit 8076e40cde3b5230ac488aa44baa4dcf73993aca ] The indication fields in the MCDI response are individual bits, but the current code mistakenly compares the larger dword with 1. This breaks encap. type discovery. Fix that. Fixes: 891408c45a63 ("common/sfc_efx/base: indicate MAE support for encapsulation") Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/common/sfc_efx/base/efx_mae.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/common/sfc_efx/base/efx_mae.c b/drivers/common/sfc_efx/base/efx_mae.c index 338a0013f9..56b9fadf86 100644 --- a/drivers/common/sfc_efx/base/efx_mae.c +++ b/drivers/common/sfc_efx/base/efx_mae.c @@ -47,17 +47,20 @@ efx_mae_get_capabilities( maep->em_encap_types_supported = 0; - if (MCDI_OUT_DWORD(req, MAE_GET_CAPS_OUT_ENCAP_TYPE_VXLAN) == 1) { + if (MCDI_OUT_DWORD_FIELD(req, MAE_GET_CAPS_OUT_ENCAP_TYPES_SUPPORTED, + MAE_GET_CAPS_OUT_ENCAP_TYPE_VXLAN) != 0) { maep->em_encap_types_supported |= (1U << EFX_TUNNEL_PROTOCOL_VXLAN); } - if (MCDI_OUT_DWORD(req, MAE_GET_CAPS_OUT_ENCAP_TYPE_GENEVE) == 1) { + if (MCDI_OUT_DWORD_FIELD(req, MAE_GET_CAPS_OUT_ENCAP_TYPES_SUPPORTED, + MAE_GET_CAPS_OUT_ENCAP_TYPE_GENEVE) != 0) { maep->em_encap_types_supported |= (1U << EFX_TUNNEL_PROTOCOL_GENEVE); } - if (MCDI_OUT_DWORD(req, MAE_GET_CAPS_OUT_ENCAP_TYPE_NVGRE) == 1) { + if (MCDI_OUT_DWORD_FIELD(req, MAE_GET_CAPS_OUT_ENCAP_TYPES_SUPPORTED, + MAE_GET_CAPS_OUT_ENCAP_TYPE_NVGRE) != 0) { maep->em_encap_types_supported |= (1U << EFX_TUNNEL_PROTOCOL_NVGRE); } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:31.285733200 +0800 +++ 0183-common-sfc_efx-base-fix-indication-of-MAE-encap-supp.patch 2021-05-10 23:59:26.620000000 +0800 @@ -1 +1 @@ -From 8076e40cde3b5230ac488aa44baa4dcf73993aca Mon Sep 17 00:00:00 2001 +From 9c9d25bce1908fc8da90e683063a6b044f04bf93 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 8076e40cde3b5230ac488aa44baa4dcf73993aca ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index e6156102d6..80fe155d0d 100644 +index 338a0013f9..56b9fadf86 100644 @@ -24 +26 @@ -@@ -46,17 +46,20 @@ efx_mae_get_capabilities( +@@ -47,17 +47,20 @@ efx_mae_get_capabilities(