qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Fabiano Rosas <farosas@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: mark.cave-ayland@ilande.co.uk, danielhb413@gmail.com,
	qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au
Subject: [PATCH 3/8] target/ppc: 74xx: Machine Check exception cleanup
Date: Wed, 26 Jan 2022 13:41:55 -0300	[thread overview]
Message-ID: <20220126164200.1048677-4-farosas@linux.ibm.com> (raw)
In-Reply-To: <20220126164200.1048677-1-farosas@linux.ibm.com>

The 74xx don't have an MSR_HV.

Also remove 40x and BookE code.

Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
---
 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 13e5cb3ddc..0d8c66b98f 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -612,34 +612,10 @@ static void powerpc_excp_74xx(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



  parent reply	other threads:[~2022-01-26 17:04 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-26 16:41 [PATCH 0/8] target/ppc: powerpc_excp improvements [74xx] (5/n) Fabiano Rosas
2022-01-26 16:41 ` [PATCH 1/8] target/ppc: Introduce powerpc_excp_74xx Fabiano Rosas
2022-01-26 16:41 ` [PATCH 2/8] target/ppc: Simplify powerpc_excp_74xx Fabiano Rosas
2022-01-26 16:41 ` Fabiano Rosas [this message]
2022-01-26 16:41 ` [PATCH 4/8] target/ppc: 74xx: External interrupt cleanup Fabiano Rosas
2022-01-26 16:41 ` [PATCH 5/8] target/ppc: 74xx: Program exception cleanup Fabiano Rosas
2022-01-26 16:41 ` [PATCH 6/8] target/ppc: 74xx: System Call " Fabiano Rosas
2022-01-26 16:41 ` [PATCH 7/8] target/ppc: 74xx: System Reset interrupt cleanup Fabiano Rosas
2022-01-26 16:42 ` [PATCH 8/8] target/ppc: 74xx: Set SRRs directly in exception code Fabiano Rosas
2022-01-26 17:55 ` [PATCH 0/8] target/ppc: powerpc_excp improvements [74xx] (5/n) BALATON Zoltan
2022-01-26 18:23   ` Cédric Le Goater
2022-01-26 20:00     ` BALATON Zoltan
2022-01-26 21:58   ` Fabiano Rosas
2022-01-27 14:40 ` Mark Cave-Ayland
2022-01-27 15:16   ` Fabiano Rosas
2022-01-27 16:51     ` Cédric Le Goater

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220126164200.1048677-4-farosas@linux.ibm.com \
    --to=farosas@linux.ibm.com \
    --cc=clg@kaod.org \
    --cc=danielhb413@gmail.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=mark.cave-ayland@ilande.co.uk \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).