1. Patchew
  2. QEMU
  3. [PATCH 0/8] target/s390x: Use explicit big-endian LD/ST API
  4. View patch

[PATCH 2/8] target/s390x: Use explicit big-endian LD/ST API

Philippe Mathieu-Daudé posted 8 patches 1 month, 2 weeks ago
Maintainers: Laurent Vivier <laurent@vivier.eu>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Farhan Ali <alifm@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Ilya Leoshkevich <iii@linux.ibm.com>, David Hildenbrand <david@kernel.org>, Matthew Rosato <mjrosato@linux.ibm.com>, "Michael S. Tsirkin" <mst@redhat.com>, Cornelia Huck <cohuck@redhat.com>
[PATCH 2/8] target/s390x: Use explicit big-endian LD/ST API
Posted by Philippe Mathieu-Daudé 1 month, 2 weeks ago 
The S390x architecture uses big endianness. Directly use
the big-endian LD/ST API.

Mechanical change running:

  $ for a in uw w l q; do \
      sed -i -e "s/ld${a}_p(/ld${a}_be_p(/" \
        $(git grep -wlE '(ld|st)u?[wlq]_p' target/s390x/);
    done

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/s390x/cpu-system.c      |  2 +-
 target/s390x/kvm/kvm.c         |  8 ++++----
 target/s390x/mmu_helper.c      |  3 ++-
 target/s390x/tcg/excp_helper.c | 16 ++++++++--------
 target/s390x/tcg/mem_helper.c  |  5 +++--
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/target/s390x/cpu-system.c b/target/s390x/cpu-system.c
index f3a9ffb2a27..b0c59b5676e 100644
--- a/target/s390x/cpu-system.c
+++ b/target/s390x/cpu-system.c
@@ -63,7 +63,7 @@ static void s390_cpu_load_normal(CPUState *s)
     uint64_t spsw;
 
     if (!s390_is_pv()) {
-        spsw = ldq_phys(s->as, 0);
+        spsw = ldq_be_phys(s->as, 0);
         cpu->env.psw.mask = spsw & PSW_MASK_SHORT_CTRL;
         /*
          * Invert short psw indication, so SIE will report a specification
diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
index 916dac1f14e..89911f356e4 100644
--- a/target/s390x/kvm/kvm.c
+++ b/target/s390x/kvm/kvm.c
@@ -1667,10 +1667,10 @@ static int handle_oper_loop(S390CPU *cpu, struct kvm_run *run)
     CPUState *cs = CPU(cpu);
     PSW oldpsw, newpsw;
 
-    newpsw.mask = ldq_phys(cs->as, cpu->env.psa +
-                           offsetof(LowCore, program_new_psw));
-    newpsw.addr = ldq_phys(cs->as, cpu->env.psa +
-                           offsetof(LowCore, program_new_psw) + 8);
+    newpsw.mask = ldq_be_phys(cs->as, cpu->env.psa +
+                              offsetof(LowCore, program_new_psw));
+    newpsw.addr = ldq_be_phys(cs->as, cpu->env.psa +
+                              offsetof(LowCore, program_new_psw) + 8);
     oldpsw.mask  = run->psw_mask;
     oldpsw.addr  = run->psw_addr;
     /*
diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
index 3b1e75f7833..8c87b30a8e3 100644
--- a/target/s390x/mmu_helper.c
+++ b/target/s390x/mmu_helper.c
@@ -44,7 +44,8 @@ static void trigger_access_exception(CPUS390XState *env, uint32_t type,
     } else {
         CPUState *cs = env_cpu(env);
         if (type != PGM_ADDRESSING) {
-            stq_phys(cs->as, env->psa + offsetof(LowCore, trans_exc_code), tec);
+            stq_be_phys(cs->as, env->psa + offsetof(LowCore, trans_exc_code),
+                        tec);
         }
         trigger_pgm_exception(env, type);
     }
diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c
index c6641280bc6..868efca3221 100644
--- a/target/s390x/tcg/excp_helper.c
+++ b/target/s390x/tcg/excp_helper.c
@@ -55,8 +55,8 @@ G_NORETURN void tcg_s390_data_exception(CPUS390XState *env, uint32_t dxc,
     g_assert(dxc <= 0xff);
 #if !defined(CONFIG_USER_ONLY)
     /* Store the DXC into the lowcore */
-    stl_phys(env_cpu(env)->as,
-             env->psa + offsetof(LowCore, data_exc_code), dxc);
+    stl_be_phys(env_cpu(env)->as,
+                env->psa + offsetof(LowCore, data_exc_code), dxc);
 #endif
 
     /* Store the DXC into the FPC if AFP is enabled */
@@ -72,8 +72,8 @@ G_NORETURN void tcg_s390_vector_exception(CPUS390XState *env, uint32_t vxc,
     g_assert(vxc <= 0xff);
 #if !defined(CONFIG_USER_ONLY)
     /* Always store the VXC into the lowcore, without AFP it is undefined */
-    stl_phys(env_cpu(env)->as,
-             env->psa + offsetof(LowCore, data_exc_code), vxc);
+    stl_be_phys(env_cpu(env)->as,
+                env->psa + offsetof(LowCore, data_exc_code), vxc);
 #endif
 
     /* Always store the VXC into the FPC, without AFP it is undefined */
@@ -651,10 +651,10 @@ void monitor_event(CPUS390XState *env,
                    uint8_t monitor_class, uintptr_t ra)
 {
     /* Store the Monitor Code and the Monitor Class Number into the lowcore */
-    stq_phys(env_cpu(env)->as,
-             env->psa + offsetof(LowCore, monitor_code), monitor_code);
-    stw_phys(env_cpu(env)->as,
-             env->psa + offsetof(LowCore, mon_class_num), monitor_class);
+    stq_be_phys(env_cpu(env)->as,
+                env->psa + offsetof(LowCore, monitor_code), monitor_code);
+    stw_be_phys(env_cpu(env)->as,
+                env->psa + offsetof(LowCore, mon_class_num), monitor_class);
 
     tcg_s390_program_interrupt(env, PGM_MONITOR, ra);
 }
diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c
index 24675fc818d..0c7e099df21 100644
--- a/target/s390x/tcg/mem_helper.c
+++ b/target/s390x/tcg/mem_helper.c
@@ -958,8 +958,9 @@ uint32_t HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint32_t r1, uint32_t r2)
 inject_exc:
 #if !defined(CONFIG_USER_ONLY)
     if (exc != PGM_ADDRESSING) {
-        stq_phys(env_cpu(env)->as, env->psa + offsetof(LowCore, trans_exc_code),
-                 env->tlb_fill_tec);
+        stq_be_phys(env_cpu(env)->as,
+                    env->psa + offsetof(LowCore, trans_exc_code),
+                    env->tlb_fill_tec);
     }
     if (exc == PGM_PAGE_TRANS) {
         stb_phys(env_cpu(env)->as, env->psa + offsetof(LowCore, op_access_id),
-- 
2.52.0
Re: [PATCH 2/8] target/s390x: Use explicit big-endian LD/ST API
Posted by Manos Pitsidianakis 1 month, 1 week ago 
On Wed, Dec 24, 2025 at 6:20 PM Philippe Mathieu-Daudé
<philmd@linaro.org> wrote:
>
> The S390x architecture uses big endianness. Directly use
> the big-endian LD/ST API.
>
> Mechanical change running:
>
>   $ for a in uw w l q; do \
>       sed -i -e "s/ld${a}_p(/ld${a}_be_p(/" \
>         $(git grep -wlE '(ld|st)u?[wlq]_p' target/s390x/);
>     done
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---

Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>

>  target/s390x/cpu-system.c      |  2 +-
>  target/s390x/kvm/kvm.c         |  8 ++++----
>  target/s390x/mmu_helper.c      |  3 ++-
>  target/s390x/tcg/excp_helper.c | 16 ++++++++--------
>  target/s390x/tcg/mem_helper.c  |  5 +++--
>  5 files changed, 18 insertions(+), 16 deletions(-)
>
> diff --git a/target/s390x/cpu-system.c b/target/s390x/cpu-system.c
> index f3a9ffb2a27..b0c59b5676e 100644
> --- a/target/s390x/cpu-system.c
> +++ b/target/s390x/cpu-system.c
> @@ -63,7 +63,7 @@ static void s390_cpu_load_normal(CPUState *s)
>      uint64_t spsw;
>
>      if (!s390_is_pv()) {
> -        spsw = ldq_phys(s->as, 0);
> +        spsw = ldq_be_phys(s->as, 0);
>          cpu->env.psw.mask = spsw & PSW_MASK_SHORT_CTRL;
>          /*
>           * Invert short psw indication, so SIE will report a specification
> diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
> index 916dac1f14e..89911f356e4 100644
> --- a/target/s390x/kvm/kvm.c
> +++ b/target/s390x/kvm/kvm.c
> @@ -1667,10 +1667,10 @@ static int handle_oper_loop(S390CPU *cpu, struct kvm_run *run)
>      CPUState *cs = CPU(cpu);
>      PSW oldpsw, newpsw;
>
> -    newpsw.mask = ldq_phys(cs->as, cpu->env.psa +
> -                           offsetof(LowCore, program_new_psw));
> -    newpsw.addr = ldq_phys(cs->as, cpu->env.psa +
> -                           offsetof(LowCore, program_new_psw) + 8);
> +    newpsw.mask = ldq_be_phys(cs->as, cpu->env.psa +
> +                              offsetof(LowCore, program_new_psw));
> +    newpsw.addr = ldq_be_phys(cs->as, cpu->env.psa +
> +                              offsetof(LowCore, program_new_psw) + 8);
>      oldpsw.mask  = run->psw_mask;
>      oldpsw.addr  = run->psw_addr;
>      /*
> diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
> index 3b1e75f7833..8c87b30a8e3 100644
> --- a/target/s390x/mmu_helper.c
> +++ b/target/s390x/mmu_helper.c
> @@ -44,7 +44,8 @@ static void trigger_access_exception(CPUS390XState *env, uint32_t type,
>      } else {
>          CPUState *cs = env_cpu(env);
>          if (type != PGM_ADDRESSING) {
> -            stq_phys(cs->as, env->psa + offsetof(LowCore, trans_exc_code), tec);
> +            stq_be_phys(cs->as, env->psa + offsetof(LowCore, trans_exc_code),
> +                        tec);
>          }
>          trigger_pgm_exception(env, type);
>      }
> diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c
> index c6641280bc6..868efca3221 100644
> --- a/target/s390x/tcg/excp_helper.c
> +++ b/target/s390x/tcg/excp_helper.c
> @@ -55,8 +55,8 @@ G_NORETURN void tcg_s390_data_exception(CPUS390XState *env, uint32_t dxc,
>      g_assert(dxc <= 0xff);
>  #if !defined(CONFIG_USER_ONLY)
>      /* Store the DXC into the lowcore */
> -    stl_phys(env_cpu(env)->as,
> -             env->psa + offsetof(LowCore, data_exc_code), dxc);
> +    stl_be_phys(env_cpu(env)->as,
> +                env->psa + offsetof(LowCore, data_exc_code), dxc);
>  #endif
>
>      /* Store the DXC into the FPC if AFP is enabled */
> @@ -72,8 +72,8 @@ G_NORETURN void tcg_s390_vector_exception(CPUS390XState *env, uint32_t vxc,
>      g_assert(vxc <= 0xff);
>  #if !defined(CONFIG_USER_ONLY)
>      /* Always store the VXC into the lowcore, without AFP it is undefined */
> -    stl_phys(env_cpu(env)->as,
> -             env->psa + offsetof(LowCore, data_exc_code), vxc);
> +    stl_be_phys(env_cpu(env)->as,
> +                env->psa + offsetof(LowCore, data_exc_code), vxc);
>  #endif
>
>      /* Always store the VXC into the FPC, without AFP it is undefined */
> @@ -651,10 +651,10 @@ void monitor_event(CPUS390XState *env,
>                     uint8_t monitor_class, uintptr_t ra)
>  {
>      /* Store the Monitor Code and the Monitor Class Number into the lowcore */
> -    stq_phys(env_cpu(env)->as,
> -             env->psa + offsetof(LowCore, monitor_code), monitor_code);
> -    stw_phys(env_cpu(env)->as,
> -             env->psa + offsetof(LowCore, mon_class_num), monitor_class);
> +    stq_be_phys(env_cpu(env)->as,
> +                env->psa + offsetof(LowCore, monitor_code), monitor_code);
> +    stw_be_phys(env_cpu(env)->as,
> +                env->psa + offsetof(LowCore, mon_class_num), monitor_class);
>
>      tcg_s390_program_interrupt(env, PGM_MONITOR, ra);
>  }
> diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c
> index 24675fc818d..0c7e099df21 100644
> --- a/target/s390x/tcg/mem_helper.c
> +++ b/target/s390x/tcg/mem_helper.c
> @@ -958,8 +958,9 @@ uint32_t HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint32_t r1, uint32_t r2)
>  inject_exc:
>  #if !defined(CONFIG_USER_ONLY)
>      if (exc != PGM_ADDRESSING) {
> -        stq_phys(env_cpu(env)->as, env->psa + offsetof(LowCore, trans_exc_code),
> -                 env->tlb_fill_tec);
> +        stq_be_phys(env_cpu(env)->as,
> +                    env->psa + offsetof(LowCore, trans_exc_code),
> +                    env->tlb_fill_tec);
>      }
>      if (exc == PGM_PAGE_TRANS) {
>          stb_phys(env_cpu(env)->as, env->psa + offsetof(LowCore, op_access_id),
> --
> 2.52.0
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.