[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [PATCH 7/8] target/arm: Allow deliver_fault() caller to s
From: |
Edgar E. Iglesias |
Subject: |
Re: [Qemu-arm] [PATCH 7/8] target/arm: Allow deliver_fault() caller to specify EA bit |
Date: |
Sat, 5 Aug 2017 03:45:07 +0200 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
On Fri, Aug 04, 2017 at 06:20:48PM +0100, Peter Maydell wrote:
> For external aborts, we will want to be able to specify the EA
> (external abort type) bit in the syndrome field. Allow callers of
> deliver_fault() to do that by adding a field to ARMMMUFaultInfo which
> we use when constructing the syndrome values.
>
> Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
> ---
> target/arm/internals.h | 2 ++
> target/arm/op_helper.c | 10 +++++-----
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/target/arm/internals.h b/target/arm/internals.h
> index 1f6efef..a3adbd8 100644
> --- a/target/arm/internals.h
> +++ b/target/arm/internals.h
> @@ -448,12 +448,14 @@ void arm_handle_psci_call(ARMCPU *cpu);
> * @s2addr: Address that caused a fault at stage 2
> * @stage2: True if we faulted at stage 2
> * @s1ptw: True if we faulted at stage 2 while doing a stage 1 page-table
> walk
> + * @ea: True if we should set the EA (external abort type) bit in syndrome
> */
> typedef struct ARMMMUFaultInfo ARMMMUFaultInfo;
> struct ARMMMUFaultInfo {
> target_ulong s2addr;
> bool stage2;
> bool s1ptw;
> + bool ea;
> };
>
> /* Do a page table walk and add page to TLB if possible */
> diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c
> index aa52a98..7eac272 100644
> --- a/target/arm/op_helper.c
> +++ b/target/arm/op_helper.c
> @@ -80,7 +80,7 @@ uint32_t HELPER(neon_tbl)(CPUARMState *env, uint32_t ireg,
> uint32_t def,
>
> static inline uint32_t merge_syn_data_abort(uint32_t template_syn,
> unsigned int target_el,
> - bool same_el,
> + bool same_el, bool ea,
> bool s1ptw, bool is_write,
> int fsc)
> {
> @@ -99,7 +99,7 @@ static inline uint32_t merge_syn_data_abort(uint32_t
> template_syn,
> */
> if (!(template_syn & ARM_EL_ISV) || target_el != 2 || s1ptw) {
> syn = syn_data_abort_no_iss(same_el,
> - 0, 0, s1ptw, is_write, fsc);
> + ea, 0, s1ptw, is_write, fsc);
> } else {
> /* Fields: IL, ISV, SAS, SSE, SRT, SF and AR come from the template
> * syndrome created at translation time.
> @@ -107,7 +107,7 @@ static inline uint32_t merge_syn_data_abort(uint32_t
> template_syn,
> */
> syn = syn_data_abort_with_iss(same_el,
> 0, 0, 0, 0, 0,
> - 0, 0, s1ptw, is_write, fsc,
> + ea, 0, s1ptw, is_write, fsc,
> false);
> /* Merge the runtime syndrome with the template syndrome. */
> syn |= template_syn;
> @@ -141,11 +141,11 @@ static void deliver_fault(ARMCPU *cpu, vaddr addr,
> MMUAccessType access_type,
> }
>
> if (access_type == MMU_INST_FETCH) {
> - syn = syn_insn_abort(same_el, 0, fi->s1ptw, fsc);
> + syn = syn_insn_abort(same_el, fi->ea, fi->s1ptw, fsc);
> exc = EXCP_PREFETCH_ABORT;
> } else {
> syn = merge_syn_data_abort(env->exception.syndrome, target_el,
> - same_el, fi->s1ptw,
> + same_el, fi->ea, fi->s1ptw,
> access_type == MMU_DATA_STORE,
> fsc);
> if (access_type == MMU_DATA_STORE
> --
> 2.7.4
>
>
- [Qemu-arm] [PATCH 0/8] Implement ARM external abort handling, Peter Maydell, 2017/08/04
- [Qemu-arm] [PATCH 8/8] target/arm: Implement new do_transaction_failed hook, Peter Maydell, 2017/08/04
- [Qemu-arm] [PATCH 7/8] target/arm: Allow deliver_fault() caller to specify EA bit, Peter Maydell, 2017/08/04
- [Qemu-arm] [PATCH 6/8] target/arm: Factor out fault delivery code, Peter Maydell, 2017/08/04
- [Qemu-arm] [PATCH 4/8] boards.h: Define new flag ignore_memory_transaction_failures, Peter Maydell, 2017/08/04
- Re: [Qemu-arm] [PATCH 4/8] boards.h: Define new flag ignore_memory_transaction_failures, Philippe Mathieu-Daudé, 2017/08/04
- Re: [Qemu-arm] [PATCH 4/8] boards.h: Define new flag ignore_memory_transaction_failures, Richard Henderson, 2017/08/04
- Re: [Qemu-arm] [PATCH 4/8] boards.h: Define new flag ignore_memory_transaction_failures, Peter Maydell, 2017/08/05
- Re: [Qemu-arm] [PATCH 4/8] boards.h: Define new flag ignore_memory_transaction_failures, Peter Maydell, 2017/08/17
- Re: [Qemu-arm] [PATCH 4/8] boards.h: Define new flag ignore_memory_transaction_failures, Philippe Mathieu-Daudé, 2017/08/21
- Re: [Qemu-arm] [PATCH 4/8] boards.h: Define new flag ignore_memory_transaction_failures, Peter Maydell, 2017/08/22