From patchwork Thu Aug 22 15:10:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 13773681 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 4984AC3DA4A for ; Thu, 22 Aug 2024 15:12:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D40EF6B0154; Thu, 22 Aug 2024 11:12:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CF0198001E; Thu, 22 Aug 2024 11:12:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B6AD36B02F2; Thu, 22 Aug 2024 11:12:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 986D56B0154 for ; Thu, 22 Aug 2024 11:12:14 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5575641837 for ; Thu, 22 Aug 2024 15:12:14 +0000 (UTC) X-FDA: 82480222188.06.DD959BC Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf18.hostedemail.com (Postfix) with ESMTP id B1D671C0008 for ; Thu, 22 Aug 2024 15:12:12 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf18.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724339473; a=rsa-sha256; cv=none; b=jrHCwrue6JCXYT/HC2I5VAO3ewGURcLls8nLTkI/5cU6pkvqMZfVKmWgpLmBkgQUYkdlFr vnhgUfQhHzyrcwr+EzTyvceGPlhuYmoYTJ51PHd9pvyKVRzmQ99EBTY6j3khjdoPqasJdY 51ohqytorxHh2LZ7ndHxMRbDjE5o2FI= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf18.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724339473; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uaX6trArFeDfzKeMq11RpmT+ufgxQad5zCSBp11VlPc=; b=zR2fJstxdCMIw5tjaJBS0egMJL9UZalB9Ss1/tvToqYudiCQ10pxQPnyDFfvOx9BorUVkQ 6MaR8X66lGv3dztnq2H286oQsYjaziRhUKq+e/ylm6Qa8eRVUbpc0Apv0fogxgpvWKC++A epXhOFM28cBtoXoIsowxYQZab5j7nwM= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id DAB8B1576; Thu, 22 Aug 2024 08:12:37 -0700 (PDT) Received: from e124191.cambridge.arm.com (e124191.cambridge.arm.com [10.1.197.45]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BC5FA3F58B; Thu, 22 Aug 2024 08:12:07 -0700 (PDT) From: Joey Gouly To: linux-arm-kernel@lists.infradead.org Cc: nd@arm.com, akpm@linux-foundation.org, aneesh.kumar@kernel.org, aneesh.kumar@linux.ibm.com, anshuman.khandual@arm.com, bp@alien8.de, broonie@kernel.org, catalin.marinas@arm.com, christophe.leroy@csgroup.eu, dave.hansen@linux.intel.com, hpa@zytor.com, joey.gouly@arm.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, maz@kernel.org, mingo@redhat.com, mpe@ellerman.id.au, naveen.n.rao@linux.ibm.com, npiggin@gmail.com, oliver.upton@linux.dev, shuah@kernel.org, skhan@linuxfoundation.org, szabolcs.nagy@arm.com, tglx@linutronix.de, will@kernel.org, x86@kernel.org, kvmarm@lists.linux.dev, linux-kselftest@vger.kernel.org Subject: [PATCH v5 11/30] arm64: enable the Permission Overlay Extension for EL0 Date: Thu, 22 Aug 2024 16:10:54 +0100 Message-Id: <20240822151113.1479789-12-joey.gouly@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240822151113.1479789-1-joey.gouly@arm.com> References: <20240822151113.1479789-1-joey.gouly@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: B1D671C0008 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: s9awuhptgzitazg7kd8wn1hhwmzxawj3 X-HE-Tag: 1724339532-925052 X-HE-Meta: U2FsdGVkX182IPv0kvF2/oRcVsLkElBVWjPdzFyqU0/ELAnwEeLoiCNwc23jdTYq/FJC7odjRZXxI092aE55v9030i7WDe6eBb713eXuKtwGg1AQnZuYZgg5fveTLNKwSc06e/nxXf9PJQiWZ6qYtWOI7zsY3+8SVkFYfi4ZHVROlIJfUuQ7z4843oo/6yNo8jld90SzOMl2uWjvdJS3mmEsaAq3VwN1mE+1PT81bf31KH9vSNOJFp7z2va2bHmsB/oUURNlHYCJoBEehL/CdCMKVFeSv6OOO38v+ddKTGfcSSQ+lGMIheU9Rkln2cbMnh2OPzrH6PIeteoxFrdHtQGI8qwNS7t67Z86gfpLDI2HYrnYzjmE31pr5k1wcWp+byhwokekf4TOyt0w/kPUOsefDcVyLNnUmL8R2CjUotSzUraxAmvgDFYrdnS8HdticBDrfb6c5RPSX7L6RkI7wFxKRRzCg2cdxtOSadB2NzfinvLyYvzxD1QczbelL6aYQZLIIjO5An1ISiqlPhMIT0Iw0gKjOGI5z8ffJ0zO2mPU10HslcI+JTQHY+vfN+mceY57vsPSST+suz16KJBRX3AIRj87kWI6Vxix7yzxF29AvFpU0+6CAEAKkylByJzX2LZE1joC/wozF/QB3v2dlFgqH9dlCHVVHfBs2DzxhB24dkjzSN7hyNo3ltp5di4WD+cfeoFbhiPiFghGsnpoYpBiYuaS9Z/nUbXvCeEeVXMivt0p941jgWESCjhGryHhBaqaxFDQ4B+kblcoYhE4FIyq07EScz8nkPq8J1iokZ3Z+qe1wDQ1wdCEV5uYhE6BC1HKn5tBAayjiXkPQKKDjyPdCfKX3iOXTdNW1+/DT9wxO/30COsATgQh40wYiPouPieDSt9qsR9gcBemDwSNrQldWyZ/+ODcjySuAkb43qd4xRjwdg4IiuzXWHShSC7ZH3qpkWXsD/SI+7adlkW d1SyT2hq iw6OOi6nHRmBVjxBmlDGR+ALiJow9S6pzXAyjYacjHb1yE4AHbAREX5CUYSqARySyd9M/++j0wqCG6vNIvIacoBwz3FtK0od5K9cnr8ZpQlMQZ2FYYeRiAxE9Gx6HM6qsiAByT7lD09CWzMlxsId8ZJhtq5hTFrE5ItqOtpHgkGDfXKUynWdSrXq0ykAhnrHI+qpugUb0IF2JRhNqadNVuo+Sog== 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: List-Subscribe: List-Unsubscribe: Expose a HWCAP and ID_AA64MMFR3_EL1_S1POE to userspace, so they can be used to check if the CPU supports the feature. Signed-off-by: Joey Gouly Cc: Catalin Marinas Cc: Will Deacon Reviewed-by: Catalin Marinas Reviewed-by: Anshuman Khandual --- Documentation/arch/arm64/elf_hwcaps.rst | 2 ++ arch/arm64/include/asm/hwcap.h | 1 + arch/arm64/include/uapi/asm/hwcap.h | 1 + arch/arm64/kernel/cpufeature.c | 14 ++++++++++++++ arch/arm64/kernel/cpuinfo.c | 1 + 5 files changed, 19 insertions(+) diff --git Documentation/arch/arm64/elf_hwcaps.rst Documentation/arch/arm64/elf_hwcaps.rst index 448c1664879b..694f67fa07d1 100644 --- Documentation/arch/arm64/elf_hwcaps.rst +++ Documentation/arch/arm64/elf_hwcaps.rst @@ -365,6 +365,8 @@ HWCAP2_SME_SF8DP2 HWCAP2_SME_SF8DP4 Functionality implied by ID_AA64SMFR0_EL1.SF8DP4 == 0b1. +HWCAP2_POE + Functionality implied by ID_AA64MMFR3_EL1.S1POE == 0b0001. 4. Unused AT_HWCAP bits ----------------------- diff --git arch/arm64/include/asm/hwcap.h arch/arm64/include/asm/hwcap.h index 4edd3b61df11..a775adddecf2 100644 --- arch/arm64/include/asm/hwcap.h +++ arch/arm64/include/asm/hwcap.h @@ -157,6 +157,7 @@ #define KERNEL_HWCAP_SME_SF8FMA __khwcap2_feature(SME_SF8FMA) #define KERNEL_HWCAP_SME_SF8DP4 __khwcap2_feature(SME_SF8DP4) #define KERNEL_HWCAP_SME_SF8DP2 __khwcap2_feature(SME_SF8DP2) +#define KERNEL_HWCAP_POE __khwcap2_feature(POE) /* * This yields a mask that user programs can use to figure out what diff --git arch/arm64/include/uapi/asm/hwcap.h arch/arm64/include/uapi/asm/hwcap.h index 285610e626f5..055381b2c615 100644 --- arch/arm64/include/uapi/asm/hwcap.h +++ arch/arm64/include/uapi/asm/hwcap.h @@ -122,5 +122,6 @@ #define HWCAP2_SME_SF8FMA (1UL << 60) #define HWCAP2_SME_SF8DP4 (1UL << 61) #define HWCAP2_SME_SF8DP2 (1UL << 62) +#define HWCAP2_POE (1UL << 63) #endif /* _UAPI__ASM_HWCAP_H */ diff --git arch/arm64/kernel/cpufeature.c arch/arm64/kernel/cpufeature.c index 2daf5597cd65..718728a85430 100644 --- arch/arm64/kernel/cpufeature.c +++ arch/arm64/kernel/cpufeature.c @@ -466,6 +466,8 @@ static const struct arm64_ftr_bits ftr_id_aa64mmfr2[] = { }; static const struct arm64_ftr_bits ftr_id_aa64mmfr3[] = { + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_POE), + FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR3_EL1_S1POE_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR3_EL1_S1PIE_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR3_EL1_TCRX_SHIFT, 4, 0), ARM64_FTR_END, @@ -2348,6 +2350,14 @@ static void cpu_enable_mops(const struct arm64_cpu_capabilities *__unused) sysreg_clear_set(sctlr_el1, 0, SCTLR_EL1_MSCEn); } +#ifdef CONFIG_ARM64_POE +static void cpu_enable_poe(const struct arm64_cpu_capabilities *__unused) +{ + sysreg_clear_set(REG_TCR2_EL1, 0, TCR2_EL1x_E0POE); + sysreg_clear_set(CPACR_EL1, 0, CPACR_ELx_E0POE); +} +#endif + /* Internal helper functions to match cpu capability type */ static bool cpucap_late_cpu_optional(const struct arm64_cpu_capabilities *cap) @@ -2876,6 +2886,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { .capability = ARM64_HAS_S1POE, .type = ARM64_CPUCAP_BOOT_CPU_FEATURE, .matches = has_cpuid_feature, + .cpu_enable = cpu_enable_poe, ARM64_CPUID_FIELDS(ID_AA64MMFR3_EL1, S1POE, IMP) }, #endif @@ -3043,6 +3054,9 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = { HWCAP_CAP(ID_AA64FPFR0_EL1, F8DP2, IMP, CAP_HWCAP, KERNEL_HWCAP_F8DP2), HWCAP_CAP(ID_AA64FPFR0_EL1, F8E4M3, IMP, CAP_HWCAP, KERNEL_HWCAP_F8E4M3), HWCAP_CAP(ID_AA64FPFR0_EL1, F8E5M2, IMP, CAP_HWCAP, KERNEL_HWCAP_F8E5M2), +#ifdef CONFIG_ARM64_POE + HWCAP_CAP(ID_AA64MMFR3_EL1, S1POE, IMP, CAP_HWCAP, KERNEL_HWCAP_POE), +#endif {}, }; diff --git arch/arm64/kernel/cpuinfo.c arch/arm64/kernel/cpuinfo.c index 09eeaa24d456..b9db812082b3 100644 --- arch/arm64/kernel/cpuinfo.c +++ arch/arm64/kernel/cpuinfo.c @@ -143,6 +143,7 @@ static const char *const hwcap_str[] = { [KERNEL_HWCAP_SME_SF8FMA] = "smesf8fma", [KERNEL_HWCAP_SME_SF8DP4] = "smesf8dp4", [KERNEL_HWCAP_SME_SF8DP2] = "smesf8dp2", + [KERNEL_HWCAP_POE] = "poe", }; #ifdef CONFIG_COMPAT