[PATCH v2 1/7] selftests/powerpc: Use mfspr/mtspr macros

[Andrew Donnellan]

On Wed, 2022-11-23 at 10:10 +1100, Benjamin Gray wrote:
> No need to write inline asm for mtspr/mfspr, we have macros for this
> in reg.h
> 
> Signed-off-by: Benjamin Gray <bgray at linux.ibm.com>

Good cleanup.

Reviewed-by: Andrew Donnellan <ajd at linux.ibm.com>

> ---
>  tools/testing/selftests/powerpc/dscr/dscr.h     | 17 +++++----------
> --
>  .../selftests/powerpc/ptrace/ptrace-hwbreak.c   |  6 ++----
>  tools/testing/selftests/powerpc/ptrace/ptrace.h |  5 +----
>  .../selftests/powerpc/security/flush_utils.c    |  3 ++-
>  4 files changed, 10 insertions(+), 21 deletions(-)
> 
> diff --git a/tools/testing/selftests/powerpc/dscr/dscr.h
> b/tools/testing/selftests/powerpc/dscr/dscr.h
> index 13e9b9e28e2c..b703714e7d98 100644
> --- a/tools/testing/selftests/powerpc/dscr/dscr.h
> +++ b/tools/testing/selftests/powerpc/dscr/dscr.h
> @@ -23,6 +23,7 @@
>  #include <sys/stat.h>
>  #include <sys/wait.h>
>  
> +#include "reg.h"
>  #include "utils.h"
>  
>  #define THREADS                100     /* Max threads */
> @@ -41,31 +42,23 @@
>  /* Prilvilege state DSCR access */
>  inline unsigned long get_dscr(void)
>  {
> -       unsigned long ret;
> -
> -       asm volatile("mfspr %0,%1" : "=r" (ret) : "i"
> (SPRN_DSCR_PRIV));
> -
> -       return ret;
> +       return mfspr(SPRN_DSCR_PRIV);
>  }
>  
>  inline void set_dscr(unsigned long val)
>  {
> -       asm volatile("mtspr %1,%0" : : "r" (val), "i"
> (SPRN_DSCR_PRIV));
> +       mtspr(SPRN_DSCR_PRIV, val);
>  }
>  
>  /* Problem state DSCR access */
>  inline unsigned long get_dscr_usr(void)
>  {
> -       unsigned long ret;
> -
> -       asm volatile("mfspr %0,%1" : "=r" (ret) : "i" (SPRN_DSCR));
> -
> -       return ret;
> +       return mfspr(SPRN_DSCR);
>  }
>  
>  inline void set_dscr_usr(unsigned long val)
>  {
> -       asm volatile("mtspr %1,%0" : : "r" (val), "i" (SPRN_DSCR));
> +       mtspr(SPRN_DSCR, val);
>  }
>  
>  /* Default DSCR access */
> diff --git a/tools/testing/selftests/powerpc/ptrace/ptrace-hwbreak.c
> b/tools/testing/selftests/powerpc/ptrace/ptrace-hwbreak.c
> index a0635a3819aa..1345e9b9af0f 100644
> --- a/tools/testing/selftests/powerpc/ptrace/ptrace-hwbreak.c
> +++ b/tools/testing/selftests/powerpc/ptrace/ptrace-hwbreak.c
> @@ -23,6 +23,7 @@
>  #include <sys/syscall.h>
>  #include <linux/limits.h>
>  #include "ptrace.h"
> +#include "reg.h"
>  
>  #define SPRN_PVR       0x11F
>  #define PVR_8xx                0x00500000
> @@ -620,10 +621,7 @@ static int ptrace_hwbreak(void)
>  
>  int main(int argc, char **argv, char **envp)
>  {
> -       int pvr = 0;
> -       asm __volatile__ ("mfspr %0,%1" : "=r"(pvr) : "i"(SPRN_PVR));
> -       if (pvr == PVR_8xx)
> -               is_8xx = true;
> +       is_8xx = mfspr(SPRN_PVR) == PVR_8xx;
>  
>         return test_harness(ptrace_hwbreak, "ptrace-hwbreak");
>  }
> diff --git a/tools/testing/selftests/powerpc/ptrace/ptrace.h
> b/tools/testing/selftests/powerpc/ptrace/ptrace.h
> index 4e0233c0f2b3..04788e5fc504 100644
> --- a/tools/testing/selftests/powerpc/ptrace/ptrace.h
> +++ b/tools/testing/selftests/powerpc/ptrace/ptrace.h
> @@ -745,10 +745,7 @@ int show_tm_spr(pid_t child, struct tm_spr_regs
> *out)
>  /* Analyse TEXASR after TM failure */
>  inline unsigned long get_tfiar(void)
>  {
> -       unsigned long ret;
> -
> -       asm volatile("mfspr %0,%1" : "=r" (ret) : "i" (SPRN_TFIAR));
> -       return ret;
> +       return mfspr(SPRN_TFIAR);
>  }
>  
>  void analyse_texasr(unsigned long texasr)
> diff --git a/tools/testing/selftests/powerpc/security/flush_utils.c
> b/tools/testing/selftests/powerpc/security/flush_utils.c
> index 4d95965cb751..9c5c00e04f63 100644
> --- a/tools/testing/selftests/powerpc/security/flush_utils.c
> +++ b/tools/testing/selftests/powerpc/security/flush_utils.c
> @@ -14,6 +14,7 @@
>  #include <string.h>
>  #include <stdio.h>
>  #include <sys/utsname.h>
> +#include "reg.h"
>  #include "utils.h"
>  #include "flush_utils.h"
>  
> @@ -79,5 +80,5 @@ void set_dscr(unsigned long val)
>                 init = 1;
>         }
>  
> -       asm volatile("mtspr %1,%0" : : "r" (val), "i" (SPRN_DSCR));
> +       mtspr(SPRN_DSCR, val);
>  }
> 
> base-commit: 247f34f7b80357943234f93f247a1ae6b6c3a740

-- 
Andrew Donnellan    OzLabs, ADL Canberra
ajd at linux.ibm.com   IBM Australia Limited