[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [RFC v4 16/71] arm: convert to cpu_halted
From: |
Alex Bennée |
Subject: |
Re: [Qemu-devel] [RFC v4 16/71] arm: convert to cpu_halted |
Date: |
Wed, 31 Oct 2018 12:15:17 +0000 |
User-agent: |
mu4e 1.1.0; emacs 26.1.50 |
Emilio G. Cota <address@hidden> writes:
> Cc: Andrzej Zaborowski <address@hidden>
> Cc: Peter Maydell <address@hidden>
> Cc: address@hidden
> Reviewed-by: Richard Henderson <address@hidden>
> Signed-off-by: Emilio G. Cota <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
> ---
> hw/arm/omap1.c | 4 ++--
> hw/arm/pxa2xx_gpio.c | 2 +-
> hw/arm/pxa2xx_pic.c | 2 +-
> target/arm/arm-powerctl.c | 4 ++--
> target/arm/cpu.c | 2 +-
> target/arm/op_helper.c | 2 +-
> 6 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
> index 539d29ef9c..55a7672976 100644
> --- a/hw/arm/omap1.c
> +++ b/hw/arm/omap1.c
> @@ -1769,7 +1769,7 @@ static uint64_t omap_clkdsp_read(void *opaque, hwaddr
> addr,
> case 0x18: /* DSP_SYSST */
> cpu = CPU(s->cpu);
> return (s->clkm.clocking_scheme << 11) | s->clkm.cold_start |
> - (cpu->halted << 6); /* Quite useless... */
> + (cpu_halted(cpu) << 6); /* Quite useless... */
> }
>
> OMAP_BAD_REG(addr);
> @@ -3790,7 +3790,7 @@ void omap_mpu_wakeup(void *opaque, int irq, int req)
> struct omap_mpu_state_s *mpu = (struct omap_mpu_state_s *) opaque;
> CPUState *cpu = CPU(mpu->cpu);
>
> - if (cpu->halted) {
> + if (cpu_halted(cpu)) {
> cpu_interrupt(cpu, CPU_INTERRUPT_EXITTB);
> }
> }
> diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c
> index e15070188e..5c3fea42e9 100644
> --- a/hw/arm/pxa2xx_gpio.c
> +++ b/hw/arm/pxa2xx_gpio.c
> @@ -128,7 +128,7 @@ static void pxa2xx_gpio_set(void *opaque, int line, int
> level)
> pxa2xx_gpio_irq_update(s);
>
> /* Wake-up GPIOs */
> - if (cpu->halted && (mask & ~s->dir[bank] & pxa2xx_gpio_wake[bank])) {
> + if (cpu_halted(cpu) && (mask & ~s->dir[bank] & pxa2xx_gpio_wake[bank])) {
> cpu_interrupt(cpu, CPU_INTERRUPT_EXITTB);
> }
> }
> diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c
> index 61275fa040..46ab4c3fc2 100644
> --- a/hw/arm/pxa2xx_pic.c
> +++ b/hw/arm/pxa2xx_pic.c
> @@ -58,7 +58,7 @@ static void pxa2xx_pic_update(void *opaque)
> PXA2xxPICState *s = (PXA2xxPICState *) opaque;
> CPUState *cpu = CPU(s->cpu);
>
> - if (cpu->halted) {
> + if (cpu_halted(cpu)) {
> mask[0] = s->int_pending[0] & (s->int_enabled[0] | s->int_idle);
> mask[1] = s->int_pending[1] & (s->int_enabled[1] | s->int_idle);
> if (mask[0] || mask[1]) {
> diff --git a/target/arm/arm-powerctl.c b/target/arm/arm-powerctl.c
> index ce55eeb682..e4477444fc 100644
> --- a/target/arm/arm-powerctl.c
> +++ b/target/arm/arm-powerctl.c
> @@ -64,7 +64,7 @@ static void arm_set_cpu_on_async_work(CPUState
> *target_cpu_state,
>
> /* Initialize the cpu we are turning on */
> cpu_reset(target_cpu_state);
> - target_cpu_state->halted = 0;
> + cpu_halted_set(target_cpu_state, 0);
>
> if (info->target_aa64) {
> if ((info->target_el < 3) && arm_feature(&target_cpu->env,
> @@ -228,7 +228,7 @@ static void arm_set_cpu_off_async_work(CPUState
> *target_cpu_state,
>
> assert(qemu_mutex_iothread_locked());
> target_cpu->power_state = PSCI_OFF;
> - target_cpu_state->halted = 1;
> + cpu_halted_set(target_cpu_state, 1);
> target_cpu_state->exception_index = EXCP_HLT;
> }
>
> diff --git a/target/arm/cpu.c b/target/arm/cpu.c
> index b5e61cc177..9c5cda8eb7 100644
> --- a/target/arm/cpu.c
> +++ b/target/arm/cpu.c
> @@ -149,7 +149,7 @@ static void arm_cpu_reset(CPUState *s)
> env->vfp.xregs[ARM_VFP_MVFR2] = cpu->mvfr2;
>
> cpu->power_state = cpu->start_powered_off ? PSCI_OFF : PSCI_ON;
> - s->halted = cpu->start_powered_off;
> + cpu_halted_set(s, cpu->start_powered_off);
>
> if (arm_feature(env, ARM_FEATURE_IWMMXT)) {
> env->iwmmxt.cregs[ARM_IWMMXT_wCID] = 0x69051000 | 'Q';
> diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c
> index fb15a13e6c..8e393823f8 100644
> --- a/target/arm/op_helper.c
> +++ b/target/arm/op_helper.c
> @@ -465,7 +465,7 @@ void HELPER(wfi)(CPUARMState *env, uint32_t insn_len)
> }
>
> cs->exception_index = EXCP_HLT;
> - cs->halted = 1;
> + cpu_halted_set(cs, 1);
> cpu_loop_exit(cs);
> }
--
Alex Bennée
- Re: [Qemu-devel] [RFC v4 61/71] mips: convert to cpu_has_work_with_iothread_lock, (continued)
- [Qemu-devel] [RFC v4 65/71] xtensa: convert to cpu_has_work_with_iothread_lock, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 64/71] sparc: convert to cpu_has_work_with_iothread_lock, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 69/71] cputlb: queue async flush jobs without the BQL, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 50/71] s390x: convert to cpu_interrupt_request, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 62/71] s390x: convert to cpu_has_work_with_iothread_lock, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 16/71] arm: convert to cpu_halted, Emilio G. Cota, 2018/10/25
- Re: [Qemu-devel] [RFC v4 16/71] arm: convert to cpu_halted,
Alex Bennée <=
- [Qemu-devel] [RFC v4 60/71] ppc: convert to cpu_has_work_with_iothread_lock, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 36/71] arm: convert to cpu_interrupt_request, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 68/71] cpu: add async_run_on_cpu_no_bql, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 63/71] riscv: convert to cpu_has_work_with_iothread_lock, Emilio G. Cota, 2018/10/25
- [Qemu-devel] [RFC v4 52/71] moxie: convert to cpu_interrupt_request, Emilio G. Cota, 2018/10/25