Skip to contentSkip to conversation

target/ppc: Fix sc instruction handling of LEV field

PATCH Applied Nicholas Piggin 3 participants 4 messages Jun 21, 2023 – Jun 23, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target/ppc: Fix sc instruction handling of LEV field

The top bits of the LEV field of the sc instruction are to be treated as as a reserved field rather than a reserved value, meaning LEV is effectively the bottom bit. LEV=0xF should be treated as LEV=1 and be a hypercall, for example.

This changes the instruction execution to just set lev from the low bit of the field. Processors which don't support the LEV field will continue to ignore it.

ISA v3.1 defines LEV to be 2 bits, in order to add the 'sc 2' ultracall instruction. TCG does not support Ultravisor, so don't worry about that bit.

---
This should probably go ahead of the ISA 3.1 LEV in SRR1 patch. I don't think they need to be backported to stable though, have not caused any real problems.

Thanks to Harsh for spotting it.

Thanks,
Nick

 target/ppc/translate.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
target/ppc/translate.c +6 -1
index 15a00bd4fa..3c62f9188a 100644
@@ -4424,7 +4424,12 @@ static void gen_sc(DisasContext *ctx)
 {
     uint32_t lev;
 
-    lev = (ctx->opcode >> 5) & 0x7F;
+    /*
+     * LEV is a 7-bit field, but the top 6 bits are treated as a reserved
+     * field (i.e., ignored). ISA v3.1 changes that to 5 bits, but that is
+     * for Ultravisor which TCG does not support, so just ignore the top 6.
+     */
+    lev = (ctx->opcode >> 5) & 0x1;
     gen_exception_err(ctx, POWERPC_SYSCALL, lev);
 }
 
Signature · 1 line
2.40.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 33 lines · Nicholas Piggin

The top bits of the LEV field of the sc instruction are to be treated as as a reserved field rather than a reserved value, meaning LEV is effectively the bottom bit. LEV=0xF should be treated as LEV=1 and be a hypercall, for example.

This changes the instruction execution to just set lev from the low bit of the field. Processors which don't support the LEV field will continue to ignore it.

ISA v3.1 defines LEV to be 2 bits, in order to add the 'sc 2' ultracall instruction. TCG does not support Ultravisor, so don't worry about that bit.

---
This should probably go ahead of the ISA 3.1 LEV in SRR1 patch. I don't think they need to be backported to stable though, have not caused any real problems.

Thanks to Harsh for spotting it.

Thanks,
Nick

  target/ppc/translate.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
target/ppc/translate.c +0 -0
index 15a00bd4fa..3c62f9188a 100644

target/ppc/translate.c static void gen_sc(DisasContext *ctx) · line 4432

Quoted 10 lines
target/ppc/translate.c +6 -1
@@ -4424,7 +4424,12 @@ static void gen_sc(DisasContext *ctx)
  {
      uint32_t lev;
 
-    lev = (ctx->opcode >> 5) & 0x7F;
+    /*
+     * LEV is a 7-bit field, but the top 6 bits are treated as a reserved
+     * field (i.e., ignored). ISA v3.1 changes that to 5 bits, but that is
+     * for Ultravisor which TCG does not support, so just ignore the top 6.
+     */
+    lev = (ctx->opcode >> 5) & 0x1;

should this change be applied to gen_scv() defined next to it as well ?

Otherwise,

Quoted 3 lines
target/ppc/translate.c +0 -0
      gen_exception_err(ctx, POWERPC_SYSCALL, lev);
  }
 
#2 lore raw
Quoted 39 lines · Harsh Prateek Bora
Quoted 36 lines · Nicholas Piggin

The top bits of the LEV field of the sc instruction are to be treated as as a reserved field rather than a reserved value, meaning LEV is effectively the bottom bit. LEV=0xF should be treated as LEV=1 and be a hypercall, for example.

This changes the instruction execution to just set lev from the low bit of the field. Processors which don't support the LEV field will continue to ignore it.

ISA v3.1 defines LEV to be 2 bits, in order to add the 'sc 2' ultracall instruction. TCG does not support Ultravisor, so don't worry about that bit.

---
This should probably go ahead of the ISA 3.1 LEV in SRR1 patch. I don't think they need to be backported to stable though, have not caused any real problems.

Thanks to Harsh for spotting it.

Thanks,
Nick

  target/ppc/translate.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
target/ppc/translate.c +0 -0
index 15a00bd4fa..3c62f9188a 100644
@@ -4424,7 +4424,12 @@ static void gen_sc(DisasContext *ctx)
  {
      uint32_t lev;
 
Quoted 9 lines

target/ppc/translate.c static void gen_sc(DisasContext *ctx) · line 4432

Quoted 7 lines
target/ppc/translate.c +6 -1
-    lev = (ctx->opcode >> 5) & 0x7F;
+    /*
+     * LEV is a 7-bit field, but the top 6 bits are treated as a reserved
+     * field (i.e., ignored). ISA v3.1 changes that to 5 bits, but that is
+     * for Ultravisor which TCG does not support, so just ignore the top 6.
+     */
+    lev = (ctx->opcode >> 5) & 0x1;

should this change be applied to gen_scv() defined next to it as well ?

No. scv uses all LEV bits.

Thanks,
Nick

Quoted 7 lines

Otherwise,

Quoted 3 lines
target/ppc/translate.c +0 -0
      gen_exception_err(ctx, POWERPC_SYSCALL, lev);
  }
 
#3 lore raw
In reply to Nicholas Piggin
Quoted 36 lines · Nicholas Piggin

The top bits of the LEV field of the sc instruction are to be treated as as a reserved field rather than a reserved value, meaning LEV is effectively the bottom bit. LEV=0xF should be treated as LEV=1 and be a hypercall, for example.

This changes the instruction execution to just set lev from the low bit of the field. Processors which don't support the LEV field will continue to ignore it.

ISA v3.1 defines LEV to be 2 bits, in order to add the 'sc 2' ultracall instruction. TCG does not support Ultravisor, so don't worry about that bit.

---
This should probably go ahead of the ISA 3.1 LEV in SRR1 patch. I don't think they need to be backported to stable though, have not caused any real problems.

Thanks to Harsh for spotting it.

Thanks,
Nick

  target/ppc/translate.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
target/ppc/translate.c +0 -0
index 15a00bd4fa..3c62f9188a 100644
@@ -4424,7 +4424,12 @@ static void gen_sc(DisasContext *ctx)
  {
      uint32_t lev;
 

target/ppc/translate.c static void gen_sc(DisasContext *ctx) · line 4435

Quoted 10 lines
target/ppc/translate.c +6 -1
-    lev = (ctx->opcode >> 5) & 0x7F;
+    /*
+     * LEV is a 7-bit field, but the top 6 bits are treated as a reserved
+     * field (i.e., ignored). ISA v3.1 changes that to 5 bits, but that is
+     * for Ultravisor which TCG does not support, so just ignore the top 6.
+     */
+    lev = (ctx->opcode >> 5) & 0x1;
      gen_exception_err(ctx, POWERPC_SYSCALL, lev);
  }
 

Applied to ppc-next.

Thanks,

C.