[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/11] target/ppc: booke: Machine Check cleanups
From: |
Fabiano Rosas |
Subject: |
[PATCH 04/11] target/ppc: booke: Machine Check cleanups |
Date: |
Fri, 28 Jan 2022 19:40:11 -0300 |
There's no MSR_HV in BookE.
Also remove 40x code.
Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
---
target/ppc/excp_helper.c | 29 ++++++-----------------------
1 file changed, 6 insertions(+), 23 deletions(-)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 8a656ace6f..4753b81527 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -819,34 +819,17 @@ static void powerpc_excp_booke(PowerPCCPU *cpu, int excp)
cs->halted = 1;
cpu_interrupt_exittb(cs);
}
- if (env->msr_mask & MSR_HVB) {
- /*
- * ISA specifies HV, but can be delivered to guest with HV
- * clear (e.g., see FWNMI in PAPR).
- */
- new_msr |= (target_ulong)MSR_HVB;
- }
/* machine check exceptions don't have ME set */
new_msr &= ~((target_ulong)1 << MSR_ME);
- /* XXX: should also have something loaded in DAR / DSISR */
- switch (excp_model) {
- case POWERPC_EXCP_40x:
- srr0 = SPR_40x_SRR2;
- srr1 = SPR_40x_SRR3;
- break;
- case POWERPC_EXCP_BOOKE:
- /* FIXME: choose one or the other based on CPU type */
- srr0 = SPR_BOOKE_MCSRR0;
- srr1 = SPR_BOOKE_MCSRR1;
+ /* FIXME: choose one or the other based on CPU type */
+ srr0 = SPR_BOOKE_MCSRR0;
+ srr1 = SPR_BOOKE_MCSRR1;
+
+ env->spr[SPR_BOOKE_CSRR0] = env->nip;
+ env->spr[SPR_BOOKE_CSRR1] = msr;
- env->spr[SPR_BOOKE_CSRR0] = env->nip;
- env->spr[SPR_BOOKE_CSRR1] = msr;
- break;
- default:
- break;
- }
break;
case POWERPC_EXCP_DSI: /* Data storage exception */
trace_ppc_excp_dsi(env->spr[SPR_DSISR], env->spr[SPR_DAR]);
--
2.34.1
- [PATCH 00/11] target/ppc: powerpc_excp improvements [BookE] (6/n), Fabiano Rosas, 2022/01/28
- [PATCH 03/11] target/ppc: booke: Critical exception cleanup, Fabiano Rosas, 2022/01/28
- [PATCH 02/11] target/ppc: Simplify powerpc_excp_booke, Fabiano Rosas, 2022/01/28
- [PATCH 01/11] target/ppc: Introduce powerpc_excp_booke, Fabiano Rosas, 2022/01/28
- [PATCH 04/11] target/ppc: booke: Machine Check cleanups,
Fabiano Rosas <=
- [PATCH 08/11] target/ppc: booke: Alignment interrupt cleanup, Fabiano Rosas, 2022/01/28
- [PATCH 10/11] target/ppc: booke: Watchdog Timer interrupt, Fabiano Rosas, 2022/01/28
- [PATCH 09/11] target/ppc: booke: System Call exception cleanup, Fabiano Rosas, 2022/01/28
- [PATCH 07/11] target/ppc: booke: External interrupt cleanup, Fabiano Rosas, 2022/01/28
- [PATCH 06/11] target/ppc: booke: Instruction storage exception cleanup, Fabiano Rosas, 2022/01/28
- [PATCH 05/11] target/ppc: booke: Data Storage exception cleanup, Fabiano Rosas, 2022/01/28
- [PATCH 11/11] target/ppc: booke: System Reset exception cleanup, Fabiano Rosas, 2022/01/28
- Re: [PATCH 00/11] target/ppc: powerpc_excp improvements [BookE] (6/n), BALATON Zoltan, 2022/01/28