[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 2/4] target-arm: Support coprocessor register
From: |
Edgar E. Iglesias |
Subject: |
Re: [Qemu-devel] [PATCH v2 2/4] target-arm: Support coprocessor registers which do I/O |
Date: |
Wed, 14 Aug 2013 07:20:36 +0200 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Fri, Aug 09, 2013 at 05:17:58PM +0100, Peter Maydell wrote:
> Add an ARM_CP_IO flag which an ARMCPRegInfo definition can use to
> indicate that the register's implementation does I/O and thus
> its accesses need to be surrounded by gen_io_start()/gen_io_end()
> in order for icount to work. Most notably, cp registers which
> implement clocks or timers need this.
Good timing, I was just looking for this kind of mechanism... :)
Reviewed-by: Edgar E. Iglesias <address@hidden>
>
> Signed-off-by: Peter Maydell <address@hidden>
> Tested-by: Laurent Desnogues <address@hidden>
> ---
> target-arm/cpu.h | 6 +++++-
> target-arm/translate.c | 16 +++++++++++++---
> 2 files changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/target-arm/cpu.h b/target-arm/cpu.h
> index b2dc494..770a240 100644
> --- a/target-arm/cpu.h
> +++ b/target-arm/cpu.h
> @@ -469,6 +469,9 @@ static inline uint64_t cpreg_to_kvm_id(uint32_t cpregid)
> * old must have the OVERRIDE bit set.
> * NO_MIGRATE indicates that this register should be ignored for migration;
> * (eg because any state is accessed via some other coprocessor register).
> + * IO indicates that this register does I/O and therefore its accesses
> + * need to be surrounded by gen_io_start()/gen_io_end(). In particular,
> + * registers which implement clocks or timers require this.
> */
> #define ARM_CP_SPECIAL 1
> #define ARM_CP_CONST 2
> @@ -476,13 +479,14 @@ static inline uint64_t cpreg_to_kvm_id(uint32_t cpregid)
> #define ARM_CP_SUPPRESS_TB_END 8
> #define ARM_CP_OVERRIDE 16
> #define ARM_CP_NO_MIGRATE 32
> +#define ARM_CP_IO 64
> #define ARM_CP_NOP (ARM_CP_SPECIAL | (1 << 8))
> #define ARM_CP_WFI (ARM_CP_SPECIAL | (2 << 8))
> #define ARM_LAST_SPECIAL ARM_CP_WFI
> /* Used only as a terminator for ARMCPRegInfo lists */
> #define ARM_CP_SENTINEL 0xffff
> /* Mask of only the flag bits in a type field */
> -#define ARM_CP_FLAG_MASK 0x3f
> +#define ARM_CP_FLAG_MASK 0x7f
>
> /* Return true if cptype is a valid type field. This is used to try to
> * catch errors where the sentinel has been accidentally left off the end
> diff --git a/target-arm/translate.c b/target-arm/translate.c
> index 6db4c50..d1e8538 100644
> --- a/target-arm/translate.c
> +++ b/target-arm/translate.c
> @@ -6280,6 +6280,10 @@ static int disas_coproc_insn(CPUARMState * env,
> DisasContext *s, uint32_t insn)
> break;
> }
>
> + if (use_icount && (ri->type & ARM_CP_IO)) {
> + gen_io_start();
> + }
> +
> if (isread) {
> /* Read */
> if (is64) {
> @@ -6369,14 +6373,20 @@ static int disas_coproc_insn(CPUARMState * env,
> DisasContext *s, uint32_t insn)
> store_cpu_offset(tmp, ri->fieldoffset);
> }
> }
> + }
> +
> + if (use_icount && (ri->type & ARM_CP_IO)) {
> + /* I/O operations must end the TB here (whether read or write) */
> + gen_io_end();
> + gen_lookup_tb(s);
> + } else if (!isread && !(ri->type & ARM_CP_SUPPRESS_TB_END)) {
> /* We default to ending the TB on a coprocessor register write,
> * but allow this to be suppressed by the register definition
> * (usually only necessary to work around guest bugs).
> */
> - if (!(ri->type & ARM_CP_SUPPRESS_TB_END)) {
> - gen_lookup_tb(s);
> - }
> + gen_lookup_tb(s);
> }
> +
> return 0;
> }
>
> --
> 1.7.9.5
>
>
- [Qemu-devel] [PATCH v2 0/4] target-arm: Implement support for generic timers, Peter Maydell, 2013/08/09
- [Qemu-devel] [PATCH v2 4/4] hw/cpu/a15mpcore: Wire generic timer outputs to GIC inputs, Peter Maydell, 2013/08/09
- [Qemu-devel] [PATCH v2 1/4] target-arm: Allow raw_read() and raw_write() to handle 64 bit regs, Peter Maydell, 2013/08/09
- [Qemu-devel] [PATCH v2 2/4] target-arm: Support coprocessor registers which do I/O, Peter Maydell, 2013/08/09
- Re: [Qemu-devel] [PATCH v2 2/4] target-arm: Support coprocessor registers which do I/O,
Edgar E. Iglesias <=
- [Qemu-devel] [PATCH v2 3/4] target-arm: Implement the generic timer, Peter Maydell, 2013/08/09
- Re: [Qemu-devel] [PATCH v2 0/4] target-arm: Implement support for generic timers, Peter Maydell, 2013/08/20