From 70f979103e3b63f1ee0e7de5bc3055fd372e8da2 Mon Sep 17 00:00:00 2001 From: Nick Hudson Date: Fri, 17 Jul 2026 19:26:53 +0000 Subject: [PATCH 11/13] Expose GIC and QEMU_PSCI_VERSION_0_2 --- target/arm/nvmm/nvmm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/arm/nvmm/nvmm.c b/target/arm/nvmm/nvmm.c index 71572c2408..9228fe114f 100644 --- a/target/arm/nvmm/nvmm.c +++ b/target/arm/nvmm/nvmm.c @@ -1030,10 +1030,16 @@ nvmm_init_vcpu(CPUState *cpu) state->sprs[NVMM_AARCH64_SPR_MPIDR_EL1] = (1U << 31) | arm_cpu->mp_affinity; CPUArchState *env = &arm_cpu->env; +#if 0 uint64_t pfr = state->tids[NVMM_AARCH64_TID_ID_AA64PFR0_EL1]; + pfr &= ~ID_AA64PFR0_EL1_GIC; pfr |= __SHIFTIN(env->gicv3state ? 1 : 0, ID_AA64PFR0_EL1_GIC); state->tids[NVMM_AARCH64_TID_ID_AA64PFR0_EL1] = pfr; +#endif + + // ArmVirtQemu 202605 needs this + arm_cpu->psci_version = QEMU_PSCI_VERSION_0_2; /* We're limited to underlying hardware caps, override internal versions */ arm_cpu->isar.idregs[ID_AA64MMFR0_EL1_IDX] = state->tids[NVMM_AARCH64_TID_ID_AA64MMFR0_EL1]; -- 2.54.0 (Apple Git-157)