On Wed, 9 Aug 2023 at 13:37, Jean-Philippe Brucker
<jean-philippe@linaro.org> wrote:
>
> A few patches to fix RME support and allow booting a realm guest, based
> on "[PATCH v2 00/15] target/arm/ptw: Cleanups and a few bugfixes"
> https://lore.kernel.org/all/20230807141514.19075-1-peter.maydell@linaro.org/
>
> Since v2:
>
> * Updated the comment in patch 5. I also removed the check for FEAT_RME,
> because as pointed out in "target/arm: Catch illegal-exception-return
> from EL3 with bad NSE/NS", the SCR_NSE bit can only be set with
> FEAT_RME enabled. Because of this additional change, I didn't add the
> Reviewed-by.
>
> * Added an EL-change hook to patch 6, to update the timer IRQ
> when changing the security state. I was wondering whether the
> el_change function should filter security state changes, since we only
> need to update IRQ state when switching between Root and
> Secure/NonSecure. But with a small syscall benchmark exercising
> EL0-EL1 switch with FEAT_RME enabled, I couldn't see any difference
> with and without the el_change hook, so I kept it simple.
>
> * Also added the .raw_write callback for CNTHCTL_EL2.
>
> v2: https://lore.kernel.org/all/20230802170157.401491-1-jean-philippe@linaro.org/
This didn't build for the linux-user targets. I squashed
this into patch 6:
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 7df1f7600b1..d906d2b1caa 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -2169,9 +2169,11 @@ static void arm_cpu_realizefn(DeviceState *dev,
Error **errp)
set_feature(env, ARM_FEATURE_VBAR);
}
- if (cpu_isar_feature(aa64_rme, cpu)) {
+#ifndef CONFIG_USER_ONLY
+ if (tcg_enabled() && cpu_isar_feature(aa64_rme, cpu)) {
arm_register_el_change_hook(cpu, >_rme_post_el_change, 0);
}
+#endif
register_cp_regs_for_features(cpu);
arm_cpu_register_gdb_regs_for_features(cpu);
With that, I've applied the series to target-arm-for-8.2.
thanks
-- PMM