From patchwork Tue Aug 22 13:56:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13360866 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D65BEEE49AA for ; Tue, 22 Aug 2023 14:04:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6C331280020; Tue, 22 Aug 2023 10:04:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6734528001C; Tue, 22 Aug 2023 10:04:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 513DC280020; Tue, 22 Aug 2023 10:04:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 41EFC28001C for ; Tue, 22 Aug 2023 10:04:46 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 069BB1C924C for ; Tue, 22 Aug 2023 14:04:46 +0000 (UTC) X-FDA: 81151911372.07.30E7107 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf25.hostedemail.com (Postfix) with ESMTP id D0F80A0018 for ; Tue, 22 Aug 2023 14:04:43 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=PVf4F+5e; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692713083; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=UdUe/7o7abJT5BqbT0XR+lhA0UzLWbJEWS7DcJ5Gy0c=; b=6twbMDYmqwvfK2xE19I6sWDg5c+GckXVVMXQNykEk1oYwblVdjL/7lSUSVIgwOBHvW3PNy //SIaHMdmJllhDV7wUEhJhWpaKCu7uhp/l7qBuhEj4ERrpVzTe2MUSGRNQ0qh0iCGLJNCf mv6npAeKu6nzvYTVODCCqp+rjPodkyE= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=PVf4F+5e; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692713083; a=rsa-sha256; cv=none; b=glV12boM5K94cK6yXIYAgGQpYjj6wyZ+DfC6uplAqO5W4PpzkCKROVR3aTrad86uZbNqsL apzl4l4EsESnSfNMblJgNN6E/d3xo7xO+vh/jCS8YXRXH5HWUTXMjvFrkrTdP/Tkbx34/X gmunIjxXO1qRiIhUVeQQ97NddfkdWkw= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 236A965715; Tue, 22 Aug 2023 14:04:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9805AC43397; Tue, 22 Aug 2023 14:04:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692713082; bh=ggfCgbEg0UE7JP5CH6e+dKjRf0SerXD/ltcRHcZOEeI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=PVf4F+5e6t8UUn6GXDHZi9BvZRw+m0vJxxlC91Y+yBnT+DenVPfSgbW/1w8vHEcs5 hq5ngEXwckWY9oCWklaJVn+Cz4i+Hb7Pb+HyOeHTVt0p18dbb8XuCuzDwxXCZAtlzb 6p1/o8hbt7SE6/a+cd+ZYSZ7AUK1JhjB+an4crDxKNtg44IrCJwF1p3grdQvpPlXAk vZufltGG8aXY+z6av+xoWDvTN0kQEFsRuzILLsd9n6BZ9MRGZCGpRDs6hw6fJtgh/6 zfEtJxsOevzv4ydSNFeqpobaM9tniDA/fgC4nwIQR2PHG9Gjp8h/mXJms1judgWcy9 8RJQK2shpfIbw== From: Mark Brown Date: Tue, 22 Aug 2023 14:56:49 +0100 Subject: [PATCH v5 16/37] arm64/hwcap: Add hwcap for GCS MIME-Version: 1.0 Message-Id: <20230822-arm64-gcs-v5-16-9ef181dd6324@kernel.org> References: <20230822-arm64-gcs-v5-0-9ef181dd6324@kernel.org> In-Reply-To: <20230822-arm64-gcs-v5-0-9ef181dd6324@kernel.org> To: Catalin Marinas , Will Deacon , Jonathan Corbet , Andrew Morton , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Arnd Bergmann , Oleg Nesterov , Eric Biederman , Kees Cook , Shuah Khan , "Rick P. Edgecombe" , Deepak Gupta , Ard Biesheuvel , Szabolcs Nagy Cc: "H.J. Lu" , Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, kvmarm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Mark Brown X-Mailer: b4 0.13-dev-034f2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3001; i=broonie@kernel.org; h=from:subject:message-id; bh=ggfCgbEg0UE7JP5CH6e+dKjRf0SerXD/ltcRHcZOEeI=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBk5L/88D0+8mIFj/SJZ4PZzOsz1BzhGTXwEx55mTve 3j6LrUWJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZOS//AAKCRAk1otyXVSH0HYlB/ 9t7R1TANYsl4wXEHzWtNfhLanvzKzswgGvwqg5bmQhyHDwPtTqc5hckjtVPt/f/LJVr51CdGDI94sS r2Uaf6n5U2WmuiCip2sf324ojSqnqEESvqIhMOY+5esBYRf1GJnRB6BkVcnhvSltvVhJgkSoTqYdhI pbUOisNhR7+G5i9CsyNGMmD2Jplfn3F0Vw4XUr1Vgex0v4DRUf28aXbXv5QHQw/x+qQ4gNUpN5Px9L EWv/4VLtx4ndzg7vkWSi0+7g0OVmIVBWaEsRf9SIwRwiKq7tMIPmUgvZN9JUt19+Sqag4U1ZfuO3lC V4niGItNSjXw/mwDDx7oU2HQZ8Fde9 X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Rspamd-Queue-Id: D0F80A0018 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: atxuf9jqjxuuqpe7hioqtg8bot4stri4 X-HE-Tag: 1692713083-13256 X-HE-Meta: U2FsdGVkX1/OPBPA7bMdVCtvCCmBAobuiDgYX5dZkMzOHqmiIK/gRMxvoeCV4DO3Od+57/QhUkYjQ27lejMvCFnrZmhdIlYIOcgtB+vYC/ojVhpp9naCcA7czpSN5p3NKK6axtU4f0iUwpaQ34NRX8TC5q/KiURTz8iU4qsQ/4Uyf9PpgJ4JFSf6pDzysI7C7VjF7rBt11twEqASmLxD6OBRN0nl2kyb2Wpv8VJcX4EFN8mE++2aKYLgfRNlFX7C0BMe/qDwm4DUs8q+UotgrY5L4pwvW3t6ZV7CSknGDRKT6L/6dAMm8eK/14iL9LA9N0QMR1Ujf8wpPnILJNJQLxe1v8NBynWZaGN3gBDUuyDyso9sDFMoLdwSONlckhQVwxAowEy7NVIoNu1+9P4PcuMs+Y6NyOmm4zci3W4LIiJLiofmfyNAM24WvCyvk00sKJAxZ2yNhjxtP/HhabMqTWWBsrDwK8bGGFHjNQM9GTqr2+zdRL/zUGB0XTneAFMXek1b34L24LgzPgveaiwmnCGAsYZvV1BVDV7VD7XmxTOccP8cWNw4VQOsJbzX9pke4BS0iFVdHd3dswFGHb9s4AQsEpNSK7S3uzwaiADypWvroTopWK1oTt/E3m512WBmO29s7pw177OWM+aEMaUxJ/qcwvMkLEuRF2vvNmm4Xa4XMaKMxU+7BKY0ZUGzzQYw+zY+5+sOlr+ERvPnd9U6SSv2ie9QgYT1lm9Pz2FBpsPn7phlYJaKoMDNlWbb0FO7YSOvtIoAmZrphfkUb/5lstj5Pq5qlqSXaTuvDIrDhLUpIF/kQeTQ5Xbe4aMys8lvac9gHgvO1R6WvqWtjNJzYDJVvrQ5ROP0g7frJT5SuIoX1StHVvBUeVFAz7YkSK+M8Mx3GTv6yZr2WWJwsxurVqJOuwgx74wF1WFKRMol0SG8f+65P+twMnuNknynjBqCBpV/yrCkTDj1tAwEEXE 6d/cUZNx CCx4JSiQDuKggdYcmtQixdoaxa7ocECmOHlOpJTExfV0jd3HXO2jKX5H00TSairOeBCe9ofMYBnGNA8YtM7vGSAc6JoQYOFxOAJBU8aY8POJjPbzXquU/7pAAwAudkyTsJ1oxiokXHtxOs42KULSjSljxo83YneYsWch3mzhV6ygWJfwjIys6AmG0M+Bo1F2w2+FxAdysTHw/IDyU4CLy5uXPNKzlh2fcT+zgd/xnuA5CwoZNXkWsyrCgIkTkLDq1W5Ssc3W8Vr1mT6CwzELuoXZcgLJCo17SwlcdL48pfhpmOuLgJ6CNntNOOcWUgXK4volnQC283YeXVWTqVj1DzjqO+llwvWQr04d+nkCxu1saADKIfonto6LGRHFZvGIkXuEaXB832EhYJ2GVaYsJpUoS28xkMdkaC6ucR0nAUyeh9kc= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Provide a hwcap to enable userspace to detect support for GCS. Signed-off-by: Mark Brown --- Documentation/arch/arm64/elf_hwcaps.rst | 3 +++ arch/arm64/include/asm/hwcap.h | 1 + arch/arm64/include/uapi/asm/hwcap.h | 1 + arch/arm64/kernel/cpufeature.c | 3 +++ arch/arm64/kernel/cpuinfo.c | 1 + 5 files changed, 9 insertions(+) diff --git a/Documentation/arch/arm64/elf_hwcaps.rst b/Documentation/arch/arm64/elf_hwcaps.rst index 8c8addb4194c..75f3960cad39 100644 --- a/Documentation/arch/arm64/elf_hwcaps.rst +++ b/Documentation/arch/arm64/elf_hwcaps.rst @@ -305,6 +305,9 @@ HWCAP2_SMEF16F16 HWCAP2_MOPS Functionality implied by ID_AA64ISAR2_EL1.MOPS == 0b0001. +HWCAP2_GCS + Functionality implied by ID_AA64PFR1_EL1.GCS == 0b1 + 4. Unused AT_HWCAP bits ----------------------- diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h index 692b1ec663b2..39f397a2b5b2 100644 --- a/arch/arm64/include/asm/hwcap.h +++ b/arch/arm64/include/asm/hwcap.h @@ -138,6 +138,7 @@ #define KERNEL_HWCAP_SME_B16B16 __khwcap2_feature(SME_B16B16) #define KERNEL_HWCAP_SME_F16F16 __khwcap2_feature(SME_F16F16) #define KERNEL_HWCAP_MOPS __khwcap2_feature(MOPS) +#define KERNEL_HWCAP_GCS __khwcap2_feature(GCS) /* * This yields a mask that user programs can use to figure out what diff --git a/arch/arm64/include/uapi/asm/hwcap.h b/arch/arm64/include/uapi/asm/hwcap.h index a2cac4305b1e..7510c35e6864 100644 --- a/arch/arm64/include/uapi/asm/hwcap.h +++ b/arch/arm64/include/uapi/asm/hwcap.h @@ -103,5 +103,6 @@ #define HWCAP2_SME_B16B16 (1UL << 41) #define HWCAP2_SME_F16F16 (1UL << 42) #define HWCAP2_MOPS (1UL << 43) +#define HWCAP2_GCS (1UL << 44) #endif /* _UAPI__ASM_HWCAP_H */ diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 91a14a6ccb04..7b46e01140c4 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -2840,6 +2840,9 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = { HWCAP_CAP(ID_AA64ZFR0_EL1, I8MM, IMP, CAP_HWCAP, KERNEL_HWCAP_SVEI8MM), HWCAP_CAP(ID_AA64ZFR0_EL1, F32MM, IMP, CAP_HWCAP, KERNEL_HWCAP_SVEF32MM), HWCAP_CAP(ID_AA64ZFR0_EL1, F64MM, IMP, CAP_HWCAP, KERNEL_HWCAP_SVEF64MM), +#endif +#ifdef CONFIG_ARM64_GCS + HWCAP_CAP(ID_AA64PFR1_EL1, GCS, IMP, CAP_HWCAP, KERNEL_HWCAP_GCS), #endif HWCAP_CAP(ID_AA64PFR1_EL1, SSBS, SSBS2, CAP_HWCAP, KERNEL_HWCAP_SSBS), #ifdef CONFIG_ARM64_BTI diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index 58622dc85917..451fbbeffa39 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -126,6 +126,7 @@ static const char *const hwcap_str[] = { [KERNEL_HWCAP_SME_B16B16] = "smeb16b16", [KERNEL_HWCAP_SME_F16F16] = "smef16f16", [KERNEL_HWCAP_MOPS] = "mops", + [KERNEL_HWCAP_GCS] = "gcs", }; #ifdef CONFIG_COMPAT