From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhLJr-0006rM-Kl for qemu-devel@nongnu.org; Mon, 05 May 2014 12:00:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WhLJk-0000lE-Uw for qemu-devel@nongnu.org; Mon, 05 May 2014 12:00:43 -0400 Received: from mail-ob0-x22f.google.com ([2607:f8b0:4003:c01::22f]:45123) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhLJk-0000l2-HW for qemu-devel@nongnu.org; Mon, 05 May 2014 12:00:36 -0400 Received: by mail-ob0-f175.google.com with SMTP id wp4so8689220obc.34 for ; Mon, 05 May 2014 09:00:36 -0700 (PDT) From: Rob Herring Date: Mon, 5 May 2014 11:00:18 -0500 Message-Id: <1399305623-22016-3-git-send-email-robherring2@gmail.com> In-Reply-To: <1399305623-22016-1-git-send-email-robherring2@gmail.com> References: <1399305623-22016-1-git-send-email-robherring2@gmail.com> Subject: [Qemu-devel] [PATCH 2/7] target-arm: add powered off cpu state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Rob Herring , qemu-devel@nongnu.org, Christoffer Dall From: Rob Herring Add tracking of cpu power state in order to support powering off of cores in system emuluation. The initial state is determined by the start-powered-off QOM property. Signed-off-by: Rob Herring --- target-arm/cpu-qom.h | 1 + target-arm/cpu.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/target-arm/cpu-qom.h b/target-arm/cpu-qom.h index edc7f26..8ccb227 100644 --- a/target-arm/cpu-qom.h +++ b/target-arm/cpu-qom.h @@ -96,6 +96,7 @@ typedef struct ARMCPU { /* Should CPU start in PSCI powered-off state? */ bool start_powered_off; + bool powered_off; /* [QEMU_]KVM_ARM_TARGET_* constant for this CPU, or * QEMU_KVM_ARM_TARGET_NONE if the kernel doesn't support this CPU type. diff --git a/target-arm/cpu.c b/target-arm/cpu.c index c0ddc3e..03c025b 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -39,7 +39,9 @@ static void arm_cpu_set_pc(CPUState *cs, vaddr value) static bool arm_cpu_has_work(CPUState *cs) { - return cs->interrupt_request & + ARMCPU *cpu = ARM_CPU(cs); + + return !cpu->powered_off && cs->interrupt_request & (CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB); } @@ -90,6 +92,9 @@ static void arm_cpu_reset(CPUState *s) env->vfp.xregs[ARM_VFP_MVFR1] = cpu->mvfr1; env->vfp.xregs[ARM_VFP_MVFR2] = cpu->mvfr2; + cpu->powered_off = cpu->start_powered_off; + s->halted = cpu->start_powered_off; + if (arm_feature(env, ARM_FEATURE_IWMMXT)) { env->iwmmxt.cregs[ARM_IWMMXT_wCID] = 0x69051000 | 'Q'; } -- 1.9.1