diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2022-02-24 13:31:31 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-02-24 13:31:31 +0000 |
| commit | 4a8cd274dd06bcad31890ba3632662917150c671 (patch) | |
| tree | 34e57ebcaaaeb3e33d400e577e8b623eef42d3be | |
| parent | d73755082669ff713e8174147e02ba6da41df76b (diff) | |
| download | qemu-arm-kvm-psci-version.tar.gz | |
debug junkkvm-psci-version
| -rw-r--r-- | hw/arm/boot.c | 2 | ||||
| -rw-r--r-- | target/arm/kvm64.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/hw/arm/boot.c b/hw/arm/boot.c index a47f38dfc9..78b0ea7482 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -492,9 +492,11 @@ static void fdt_add_psci_node(void *fdt) if (armcpu->psci_version < QEMU_PSCI_VERSION_1_0) { const char comp[] = "arm,psci-0.2\0arm,psci"; qemu_fdt_setprop(fdt, "/psci", "compatible", comp, sizeof(comp)); + printf("reporting psci in dtb as psci-0.2\n"); } else { const char comp[] = "arm,psci-1.0\0arm,psci-0.2\0arm,psci"; qemu_fdt_setprop(fdt, "/psci", "compatible", comp, sizeof(comp)); + printf("reporting psci in dtb as psci-1.0\n"); } cpu_off_fn = QEMU_PSCI_0_2_FN_CPU_OFF; diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index ccadfbbe72..84bbb64d24 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -867,6 +867,7 @@ int kvm_arch_init_vcpu(CPUState *cs) if (kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PSCI_0_2)) { cpu->psci_version = QEMU_PSCI_VERSION_0_2; cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_PSCI_0_2; + printf("KVM_CAP_ARM_PSCI_0_2 is present\n"); } if (!arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_EL1_32BIT; @@ -913,6 +914,7 @@ int kvm_arch_init_vcpu(CPUState *cs) * returns). */ if (!kvm_get_one_reg(cs, KVM_REG_ARM_PSCI_VERSION, &psciver)) { + printf("read KVM_REG_ARM_PSCI_VERSION as 0x%" PRIx64 "\n", psciver); cpu->psci_version = psciver; } |