All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Cédric Le Goater" <clg@kaod.org>
To: qemu-ppc@nongnu.org, qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Cédric Le Goater" <clg@kaod.org>,
	"Fabiano Rosas" <farosas@linux.ibm.com>
Subject: [PULL 19/42] target/ppc: 6xx: Machine Check exception cleanup
Date: Thu, 10 Feb 2022 13:59:45 +0100	[thread overview]
Message-ID: <20220210130008.2599950-20-clg@kaod.org> (raw)
In-Reply-To: <20220210130008.2599950-1-clg@kaod.org>

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



  parent reply	other threads:[~2022-02-10 16:09 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-10 12:59 [PULL 00/42] ppc queue Cédric Le Goater
2022-02-10 12:59 ` [PULL 01/42] target/ppc: Remove 440x4 CPU Cédric Le Goater
2022-02-10 12:59 ` [PULL 02/42] target/ppc: Introduce powerpc_excp_booke Cédric Le Goater
2022-02-10 12:59 ` [PULL 03/42] target/ppc: Simplify powerpc_excp_booke Cédric Le Goater
2022-02-10 12:59 ` [PULL 04/42] target/ppc: booke: Critical exception cleanup Cédric Le Goater
2022-02-10 12:59 ` [PULL 05/42] target/ppc: booke: Machine Check cleanups Cédric Le Goater
2022-02-10 12:59 ` [PULL 06/42] target/ppc: booke: Data Storage exception cleanup Cédric Le Goater
2022-02-10 12:59 ` [PULL 07/42] target/ppc: booke: Instruction storage " Cédric Le Goater
2022-02-10 12:59 ` [PULL 08/42] target/ppc: booke: External interrupt cleanup Cédric Le Goater
2022-02-10 12:59 ` [PULL 09/42] target/ppc: booke: Alignment " Cédric Le Goater
2022-02-10 12:59 ` [PULL 10/42] target/ppc: booke: System Call exception cleanup Cédric Le Goater
2022-02-10 12:59 ` [PULL 11/42] target/ppc: booke: Watchdog Timer interrupt Cédric Le Goater
2022-02-10 12:59 ` [PULL 12/42] target/ppc: booke: System Reset exception cleanup Cédric Le Goater
2022-02-10 12:59 ` [PULL 13/42] target/ppc: Fix radix logging Cédric Le Goater
2022-02-10 12:59 ` [PULL 14/42] target/ppc: Remove PowerPC 601 CPUs Cédric Le Goater
2022-02-10 12:59 ` [PULL 15/42] target/ppc: Merge exception model IDs for 6xx CPUs Cédric Le Goater
2022-02-10 12:59 ` [PULL 16/42] target/ppc: Introduce powerpc_excp_6xx Cédric Le Goater
2022-02-10 12:59 ` [PULL 17/42] target/ppc: Simplify powerpc_excp_6xx Cédric Le Goater
2022-02-10 12:59 ` [PULL 18/42] target/ppc: 6xx: Critical exception cleanup Cédric Le Goater
2022-02-10 12:59 ` Cédric Le Goater [this message]
2022-02-10 12:59 ` [PULL 20/42] target/ppc: 6xx: External interrupt cleanup Cédric Le Goater
2022-02-10 12:59 ` [PULL 21/42] target/ppc: 6xx: Program exception cleanup Cédric Le Goater
2022-02-10 12:59 ` [PULL 22/42] target/ppc: 6xx: System Call " Cédric Le Goater
2022-02-10 12:59 ` [PULL 23/42] target/ppc: 6xx: System Reset interrupt cleanup Cédric Le Goater
2022-02-10 12:59 ` [PULL 24/42] target/ppc: 6xx: Software TLB exceptions cleanup Cédric Le Goater
2022-02-10 12:59 ` [PULL 25/42] target/ppc: 6xx: Set SRRs directly in exception code Cédric Le Goater
2022-02-10 12:59 ` [PULL 26/42] target/ppc: Merge 7x5 and 7x0 exception model IDs Cédric Le Goater
2022-02-10 12:59 ` [PULL 27/42] target/ppc: Introduce powerpc_excp_7xx Cédric Le Goater
2022-02-10 12:59 ` [PULL 28/42] target/ppc: Simplify powerpc_excp_7xx Cédric Le Goater
2022-02-10 12:59 ` [PULL 29/42] target/ppc: 7xx: Machine Check exception cleanup Cédric Le Goater
2022-02-10 12:59 ` [PULL 30/42] target/ppc: 7xx: External interrupt cleanup Cédric Le Goater
2022-02-10 12:59 ` [PULL 31/42] target/ppc: 7xx: Program exception cleanup Cédric Le Goater
2022-02-10 12:59 ` [PULL 32/42] target/ppc: 7xx: System Call " Cédric Le Goater
2022-02-10 12:59 ` [PULL 33/42] target/ppc: 7xx: System Reset cleanup Cédric Le Goater
2022-02-10 13:00 ` [PULL 34/42] target/ppc: 7xx: Software TLB cleanup Cédric Le Goater
2022-02-10 13:00 ` [PULL 35/42] target/ppc: 7xx: Set SRRs directly in exception code Cédric Le Goater
2022-02-10 13:00 ` [PULL 36/42] target/ppc: Remove powerpc_excp_legacy Cédric Le Goater
2022-02-10 13:00 ` [PULL 37/42] target/ppc: powerpc_excp: Move common code to the caller function Cédric Le Goater
2022-02-10 13:00 ` [PULL 38/42] target/ppc: Assert if MSR bits differ from msr_mask during exceptions Cédric Le Goater
2022-02-10 13:00 ` [PULL 39/42] target/ppc: books: Remove excp_model argument from ppc_excp_apply_ail Cédric Le Goater
2022-02-10 13:00 ` [PULL 40/42] target/ppc: Change VSX instructions behavior to fill with zeros Cédric Le Goater
2022-02-10 13:00 ` [PULL 41/42] docs: rstfy confidential guest documentation Cédric Le Goater
2022-02-10 13:00 ` [PULL 42/42] spapr/vof: Install rom and nvram binaries Cédric Le Goater
2022-02-14 15:23 ` [PULL 00/42] ppc queue Peter Maydell

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=20220210130008.2599950-20-clg@kaod.org \
    --to=clg@kaod.org \
    --cc=farosas@linux.ibm.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=richard.henderson@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.