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 65AD3A0A0E for ; Mon, 10 May 2021 18:10:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 59F0C4003E; Mon, 10 May 2021 18:10:24 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2084.outbound.protection.outlook.com [40.107.237.84]) by mails.dpdk.org (Postfix) with ESMTP id B0FA24003E for ; Mon, 10 May 2021 18:10:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WwSUuU+CfYV8d45fNFemT/oDmpKq1/DMhr91D4hK3zinvhSTMjr3ieu+SV+sUo/xZgpxC3dLJJBP6qanDfOPJE5RzRpyvsr2eD7n4URrsO0ofQf9PYJ+Qf+e4XjETGs4ImUMB/3qwbm8ARZhDpGRyAXjkVK1Eo4bCyjq211pM7KZugqLh5lqgOySMgAYVdG5P1ygsFxc9ckCfGlpU4iKwCRK5a7URYjyePXxiNBY6WYZjMnWi1BvjVHyvTDoJBqOQpDu1lztpf0NQjG+cmboGrjaMb2Y8vuvfUec1oasuhOEVOUFGonw6+4CjkYuFzCH4v2KcOjXVlO/nziLpCZLBw== 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=VcU3ZkiB1X+mFAR4yTPYjh+W0ysJNYswMvHl8+6gmeo=; b=XjXcPGZjAEZxBOTPoWL0wlg3JLpCV50MG2Vq211SE5p/IFmy1CP6VXLueoadO8p5bUrLJjjVbqXe3r44Vb3A4FduAMSLRzE7Au8xrJIN/JZaIfUmQY0S/yZfdsJClNsXjr57LJM12U/hmEanpXdWhneNcg59dhT3EUG0pISrS1fRd3na2hgro+puRgI0bufSTYhtKz903UMrhryM9xaE0pG+u52sYpOgxAmE721UTZhigr/b5XXhcGebA8D6JMrKzGA2uqsXWOXKjL5ooT0WcHJL0zZaZfJCVotiFRRsDiafRDjxsCqEw0gbwO69V4pPTpCkJO5B18zW44z3P4UwEA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=oktetlabs.ru 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=VcU3ZkiB1X+mFAR4yTPYjh+W0ysJNYswMvHl8+6gmeo=; b=byKtMJ8l4/d6hW2EyNfjoFVcJ9v0x/wDUm3/OM4ydd2gpsgMBUllbvHugWaN/g3PrIg7Rg831cJBIRedIfcCJQKVCZy9FwCr8rCaZyGHiQUVe9hHcmTR3Z8HZ2vZVlWmyVjBfJxyhhKudF4fUCUbiacb9DDR0S5YfNssnsH1NxWAnfIQVJ5QjNpuFUEeOGLDYTGZAQUfdiIgfWVKRmf0Xor8W3B82fzMa744WpBMcjaQCTGlTWxONiEMfacDkDJeIdAGNxobLZf/g+H/hCaNr0hwN5nLoHNU56Bw2aJEaMWa1TG4MURMYOf7Awcm+PoKDdpPxvrz5Lp4utaHl2wCIA== Received: from BN6PR13CA0006.namprd13.prod.outlook.com (2603:10b6:404:10a::16) by BN6PR1201MB0179.namprd12.prod.outlook.com (2603:10b6:405:59::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May 2021 16:10:22 +0000 Received: from BN8NAM11FT030.eop-nam11.prod.protection.outlook.com (2603:10b6:404:10a:cafe::c1) by BN6PR13CA0006.outlook.office365.com (2603:10b6:404:10a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.11 via Frontend Transport; Mon, 10 May 2021 16:10:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; oktetlabs.ru; dkim=none (message not signed) header.d=none;oktetlabs.ru; 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 BN8NAM11FT030.mail.protection.outlook.com (10.13.177.146) 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:10:22 +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:10:19 +0000 From: Xueming Li To: Natanael Copa CC: Luca Boccassi , Hemant Agrawal , Thomas Monjalon , Andrew Rybchenko , David Marchand , dpdk stable Date: Tue, 11 May 2021 00:00:20 +0800 Message-ID: <20210510160258.30982-71-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: 0e739b07-822c-468a-dc70-08d913ce1d32 X-MS-TrafficTypeDiagnostic: BN6PR1201MB0179: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FcKV0up8OMCOjV+a1+WLR/bnAcadM6o9FTW9+SJMvrP4PRCSDVBEsERTs31UeL/kua2YRHK8ZBj3hYf6cJPmOqQEEpW1o5VYIsczEiRVNjnEpV81Di/aM/Li4p942D00o3fIYpEVQsryf5WGUGUbC622DKXR5xRL0CaYwvUDURbBQkzxGtFrQalyrPMTrDo4xCgLLiWGSIvtL5cAPGUpplltq+ia6qJ1mwzRDOaC46Qq7IBim3oUoejxytpUHAHfnpiEHeI19yELBDtcIIokz91U8WvdRkTIkxakokxvIL7PVtl+GKALxdr3d092BrfDX4GD9ncd6CEh+fH6LHE5mMrXQtPrDuk3fLtobGSw6k81y5OxRIy/fwpQvnamqg3ZF22PHXRVqHlVrms81Tvf1Bl8pjqhNbvRLKSkkM7tIMq5wOBXi9/f0+Wxb127HwJzqrx7Ae3gBMllFHubuqflitmhCTjqWxg5ocoUywMgm33bRbJJyDx7OD5PdPb5ynUIpXVKE4tGpND6FV45bV1qzEdiOYhilkdh+Q8FeGTMrQGvdvxlA2dsfKmHJPWT35GGXYXKpoXqZu4azt46akrNTuHVCBrg8Q0kj6wIK89lV+m2AeM4DRI9uUq1kfgBYuovIC30mYqAp8iDQhqakkkSaY7eAoT6VgpU0W7sptjnh9cFrZgIqrvKmqZL7qGIMuuNKQBLH+SxQdWAOtDfScnrfbZRK5CDAmSWPo69LFb+nXuHoIPZHmjtQsT8Mf0sJxskIhTMWJuYmjbU0scqO9ycVQ== 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)(39860400002)(346002)(396003)(136003)(376002)(46966006)(36840700001)(2616005)(26005)(356005)(36860700001)(478600001)(53546011)(55016002)(82740400003)(2906002)(86362001)(336012)(54906003)(7696005)(70206006)(6916009)(6286002)(966005)(70586007)(83380400001)(47076005)(186003)(5660300002)(316002)(6666004)(7636003)(1076003)(4326008)(82310400003)(36906005)(16526019)(36756003)(8676002)(8936002)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:10:22.1970 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0e739b07-822c-468a-dc70-08d913ce1d32 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: BN8NAM11FT030.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB0179 Subject: [dpdk-stable] patch 'common/dpaax/caamflib: fix build with musl' 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/a4553bb9d242788592ce492eab69711b5d2926b6 Thanks. Xueming Li --- >From a4553bb9d242788592ce492eab69711b5d2926b6 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 5 Nov 2020 22:17:14 +0100 Subject: [PATCH] common/dpaax/caamflib: fix build with musl Cc: Luca Boccassi [ upstream commit 8bf3ff3c37ec1786470dfa7b8056e3304bbba14f ] The swab16/swab32/swab64 are Linux specific and not GNU libc specific. Keep the check for __GLIBC__ just in case other GNU systems depends on this (Hurd or GNU/kFreeBSD). This fixes a build error with musl libc. Fixes: 04711d41a872 ("crypto/dpaa2_sec: add run-time assembler for descriptor") Signed-off-by: Natanael Copa Acked-by: Hemant Agrawal Signed-off-by: Thomas Monjalon Acked-by: Andrew Rybchenko Acked-by: David Marchand --- drivers/common/dpaax/caamflib/compat.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/common/dpaax/caamflib/compat.h b/drivers/common/dpaax/caamflib/compat.h index 36ee4b5335..c1a693498d 100644 --- a/drivers/common/dpaax/caamflib/compat.h +++ b/drivers/common/dpaax/caamflib/compat.h @@ -11,7 +11,7 @@ #include #include -#ifdef __GLIBC__ +#ifdef RTE_EXEC_ENV_LINUX #include #include #include @@ -24,7 +24,7 @@ #error "Undefined endianness" #endif -#else +#else /* !RTE_EXEC_ENV_LINUX */ #error Environment not supported! #endif @@ -40,7 +40,7 @@ #define __maybe_unused __rte_unused #endif -#if defined(__GLIBC__) && !defined(pr_debug) +#if !defined(pr_debug) #if !defined(SUPPRESS_PRINTS) && defined(RTA_DEBUG) #define pr_debug(fmt, ...) \ RTE_LOG(DEBUG, PMD, "%s(): " fmt "\n", __func__, ##__VA_ARGS__) @@ -49,7 +49,7 @@ #endif #endif /* pr_debug */ -#if defined(__GLIBC__) && !defined(pr_err) +#if !defined(pr_err) #if !defined(SUPPRESS_PRINTS) #define pr_err(fmt, ...) \ RTE_LOG(ERR, PMD, "%s(): " fmt "\n", __func__, ##__VA_ARGS__) @@ -58,7 +58,7 @@ #endif #endif /* pr_err */ -#if defined(__GLIBC__) && !defined(pr_warn) +#if !defined(pr_warn) #if !defined(SUPPRESS_PRINTS) #define pr_warn(fmt, ...) \ RTE_LOG(WARNING, PMD, "%s(): " fmt "\n", __func__, ##__VA_ARGS__) @@ -101,7 +101,7 @@ #endif /* Use Linux naming convention */ -#ifdef __GLIBC__ +#if defined(RTE_EXEC_ENV_LINUX) || defined(__GLIBC__) #define swab16(x) rte_bswap16(x) #define swab32(x) rte_bswap32(x) #define swab64(x) rte_bswap64(x) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:28.491346400 +0800 +++ 0072-common-dpaax-caamflib-fix-build-with-musl.patch 2021-05-10 23:59:26.430000000 +0800 @@ -1 +1 @@ -From 8bf3ff3c37ec1786470dfa7b8056e3304bbba14f Mon Sep 17 00:00:00 2001 +From a4553bb9d242788592ce492eab69711b5d2926b6 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 8bf3ff3c37ec1786470dfa7b8056e3304bbba14f ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org