[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 06/14] target/ppc: 405: Machine check exception cleanup
From: |
Fabiano Rosas |
Subject: |
[PATCH v2 06/14] target/ppc: 405: Machine check exception cleanup |
Date: |
Tue, 18 Jan 2022 15:44:40 -0300 |
powerpc_excp_40x applies only to the 405, so remove HV code and
references to BookE.
Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
---
target/ppc/excp_helper.c | 26 ++------------------------
1 file changed, 2 insertions(+), 24 deletions(-)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index bddea702be..e98d783ecd 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -457,34 +457,12 @@ static void powerpc_excp_40x(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;
-
- env->spr[SPR_BOOKE_CSRR0] = env->nip;
- env->spr[SPR_BOOKE_CSRR1] = msr;
- break;
- default:
- break;
- }
+ srr0 = SPR_40x_SRR2;
+ srr1 = SPR_40x_SRR3;
break;
case POWERPC_EXCP_DSI: /* Data storage exception */
trace_ppc_excp_dsi(env->spr[SPR_DSISR], env->spr[SPR_DAR]);
--
2.33.1
- [PATCH v2 00/14] target/ppc: powerpc_excp improvements [40x] (3/n), Fabiano Rosas, 2022/01/18
- [PATCH v2 03/14] target/ppc: Introduce powerpc_excp_40x, Fabiano Rosas, 2022/01/18
- [PATCH v2 01/14] target/ppc: 405: Rename MSR_POW to MSR_WE, Fabiano Rosas, 2022/01/18
- [PATCH v2 04/14] target/ppc: Simplify powerpc_excp_40x, Fabiano Rosas, 2022/01/18
- [PATCH v2 06/14] target/ppc: 405: Machine check exception cleanup,
Fabiano Rosas <=
- [PATCH v2 07/14] target/ppc: 405: External exception cleanup, Fabiano Rosas, 2022/01/18
- [PATCH v2 08/14] target/ppc: 405: System call exception cleanup, Fabiano Rosas, 2022/01/18