From 0139cbc2cd44cb0b9ccb0bb08a1617c23a1771a8 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Fri, 2 Mar 2018 12:59:38 -0500 Subject: [PATCH] target/arm/arm-powerctl: Fix psci info return values The power state spec section 5.1.5 AFFINITY_INFO defines the affinity info return values as 0 ON 1 OFF 2 ON_PENDING I grepped QEMU for power_state to ensure that no assumptions of OFF=0 were being made. Backports commit d5affb0d8677e1a8a8fe03fa25005b669e7cdc02 from qemu --- qemu/target/arm/cpu.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/qemu/target/arm/cpu.h b/qemu/target/arm/cpu.h index b25af15a..8cfc0083 100644 --- a/qemu/target/arm/cpu.h +++ b/qemu/target/arm/cpu.h @@ -532,6 +532,14 @@ typedef struct CPUARMState { */ typedef void ARMELChangeHook(ARMCPU *cpu, void *opaque); +/* These values map onto the return values for + * QEMU_PSCI_0_2_FN_AFFINITY_INFO */ +typedef enum ARMPSCIState { + PSCI_ON = 0, + PSCI_OFF = 1, + PSCI_ON_PENDING = 2 +} ARMPSCIState; + /** * ARMCPU: * @env: #CPUARMState