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 D6D45433D8 for ; Mon, 11 Dec 2023 11:22:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D134140ED2; Mon, 11 Dec 2023 11:22:09 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2066.outbound.protection.outlook.com [40.107.243.66]) by mails.dpdk.org (Postfix) with ESMTP id B8D4340E0F for ; Mon, 11 Dec 2023 11:22:08 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kYrd2H6THOjsEfX7h2kr/ykzUk63g3gcf87m16Hff9SwMW1R0sUvx0wUSwQN5S1HEEv+1JPXkXjwnl1QclMctzKJKcrmbf5WxH0oScZxRhfhiYCY7jtgBIg2zQoK2zN12maNj/3mFYAqX3IRQ8HWCIJbsEJ5SM5lhlPZuxPXjWKNeQh6MQ1tp4vqe0TZgPj3EcHWJsE8WpBWuZ5iF7PNxh4nPG95/QyYCVOUSm++/diivG0AgvgzubdTK+ei47PiAdPxBMfDll3va57fRAmu0d2tB36EmzN4400FrXdqCE+FuMXHmoumWL5hF0jYxZg0W3XUtfPWkqu2rpeiB/26qw== 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=Hz/3tbN2xERDdC6aUk8R7EIZzO6kD6N8ELDqIoC61ZY=; b=ECrSsdODGK87IAW8BeZzEzuHZ1uz23sss1lbcNq6X5zuuQ1JPckdt0+YJtxJDpdPzcGNgQlzN6cIOJNhVo4eVOUvwKXxLdejwRFt2WYbYvByb6WEYwIrEC7w0E81kTILw2V8dJOIwuEA3spzpz+yeknqspCQUcirtsQvabm5/WG9yny6YYiU0R0yUDEkV9kQfU9zZ71cFHWOcucU8EqFGgkbIjqbMnpAuxCdCNUOci1UNxA+3IMNXpYR8QiqkwxScF5L/5M3TbkSeplTaWN1ALsTwk/eGHyMppikbl6TO4SOrtLX4Wgdl/XXBudegvYY6AvHntjjKqUxO+at60Hmdw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=canonical.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=Hz/3tbN2xERDdC6aUk8R7EIZzO6kD6N8ELDqIoC61ZY=; b=gxUgm3chgsrUfJQwVIY+b2hn7PW27ZfdVglgYUXLfuSdIo8bLVwCKHdDpgusBx51FEPMq73lHko2t6TD4V/7VRE1HwnyTkfMWMKx2Zf9kOkAPVEk8yJxzXUQnMiSIowPLcUTwHg01O38tq/OuVZwNeq1kGWi1vX6H0mxPzK3sHq2W0W2uddNGU01XgBTMO15I62iiEYXHBsE1HBzbkQJGunhR3/Rg3g68nY9F9VKbBEDasLDLCuF1Dz2YiCFQhRtnsexyz3fHpwFt6D+qwFqHsazut+U3LEy0+ftVbEi7kZuUukaApETWgSt/3FbCBrsTE7KOCsv1Zscc5ToQ6NbFw== Received: from SA9PR13CA0078.namprd13.prod.outlook.com (2603:10b6:806:23::23) by BY5PR12MB4196.namprd12.prod.outlook.com (2603:10b6:a03:205::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:22:03 +0000 Received: from SN1PEPF0002529E.namprd05.prod.outlook.com (2603:10b6:806:23:cafe::ce) by SA9PR13CA0078.outlook.office365.com (2603:10b6:806:23::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.21 via Frontend Transport; Mon, 11 Dec 2023 10:22:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF0002529E.mail.protection.outlook.com (10.167.242.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:22:02 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:21:47 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:21:45 -0800 From: Xueming Li To: Christian Ehrhardt CC: Sivaprasad Tummala , dpdk stable Subject: patch 'config: fix RISC-V native build' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:12:09 +0800 Message-ID: <20231211101226.2122-105-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002529E:EE_|BY5PR12MB4196:EE_ X-MS-Office365-Filtering-Correlation-Id: ee724688-c0a6-4b4b-ee0c-08dbfa33044c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KEAMX/aZkIqm5MfL1EYEkkKk1tZalNVgkQhXTE+eHOieUw4PxdOYJKrt5NkPMmSwCbhaQq7osr+L7rc5DU2UWjLMdMoAAdIFKw8hyvz9THVgN/DnSf2sMe1jbUPyjsy94L8/utoSkvEgqsAQwxcu4C09H7ecnKyMr0KGH9PAJyEllo9oqI3UZlq+wju6GOhUXkDmVs38Urr1856O0Z/ObWTpM8hixSD92qn+fehWGmiKIKdvhnL28RH2XPVyqXNxwtlH8yggY9UQ+49rncxGJwFx3JeupYppUxuvzIWBfIKXBpDMUN6NwVHVxWgfNx02EPZNYY1eUiTmFXyNwv8JhgYBMZ4W1Sdc6C/2DMfkUqgjoCon0VVrtJC6u99t1+jF4SoXVUJcLQS0uwUQrQTCFxN88CS81VwvQd14y0zQ6b/sO/F1GbMUsWVCDmrZ8hhNKixFdPgvTbi6+6IQ6Q46eM3rJqmEmAis/8O3hTchplsulBl6ElOkGCHQXEMp8d/AXfgyQTzcJY7Cnk7gyKMASehhNp+BJOR9O3Rq0//ax6Hhbx/9vd6tfpl73+N+1n6VzCohWz33XA55QkiWC9rZFj2x1G0Ol5QlSYXKU+QTq3hikLpZPwOI/BBgoSeLGa1/ci3iGydaSs0/ZGaDyVripVIGNskgbL6Iy60KD6AbMsp4aj52FHbsIGwBcfJ+2YeoIIj4lApKZCqCVo6XDp9kp2BZNjfbBy7a7DdSb47V+kxKzkwAEfXMWiI2uxeETE8xj3a1nW66WjeXVa/fnXJDrUU5CIMkTkiiocHOJjKCdAY= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(376002)(396003)(136003)(39850400004)(346002)(230922051799003)(451199024)(1800799012)(186009)(82310400011)(64100799003)(40470700004)(36840700001)(46966006)(83380400001)(2906002)(82740400003)(478600001)(356005)(41300700001)(4001150100001)(7636003)(55016003)(70206006)(70586007)(54906003)(6916009)(426003)(966005)(40480700001)(316002)(6666004)(86362001)(7696005)(4326008)(8936002)(8676002)(53546011)(40460700003)(36756003)(1076003)(47076005)(6286002)(5660300002)(36860700001)(26005)(336012)(2616005)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:22:02.4077 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ee724688-c0a6-4b4b-ee0c-08dbfa33044c X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002529E.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4196 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 Hi, FYI, your patch has been queued to stable release 22.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 12/13/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=82dd3dde96981b7d2445aa8e64602b67a4b44de0 Thanks. Xueming Li --- >From 82dd3dde96981b7d2445aa8e64602b67a4b44de0 Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Tue, 21 Nov 2023 17:49:03 +0100 Subject: [PATCH] config: fix RISC-V native build Cc: Xueming Li [ upstream commit 3f457edd80900d2771c673843c17088a8c7fcf49 ] If building riscv natively with -Dplatform=generic, config/meson.build will select cpu_instruction_set=riscv. That was fine because config/riscv/meson.build did override it to valid values later, but since commit b7676fcccab4 ("config: verify machine arch flag"), it will break the build as it tries to test -march=riscv which is not a valid value. The generic setting used in most cases is rv64gc, set this here as well. Fixes: b7676fcccab4 ("config: verify machine arch flag") Fixes: f22e705ebf12 ("eal/riscv: support RISC-V architecture") Signed-off-by: Christian Ehrhardt Acked-by: Sivaprasad Tummala --- config/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/meson.build b/config/meson.build index 6c59b28468..5f6320ab19 100644 --- a/config/meson.build +++ b/config/meson.build @@ -122,7 +122,7 @@ if cpu_instruction_set == 'generic' elif host_machine.cpu_family().startswith('ppc') cpu_instruction_set = 'power8' elif host_machine.cpu_family().startswith('riscv') - cpu_instruction_set = 'riscv' + cpu_instruction_set = 'rv64gc' endif endif -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:26.454134000 +0800 +++ 0104-config-fix-RISC-V-native-build.patch 2023-12-11 17:56:23.217652300 +0800 @@ -1 +1 @@ -From 3f457edd80900d2771c673843c17088a8c7fcf49 Mon Sep 17 00:00:00 2001 +From 82dd3dde96981b7d2445aa8e64602b67a4b44de0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3f457edd80900d2771c673843c17088a8c7fcf49 ] @@ -27 +30 @@ -index d732154731..a9ccd56deb 100644 +index 6c59b28468..5f6320ab19 100644 @@ -30 +33 @@ -@@ -152,7 +152,7 @@ if cpu_instruction_set == 'generic' +@@ -122,7 +122,7 @@ if cpu_instruction_set == 'generic'