[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/41] target/ppc: 405: Machine check exception cleanup
From: |
Cédric Le Goater |
Subject: |
[PULL 19/41] target/ppc: 405: Machine check exception cleanup |
Date: |
Mon, 31 Jan 2022 12:07:49 +0100 |
From: Fabiano Rosas <farosas@linux.ibm.com>
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>
Message-Id: <20220118184448.852996-7-farosas@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
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 aafc381eb0e6..3894d366854d 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.34.1
- [PULL 00/41] ppc queue, Cédric Le Goater, 2022/01/31
- [PULL 18/41] target/ppc: 405: Critical exceptions cleanup, Cédric Le Goater, 2022/01/31
- [PULL 26/41] target/ppc: 405: Program exception cleanup, Cédric Le Goater, 2022/01/31
- [PULL 23/41] target/ppc: 405: Debug exception cleanup, Cédric Le Goater, 2022/01/31
- [PULL 11/41] target/ppc: Put do_rfi under a TCG-only block, Cédric Le Goater, 2022/01/31
- [PULL 14/41] target/ppc: 405: Rename MSR_POW to MSR_WE, Cédric Le Goater, 2022/01/31
- [PULL 25/41] target/ppc: 405: Instruction storage interrupt cleanup, Cédric Le Goater, 2022/01/31
- [PULL 33/41] target/ppc: Introduce powerpc_excp_74xx, Cédric Le Goater, 2022/01/31
- [PULL 06/41] ppc/pnv: use a do-while() loop in pnv_phb4_translate_tve(), Cédric Le Goater, 2022/01/31
- [PULL 19/41] target/ppc: 405: Machine check exception cleanup,
Cédric Le Goater <=
- [PULL 10/41] target/ppc: Fix test on mmu_model in hreg_compute_hflags_value(), Cédric Le Goater, 2022/01/31
- [PULL 27/41] target/ppc: 405: Watchdog timer exception cleanup, Cédric Le Goater, 2022/01/31
- [PULL 35/41] target/ppc: 74xx: Machine Check exception cleanup, Cédric Le Goater, 2022/01/31
- [PULL 32/41] target/ppc: books: Program exception cleanup, Cédric Le Goater, 2022/01/31
- [PULL 01/41] spapr: Force 32bit when resetting a core, Cédric Le Goater, 2022/01/31
- [PULL 30/41] target/ppc: books: Machine Check exception cleanup, Cédric Le Goater, 2022/01/31
- [PULL 05/41] ppc/pnv: use a do-while() loop in pnv_phb3_translate_tve(), Cédric Le Goater, 2022/01/31
- [PULL 16/41] target/ppc: Introduce powerpc_excp_40x, Cédric Le Goater, 2022/01/31
- [PULL 12/41] hw/ppc/vof: Add missing includes, Cédric Le Goater, 2022/01/31
- [PULL 38/41] target/ppc: 74xx: System Call exception cleanup, Cédric Le Goater, 2022/01/31