[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 33/42] target/ppc: 7xx: System Reset cleanup
From: |
Cédric Le Goater |
Subject: |
[PULL 33/42] target/ppc: 7xx: System Reset cleanup |
Date: |
Thu, 10 Feb 2022 13:59:59 +0100 |
From: Fabiano Rosas <farosas@linux.ibm.com>
Thre is no HV support in the 7xx.
Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Message-Id: <20220204173430.1457358-9-farosas@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
target/ppc/excp_helper.c | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 14a4eea9d6f2..2bbfc25d2b0d 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -894,23 +894,9 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)
case POWERPC_EXCP_DECR: /* Decrementer exception */
break;
case POWERPC_EXCP_RESET: /* System reset exception */
- /* A power-saving exception sets ME, otherwise it is unchanged */
if (msr_pow) {
- /* indicate that we resumed from power save mode */
- msr |= 0x10000;
- new_msr |= ((target_ulong)1 << MSR_ME);
- }
- if (env->msr_mask & MSR_HVB) {
- /*
- * ISA specifies HV, but can be delivered to guest with HV
- * clear (e.g., see FWNMI in PAPR, NMI injection in QEMU).
- */
- new_msr |= (target_ulong)MSR_HVB;
- } else {
- if (msr_pow) {
- cpu_abort(cs, "Trying to deliver power-saving system reset "
- "exception %d with no HV support\n", excp);
- }
+ cpu_abort(cs, "Trying to deliver power-saving system reset "
+ "exception %d with no HV support\n", excp);
}
break;
case POWERPC_EXCP_TRACE: /* Trace exception */
--
2.34.1
- [PULL 34/42] target/ppc: 7xx: Software TLB cleanup, (continued)
- [PULL 34/42] target/ppc: 7xx: Software TLB cleanup, Cédric Le Goater, 2022/02/10
- [PULL 05/42] target/ppc: booke: Machine Check cleanups, Cédric Le Goater, 2022/02/10
- [PULL 17/42] target/ppc: Simplify powerpc_excp_6xx, Cédric Le Goater, 2022/02/10
- [PULL 26/42] target/ppc: Merge 7x5 and 7x0 exception model IDs, Cédric Le Goater, 2022/02/10
- [PULL 13/42] target/ppc: Fix radix logging, Cédric Le Goater, 2022/02/10
- [PULL 38/42] target/ppc: Assert if MSR bits differ from msr_mask during exceptions, Cédric Le Goater, 2022/02/10
- [PULL 16/42] target/ppc: Introduce powerpc_excp_6xx, Cédric Le Goater, 2022/02/10
- [PULL 24/42] target/ppc: 6xx: Software TLB exceptions 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 22/42] target/ppc: 6xx: System Call exception cleanup, Cédric Le Goater, 2022/02/10
- [PULL 33/42] target/ppc: 7xx: System Reset cleanup,
Cédric Le Goater <=
- [PULL 35/42] target/ppc: 7xx: Set SRRs directly in exception code, Cédric Le Goater, 2022/02/10
- [PULL 27/42] target/ppc: Introduce powerpc_excp_7xx, Cédric Le Goater, 2022/02/10
- [PULL 41/42] docs: rstfy confidential guest documentation, Cédric Le Goater, 2022/02/10
- [PULL 03/42] target/ppc: Simplify powerpc_excp_booke, Cédric Le Goater, 2022/02/10
- [PULL 29/42] target/ppc: 7xx: Machine Check exception cleanup, Cédric Le Goater, 2022/02/10
- [PULL 40/42] target/ppc: Change VSX instructions behavior to fill with zeros, Cédric Le Goater, 2022/02/10
- [PULL 25/42] target/ppc: 6xx: Set SRRs directly in exception code, Cédric Le Goater, 2022/02/10
- Re: [PULL 00/42] ppc queue, Peter Maydell, 2022/02/14