From: Fabiano Rosas Date: Wed, 9 Feb 2022 08:08:55 +0000 (+0100) Subject: target/ppc: 6xx: System Reset interrupt cleanup X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=000ac49ad22be56e8ab21550e90e997b9ee39575;p=qemu.git target/ppc: 6xx: System Reset interrupt cleanup There is no HV support in the 6xx. Signed-off-by: Fabiano Rosas Message-Id: <20220203200957.1434641-10-farosas@linux.ibm.com> Signed-off-by: Cédric Le Goater --- diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 28d9a9a887..538905c4dd 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -685,23 +685,9 @@ static void powerpc_excp_6xx(PowerPCCPU *cpu, int excp) case POWERPC_EXCP_ITLB: /* Instruction TLB error */ 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 */