qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Nicholas Piggin <npiggin@gmail.com>
To: qemu-ppc@nongnu.org
Cc: "Nicholas Piggin" <npiggin@gmail.com>,
	qemu-devel@nongnu.org,
	"Christophe Leroy" <christophe.leroy@csgroup.eu>,
	"BALATON Zoltan" <balaton@eik.bme.hu>,
	"Harsh Prateek Bora" <harshpb@linux.ibm.com>,
	"Daniel Henrique Barboza" <danielhb413@gmail.com>,
	"Cédric Le Goater" <clg@kaod.org>,
	"David Gibson" <david@gibson.dropbear.id.au>,
	"Greg Kurz" <groug@kaod.org>
Subject: [PATCH 2/4] target/ppc: Add POWER9/10 invalid-real machine check codes
Date: Fri, 23 Jun 2023 18:19:51 +1000	[thread overview]
Message-ID: <20230623081953.290875-3-npiggin@gmail.com> (raw)
In-Reply-To: <20230623081953.290875-1-npiggin@gmail.com>

Implement the correct register settings for  the invalid-real access
machine check for POWER9/10 processors.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 target/ppc/excp_helper.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index c9bfa3a827..1c26828d8b 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -3139,8 +3139,6 @@ void ppc_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr,
     case POWERPC_EXCP_970:
     case POWERPC_EXCP_POWER7:
     case POWERPC_EXCP_POWER8:
-    case POWERPC_EXCP_POWER9:
-    case POWERPC_EXCP_POWER10:
         /*
          * TODO: This does not give the correct machine check code but
          * it will report a NIP and DAR.
@@ -3149,6 +3147,30 @@ void ppc_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr,
             env->spr[SPR_DAR] = vaddr;
         }
         break;
+    case POWERPC_EXCP_POWER9:
+    case POWERPC_EXCP_POWER10:
+        /*
+         * Machine check codes can be found in User Manual or Linux or
+         * skiboot source.
+         */
+        if (access_type == MMU_DATA_LOAD) {
+            env->spr[SPR_DAR] = vaddr;
+            env->spr[SPR_DSISR] = PPC_BIT(57);
+            env->error_code = PPC_BIT(42);
+
+        } else if (access_type == MMU_DATA_STORE) {
+            /*
+             * MCE for stores in POWER is asynchronous so hardware does
+             * not set DAR, but QEMU can do better.
+             */
+            env->spr[SPR_DAR] = vaddr;
+            env->error_code = PPC_BIT(36) | PPC_BIT(43) | PPC_BIT(45);
+            env->error_code |= PPC_BIT(42);
+        } else { /* Fetch */
+
+            env->error_code = PPC_BIT(36) | PPC_BIT(44) | PPC_BIT(45);
+        }
+        break;
 #endif
     default:
         /* TODO: Check behaviour for other CPUs, for now do nothing. */
-- 
2.40.1



  parent reply	other threads:[~2023-06-23  8:21 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-23  8:19 [PATCH 0/4] target/ppc: Catch invalid real address accesses Nicholas Piggin
2023-06-23  8:19 ` [PATCH 1/4] target/ppc: Machine check on invalid real address access Nicholas Piggin
2023-06-23  8:19 ` Nicholas Piggin [this message]
2023-06-23  8:19 ` [PATCH 3/4] target/ppc: Move common check in machne check handlers to a function Nicholas Piggin
2023-06-23 13:20   ` Fabiano Rosas
2023-06-23 16:16     ` BALATON Zoltan
2023-06-25  9:20     ` Nicholas Piggin
2023-06-23  8:19 ` [PATCH 4/4] target/ppc: Make checkstop stop the system Nicholas Piggin
2023-06-23 11:51   ` BALATON Zoltan
2023-06-25  9:15     ` Nicholas Piggin
2023-06-23  9:10 ` [PATCH 0/4] target/ppc: Catch invalid real address accesses Peter Maydell
2023-06-23 12:37   ` Cédric Le Goater
2023-06-23 23:35     ` Philippe Mathieu-Daudé
2023-06-24  9:50       ` BALATON Zoltan
2023-06-26 13:35     ` Cédric Le Goater
2023-06-26 23:28       ` Nicholas Piggin
2023-06-27  6:49         ` Cédric Le Goater
2023-06-27  8:14       ` Mark Cave-Ayland
2023-06-27 10:28         ` Howard Spoelstra
2023-06-27 11:24           ` Mark Cave-Ayland
2023-06-27 12:05             ` Howard Spoelstra
2023-06-27 12:41               ` Cédric Le Goater
2023-06-27 20:26                 ` Mark Cave-Ayland
2023-06-28  7:02                   ` Cédric Le Goater
2023-06-28  7:17                     ` Cédric Le Goater
2023-06-29  8:29                       ` Mark Cave-Ayland
2023-06-29  9:05                         ` Cédric Le Goater
2023-06-29  9:41                           ` Nicholas Piggin
2023-06-27 12:03         ` Cédric Le Goater
2023-06-27 20:24           ` Mark Cave-Ayland
2023-06-25  9:18   ` Nicholas Piggin

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=20230623081953.290875-3-npiggin@gmail.com \
    --to=npiggin@gmail.com \
    --cc=balaton@eik.bme.hu \
    --cc=christophe.leroy@csgroup.eu \
    --cc=clg@kaod.org \
    --cc=danielhb413@gmail.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=groug@kaod.org \
    --cc=harshpb@linux.ibm.com \
    --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).