[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/42] target/ppc: 6xx: Machine Check exception cleanup
From: |
Cédric Le Goater |
Subject: |
[PULL 19/42] target/ppc: 6xx: Machine Check exception cleanup |
Date: |
Thu, 10 Feb 2022 13:59:45 +0100 |
From: Fabiano Rosas <farosas@linux.ibm.com>
There's no MSR_HV in the 6xx CPUs.
Also remove the 40x and BookE code.
Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Message-Id: <20220203200957.1434641-6-farosas@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
target/ppc/excp_helper.c | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index e27e1c3c705f..734170d4c2ef 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -612,34 +612,10 @@ static void powerpc_excp_6xx(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;
- }
break;
case POWERPC_EXCP_DSI: /* Data storage exception */
trace_ppc_excp_dsi(env->spr[SPR_DSISR], env->spr[SPR_DAR]);
--
2.34.1
- [PULL 11/42] target/ppc: booke: Watchdog Timer interrupt, (continued)
- [PULL 11/42] target/ppc: booke: Watchdog Timer interrupt, Cédric Le Goater, 2022/02/10
- [PULL 04/42] target/ppc: booke: Critical exception cleanup, Cédric Le Goater, 2022/02/10
- [PULL 06/42] target/ppc: booke: Data Storage exception cleanup, Cédric Le Goater, 2022/02/10
- [PULL 12/42] target/ppc: booke: System Reset exception cleanup, Cédric Le Goater, 2022/02/10
- [PULL 18/42] target/ppc: 6xx: Critical exception cleanup, Cédric Le Goater, 2022/02/10
- [PULL 03/42] target/ppc: Simplify powerpc_excp_booke, Cédric Le Goater, 2022/02/10
- [PULL 14/42] target/ppc: Remove PowerPC 601 CPUs, Cédric Le Goater, 2022/02/10
- [PULL 32/42] target/ppc: 7xx: System Call exception cleanup, Cédric Le Goater, 2022/02/10
- [PULL 09/42] target/ppc: booke: Alignment interrupt cleanup, Cédric Le Goater, 2022/02/10
- [PULL 20/42] target/ppc: 6xx: External interrupt cleanup, Cédric Le Goater, 2022/02/10
- [PULL 19/42] target/ppc: 6xx: Machine Check exception cleanup,
Cédric Le Goater <=
- [PULL 26/42] target/ppc: Merge 7x5 and 7x0 exception model IDs, Cédric Le Goater, 2022/02/10
- [PULL 15/42] target/ppc: Merge exception model IDs for 6xx CPUs, Cédric Le Goater, 2022/02/10
- [PULL 05/42] target/ppc: booke: Machine Check cleanups, Cédric Le Goater, 2022/02/10
- [PULL 30/42] target/ppc: 7xx: External interrupt cleanup, Cédric Le Goater, 2022/02/10
- [PULL 16/42] target/ppc: Introduce powerpc_excp_6xx, Cédric Le Goater, 2022/02/10
- [PULL 22/42] target/ppc: 6xx: System Call exception cleanup, Cédric Le Goater, 2022/02/10
- [PULL 42/42] spapr/vof: Install rom and nvram binaries, Cédric Le Goater, 2022/02/10
- [PULL 33/42] target/ppc: 7xx: System Reset cleanup, Cédric Le Goater, 2022/02/10
- [PULL 28/42] target/ppc: Simplify powerpc_excp_7xx, Cédric Le Goater, 2022/02/10
- [PULL 02/42] target/ppc: Introduce powerpc_excp_booke, Cédric Le Goater, 2022/02/10