From patchwork Wed May 18 09:25:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongren Zheng X-Patchwork-Id: 12853449 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CCFECC433F5 for ; Wed, 18 May 2022 09:41:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XO85ckaI2TiM+Nsv96Cma/Y7SrrQkMsFXM1w4B1BXn8=; b=1FTqtPl29wXggq +fj3W7Cu0x9tezWnkjGhovHcaj1O54EmRr0S5YkWo3IO3WRl+pAq0ZxITii99DD8Av+cGE/eXdCVQ 1Uh5GOBa84DSlvCYHdau15eGiF/ZKqXo9iVsNy7dPbuPaUL4H4kJgYHU1AI3uB3RrpWpWS6NqUuKi kpy3LXvFJXrn5oNiwi0QR+4/YA7HFRwnbKg3gFcWUaZz+Nzqwo/725P4esU4bCnpeOwdiB5RLhKaM t4jHRDs8d16ytvWGRyJKzB5Ocy/3fgbwKgamyo3fPRHfxc0f72PHKLUPw4ae2Qy9TRq4d36mHd4fS ZQIpVdVfVDTgBn5wDFUw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nrGB8-0017DP-5O; Wed, 18 May 2022 09:41:14 +0000 Received: from mail-os0jpn01on20706.outbound.protection.outlook.com ([2a01:111:f403:700c::706] helo=JPN01-OS0-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nrG9Z-0016Fj-PT for linux-riscv@lists.infradead.org; Wed, 18 May 2022 09:39:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LI3tp2blQtKDatHs7/Qpl9lSlAKCaJ0D++/3hGS3cOPMVXJngZFY4vSncdKbOKkpNnTar0TmzLucKgnZ6c4i5tXrJr65hOIsln889009kn/lif1mxG8V7LaqH4nC8Mrmn1MwDgYx/qp/1J1uZyYzYqUvl5SPO7oYYEwKohpaTHAFSFFTJ68BN8d+Mf9YvCRY1wMpFL4pcblzQUk3OtYY5lROCyU1qw29sB8g0CNJZDi7tISoR6IfjdAQQRQJttO+7/XZx9Zrx2qvkookPjZqZUUNxBG0HzS/XHCKSbjrKp6glFAQi2X6BK9kAf2ZCNZgK1UMwHVkXYP9yyLnsCUs7g== 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=wNfCgJR3Ja8v/vaWzIyIYaEoo716ETZ2a3s9k40pToE=; b=KNRvifhtIPBDb9AkhiTWSDDJYs3QB0K4sY47iOE/TNMv2ukE/oCqYfY1mwoqzEUJQeYP4kO0kfqvZDPQGBRtC/LuTHqoD6m4mdK0L100rQkoDZDfaQmWrjXFExA/sfALovJ4mvUz/HSoxWVlBKrupFJTJmG4fve+/0cvIq8TbsfoNQNUf8N+ORPLz3qRFiMh+6ZmvCtDVwfbG2evaH2vTWORWSiL1m+9TbTtw5QsRoOo8XNLvHpk/qyfTj4xyci5bFgbLN1BCxFukqNfqe7VFNUfB7ANGVAXc3PcstgrE99d1GsihgAWe6ciHJFcSCQ8Sg8zu7IUV0QKpt0jTJcAxA== 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=wNfCgJR3Ja8v/vaWzIyIYaEoo716ETZ2a3s9k40pToE=; b=CGnm6ehlNosvzLECymMLxnqaBw+R/5bcKpBdGK4qoREe3TbH3tVGAWLMGpiNN92Lh4uYiv2ivWeOKjZ3Fp5Al/hU4rJci2c/gM5fS5VIDsvOxLBuDZUhYHN3jI71eEzAqyCSwZSHEWZGHVWYmpHsOuUFvduBasSsn2iLOrykuls= 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 OSZP286MB1324.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:13c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Wed, 18 May 2022 09:25:09 +0000 Received: from TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM ([fe80::bd99:5c83:e2dc:a8f7]) by TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM ([fe80::bd99:5c83:e2dc:a8f7%7]) with mapi id 15.20.5273.014; Wed, 18 May 2022 09:25:09 +0000 Date: Wed, 18 May 2022 17:25:01 +0800 From: "Hongren (Zenithal) Zheng" To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Heiko Stuebner 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 -next v2 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: SJ0PR03CA0253.namprd03.prod.outlook.com (2603:10b6:a03:3a0::18) 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: b1367cf5-9f74-4a0b-016b-08da38b04d5f X-MS-TrafficTypeDiagnostic: OSZP286MB1324: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: nLCVBNFW/ym6Egm2cma/unEDH3IqPoGIv5CBjeiHZQJ0ye+Y7dvk/6QuACIhNURte/J1NptRERXY+bHExK4vwF4ZC9XOlvt6JKlv50O8VsYLWOxtiBVm7/5qySFA6VLZSXQPFCLHFEWMIbau9qp944cf1794KI7Jg2IJJC2AR6gBDRCIcZo7ec70zl5G9tWHdH+GznyBC31/Kxv6On7f6/kFwlAbd5wahoMyWrEkOG4Nf+DHBC8CJNFHOsxOOf9+AVNWXv1FXtjivwhfAaDh+ZfwPbJ0TrGcEj3n7qNGxaphuKNFuAN/f2yPcJzikM4s5pHjMBb6YtkIVWFNpU2ZarDhudEAv67tZuPOx8PzVB2AhwcF1QwXby1sAPSBERonrUIJAkxqq/+rqFgKAw4gAYGfMGAc+Y2OsLoHDKN5/RfKO9u3k41oXNJ12r+hnGfUacWwc7xV83fbiwI1KXX85CbXnGN3qa9aRzb/zxKgKX6UtrpM6ObUHN4nW9Sv1dE9M0aa1saCDVUsi5RQk9PN5pXdjrjDTaKwugF8CSeA9Xuq32ca05sRmuTNS56H9CHER7O/zDVGE5ywcbvzRQ/z5CYSYA7cFGU09gfrblzVXSyfFafRPXED+m8DRIr5HbSY9gCcVylkllcYyB4u/E9JRgs5rECcCnaboEGTtlLjEXLc+uIM6qstlP8EugZmYnG8KTI7ot/S1McuK4Q2lxzoQw== 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)(346002)(136003)(396003)(376002)(39830400003)(366004)(52116002)(6512007)(6506007)(186003)(38100700002)(508600001)(54906003)(110136005)(6486002)(2906002)(9686003)(33716001)(66946007)(8676002)(4326008)(66556008)(66476007)(6666004)(5660300002)(7416002)(8936002)(41300700001)(41320700001)(83380400001)(316002)(786003)(86362001)(49092004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +sSh0HCXhW53nvPgK6opv1Il17XDdSbOhPwpHWvbhwkfqqVCIn3nPWwQqmHxAgZY39NQmMXW2un/vcG/QM2t5Um/XbEVy0I1Otk8rxYhPZ8GUFHBw5ZN0D6P8HHsFrk9Iblm5VD1tCEzexIsm3iY5se53JVO2pUgDOT1XXSjOnW30+lFck253CSbGZpiFAjIk2XrVXGWossrkQwIcqPQIBCA7i06aggM7PcwzHqoRShkWWybhMANolv0ANteAcppuqE2SJkNk9KfucezndivtlwMbVSbZnNXe4SFb5KFm6ByCya+7CT91Dj83bsxzhxxIU5EICgH77EOEXT6CyoncQIbWk0A5cVZRtHpuIsxoC9+aNIMgrgrC0CdvpFLtQ45HnDdznM1wG64DChOZR9zokRTrQJoB8IFcZMHWCR3QZDHZu+abEC4KItmckZF8ZbeOSSUEU56js8cTneGj656H2T5ZrGbiIiKPlYNdTK0VKbCrSdkRqOZQPiRpW744XTaVMpXePGWTwRJVXbNkhf+k20DyvGecHf89H2RVFPRhxnZ+ULCeWyp4vHQ1jVgxlSpDMeYaPaSY13hpGtIghQtLFQ/azGZ8UATjTMPupMbjS8aEL9+fYiAJ+LryybuTPK8fyW31mlq29LEnSo3H15I40j/tGZiuxypaYIXTVTpd6/nYxOCC+7soh6l6tgnUvsfvubw4YhvGhA8ojGVBYNPkWvgh01TxUU3K3lb+iauxaTp4iaCGXrOd1ptCWYN+NlJgoB8gK0u6d3s4iV4jvbZ/NgZ0+g+DvMuhOOW403zV1L55CukW1A6J31ie4fsYGEzOjNBcGZ+poOl9iHQ56OpWL5HaHvr2zjRx2tRc71IRIJjLrgiE+zyjIq+YSBboczXmUMmkjkVCFd+nA1cVmTeLdInDApX+sg6yDHLr/XRtdguf9ibVyRINOPVZ33etANBG0PD2GLV4H0iCSwilygwObkkOrXz+FU1GoEDPnLOrMQ+0mopX2UERWliIobaJz2dKcjaxMS5egOGW5iGuWB5gib+zcg9/sv3MJtq8JORkV98TgCj0CiZYBLTmRaPLcEY7ni99eAOUfX6rwPO2N8b9ENg/UIeeawlo3wkKL0o1fyUw9SFmHkGHTcWr2qThUFScIjb0FODOiwxpP1aAuVAPdvLRGChXJ1Xk+W+hnteRJcEK1NzPdxsza4QN4LqPrH4+ZoIf1cSRnjbzjDX2hYtrE+A8wbzN3RQNNqjYDRqcmecaOhRwb7MdVDtKGE9Lx9/x9jGVcdqfT1Bw/lIqWP4v0maJWzkjafBF02GqTYWzUvWgmOfPtFTmo1oeL+M5xOrPHtWmAvHi3Uqjc/v7LoBG8ambJDKjU2LVe23SP/BfJNlSmFYZqLt0SUzMVwgxg2fjzLmEOzXf8I9qRZQMcnbbX9QEYK1ij2rScDvzrnCLUesAGTn7irJR9epghLSPEDen43ckMy4EA6KiR8zM6FdajSuh2Hfg2jml3mwPP3GqhhnxLSARkAJZOupxflpPdDH3IZaF5a3LgTLNXqhTBodNo1L1cUVDjWI+SCvCJXVzvn6CPJ70kYIyYWKXpy8L7ahgiDr8FmOcgKqu7x18pcqvTFbSNdOaRJkBJx1ZZ54dBVSayP4aknm3Y3Qt+8xbvw4outzyWcTyWMSQ8H5lUMPCDHA8Ow1EH8zwirHsIa7c3BlCyjLpOP2NdFAKMWtoz4yS+FkSTLirKLbPaBlcto6Lg== X-OriginatorOrg: zenithal.me X-MS-Exchange-CrossTenant-Network-Message-Id: b1367cf5-9f74-4a0b-016b-08da38b04d5f X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 09:25:09.1236 (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: jyxS+IJqzRrj1PiJmSXIWXKPZeYO/BkV2ouC8pg0ThH50lKjGTi4t+WhgoZ0u6D0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZP286MB1324 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220518_023937_862791_7AA08FB5 X-CRM114-Status: GOOD ( 13.72 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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. This commit also changes the logical id of existing multi-letter extensions and adds a statement that instead of logical id compatibility, the order is needed. 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 | 20 +++++++++++++++++++- arch/riscv/kernel/cpu.c | 14 ++++++++++++++ arch/riscv/kernel/cpufeature.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h index 4e2486881840..02c454a12683 100644 --- a/arch/riscv/include/asm/hwcap.h +++ b/arch/riscv/include/asm/hwcap.h @@ -49,9 +49,27 @@ extern unsigned long elf_hwcap; * RISCV_ISA_EXT_MAX. 0-25 range is reserved for single letter * extensions while all the multi-letter extensions should define the next * available logical extension id. + * + * The order of them should be maintained according to the riscv-isa-manual. + * As this is an internal API, changing the id of one extension does + * not affect compatibility. */ enum riscv_isa_ext_id { - RISCV_ISA_EXT_SSCOFPMF = RISCV_ISA_EXT_BASE, + RISCV_ISA_EXT_ZBA = RISCV_ISA_EXT_BASE, + RISCV_ISA_EXT_ZBB, + RISCV_ISA_EXT_ZBC, + RISCV_ISA_EXT_ZBKB, + RISCV_ISA_EXT_ZBKC, + RISCV_ISA_EXT_ZBKX, + RISCV_ISA_EXT_ZBS, + RISCV_ISA_EXT_ZKND, + RISCV_ISA_EXT_ZKNE, + RISCV_ISA_EXT_ZKNH, + RISCV_ISA_EXT_ZKR, + RISCV_ISA_EXT_ZKSED, + RISCV_ISA_EXT_ZKSH, + RISCV_ISA_EXT_ZKT, + RISCV_ISA_EXT_SSCOFPMF, RISCV_ISA_EXT_SVPBMT, RISCV_ISA_EXT_ID_MAX = RISCV_ISA_EXT_MAX, }; diff --git a/arch/riscv/kernel/cpu.c b/arch/riscv/kernel/cpu.c index 40c8776aec12..9d2bed2c1a37 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[] = { + __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(svpbmt, RISCV_ISA_EXT_SVPBMT), __RISCV_ISA_EXT_DATA("", RISCV_ISA_EXT_MAX), diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index dea3ea19deee..800a7aebced3 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -199,6 +199,39 @@ void __init riscv_fill_hwcap(void) } else { SET_ISA_EXT_MAP("sscofpmf", RISCV_ISA_EXT_SSCOFPMF); SET_ISA_EXT_MAP("svpbmt", RISCV_ISA_EXT_SVPBMT); + 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 } From patchwork Wed May 18 09:25:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongren Zheng X-Patchwork-Id: 12853416 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9815BC433EF for ; Wed, 18 May 2022 09:26:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=W98tRNWw4o4yvJBHrgAn0huQJmv1ud0x7OliZIv2Nks=; b=tdy0KkD3VbxBGs md5Yk+Q9uC3JrN0c7P5iG6QdI4Tzyvs29oYKJSexDnQRhUm19WFVKmW5xNj/Y6wap5Ond5yafN4Cv SONgjipMs3jnWPJbIu4JYlP7JCz1jbHpP0vAHwnEF0YcoQYJuEYAmT8+8TNZ37PToMspLlU/bLFVu F3s7gDUYdZWQyDPhUgcSJLtXL/MDUTf7VHU+suTAUrS+qX445gN8DkiEpUAiQGja39PaVgI0jn6SY L9yXxUREBdFcEXKLoqYIZfESwq/20L7AuGfUjIU9FeXl7NOla6xSEN3hU+Hb1LiQyeu/AJ0wQhheN aFj/Ql9QOtVOtiXDCeQg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nrFwN-00107N-IU; Wed, 18 May 2022 09:25:59 +0000 Received: from mail-os0jpn01on20703.outbound.protection.outlook.com ([2a01:111:f403:700c::703] helo=JPN01-OS0-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nrFwK-00104J-67 for linux-riscv@lists.infradead.org; Wed, 18 May 2022 09:25:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FSuHhjcuOnbJ6j5zhJvCyVRLCmZ/Z3AL7Pv985Hdyi8RIVqdqu9pXqL/Cpa5pHTMYptmIOr1eTRx2RrheJvniLL8AxqNeZzgYMk4wJMH/p352oxzPA+EpXVGtKxNnyFvEm2SEx1lJuXn+xw2Nza+EP4XicUVHjzlPZm9/rRCj3qqJ4eYNKz1Crhco1byx8QTK1KSmYeL8Kd7tVzdgZBvQs+wX+gckmWLpPz6sUs0SLspxeKpoxisbx+6vud3f+CLZx5shM84v2xVJ3Z8JdgJSoHgEiZI/NZgDRbuklhE1Q7g1tdi57k5aYwy1Fay2iZtxelzRxci3auYZ8ufhA9hOQ== 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=VPdgp4A8FElSkPDXG5gJEL4Nwig/wZDU4pl1m5bnHO2poaA1ikn0XrlJXesWypYUwprsHUP0duEq5I31HkApDIbFE3OUq8jPv5SL9ZcXraN9CdIsjsn2KdH/glLe7fZbozIiBUbgFLEmyo/XG9nzB6zIKjoCG/1ZB/PquKPSzAvQT8fPAZeFy+admZ6Dw/3h2SwV3ALe/GmrJ9SBI2YZzG5P7yJ/pa+YzmyhDiDlx6iGKvWl/gSQdzPIsvJv7hOlKKe6i2niUqYMDquQVAlAeAJ38mBTLNb7eNUlZLP29gaANhifnMVaBhK5iLJ9mvQ4yL+WSwV3QZeIp0O+UaBwww== 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=JjdJWlhimKCm0NQLXLqh06pvspkyFVdnVpBOXxjSyWnJ9p5kahwcJlnQLW0rpLIRKwZF6IZ8SIU0z55JbwKv+WL6mTF+Ym+STG4Mz/AFuOroJI27wFsnwgdsKLLeGtGsa9eELOLlvBR9mNrZcvuC8bd28Y99YiUO5a9IYkbriQY= 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 OSZP286MB1324.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:13c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Wed, 18 May 2022 09:25:49 +0000 Received: from TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM ([fe80::bd99:5c83:e2dc:a8f7]) by TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM ([fe80::bd99:5c83:e2dc:a8f7%7]) with mapi id 15.20.5273.014; Wed, 18 May 2022 09:25:49 +0000 Date: Wed, 18 May 2022 17:25:42 +0800 From: "Hongren (Zenithal) Zheng" To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Heiko Stuebner 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 -next v2 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: SJ0PR03CA0248.namprd03.prod.outlook.com (2603:10b6:a03:3a0::13) 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: 33fbae2b-a1db-439f-6746-08da38b06561 X-MS-TrafficTypeDiagnostic: OSZP286MB1324: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: B+pDy2P4AziHMVYZfxmPZ8NODBj0i/2UVtw2U+y/2de3C9fRPAzb7OYsvUStx1uVP5XwHAZloTFwzPRvE/1FC/wsXpcq/QvFl6R4GITdMMJrQ+dIZsaE6sFOAn14OSEd47ohrizJHS5J9Bi/dvkkp/W7kzxXhXXV9OIoRZjl1LFXyqZqa3Q6AcM1z3A+2Ok/2UvAJc24t1KzjrmZziqFprZ7d9YW6zK12E7QZZbR+xQ4HEsX+NlM57nBz5ErgkZqBDLFVFiy5NM/BeR85P2uY/X9SowV+AlA9dyT3QPydydR1vTYVRHac5/mGYQqp91CqaaxRzM4sogTIyMUFIFlsBSzhxtIjZ39oFWTXStskZ8wrpYfluabGcAQ09B70NK5KZ3dLOxWnnEBlRPhGc7OzS2SJoHD72IO8tpLhGBmgjjYCpEc+f7Cc00F+wWN02JEHPFtISvGCgX2L84Xg6f5GAim6wvfQ94KfMB+M+mahXE2TjbMRKk5m43L7mrIYe5IYf/Sl6dB3tVzcfCc6p6pAEkHrk5NXEml9V3kmMsEjp8JG4djvIW6cpNAWm5VD5iaqC1mbvgdRYvZuY6oRl+j/UTM5GTmPFiAiH3OfI81mOyfxtJpiwH50m/qGWRTunhZ+F4wUwnvuJQJ8Sd/LSoc0vNcnN9MrNvoMTgvfSF9zQAsOHx1MKVayXHw54do+y+K5GKgKkR+SxrctyTutO6gvTMkzN4StrahanakFof93D9kqljCTzamLrmbGf6rkj68QWMumfAN+kCvHC3ujezRpw== 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)(346002)(136003)(396003)(376002)(39830400003)(366004)(52116002)(6512007)(6506007)(186003)(38100700002)(508600001)(54906003)(110136005)(6486002)(966005)(2906002)(9686003)(33716001)(66946007)(8676002)(4326008)(66556008)(66476007)(6666004)(5660300002)(7416002)(8936002)(41300700001)(41320700001)(83380400001)(316002)(786003)(86362001)(49092004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2yELDRNvZXK/b/ENvQEMRJxIt3MEBBwrMDz5J+NjKIr87aNyRIsjPdBtF8ehsWhtVxYp/sY+S9CPaRT//kNoV+ympU5rRXpM4+GBod1L4HqWzK9JPXuKh92s0MDVQ9TYkzifrnKKxQ8N3uKA4lod46mQ4JE6J1GWUskg49q2OP2Iw8JsSFHbLns2xKsfxMrO7WePpsvz3rBqffdeYBlmAnbiqS/UEugs5XOmeqEbp33v4OF96NCdQ0B3Q3Irb/LjXtaQCsNDEY14Lm1Lt0RXPiKE1pLnlEABymmuQkPMH8KFVKlXZRRwMfoEKRXAtfcQ0QxSi74CYbu9Ruc02VC//Dn3UJq0+mjO/oqZ7Xi6m6p3iV8V1JbRZlf2+xyEwUtbAH+2+fz7QLbaX20MihWe8v5N3xV7BwgENv8uNC9Dk2eDEgwmPR/Wuqp4E9vTLTnYqprRJHkf26DlNV40h1GAJwsAuXDud9H/rejn343TQH+mW7Y5uV9zeDgz9Z4obbNVxpT2lJbp8Tsv3CzeSSvxaml1yjqo4BnineYXJC/+I13kjXF01IM2zB5FoqU8XXaxvlrXKCzNzgg4qXngxyMjVy8mTByDWJveJHXBEzaOaQp8/fblE73U4kHBom0Hp+Y18Gj4ppU7ZF5K2f7rvUT7QmJIzb1xgzI66841q9QsunRSIpEZyPqCyCbiB8CQ2CFCTjhHrtN5h2WO93P98je8W1xxQMEYlprylFo/BT29X/zQ75AQ88UnIBu/3WdMaaYqM7ED8mpLndSWagdnQdmCVbWdYlaAtOWXX7kRiazqyAXQyR4NZlgMu9t9ckhpWVs/kdrFRueAiJllIc2Ly4lXUTgPgqcBM97aJ/XokLnezU8VMHYkmGornDKl/oN5m+5T2WWnM4jALbA9orNvqrz3koxPcJqKzkVcgPie1AaigaIPzfbrTV6SVuDeO7Gjf30c/25Pux64EGa2M4oxy1Fx4UmNdo9PMqQCA0Kyei44GhyUf/ZjDitgN6+02SxXak38f/nr3e6nZciHAKKRWgzSQJJor+fRlszc+1vSzx/AUxdUMiE44Fj9KYLTvbQV2DPYF2BeecJOSHEa+R2e/hG3gmAZ8KGsK24tjyYlewiH26zcEdo5/qszTJnucbeDUCeqt3ExO4bAS1TDUDQq9P/vZfROJ6HXeitdPFXmYrbCE6Gllj4fAwcrUVPm89mCTTKRdPcG1Km0iWhY5scjHdimyD0mwsIGXotOZon5JWonnlzDOZSaU/wraI0cRZ8McKKBMPc8xf3TDh5MY740c5/2zKM8BYnVe80KSiCEZL2SKskMSm2uzjfqZfeAPpfwXCEZ3IL0BxjCoYsotjRKD2ri12eTuvjkXtUF73zh2BhmOvdLWOee7qTo9l3voKN+KF7Eux5yGSDx6LwxUdZDmdr6/CP4B2hlZ7aMVB/sZ3TU+LCZ+6tVA04S9fL1Bj4QsbqwyJYBp2bfPMpVPV1wmh8TifzUqRJwal0OCsJOOodMplpnV7sxd1w8LQinkdpUb4H9TvdSS0evLjWIPU0QU2jU28mRhnJ/xEN4f6t3/2VQ/hAoW0oH7+CExmOKw+exnTu8SfISwiyP7pBkQABYaN7Ed0PjN3JcvFPRGlCfqH1iRNzrFnBwhrjrt1ZYfdBdy+febhW6CJbLOL7fy3Yp1EHF1CIZV4ub7xU75vqvQmiSkWS33/SZUzdj78VpjuHtiOa6t5E7C734279v+4f3lFFEbQ== X-OriginatorOrg: zenithal.me X-MS-Exchange-CrossTenant-Network-Message-Id: 33fbae2b-a1db-439f-6746-08da38b06561 X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 09:25:49.5596 (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: TWKQefj54T/6G1fxPJCnmNcngOuGI/0zb8FsKkmb06bE0gAsPUXxaudqyBGNp8tf X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZP286MB1324 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220518_022556_258108_C6AF5E8F X-CRM114-Status: GOOD ( 10.80 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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')) +/* + * 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 */ From patchwork Wed May 18 09:26:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongren Zheng X-Patchwork-Id: 12853417 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9A80CC43219 for ; Wed, 18 May 2022 09:27:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=X7TkXeUepQwjOILCXjO3AMkrHibm5XDpazpU6Zyzx2Q=; b=IwH8jkfB+YmH+g k2b48YskUpJpbF3LEINA6mB7gXhJ/hfvIe0NQ3+0BJlzhiG8e6x8i6VvNUt6TbioI0n77SOQAF0ny BQq6rJK5y7AMPnVJIaR8Pmww1qKl5m2z1Y4ykEFnzhaAElPbp4/bmb9O7P2dQxueRQv7I2PFqfeMq 5b0dH3BZ8El5Ms30rIyHWmI4opvWBcfVikOqkzjNyL+ldACGs4b7DZ/4Dvz+tQHvD+scq+CCeskxk F5gH0Qnncia8HxlIncj4JCZcpo3K841oJ7lL7IO/9mahA765xuSh7i5kCL6nZOfduFgcbHS/NFE7l wUL/ajBj0xElwZ83/g4g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nrFxL-0010R4-MU; Wed, 18 May 2022 09:26:59 +0000 Received: from mail-os0jpn01on20729.outbound.protection.outlook.com ([2a01:111:f403:700c::729] helo=JPN01-OS0-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nrFxJ-0010O8-Fw for linux-riscv@lists.infradead.org; Wed, 18 May 2022 09:26:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BfGRLgvBp9AYOMkkRwXu4SdjbAeLKMePOfAWcSjcVtCeQMDIZ8HHkkIZUZvs5RRK5vRihxLTzf0IAsBsO+vtq+ExfI0+s0jz++kOpkj1w3qnvTRI8NQe2bMYjDCWkuF/5uHOptoBufADVHAEAwSEPQaaWUc+Cskq+iVscSIUZ/T2tsH8uaLpW5L+Wc+oq/8Wi+e50RLXIsXRYPD73TwtZN9pbyxeUGZbgE1laLjb5oaUwN2nY8Ig+elgzMEYdfw510FOlLpMdXL+/3FCEpPvGcKYieri4UlVuTyLAmAY/5CkdYr28yiqRsgLQFOAQ7802KJzGgCkDT683LuOPuP2Iw== 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=Tb9uXup1SNxpWP2+fr3T4QxkLHnxcu9yVSz47ObqrQo=; b=PI1EgD1r/9/c7MAaDx5FuaLfmPVM8c1CD95iwGOh7Q5JMZK7SSsHd4uNSVNZf8I4dnuWp11RYOAXZ9jjysuXVuA7kBqeHmy+ke/AsKH/GTK60KuVdDyVeqXqJKigzHfMH6eLfvDBrEr9n4TZMAq2Dzvcl7IR3aiSPHgwDLAfauoIAyHzelXJ+o9gBSty4ZLetlYeKQbgerjoP4A76aoJDuSLIUrKisxsbMb3AvbiYys2LeGxgMVxwM2U2hK4UEY9sg69RHbfft5GXMtUbSGgm3eRk+YMBHx+CgF7SIe8rMzspHrNPgeOqPQqu/k97TjBcAVacfUIW0RhgOzHiVt1eA== 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=Tb9uXup1SNxpWP2+fr3T4QxkLHnxcu9yVSz47ObqrQo=; b=YUwoFpSx7U+cALpoUBO+DAQAatyl2nFym89A1TffXLkOy6XeYNgV1Hd7lFha42KMNGTKxZkjxo0Clj1yqgOostjTiDxxuH9CaQGSLZM50ur13GKLA8gu1W045Y6rNqx3eaJRLH/aYAUwBTSGbjz2450I2hcKhNOuYcpaoyuspH8= 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 OSYP286MB0024.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:86::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Wed, 18 May 2022 09:26:41 +0000 Received: from TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM ([fe80::bd99:5c83:e2dc:a8f7]) by TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM ([fe80::bd99:5c83:e2dc:a8f7%7]) with mapi id 15.20.5273.014; Wed, 18 May 2022 09:26:41 +0000 Date: Wed, 18 May 2022 17:26:34 +0800 From: "Hongren (Zenithal) Zheng" To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Heiko Stuebner 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 -next v2 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: SJ0PR03CA0269.namprd03.prod.outlook.com (2603:10b6:a03:3a0::34) 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: a1ca3e96-2e7a-4ef3-2bcb-08da38b08435 X-MS-TrafficTypeDiagnostic: OSYP286MB0024: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: judtiGB22SzoTePbYOD68JudlrbKqUkyUQtZxGhXRDFZHNsJLcGlwUFft900YCs4Mn3fG+zToXAyHgzy5RLgAXLGMHGMvl4FnOyiYX4YR8u6YeFie8koRsbo/ZY172bkWGn69vtneINyJwGyvOpLfv7wmowfSzlllTPq8hGgg0X5PfxN/uPsBTMwzZZweZqK7BfUnu+zWustUzSNyS2zk3COW4nsMA23nN2aLQEjcxbp9Y44Gks1Je3LKQUng6TeSqeAka43ZzjP5sKWkDifIFbnnVseZ/xpJrchB/mR3AGbEdLeDIc0Qmxc4m+JOixtg3dviH7Vsme1Z4KLVPcww0gSKrF1vjiTSkmlNHiERyPWTcw5JbOzIf33xHTiQ89mAPlB5Aehlbe/dHpmrA0vbxCdYCN0mVdKqhBZv0Qlx1rK+qhL2gXhLzm/xXx03vSYoZgFuzfrIjVJTwKwMIwEnrdIraC2Wpk/Q4m6ztcuq2Hasi1mfBfGKFRBMZbIcve+CKqAfUdPYUGBXWDDrw/F+VOY9z3FrzUGG3q9pJwAYKjeMKXx56Q6iHnu8datGVfAIvVC7/0ZdBZkgn6oSU4FzDEtsuKyhAn7Iisi1OR7Iz8LeqC+zGyCIhEnOQNibiQzRhO5I73T4q/WyXca1ALVCQq1QjnCdtlWTgsD1udwLC0BIapoonxLLQD0rtZPoDJi 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)(136003)(346002)(39830400003)(396003)(376002)(83380400001)(786003)(6512007)(6666004)(316002)(6486002)(9686003)(41300700001)(41320700001)(6506007)(2906002)(52116002)(86362001)(8676002)(8936002)(508600001)(33716001)(66946007)(66476007)(4326008)(38100700002)(186003)(7416002)(54906003)(5660300002)(110136005)(66556008)(49092004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QmGRnlImVaedpAuD2lLukeMkw+wKsTs2x07Ax/CakYt4fKIkDPQ+W31ZS06xXgbCf8oXt28FRwUGqgbb2jNNEyk71sFmW5G6fEtSZ6aO7Q2FGR80mFr/3g+oIwOZ/pKQZexdqhVN9UahISCW/i9b+qXyUov4OPuGoplUz+FpJT10wOC6DkudVH32cQFqtyoQ0LJNayMxQS0ZkiZVX0pZjtJo8IgheaM7s8q0utkRPXmrCl5VjP3nJCKOM/A+1IFbFPntQ6QERxhi2eKdLiX+qNvhdDtQBawufHpNCkICTOXmAL5JzueHJG7wsf7jscq4Ns1DH7+Y+oGo9+xb3O6EZfgeUvgiG6nWUyVsnQIaSlg9O6/E1rLnfgWMvD0Kp9CVaMHdPmkfvXr8uERJ7Mqtew28UYjlSfTTYAoc4/xGqrvjGpliiOv/b2cbz/KOTcDxwhhT46FxwbC3VlOS5OMcAK6tVtpCYbwPrdJ6pwVJCMIrPdlcLRuOdzznz/933jUCTKW29bW9zJcPA5sUW59ITv0pkQmlq5ldlki3Z+3fin+smbM9QTIaU0hU5sZGoBwoweNLey6SPkTMqtUdzf2fH/51gMvw01VMPUuJi1iCJyfdGQDahmPkwfdFFnYP0ktUXKyg/8iYKbCy4g8pXjev3wiEKMv6uDo6ja0vjYB2AIgU4vgomfIf4xJ8d8HIxsNiSwKNVJFyIk5UJ5RfJAuEyaJgWQg0nzqDpq33kUw60RDRH7uiWUvZKdtKtJB2gQHSi17rpTH3m3we8wKTfF9r5z4AtQq5Q40ZT/Yb68zTt7+TWrzVTPyRrEPTrE7l7I8W7nUDtLOz72NOs8pEtDDbVHIGXRF5LuyvF1jyYX887pVDwMy41ldQcmVqBOrMUqwdfFLq2rXs5w1bmKe7H7O1Mz1+crcnjiD91dHKQkX34iX0LQ8lDfiG7dIK+NIP486PZxGuIu/WzvaEe+TZpO5OCysHWd3KrbV2tVoDpXUzvqs58CZNN5ZhmOQl+8qV8qX1ZbPnOfIw7Of9o9BMDOqn/tKp8bUqYdvW2IMFjZ8UKsejnL+iIABJ4OxMrPr5kzNeReVTepUJ3IFtk+U0+9MZKjt8R1zNiTF/LUdudxF3ugEOs20iKtQyeEV0KWdCBAnRR+968P6DOx3XnF/v8OhnE9eg48MAcxf48xrE2aqXDwi9gjONY0HPQVVybXCJehZlLhAGha6nxlZXm4lVUUVKPJrhyoHRNNtyQ7hXBG8kwi4JhM7e3m7qyTbaQWg5zdsu2Adon+sV+5c79ohMOwB3NYgHPhV2FHgPzAuJJf25Yu5gpq4lilxeAXgunuZKTqG/KyOSz+U2TjdeB20SKvXCK88Ha7D+y6nv1ym2LRxLA0npWaPoxGw20f8MKg4ZqJwYUoVZ4X5pQZt++SReu/B4lt9dzCFw10oHyQG8t1/CO2X6Nt52DitC1i6vXWva1QCyuohZj/nXcObJBwxoVCRCzLu7hBjPQ/pi17mX+R41Yd8r28m1PJ34ROPM3svWhDVrohJy3L5VhltSWdPWS34zYddr360fqakCOMUZo/dEJjwOntm1+9VZ7G/H8GLc/8MJA8ue0fWPSMRUf59l31u1l1BTD9Iy6AAu859LjJ/7a2qi35YTVs3BMdw6uYZDXs6MF+Y2t71LDwX9mXffOTOpDfoomYvo8VyhQUI6WzYbleUoICuD1LtAXDDpj6Lpq/+YdETqMV7dmYzsOaqc876FxA== X-OriginatorOrg: zenithal.me X-MS-Exchange-CrossTenant-Network-Message-Id: a1ca3e96-2e7a-4ef3-2bcb-08da38b08435 X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB1393.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 09:26:41.1222 (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: g59vRL6FS3v6kamzG/mvZ5wGL6t/4RdBE2u7r1o8IRk5QOjzWhZz2EAdRFr3X7xp X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSYP286MB0024 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220518_022657_562692_4B1BC29A X-CRM114-Status: GOOD ( 14.74 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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 | 48 ++++++++++++++++++++++++++-------- 3 files changed, 41 insertions(+), 11 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; /* * 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 02c454a12683..ef0349c5d303 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) enum { CAP_HWCAP = 1, }; extern unsigned long elf_hwcap; +extern unsigned long elf_hwcap2; #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 800a7aebced3..03ea199edffc 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -23,6 +23,7 @@ #define NUM_ALPHA_EXTS ('z' - 'a' + 1) unsigned long elf_hwcap __read_mostly; +unsigned long elf_hwcap2 __read_mostly; /* Host ISA bitmap */ static DECLARE_BITMAP(riscv_isa, RISCV_ISA_EXT_MAX) __read_mostly; @@ -74,21 +75,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] = {0}; - - isa2hwcap['i'] = isa2hwcap['I'] = COMPAT_HWCAP_ISA_I; - isa2hwcap['m'] = isa2hwcap['M'] = COMPAT_HWCAP_ISA_M; - isa2hwcap['a'] = isa2hwcap['A'] = COMPAT_HWCAP_ISA_A; - isa2hwcap['f'] = isa2hwcap['F'] = COMPAT_HWCAP_ISA_F; - isa2hwcap['d'] = isa2hwcap['D'] = COMPAT_HWCAP_ISA_D; - isa2hwcap['c'] = isa2hwcap['C'] = COMPAT_HWCAP_ISA_C; + static unsigned long isa2hwcap[RISCV_ISA_EXT_MAX] = {0}; + + /* HWCAP */ + isa2hwcap[RISCV_ISA_EXT_i] = COMPAT_HWCAP_ISA_I; + isa2hwcap[RISCV_ISA_EXT_m] = COMPAT_HWCAP_ISA_M; + isa2hwcap[RISCV_ISA_EXT_a] = COMPAT_HWCAP_ISA_A; + isa2hwcap[RISCV_ISA_EXT_f] = COMPAT_HWCAP_ISA_F; + isa2hwcap[RISCV_ISA_EXT_d] = COMPAT_HWCAP_ISA_D; + isa2hwcap[RISCV_ISA_EXT_c] = COMPAT_HWCAP_ISA_C; + /* HWCAP2 */ + isa2hwcap[RISCV_ISA_EXT_ZBA] = COMPAT_HWCAP2_ISA_ZBA; + isa2hwcap[RISCV_ISA_EXT_ZBB] = COMPAT_HWCAP2_ISA_ZBB; + isa2hwcap[RISCV_ISA_EXT_ZBC] = COMPAT_HWCAP2_ISA_ZBC; + isa2hwcap[RISCV_ISA_EXT_ZBS] = COMPAT_HWCAP2_ISA_ZBS; + isa2hwcap[RISCV_ISA_EXT_ZBKB] = COMPAT_HWCAP2_ISA_ZBKB; + isa2hwcap[RISCV_ISA_EXT_ZBKC] = COMPAT_HWCAP2_ISA_ZBKC; + isa2hwcap[RISCV_ISA_EXT_ZBKX] = COMPAT_HWCAP2_ISA_ZBKX; + isa2hwcap[RISCV_ISA_EXT_ZKNE] = COMPAT_HWCAP2_ISA_ZKND; + isa2hwcap[RISCV_ISA_EXT_ZKND] = COMPAT_HWCAP2_ISA_ZKNE; + isa2hwcap[RISCV_ISA_EXT_ZKNH] = COMPAT_HWCAP2_ISA_ZKNH; + isa2hwcap[RISCV_ISA_EXT_ZKSED] = COMPAT_HWCAP2_ISA_ZKSED; + isa2hwcap[RISCV_ISA_EXT_ZKSH] = COMPAT_HWCAP2_ISA_ZKSH; + isa2hwcap[RISCV_ISA_EXT_ZKR] = COMPAT_HWCAP2_ISA_ZKR; + isa2hwcap[RISCV_ISA_EXT_ZKT] = COMPAT_HWCAP2_ISA_ZKT; elf_hwcap = 0; + elf_hwcap2 = 0; bitmap_zero(riscv_isa, RISCV_ISA_EXT_MAX); for_each_of_cpu_node(node) { unsigned long this_hwcap = 0; + unsigned long this_hwcap2 = 0; DECLARE_BITMAP(this_isa, RISCV_ISA_EXT_MAX); const char *temp; @@ -187,15 +206,17 @@ void __init riscv_fill_hwcap(void) #define SET_ISA_EXT_MAP(name, bit) \ do { \ if ((ext_end - ext == sizeof(name) - 1) && \ - !memcmp(ext, name, sizeof(name) - 1)) \ + !memcmp(ext, name, sizeof(name) - 1)) { \ + this_hwcap2 |= isa2hwcap[bit]; \ set_bit(bit, this_isa); \ + } \ } while (false) \ if (unlikely(ext_err)) continue; if (!ext_long) { - this_hwcap |= isa2hwcap[(unsigned char)(*ext)]; - set_bit(*ext - 'a', this_isa); + this_hwcap |= 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("svpbmt", RISCV_ISA_EXT_SVPBMT); @@ -246,6 +267,11 @@ void __init riscv_fill_hwcap(void) else elf_hwcap = this_hwcap; + if (elf_hwcap2) + elf_hwcap2 &= this_hwcap2; + else + elf_hwcap2 = this_hwcap2; + if (bitmap_weight(riscv_isa, RISCV_ISA_EXT_MAX)) bitmap_and(riscv_isa, riscv_isa, this_isa, RISCV_ISA_EXT_MAX); else