From nobody Mon Jun 15 10:12:47 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68612C433EF for ; Sat, 30 Apr 2022 13:52:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382822AbiD3NyL (ORCPT ); Sat, 30 Apr 2022 09:54:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1381686AbiD3Nxy (ORCPT ); Sat, 30 Apr 2022 09:53:54 -0400 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2104.outbound.protection.outlook.com [40.107.113.104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E0F49FDB; Sat, 30 Apr 2022 06:50:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ACqt7cNqGiwvcVCX81aMt+Q7EXAV25y9Y6XMWRNfgNw62cMNjy7AoNLV0d1stAL3i2PEXWwzzzdFc0QSeOyo/he/d1lbpFKY05LmDeDz3/KCTAUYvRBk3+QY1W98hCXRYpulSZ6kOagDIEcm9ghmhV1BuZzXEPPom7ToZCwM1a6sfNO/1xgGzovD9i1e+rkeIoidlDFdY0Bgooz81/3T6DjzXYKzkrrSYm54W2d17EDh7auGFPHiZJHQngmtrnat8OWpkEJdC0uqVVtHPmBaEYwfBNIWSqf6qNGDiJoRZgbrYuu7Um9PLuUw9runzedEHbb/rwY5xJmbN2I9Gj7JHQ== 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=BV7LJ5grIlE3aOHlv60sVa47Qy4odXuKHBATm9XJom8=; b=cnmywO0oipw/qQQWUmfFIOygQxuEC65iC1qZyQ+GKnPMjpmazI0GDePJcJAHLZeFc6yrqmgwRjbyegYzwGjt6ujA9WFEKOp+daohYYwAd4No8Yg4vRXCDOvvEzGYLJkeh5QQ8Hf8U0/wrXo/QRRLgc+c4lwrWOQJsxDGfOwrixsWQ83lTWDt+PjSQZnJHWiJD2zOfNaiAycjcXBo6vfzsV8wXtmGhgh96lA7pefb3IXz4CRtV27jJx7uocdqvAfBMXuIwOraJYKnpc28SAQkZBJ3vZJgP2B+Q2LblY2wXtFP1ydHnHTCoQq5QBLWW8PhuouzpYIPttd5qCdIrW2+4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=zenithal.me; dmarc=pass action=none header.from=zenithal.me; dkim=pass header.d=zenithal.me; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zenithal.me; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BV7LJ5grIlE3aOHlv60sVa47Qy4odXuKHBATm9XJom8=; b=YyVmvvuBm/CsoD/oNC3zI1AiRGklWHiwvIKB8sbgOyYikN9teGromgW2dwhWb1PLPfAf+2tf7RDi7VCfL/7gADOW8Pr7qasm+8W0QmR7gRN86r1pPZ5ySQ+OWtncapKutHon2lh/NV0Enrxgo9qH0E2fcxlYKN6gR8ElTLhr128= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=zenithal.me; Received: from TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:c0::6) by TYCP286MB1706.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:187::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Sat, 30 Apr 2022 13:50:30 +0000 Received: from TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM ([fe80::bd99:5c83:e2dc:a8f7]) by TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM ([fe80::bd99:5c83:e2dc:a8f7%6]) with mapi id 15.20.5206.012; Sat, 30 Apr 2022 13:50:30 +0000 Date: Sat, 30 Apr 2022 21:50:22 +0800 From: "Hongren (Zenithal) Zheng" To: Palmer Dabbelt , Paul Walmsley , Albert Ou Cc: Atish Patra , Anup Patel , Eric Biederman , Kees Cook , linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, Michael Kerrisk , linux-man@vger.kernel.org, Jiatai He Subject: [PATCH 1/3] RISC-V: add Bitmanip/Scalar Crypto parsing from DT Message-ID: References: Content-Disposition: inline In-Reply-To: X-Operating-System: Linux Sun 5.15.26 X-Mailer: Mutt 2.2.1 (2022-02-19) X-ClientProxiedBy: BY3PR10CA0006.namprd10.prod.outlook.com (2603:10b6:a03:255::11) To TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:c0::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7b238793-026a-4525-b3e8-08da2ab0636a X-MS-TrafficTypeDiagnostic: TYCP286MB1706:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iifNFFkGZbDWnoJGS0XR4/a0Z3E0NNQJp3LlVqrSg6njYB/ZiDXF8PmsAmp0Fm+ULm7mQxAOAmcs/oPysKpM5psiZvrKyW80PtYkIuOZCzaO/Wk1vWgW7leg2uhKZLOPqhQVb1Z/k0K9wJxq8eDACryhHrh7hUdDyfis+mqYnJ7eKsX7tAUXbRkisVJmxvJlTZSpW3wm7mV6yQiZr/xDbQc6u2ikmHR58bZkDCTv0pz2LNB0kLrxHfSXqWiW3KJF6EEkhR9Gs50Q5fTZ7ejrB/DYY/fyv2hTIqz32OBYVcGQwG6uByz4sBK6FxMG0EMBuwSjv7kbsCCt5t+eoT0X4EUbXS29gXWLfsrq7eKzF3CG5jlgtQs2qUR2dKDlAlaI8wk1raMWFTpXfKw+edZbUZzeuZ16TilZ5JlmadkHQNrJ3fnzigZoWB8zv7OIjlBDVADdJozC3+b5dKgEjDDpgEkr/4c03uACbZaiAyQH3Qf53qGkLRyyIVhJT/zpOqqZsS6Wk+S7MbZSmXZKcY1BOqiwBrhXhUqCEHtyYAU2OPRPVKhaYEE3YeQKwQaJYeCqsUgSckWKXZR5T3K1HBwBz+BXmsD2lRPOZrylk9dpidbRoSdhHSNXEuUrSJGxhMMgMgTJtkK16AFZYKWVF8/zhKdgbO1t48e/XP4fkPrXO4is1WAVI3z+gSpOK0KMZbtkFY908vbsULNhtEouyZVb7Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230001)(7916004)(366004)(376002)(346002)(396003)(136003)(39830400003)(6506007)(86362001)(6666004)(52116002)(6486002)(38100700002)(508600001)(6512007)(9686003)(186003)(8936002)(2906002)(316002)(786003)(33716001)(7416002)(66946007)(54906003)(66476007)(66556008)(110136005)(5660300002)(8676002)(4326008)(49092004)(67856001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vpaIyHZUxQM8EwYT2S93ZUHjzMjQXZ19P6L8di5Ses1bdkAZ9olGzllYtc9Y?= =?us-ascii?Q?3BwgHSEc4aWuijGIr1MAlTAxMpl8vf/jCYCdtY1/eSuLPJE0nkCA2zlwvT75?= =?us-ascii?Q?akU7/vlCiAHVzu24zF+cv7oqxeWLNEyTiRp6kmfWI/H49CD3FF0IKTpdEXY9?= =?us-ascii?Q?1Zd784F/ybpETSXqhMZy2ci9qpbnb7tbWs1xh2S1sNLM4LPC0zIdagxdQVVc?= =?us-ascii?Q?WxLyfFLAhHAUxppl211mFMu7wcOYw+yarvUnLTkbdbjRENzJGedXVPq/BXUG?= =?us-ascii?Q?a4MWCEU8CbtebeI1dH6EXX4V1xgwSgfUH+JZMcUjK4vmhqXLKNnq1NS9DmUk?= =?us-ascii?Q?Xw/88Ll5X2FaLRes0W8B8dFzq8vLZs9B2P9YKn0jCrmI/mJdI4B+0mD47iT+?= =?us-ascii?Q?2VwCbcWMcZR3ZTfxqx08GOVGhcR11HOG+c3DkbvXERQRWa9yqWqZ8rVi6wWO?= =?us-ascii?Q?GYO9A38oju5zKYdrzWR61zYYBgKLoRHouW2TcPZNOCi4GlNu3TR9xe/F78Fp?= =?us-ascii?Q?rCAo1SDtqVdaq/ulsTdsQ+nHipsYRp3PsK3GznIl8Z39uVB5F4kjCz6+gj4M?= =?us-ascii?Q?j7iBTfgT5W4KDJqw4ZYEX5jzV83dJNY6o3Pem/FRBS7DdIYmU5fOLFEGInWV?= =?us-ascii?Q?KfQAYoB2gz+bCO1TB1CgUsD9W0FYedWhsKyGtuiBnyI0pg4Q8MxUkg5unLQU?= =?us-ascii?Q?e7GePlnrcuV9FPNXmDl0ftWIyrwOsdpRQQm+BsjN3zoac2t7Pnw3ZHUdQ294?= =?us-ascii?Q?RA6bvtcf3bU11YtgVS+0Xodoir0PqesU4dUbpmtO/a6/HicHO55g1IMXCtFY?= =?us-ascii?Q?XeyqBxrSugiBhTBzzadvkVrY2GBZqlwDrkkYk8PvHpO09cJMpYbh10qfb9Tl?= =?us-ascii?Q?+2ElpiPN8z7schdS2vKzLqo+R5k/Hgm+QQNewRO9h5J1K2xF8dCbNIgIL7Pi?= =?us-ascii?Q?1B2glfDbFrpiuCt9eUdBa/cWk7KzrgOCzXGbAwvVt6vECFvN36pi1wub+Oul?= =?us-ascii?Q?QxNnX2yARbwx9V7FDMhUsrY9SbB+UKKPjlvvzhUAo1+hDE0zBepmCnY2Bof7?= =?us-ascii?Q?8lrsA7vHD3KE42ZoBtzTFDP549jhmVLF95rVht/ifr7M3jaqrMtaPrOgX0VB?= =?us-ascii?Q?luRaYIiFtESraOBaqog+Gr+YsrrnzCvQrlKtsV/O5Buys7s32vLdFNNPa0ZU?= =?us-ascii?Q?gaYhUxmf9xjHcU2O+RJyTAZSHMV1l1I47MEVKOQHzYwhMJQsBAsEiNDbcN6+?= =?us-ascii?Q?2Zv6AJGNEPUJyk1AHBaGsxpQjFxbUl7b5bjvK35naOFivrv2F1qBKzLlgAs+?= =?us-ascii?Q?ZYpxoEJso1d+xwuwx1ghKiBhrr4/VAQ77qgj6SFr4/7HZucTvsuqA0jCQ+9T?= =?us-ascii?Q?Ra+TbhMCcgKFFYfIia69zH08VIkpqHbB465mStucRi1+a+hCB2Vrb1kIsKzD?= =?us-ascii?Q?+/E5nsa7/5QTtoCH/cgqZCFpGA31EPU/bE4LIqifPfp5yoCNdlWMv2PVpqLm?= =?us-ascii?Q?He3v5ioDqqhxTAFuHmKIw2UgZpbu4qMRbOyNcQ5bOYUjvIeJydUWRaLHEsqB?= =?us-ascii?Q?GmmC8V7q0cAQmxVaQySnffYI7C0mtOuC3o/7HlnNe+CUQAyeqN3UDT+7M7tg?= =?us-ascii?Q?dJUNTuL3QX+BJPVYuGpC5QBnn3i6WBh4yMFbmTpGOSsr4ktrlhaHYcqNgyd0?= =?us-ascii?Q?bzGosGijQbvxsls18e7Lzx57UiL0RRVKl8a2VDy4EIziOp1+IRA28/mKFABh?= =?us-ascii?Q?cq5kaljW1g=3D=3D?= X-OriginatorOrg: zenithal.me X-MS-Exchange-CrossTenant-Network-Message-Id: 7b238793-026a-4525-b3e8-08da2ab0636a X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2022 13:50:30.1100 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 436d481c-43b1-4418-8d7f-84c1e4887cf0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xTpi7Q+Cjk5EF9TdqbZqutIxORbGYyh2UDfHKzq/WBx7kcTdwhQzILQVlwKPoA0T X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCP286MB1706 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This commit parses Zb/Zk related string from DT and output them in cpuinfo One thing worth noting is that if DT provides zk, all zbkb, zbkc, zbkx and zkn, zkr, zkt would be enabled. Note that zk is a valid extension name and the current DT binding spec allows this. There currently lacks a mechanism to merge them when producing cpuinfo. Namely if you provide a riscv,isa "rv64imafdc_zk_zks", the cpuinfo output would be "rv64imafdc_zbkb_zbkc_zbkx_zknd_zkne_zknh_zkr_zksed _zksh_zkt" Tested-by: Jiatai He Signed-off-by: Hongren (Zenithal) Zheng --- arch/riscv/include/asm/hwcap.h | 14 ++++++++++++++ arch/riscv/kernel/cpu.c | 14 ++++++++++++++ arch/riscv/kernel/cpufeature.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h index 0734e42f74f2..199eda39e0b8 100644 --- a/arch/riscv/include/asm/hwcap.h +++ b/arch/riscv/include/asm/hwcap.h @@ -52,6 +52,20 @@ extern unsigned long elf_hwcap; */ enum riscv_isa_ext_id { RISCV_ISA_EXT_SSCOFPMF =3D RISCV_ISA_EXT_BASE, + RISCV_ISA_EXT_ZBA, + RISCV_ISA_EXT_ZBB, + RISCV_ISA_EXT_ZBC, + RISCV_ISA_EXT_ZBS, + RISCV_ISA_EXT_ZBKB, + RISCV_ISA_EXT_ZBKC, + RISCV_ISA_EXT_ZBKX, + RISCV_ISA_EXT_ZKNE, + RISCV_ISA_EXT_ZKND, + RISCV_ISA_EXT_ZKNH, + RISCV_ISA_EXT_ZKSED, + RISCV_ISA_EXT_ZKSH, + RISCV_ISA_EXT_ZKR, + RISCV_ISA_EXT_ZKT, RISCV_ISA_EXT_ID_MAX =3D RISCV_ISA_EXT_MAX, }; =20 diff --git a/arch/riscv/kernel/cpu.c b/arch/riscv/kernel/cpu.c index ccb617791e56..7251336969c1 100644 --- a/arch/riscv/kernel/cpu.c +++ b/arch/riscv/kernel/cpu.c @@ -87,6 +87,20 @@ int riscv_of_parent_hartid(struct device_node *node) * extensions by an underscore. */ static struct riscv_isa_ext_data isa_ext_arr[] =3D { + __RISCV_ISA_EXT_DATA(zba, RISCV_ISA_EXT_ZBA), + __RISCV_ISA_EXT_DATA(zbb, RISCV_ISA_EXT_ZBB), + __RISCV_ISA_EXT_DATA(zbc, RISCV_ISA_EXT_ZBC), + __RISCV_ISA_EXT_DATA(zbkb, RISCV_ISA_EXT_ZBKB), + __RISCV_ISA_EXT_DATA(zbkc, RISCV_ISA_EXT_ZBKC), + __RISCV_ISA_EXT_DATA(zbkx, RISCV_ISA_EXT_ZBKX), + __RISCV_ISA_EXT_DATA(zbs, RISCV_ISA_EXT_ZBS), + __RISCV_ISA_EXT_DATA(zknd, RISCV_ISA_EXT_ZKND), + __RISCV_ISA_EXT_DATA(zkne, RISCV_ISA_EXT_ZKNE), + __RISCV_ISA_EXT_DATA(zknh, RISCV_ISA_EXT_ZKNH), + __RISCV_ISA_EXT_DATA(zkr, RISCV_ISA_EXT_ZKR), + __RISCV_ISA_EXT_DATA(zksed, RISCV_ISA_EXT_ZKSED), + __RISCV_ISA_EXT_DATA(zksh, RISCV_ISA_EXT_ZKSH), + __RISCV_ISA_EXT_DATA(zkt, RISCV_ISA_EXT_ZKT), __RISCV_ISA_EXT_DATA(sscofpmf, RISCV_ISA_EXT_SSCOFPMF), __RISCV_ISA_EXT_DATA("", RISCV_ISA_EXT_MAX), }; diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 1b2d42d7f589..10f9daf3734e 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -192,6 +192,39 @@ void __init riscv_fill_hwcap(void) set_bit(*ext - 'a', this_isa); } else { SET_ISA_EXT_MAP("sscofpmf", RISCV_ISA_EXT_SSCOFPMF); + SET_ISA_EXT_MAP("zba" , RISCV_ISA_EXT_ZBA ); + SET_ISA_EXT_MAP("zbb" , RISCV_ISA_EXT_ZBB ); + SET_ISA_EXT_MAP("zbc" , RISCV_ISA_EXT_ZBC ); + SET_ISA_EXT_MAP("zbs" , RISCV_ISA_EXT_ZBS ); + SET_ISA_EXT_MAP("zbkb" , RISCV_ISA_EXT_ZBKB ); + SET_ISA_EXT_MAP("zbkc" , RISCV_ISA_EXT_ZBKC ); + SET_ISA_EXT_MAP("zbks" , RISCV_ISA_EXT_ZBKX ); + SET_ISA_EXT_MAP("zknd" , RISCV_ISA_EXT_ZKND ); + SET_ISA_EXT_MAP("zkne" , RISCV_ISA_EXT_ZKNE ); + SET_ISA_EXT_MAP("zknh" , RISCV_ISA_EXT_ZKNH ); + SET_ISA_EXT_MAP("zksed" , RISCV_ISA_EXT_ZKSED ); + SET_ISA_EXT_MAP("zksh" , RISCV_ISA_EXT_ZKSH ); + SET_ISA_EXT_MAP("zkr" , RISCV_ISA_EXT_ZKR ); + SET_ISA_EXT_MAP("zkt" , RISCV_ISA_EXT_ZKT ); + SET_ISA_EXT_MAP("zkn" , RISCV_ISA_EXT_ZBKB ); + SET_ISA_EXT_MAP("zkn" , RISCV_ISA_EXT_ZBKC ); + SET_ISA_EXT_MAP("zkn" , RISCV_ISA_EXT_ZBKX ); + SET_ISA_EXT_MAP("zkn" , RISCV_ISA_EXT_ZKND ); + SET_ISA_EXT_MAP("zkn" , RISCV_ISA_EXT_ZKNE ); + SET_ISA_EXT_MAP("zkn" , RISCV_ISA_EXT_ZKNH ); + SET_ISA_EXT_MAP("zks" , RISCV_ISA_EXT_ZBKB ); + SET_ISA_EXT_MAP("zks" , RISCV_ISA_EXT_ZBKC ); + SET_ISA_EXT_MAP("zks" , RISCV_ISA_EXT_ZBKX ); + SET_ISA_EXT_MAP("zks" , RISCV_ISA_EXT_ZKSED ); + SET_ISA_EXT_MAP("zks" , RISCV_ISA_EXT_ZKSH ); + SET_ISA_EXT_MAP("zk" , RISCV_ISA_EXT_ZBKB ); + SET_ISA_EXT_MAP("zk" , RISCV_ISA_EXT_ZBKC ); + SET_ISA_EXT_MAP("zk" , RISCV_ISA_EXT_ZBKX ); + SET_ISA_EXT_MAP("zk" , RISCV_ISA_EXT_ZKND ); + SET_ISA_EXT_MAP("zk" , RISCV_ISA_EXT_ZKNE ); + SET_ISA_EXT_MAP("zk" , RISCV_ISA_EXT_ZKNH ); + SET_ISA_EXT_MAP("zk" , RISCV_ISA_EXT_ZKR ); + SET_ISA_EXT_MAP("zk" , RISCV_ISA_EXT_ZKT ); } #undef SET_ISA_EXT_MAP } --=20 2.35.1 From nobody Mon Jun 15 10:12:47 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6EADC433EF for ; Sat, 30 Apr 2022 13:51:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238569AbiD3Nyx (ORCPT ); Sat, 30 Apr 2022 09:54:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229844AbiD3Nyt (ORCPT ); Sat, 30 Apr 2022 09:54:49 -0400 Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2113.outbound.protection.outlook.com [40.107.114.113]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E138866F8D; Sat, 30 Apr 2022 06:51:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AHxBNurMNGE0buCWOHfsHk13gTQtFtn68vStkY66oirTYWkNORCi0unLAijOKhEG501hkRUgOpIYKWnHe3z/NNTqh9D/hmDIcWpBYlR6DxVrOe2uvZi02xJnVUXp7vLSVvQCL77VmcIhFv6VaaV37I1YQBxmFZVelbAidMrH/uytE0u8YcUA+wb5UzdTmZDlIpparh7Yx1rLweWuHB3PBZ+OdCYm13ADTSMfC2RDRJMjjz6ntVKaUc8UBUgeGpqzNuDfFUH1JNrx0khsiFKhXOiwBHcUn8tQ0UzL2w6u5P2to8BOVWaCmJCm3xTq+hB4oNypb4wMvPb/zwRd0CDsEQ== 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=LmgCsUrRFQiDkhjhuP0NOx/lzAJkFtwARE4FbvL7+C0=; b=d8eP2LKw+ByVU+EV6RkJLdlkOcLeQcj/8VNL+h4G0hF6v3IUu2A/DgH/blrgL0Ivqc9b3UFgBAH2pygq437a7G/ZIGzNhBPHssaE5vjwLSlKZX2FAiavnsasMHkf8v+ZAohoQrkEozpRURjNSHosjtWSGPQ1B6QBgazpMWOohdMXu+0d5Hlcc+2mpUDbJxvFFFYBMk83pdGHg9WkzA7li/KydCMk0IjVkd1W28PXoBu8A8hW7eGBp9GVQGS3jIHDYGwn1bxKnySFdNlqnMF+4xFKMG+CjdnouMa1KUf7yiytwv2GRyjc+qkD4/6QmjpC+54M8g55Lfw9WQ6SV2SGkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=zenithal.me; dmarc=pass action=none header.from=zenithal.me; dkim=pass header.d=zenithal.me; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zenithal.me; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LmgCsUrRFQiDkhjhuP0NOx/lzAJkFtwARE4FbvL7+C0=; b=AyJPX6NiAe2dK9ODObFRGl/QH01b/mupEujQfHlJ6fWjpSA3fixSOgLB+ipEo2dWpsxn2NQg9eJH7jTGfsOmOmUzuEZVrzSv20wgEuXx8GzyX96hC/2joynUY0EL179978shMzoOFRkM1guVAKOyOUZ99SyIGtsPSy6qmT3pDbc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=zenithal.me; Received: from TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:c0::6) by OSZP286MB1559.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:1b4::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Sat, 30 Apr 2022 13:51:24 +0000 Received: from TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM ([fe80::bd99:5c83:e2dc:a8f7]) by TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM ([fe80::bd99:5c83:e2dc:a8f7%6]) with mapi id 15.20.5206.012; Sat, 30 Apr 2022 13:51:24 +0000 Date: Sat, 30 Apr 2022 21:51:17 +0800 From: "Hongren (Zenithal) Zheng" To: Palmer Dabbelt , Paul Walmsley , Albert Ou Cc: Atish Patra , Anup Patel , Eric Biederman , Kees Cook , linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, Michael Kerrisk , linux-man@vger.kernel.org, Jiatai He Subject: [PATCH 2/3] RISC-V: uapi: add HWCAP for Bitmanip/Scalar Crypto Message-ID: References: Content-Disposition: inline In-Reply-To: X-Operating-System: Linux Sun 5.15.26 X-Mailer: Mutt 2.2.1 (2022-02-19) X-ClientProxiedBy: BY3PR10CA0010.namprd10.prod.outlook.com (2603:10b6:a03:255::15) To TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:c0::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1b8ba11a-9e21-4747-6a4b-08da2ab083b7 X-MS-TrafficTypeDiagnostic: OSZP286MB1559:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rgxlnJNqf8Wa11zhqqGI0eXt26A/pe7SIYfej+7A+EV+4nnSlVKjSC/78UWxOVLikmQvCVGqf7OVlOCPYBtjFBQBMtaUmBKHUChWKjJGjH5b8ze5z+eHGRBBL83crHCmRype/h2W5uidE1Vynevken8mFYMGlata/Mp2BWjxRZ5wCyqEEP8GCILAu0QYmlNWf+6hRZmK43lEvfPqUGAI1YBHPrRUYGg80HLqCUUYevFqbn7BOt51x4M/81AP3JTFR2DUGAE679dkfCZ/p0JeIlmx7x/EeARF9xWMNEwiWj551n3ly1D5FUGI0+HTbNzNUHY2Yvm7MplRqGV/ytkeIji0f+xF6kxcsPvkBvjXSlAbpCAKOqgY8+ao+fT2+/Wn/2AkJNrwqKqYLH2U5Q4tYEsDNljKcmsTR1TsMhnTtYE1JNHIMLkc72uI4phNw/fhdfMfTqhxvH4ib+M2SqUV276fWh+0DZ7o0y1ywzYJh0vrLLQVSxE7rpdpJ6PPwn7HNSmbPwxCMG4YYTAkKRHNSpyU/Wqjfb/BLVXkcOoXIt0vPK+W5atuSyThDe3RqjABLkQv5SJjiGa8NA4S0d1kKyy7J+UyWblHMy1ru0LBfdHJdqryctHCsWKlJeL/eBfOCqOvD+y081A28dyIhrLu8okZaId4wyH7R7XCGxIjwW07DDYmreJbtZ+FbN2b4SMGnwW49nq08clS7kaR/u/68N1u0BdiMAZtiissa1gjoze+yn0x2VOi+xOBGrE+N1aQP/kudaI2UresQJkD4ajRB8oXbDIWwh2htL9c2urHQKE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230001)(7916004)(136003)(396003)(366004)(39830400003)(346002)(376002)(6486002)(6666004)(6512007)(86362001)(52116002)(33716001)(6506007)(966005)(9686003)(508600001)(110136005)(186003)(38100700002)(83380400001)(786003)(54906003)(316002)(8936002)(5660300002)(7416002)(2906002)(4326008)(66946007)(66556008)(66476007)(8676002)(49092004)(67856001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?60lVRJIm7eBDrb4HnyO5HrKP40/R6etad5dVPNmDFqcHBOmuIf7ycFtIc4+A?= =?us-ascii?Q?iEQ4GnNaN5BT2ePSKekVPWkXaGd2kfpiKrdbHM6WCkzafa8fzST1oMu5676h?= =?us-ascii?Q?ieSu9+WIYlIxAGyjMmwsQaVTiF9YMjmvIwjAmsJz+3XGfoW+PbGDLbWKD3yR?= =?us-ascii?Q?73iEpkc3YKKxmEfdpbVJ2gFsnD6/2xSDe53o19xBK683cxGlJcUanCgsCOg6?= =?us-ascii?Q?dEmW7kYeB7qOMTvHtwCn6gX0l6QLN16elDtRtl4RuEWvx3XLJJBsSSnG+piz?= =?us-ascii?Q?nEdINKRz2hzDVTV7lLpQSV11KDIf59im5JDJ3FqhX9kiVGb22yVBdjD4a8gh?= =?us-ascii?Q?KXK89fjdPOgurTH5+W9ePsq0fIsbK3dTZ14EEZb7x8j1t7Iv1NTTf6MSIGw/?= =?us-ascii?Q?G3KgxUJibsq/ZVDFGd30bKilJ1t0doIGc/uMe+h0LGTDVMZSKNHkcb6JRLf/?= =?us-ascii?Q?NZRn2MYfux4y5MuFVk3EuO4fQCwEAEjaz5c0Dp0Pw5mplyjTnnBetvuYSv1U?= =?us-ascii?Q?5648v4YPY6lig5WDUgXP1fAKiWU7wFTBNsJy6RfFVYqwTNiUsqMPdeeujhpL?= =?us-ascii?Q?anfe9h+kjgh20pFCb40EqCuUUZ5/83bmZlm0GxliWBg6cEK0ekocUrwcW+1o?= =?us-ascii?Q?AcOdmMFcc/uAYbYv4sv6Xer4en95QIWKJ00tNyKnwYaPwHT89M/k9OdWRUgv?= =?us-ascii?Q?iEx2EOXbJtQBpHVjegXe/a04H0MMMdfZfMIpHT1w86wQICNPXHwimjKlfuNX?= =?us-ascii?Q?0R3NuEqddOMKEAzTo73QDz1wOqVaPEsQZW3zcLAq2BmCL5X8wwl6vwZwLLpG?= =?us-ascii?Q?gI273lfywHhrwCf+B2F/UES2fcwNMIaOjmfHM/i4CwgLeh31puXYSU0VhGlh?= =?us-ascii?Q?pAFL67mXIuyCnVVCvEHIpBKugjbhtZmiP/myICycIMSbgXic+wVf5Ri7gnTo?= =?us-ascii?Q?SGdYkAeb3Qb+8kQJUQm3gYVQJA7indRRaDg12Ur/5O5zs5FE6GlHXPx0b4Kx?= =?us-ascii?Q?0mTdkLBkNT0PdHj555j28F8Hbgw2ykdeBC4kMPv/sWA633mGlmies3en+XhP?= =?us-ascii?Q?OXeuuunPKkRM5szRMYULRCfexltmgBTiNm1lJ2hXlu+khFpVSCdmzZ4q6MoK?= =?us-ascii?Q?POd6ygFZxCFN7eNuFVwAB5BC7FD4ouydhSWhZ7ecfYvEZQ0E+QrOvOOFwJWm?= =?us-ascii?Q?78heFGms+eeJQQIxy8Dwu4px/k0UwaaXlXoFHoBlAP8I0nJ3PdfUjY0YrlJF?= =?us-ascii?Q?CTifX4q0rGRg0hcUkzamIaSc+5fsWVEPIyNkjEKlnPdI1gUsRppLwfYTo3O6?= =?us-ascii?Q?bZNhhgq/pFR8BiFIEiRfM53Ot1BpLxZj9m26ieNnyd8sazGGA7XSwbvRwdtF?= =?us-ascii?Q?c8QaDBjxRj/cUXPZAx3NHkID4wSwVjBJSHoMfhhJfdgTmh0ZjcOxeIFPEdPe?= =?us-ascii?Q?gclZKki5BFRdZjWkWarf9lQ2ReaHINQByVW0yxysRUJF96L26jpC/vnl8b4t?= =?us-ascii?Q?wxzSCz9IUahZSGq7Afkzqgmv0kAatoH4yKPJYWKqSzv/esXpBsR41WbSWgT8?= =?us-ascii?Q?am70TxZ2vXJYArh2JhgOBtozJ9xD8wl5LagE2vFEAJ/QRtM8/U4EZHgpS+DM?= =?us-ascii?Q?WCDId7N89pEP+ZXbw8Kgk7invjjQi1nj/zp8B5WjDO53pMfwSXHu7P1I/7W2?= =?us-ascii?Q?RQ1MhxHrbajaIXSTTHgwedZekfh5Vq7yhFp1K0Q4gwgS8DDoS/YDAqbyP54H?= =?us-ascii?Q?DpuK0YtAkA=3D=3D?= X-OriginatorOrg: zenithal.me X-MS-Exchange-CrossTenant-Network-Message-Id: 1b8ba11a-9e21-4747-6a4b-08da2ab083b7 X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2022 13:51:24.1448 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 436d481c-43b1-4418-8d7f-84c1e4887cf0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1HAqmPl28AaZPCa74JvTfsW7h27OpeyX03LNu4HTbydelywpXkGpNXa/Wlk7hrrL X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZP286MB1559 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" userspace currently lacks a way to detect whether the platform has Bitmanip/Scalar Crypto capability, this commit provides a way such that the userspace can detect it. RISC-V currently still has no mature mechanism, but no matter how things in the spec changes, (no matter how "M" mode things change), the kernel still needs to offer some API to the userspace. More discussion can be found at https://github.com/openssl/openssl/pull/18197 Userspace currently has to use env var to detect them. This commit along does not assume any specific mechanism below kernel. Tested-by: Jiatai He Signed-off-by: Hongren (Zenithal) Zheng --- arch/riscv/include/uapi/asm/hwcap.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/riscv/include/uapi/asm/hwcap.h b/arch/riscv/include/uapi/= asm/hwcap.h index 46dc3f5ee99f..bfed3e5c338c 100644 --- a/arch/riscv/include/uapi/asm/hwcap.h +++ b/arch/riscv/include/uapi/asm/hwcap.h @@ -22,4 +22,26 @@ #define COMPAT_HWCAP_ISA_D (1 << ('D' - 'A')) #define COMPAT_HWCAP_ISA_C (1 << ('C' - 'A')) =20 +/* + * HWCAP2 flags - for elf_hwcap2 (in kernel) and AT_HWCAP2 + * + * As only 32 bits of elf_hwcap (in kernel) could be used + * and RISC-V has reserved 26 bits of it, other caps like + * bitmanip and crypto can not be placed in AT_HWCAP + */ +#define COMPAT_HWCAP2_ISA_ZBA (1 << 0) +#define COMPAT_HWCAP2_ISA_ZBB (1 << 1) +#define COMPAT_HWCAP2_ISA_ZBC (1 << 2) +#define COMPAT_HWCAP2_ISA_ZBS (1 << 3) +#define COMPAT_HWCAP2_ISA_ZBKB (1 << 4) +#define COMPAT_HWCAP2_ISA_ZBKC (1 << 5) +#define COMPAT_HWCAP2_ISA_ZBKX (1 << 6) +#define COMPAT_HWCAP2_ISA_ZKND (1 << 7) +#define COMPAT_HWCAP2_ISA_ZKNE (1 << 8) +#define COMPAT_HWCAP2_ISA_ZKNH (1 << 9) +#define COMPAT_HWCAP2_ISA_ZKSED (1 << 10) +#define COMPAT_HWCAP2_ISA_ZKSH (1 << 11) +#define COMPAT_HWCAP2_ISA_ZKR (1 << 12) +#define COMPAT_HWCAP2_ISA_ZKT (1 << 13) + #endif /* _UAPI_ASM_RISCV_HWCAP_H */ --=20 2.35.1 From nobody Mon Jun 15 10:12:47 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A627DC433F5 for ; Sat, 30 Apr 2022 13:52:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242263AbiD3Nzh (ORCPT ); Sat, 30 Apr 2022 09:55:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242217AbiD3Nz3 (ORCPT ); Sat, 30 Apr 2022 09:55:29 -0400 Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2094.outbound.protection.outlook.com [40.107.114.94]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B34A566F8D; Sat, 30 Apr 2022 06:52:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KghrvQLNxii+iamwaWTbjeLd9v/9zKihCISJA+idyi/1y1bR3qJiRBUOHAQ/oMbZ+8am3/t4Jn7HOKyBk2bnRSxJQ0sXZvaYbOoNyeTwO39vpg50zSyGOdReHsb/2IaX/YmexLy5wV5yo8Lo8Ymvge91mGeqUhCw5mLvCBt+dzqgTatJkAiU6zrobVZoiMgcrWtov9joX4QENEeAWMw+2RI84N33os94vpD4159cJCtyvCxUP9y2kEwXEDqZtMsP9FOgq/8bmmqmu47qCyDBqKdeo8a1tnP/pCy0WIUZTM6gnA7hcKxeI2PDwBCMiFsPIAAfvTs5F6k74+mEymymCA== 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=znMOr2UdiYf9gJM+5XymrfVPvk8Y0cGGp54ZuT9/7b0=; b=Zir4eW09ZPBuTPxf/+tZCk27OZVIKUHX+Gl4m2Ub4WDpoMqdUOlMfx6EmlrL0IB+RUlnaj7s3rTKUx3E8/BcmMiEDLS2vRjlaRJXb8qhbvVeRigV0hVeHgxSLD1y5nwpfD+WBDc/x5FcOoHkB5pzY4hjR+NtngKFEkU2QwxlnNNj3dZp18fCGvAvvU6TvowUYAO1RkJnetezh9NO4A0P666jCf+42vjm0pyZCQleAilM9UMwC2DSeS9SvJzNj9TyYNV246hZrx9cl0F6icujhYQBUiuu7v2BC6TZP/CtcDCpifIoihOtSUkXD6nx057/kTQVpRRUVUzSsV07kQABTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=zenithal.me; dmarc=pass action=none header.from=zenithal.me; dkim=pass header.d=zenithal.me; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zenithal.me; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=znMOr2UdiYf9gJM+5XymrfVPvk8Y0cGGp54ZuT9/7b0=; b=PBhhYaDb0eF3k404rRcE/0juTtbtfa67E7xz44CJ3Cc1AKiBm7VENKgoToVgbiyinEsu08WhWf/DCyKrhK72gGsaMp0Kx/xo6avQfaEJsZNr44PIS0uCdPMS67s31B27lM5/22fdLGX/YsuLGpGYwppvs2SUaLNL4uMkdwt370s= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=zenithal.me; Received: from TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:c0::6) by OSZP286MB1559.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:1b4::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Sat, 30 Apr 2022 13:52:03 +0000 Received: from TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM ([fe80::bd99:5c83:e2dc:a8f7]) by TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM ([fe80::bd99:5c83:e2dc:a8f7%6]) with mapi id 15.20.5206.012; Sat, 30 Apr 2022 13:52:03 +0000 Date: Sat, 30 Apr 2022 21:51:56 +0800 From: "Hongren (Zenithal) Zheng" To: Palmer Dabbelt , Paul Walmsley , Albert Ou Cc: Atish Patra , Anup Patel , Eric Biederman , Kees Cook , linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, Michael Kerrisk , linux-man@vger.kernel.org, Jiatai He Subject: [PATCH 3/3] RISC-V: HWCAP: parse Bitmanip/Scalar Crypto HWCAP from DT Message-ID: References: Content-Disposition: inline In-Reply-To: X-Operating-System: Linux Sun 5.15.26 X-Mailer: Mutt 2.2.1 (2022-02-19) X-ClientProxiedBy: BY3PR10CA0020.namprd10.prod.outlook.com (2603:10b6:a03:255::25) To TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:c0::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ce7e4b6-3c7e-492b-1c0d-08da2ab09aec X-MS-TrafficTypeDiagnostic: OSZP286MB1559:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u1PWH6LI3AUJ/ISh+zr1YIz1iTFTSbX8Frrba6ldIv64XendKguQI2jlSIVi6UXojBz6Hfuku4bnw61+Cl1hXkRX68/SWU60OtuHbXSFqnRHiirrSD5nKDIh/hGdQ8ANDZNDq719o3GiWvekTpdk2AHqfK6bIFZbAW8SflPj1WpkNPGG55GL929iesvIkzGSzq5xtyIoa90/0DmoUwhcA/FFqMBuM5A1pjrcBnept1QKReuj8rT36ToX10OJ/aAQ2GGaM4SBk6uBlt8UboKWuxI8qnBtJSIVVYi2GozB40bUpgBAKXIPtCwNNtQ8vc+qlP3FkwfG3dLY9GeyyIv/5zhEky81xgljU3ArtwnxwFFMjss1GgztC4H0P4Z2SCoilboXgCsm4o3+baM1rKpCAb9ytyjD4c6gDLlCq8GvcIISkEiruOQ0pzwDgfNQlGJf4zJHqE1cAnjSZNlCrRSknyTSA6J7SLDFLy3qUbtXGBOzzGsmWEa65/Dhnq7Guonziqgu0vFvCfSGX9JMgZsa1Zhm+ppIXAbFBL0eghzhRkEcU5RvzvVGYWEefbtXl4VqWuJ9bpG6I4P67bxKPouAPtK4gkKTFYfdq5IJzzAPvtVE9WQdtB296J0lc5R2fa7DCwCfMNzJ9DCZvxWQKuYtGKvRiMBJlyKXXANYGPceRIgpwyEd6V4095fp6tfh96Xw X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230001)(7916004)(136003)(396003)(366004)(39830400003)(346002)(376002)(6486002)(6666004)(6512007)(86362001)(52116002)(33716001)(6506007)(9686003)(508600001)(110136005)(186003)(38100700002)(83380400001)(786003)(54906003)(316002)(8936002)(5660300002)(7416002)(2906002)(4326008)(66946007)(66556008)(66476007)(8676002)(49092004);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gf7EKPLrinSb73O2QJcwrxYqnGDKSUkYPWq+s8e4KNDSENcwT/ZnqM/hGxV4?= =?us-ascii?Q?yU2dAbds7GLUxJG4ZNm7veAsMDABMu9Yv2aXmXx4wg/Ix4mZYPFDUpNwlnAp?= =?us-ascii?Q?BsU1C7DBZH9f1WEbIzlDjJEU9KLRpUKnwL95zLg8W8E9HpfuPK2rGTorxz75?= =?us-ascii?Q?gFQAdfyjcD1yCl3jh0ddo1+ZxT4Q2mpsKDNWi79q10FGBvkNgOsQV3csOuJ/?= =?us-ascii?Q?HZJU308PLjjWj19WFWK72Gpp/zP1acJU8Mc9tU2zaP89Ui3J9HIh+4WeXeuG?= =?us-ascii?Q?wJXynt2W9phtIUjmdSARZO2YZnr/Qtvr1X2uF6OLp05viWPBd5akkIuIpXdv?= =?us-ascii?Q?JXpN8a8UbrkKtXqdwB2rPWXsU5/KIC70h0YQ7ffr7HtXMMsTRVU0TwLFPqdv?= =?us-ascii?Q?thiOZ27HCSelyESK+2SbCkhuv1HPTKbZD/YxbbzKz7yncjxm9mvackMfnT/4?= =?us-ascii?Q?ellkvBji4tmlkHx0Uf49/zbb2dOUQXuwnppRWALcEGdcuUjwDBQkbOCQDHhM?= =?us-ascii?Q?NJyVP/phafZV4mwkxIjfZ22mSuOy5JA6p95tIXaOsTMCdn5WPZvgAdkhHlHS?= =?us-ascii?Q?qk2fQ7fkhJZKfVA3bWGVvF9X9atDZ/xQSFWiNVNtLb6RgMQaCK6+PCynDnB7?= =?us-ascii?Q?RNPmiqME2CEESLqBcF0+2NM2x9EdigWl4iMm2aimbDlswPNlh2P6IHDaGyPU?= =?us-ascii?Q?4YNgt42mpBPHhlHho3TIwAroeWkP2c7tDmogVMsOnvXY8lFQParNompZq7nZ?= =?us-ascii?Q?R9VYve2Wzq8LGFy68+JsBTOXTBhuc4Y5nCO6NhL/GLiTXppIc4lYtae0Jxlp?= =?us-ascii?Q?Skp4P6+gYxqmpUzCoCrepdX60yUMjycVARW/h6DGG/0he0q8LVqmPSgvSyAt?= =?us-ascii?Q?IFDM34sBNf5ayy4gYSmkRGpaZFusIRGizTMmqsPtpQP+tBQNzUIxQAz3h6ty?= =?us-ascii?Q?16Pyqo1GRnmmc8jG8ZbVnj/qj/zw1kQQrJ2hijkOhW4xi1E+JLuoG12gLhgE?= =?us-ascii?Q?qZAz5/Fd6J9/UFr8WI6fQ8o4qLWBUwDQvCcpXtfb3L0dlXpbvXzDClFOsGzd?= =?us-ascii?Q?DMPmaGuzcfih0FxKvvzsqUgITv43tnRSPnNhtSbyBOjv+uwzYiwybtubTZ4n?= =?us-ascii?Q?+UToLpXD8P/FKnoUGD6HpnJf6JF06qaUJiwY3aPu40Nc9j9ErV/zSG3YSATA?= =?us-ascii?Q?1h+02Dr95vbyD0wCSBICB2GPFdniFST8kDLv7x3f03sKmBlfYQ4YAHH2QznL?= =?us-ascii?Q?UI6VqhZboW1gV27LB+8Jlbjh2c1ZnUhPw/GkC0GDrgV2LDNjg0uHQTQXgLWg?= =?us-ascii?Q?rvfqhOFCzIR6wqknQ8ljYp1VAwGt2JJZNLQHLpG9SeLB0Jtb0YBhEJsQzHgW?= =?us-ascii?Q?H/KY5Zbq/cOqeEMsseAVLMoMnKJgBlt82VWT/xuowLfVPvV2dny6ZILOBfar?= =?us-ascii?Q?7izLl/5KooWzdtS8RSmKK0wdDZIL3PnsXIC0650bhyQK37bOG9/vdkA/Qm6D?= =?us-ascii?Q?2FfwhtgQG1gGUXSDKm+wHEA9sJ4fsyuEjq7tbeDfEPA9qBjbmrjRxpnN3u0f?= =?us-ascii?Q?CXXz2xggvjMqbeG6eqeZ5JGDy84XT2OHaXNWTukmDGxDAzfB4X3Lr7VI2Q1+?= =?us-ascii?Q?dfJN+CH+JJalDxHanCAxjSc10az6xI4cL6j3hd4wsFqp55/4GHbn3Y6EIOTW?= =?us-ascii?Q?wMwnYaEQiRuO8m1rXEqwiCPHMte/asmEPN9C5Ibw5xy4rf2he1nG9pVUhSzJ?= =?us-ascii?Q?Ew4JFuLO0w=3D=3D?= X-OriginatorOrg: zenithal.me X-MS-Exchange-CrossTenant-Network-Message-Id: 4ce7e4b6-3c7e-492b-1c0d-08da2ab09aec X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2022 13:52:03.0777 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 436d481c-43b1-4418-8d7f-84c1e4887cf0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Xy6yQLp3Bo4yJ0lX8uAuHMm+YJ6ZyvWLEpEcSeLS9sT7dBZqs3MI2buGGCDbXqFC X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZP286MB1559 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" One viable way to detect Zb/Zk HWCAP is from the DT binding. No matter how the "M" mode things change, this way can always be an auxiliary way to detect it. Note that QEMU currently has "zba/zbb/zbc/zbs" in their device tree riscv,isa This also fixes the isa2hwcap way as using unsigned char for long extension is not viable. Note that the tolower function ensures functionality. For other no-hwcap extension (e.g. h, s, u), or ("|") with 0 has no effect on hwcap. Tested-by: Jiatai He Signed-off-by: Hongren (Zenithal) Zheng --- arch/riscv/include/asm/elf.h | 2 ++ arch/riscv/include/asm/hwcap.h | 2 ++ arch/riscv/kernel/cpufeature.c | 46 ++++++++++++++++++++++++++-------- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/arch/riscv/include/asm/elf.h b/arch/riscv/include/asm/elf.h index f53c40026c7a..c6a4d8d2a241 100644 --- a/arch/riscv/include/asm/elf.h +++ b/arch/riscv/include/asm/elf.h @@ -51,7 +51,9 @@ * but it's not easy, and we've already done it here. */ #define ELF_HWCAP (elf_hwcap) +#define ELF_HWCAP2 (elf_hwcap2) extern unsigned long elf_hwcap; +extern unsigned long elf_hwcap2; =20 /* * This yields a string that ld.so will use to load implementation diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h index 199eda39e0b8..357b0481f1d0 100644 --- a/arch/riscv/include/asm/hwcap.h +++ b/arch/riscv/include/asm/hwcap.h @@ -17,12 +17,14 @@ * instruction set this cpu supports. */ #define ELF_HWCAP (elf_hwcap) +#define ELF_HWCAP2 (elf_hwcap2) =20 enum { CAP_HWCAP =3D 1, }; =20 extern unsigned long elf_hwcap; +extern unsigned long elf_hwcap2; =20 #define RISCV_ISA_EXT_a ('a' - 'a') #define RISCV_ISA_EXT_c ('c' - 'a') diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 10f9daf3734e..f3a033bb51f5 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -17,6 +17,7 @@ #define NUM_ALPHA_EXTS ('z' - 'a' + 1) =20 unsigned long elf_hwcap __read_mostly; +unsigned long elf_hwcap2 __read_mostly; =20 /* Host ISA bitmap */ static DECLARE_BITMAP(riscv_isa, RISCV_ISA_EXT_MAX) __read_mostly; @@ -68,21 +69,39 @@ void __init riscv_fill_hwcap(void) const char *isa; char print_str[NUM_ALPHA_EXTS + 1]; int i, j; - static unsigned long isa2hwcap[256] =3D {0}; + static unsigned long isa2hwcap[RISCV_ISA_EXT_MAX] =3D {0}; =20 - isa2hwcap['i'] =3D isa2hwcap['I'] =3D COMPAT_HWCAP_ISA_I; - isa2hwcap['m'] =3D isa2hwcap['M'] =3D COMPAT_HWCAP_ISA_M; - isa2hwcap['a'] =3D isa2hwcap['A'] =3D COMPAT_HWCAP_ISA_A; - isa2hwcap['f'] =3D isa2hwcap['F'] =3D COMPAT_HWCAP_ISA_F; - isa2hwcap['d'] =3D isa2hwcap['D'] =3D COMPAT_HWCAP_ISA_D; - isa2hwcap['c'] =3D isa2hwcap['C'] =3D COMPAT_HWCAP_ISA_C; + /* HWCAP */ + isa2hwcap[RISCV_ISA_EXT_i] =3D COMPAT_HWCAP_ISA_I; + isa2hwcap[RISCV_ISA_EXT_m] =3D COMPAT_HWCAP_ISA_M; + isa2hwcap[RISCV_ISA_EXT_a] =3D COMPAT_HWCAP_ISA_A; + isa2hwcap[RISCV_ISA_EXT_f] =3D COMPAT_HWCAP_ISA_F; + isa2hwcap[RISCV_ISA_EXT_d] =3D COMPAT_HWCAP_ISA_D; + isa2hwcap[RISCV_ISA_EXT_c] =3D COMPAT_HWCAP_ISA_C; + /* HWCAP2 */ + isa2hwcap[RISCV_ISA_EXT_ZBA ] =3D COMPAT_HWCAP2_ISA_ZBA; + isa2hwcap[RISCV_ISA_EXT_ZBB ] =3D COMPAT_HWCAP2_ISA_ZBB; + isa2hwcap[RISCV_ISA_EXT_ZBC ] =3D COMPAT_HWCAP2_ISA_ZBC; + isa2hwcap[RISCV_ISA_EXT_ZBS ] =3D COMPAT_HWCAP2_ISA_ZBS; + isa2hwcap[RISCV_ISA_EXT_ZBKB ] =3D COMPAT_HWCAP2_ISA_ZBKB; + isa2hwcap[RISCV_ISA_EXT_ZBKC ] =3D COMPAT_HWCAP2_ISA_ZBKC; + isa2hwcap[RISCV_ISA_EXT_ZBKX ] =3D COMPAT_HWCAP2_ISA_ZBKX; + isa2hwcap[RISCV_ISA_EXT_ZKNE ] =3D COMPAT_HWCAP2_ISA_ZKND; + isa2hwcap[RISCV_ISA_EXT_ZKND ] =3D COMPAT_HWCAP2_ISA_ZKNE; + isa2hwcap[RISCV_ISA_EXT_ZKNH ] =3D COMPAT_HWCAP2_ISA_ZKNH; + isa2hwcap[RISCV_ISA_EXT_ZKSED] =3D COMPAT_HWCAP2_ISA_ZKSED; + isa2hwcap[RISCV_ISA_EXT_ZKSH ] =3D COMPAT_HWCAP2_ISA_ZKSH; + isa2hwcap[RISCV_ISA_EXT_ZKR ] =3D COMPAT_HWCAP2_ISA_ZKR; + isa2hwcap[RISCV_ISA_EXT_ZKT ] =3D COMPAT_HWCAP2_ISA_ZKT; =20 elf_hwcap =3D 0; + elf_hwcap2 =3D 0; =20 bitmap_zero(riscv_isa, RISCV_ISA_EXT_MAX); =20 for_each_of_cpu_node(node) { unsigned long this_hwcap =3D 0; + unsigned long this_hwcap2 =3D 0; DECLARE_BITMAP(this_isa, RISCV_ISA_EXT_MAX); const char *temp; =20 @@ -181,15 +200,17 @@ void __init riscv_fill_hwcap(void) #define SET_ISA_EXT_MAP(name, bit) \ do { \ if ((ext_end - ext =3D=3D sizeof(name) - 1) && \ - !memcmp(ext, name, sizeof(name) - 1)) \ + !memcmp(ext, name, sizeof(name) - 1)) { \ + this_hwcap2 |=3D isa2hwcap[bit]; \ set_bit(bit, this_isa); \ + } \ } while (false) \ =20 if (unlikely(ext_err)) continue; if (!ext_long) { - this_hwcap |=3D isa2hwcap[(unsigned char)(*ext)]; - set_bit(*ext - 'a', this_isa); + this_hwcap |=3D isa2hwcap[tolower(*ext) - 'a']; + set_bit(tolower(*ext) - 'a', this_isa); } else { SET_ISA_EXT_MAP("sscofpmf", RISCV_ISA_EXT_SSCOFPMF); SET_ISA_EXT_MAP("zba" , RISCV_ISA_EXT_ZBA ); @@ -239,6 +260,11 @@ void __init riscv_fill_hwcap(void) else elf_hwcap =3D this_hwcap; =20 + if (elf_hwcap2) + elf_hwcap2 &=3D this_hwcap2; + else + elf_hwcap2 =3D this_hwcap2; + if (bitmap_weight(riscv_isa, RISCV_ISA_EXT_MAX)) bitmap_and(riscv_isa, riscv_isa, this_isa, RISCV_ISA_EXT_MAX); else --=20 2.35.1