selftests/powerpc: Move Hash MMU check to utilities

This moves a function to test if the MMU is in Hash mode
under the generic test utilities.

Signed-off-by: Sandipan Das <sandipan@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200604125610.649668-3-sandipan@linux.ibm.com

diff --git a/tools/testing/selftests/powerpc/include/utils.h b/tools/testing/selftests/powerpc/include/utils.h
index 2e39b297054f3756a9c76e3f68cbf0eb943f563a..9dbe607cc5ec3fe4184e66312390de9ccbdcd3fe 100644 (file)
--- a/tools/testing/selftests/powerpc/include/utils.h
+++ b/tools/testing/selftests/powerpc/include/utils.h
@@ -60,6 +60,7 @@ static inline bool have_hwcap2(unsigned long ftr2)
 #endif
 
 bool is_ppc64le(void);
+int using_hash_mmu(bool *using_hash);
 
 /* Yes, this is evil */
 #define FAIL_IF(x)                                             \

diff --git a/tools/testing/selftests/powerpc/mm/Makefile b/tools/testing/selftests/powerpc/mm/Makefile
index b9103c4bb4145f2b61f10c95409a03e9df18e6e0..2389bf791fd660aead070c73c4ebd396a8a67438 100644 (file)
--- a/tools/testing/selftests/powerpc/mm/Makefile
+++ b/tools/testing/selftests/powerpc/mm/Makefile
@@ -10,7 +10,7 @@ TEST_GEN_FILES := tempfile
 top_srcdir = ../../../../..
 include ../../lib.mk
 
-$(TEST_GEN_PROGS): ../harness.c
+$(TEST_GEN_PROGS): ../harness.c ../utils.c
 
 $(OUTPUT)/prot_sao: ../utils.c
 

diff --git a/tools/testing/selftests/powerpc/mm/bad_accesses.c b/tools/testing/selftests/powerpc/mm/bad_accesses.c
index adc465f499efae7c17cefec718ff3dc99329adaf..a864ed7e2008191560f89e16e286c82698c7a5fb 100644 (file)
--- a/tools/testing/selftests/powerpc/mm/bad_accesses.c
+++ b/tools/testing/selftests/powerpc/mm/bad_accesses.c
@@ -64,34 +64,6 @@ int bad_access(char *p, bool write)
        return 0;
 }
 
-static int using_hash_mmu(bool *using_hash)
-{
-       char line[128];
-       FILE *f;
-       int rc;
-
-       f = fopen("/proc/cpuinfo", "r");
-       FAIL_IF(!f);
-
-       rc = 0;
-       while (fgets(line, sizeof(line), f) != NULL) {
-               if (strcmp(line, "MMU           : Hash\n") == 0) {
-                       *using_hash = true;
-                       goto out;
-               }
-
-               if (strcmp(line, "MMU           : Radix\n") == 0) {
-                       *using_hash = false;
-                       goto out;
-               }
-       }
-
-       rc = -1;
-out:
-       fclose(f);
-       return rc;
-}
-
 static int test(void)
 {
        unsigned long i, j, addr, region_shift, page_shift, page_size;

diff --git a/tools/testing/selftests/powerpc/utils.c b/tools/testing/selftests/powerpc/utils.c
index 5ee0e98c4896712eca356cc6edae654441e0fec1..933678f1ed0a0ea23171c500b748943ef2c41e90 100644 (file)
--- a/tools/testing/selftests/powerpc/utils.c
+++ b/tools/testing/selftests/powerpc/utils.c
@@ -293,3 +293,31 @@ void set_dscr(unsigned long val)
 
        asm volatile("mtspr %1,%0" : : "r" (val), "i" (SPRN_DSCR));
 }
+
+int using_hash_mmu(bool *using_hash)
+{
+       char line[128];
+       FILE *f;
+       int rc;
+
+       f = fopen("/proc/cpuinfo", "r");
+       FAIL_IF(!f);
+
+       rc = 0;
+       while (fgets(line, sizeof(line), f) != NULL) {
+               if (strcmp(line, "MMU           : Hash\n") == 0) {
+                       *using_hash = true;
+                       goto out;
+               }
+
+               if (strcmp(line, "MMU           : Radix\n") == 0) {
+                       *using_hash = false;
+                       goto out;
+               }
+       }
+
+       rc = -1;
+out:
+       fclose(f);
+       return rc;
+}