Revert "ANDROID: arm64: Forcefully disable SME at runtime"

This reverts commit f9736c87fa.

SME is ready to rock 'n' roll. Let it rip!

Bug: 393087661
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I0c537b1cb118f8eb6b408df79d4666fbfcfa4ea3
This commit is contained in:
Will Deacon
2025-05-08 16:21:08 +01:00
parent 0aaf2786fa
commit 84849bc819

View File

@@ -399,17 +399,6 @@ void __init init_feature_override(u64 boot_status, const void *fdt,
parse_cmdline(fdt, chosen);
/*
* ANDROID: Forcefully disable SME at runtime until it is fixed
* upstream (b/393087661). We prefer this to disabling
* CONFIG_ARM64_SME so that the impact of the fixes on KMI is
* minimised.
*/
id_aa64pfr1_override.mask |= ID_AA64PFR1_EL1_SME;
id_aa64pfr1_override.val &= ~ID_AA64PFR1_EL1_SME;
id_aa64smfr0_override.mask = GENMASK(63, 0);
id_aa64smfr0_override.val = 0;
for (i = 0; i < ARRAY_SIZE(regs); i++) {
reg = prel64_pointer(regs[i].reg);
override = prel64_pointer(reg->override);