41 files changed, 4083 insertions, 46 deletions

diff --git a/tools/testing/selftests/powerpc/Makefile b/tools/testing/selftests/powerpc/Makefile
index b3dbe9ef1a40..54833a791a44 100644
--- a/tools/testing/selftests/powerpc/Makefile
+++ b/tools/testing/selftests/powerpc/Makefile
@@ -13,7 +13,7 @@ CFLAGS := -Wall -O2 -flto -Wall -Werror -DGIT_VERSION='"$(GIT_VERSION)"' -I$(CUR
 
 export CC CFLAGS
 
-TARGETS = pmu copyloops mm
+TARGETS = pmu copyloops mm tm
 
 endif
 
diff --git a/tools/testing/selftests/powerpc/harness.c b/tools/testing/selftests/powerpc/harness.c
index e80c42a584fe..8ebc58a09311 100644
--- a/tools/testing/selftests/powerpc/harness.c
+++ b/tools/testing/selftests/powerpc/harness.c
@@ -30,12 +30,15 @@ int run_test(int (test_function)(void), char *name)
 
         pid = fork();
         if (pid == 0) {
+                setpgid(0, 0);
                 exit(test_function());
         } else if (pid == -1) {
                 perror("fork");
                 return 1;
         }
 
+        setpgid(pid, pid);
+
         /* Wake us up in timeout seconds */
         alarm(TIMEOUT);
         terminated = false;
@@ -50,17 +53,20 @@ wait:
 
                 if (terminated) {
                         printf("!! force killing %s\n", name);
-                        kill(pid, SIGKILL);
+                        kill(-pid, SIGKILL);
                         return 1;
                 } else {
                         printf("!! killing %s\n", name);
-                        kill(pid, SIGTERM);
+                        kill(-pid, SIGTERM);
                         terminated = true;
                         alarm(KILL_TIMEOUT);
                         goto wait;
                 }
         }
 
+        /* Kill anything else in the process group that is still running */
+        kill(-pid, SIGTERM);
+
         if (WIFEXITED(status))
                 status = WEXITSTATUS(status);
         else {
@@ -99,7 +105,10 @@ int test_harness(int (test_function)(void), char *name)
 
         rc = run_test(test_function, name);
 
-        test_finish(name, rc);
+        if (rc == MAGIC_SKIP_RETURN_VALUE)
+                test_skip(name);
+        else
+                test_finish(name, rc);
 
         return rc;
 }
diff --git a/tools/testing/selftests/powerpc/pmu/Makefile b/tools/testing/selftests/powerpc/pmu/Makefile
index 7216f0091655..b9ff0db42c79 100644
--- a/tools/testing/selftests/powerpc/pmu/Makefile
+++ b/tools/testing/selftests/powerpc/pmu/Makefile
@@ -4,7 +4,7 @@ noarg:
 PROGS := count_instructions
 EXTRA_SOURCES := ../harness.c event.c
 
-all: $(PROGS)
+all: $(PROGS) sub_all
 
 $(PROGS): $(EXTRA_SOURCES)
 
@@ -12,12 +12,30 @@ $(PROGS): $(EXTRA_SOURCES)
 count_instructions: loop.S count_instructions.c $(EXTRA_SOURCES)
         $(CC) $(CFLAGS) -m64 -o $@ $^
 
-run_tests: all
+run_tests: all sub_run_tests
         @-for PROG in $(PROGS); do \
                 ./$$PROG; \
         done;
 
-clean:
+clean: sub_clean
         rm -f $(PROGS) loop.o
 
-.PHONY: all run_tests clean
+
+SUB_TARGETS = ebb
+
+sub_all:
+        @for TARGET in $(SUB_TARGETS); do \
+                $(MAKE) -C $$TARGET all; \
+        done;
+
+sub_run_tests: all
+        @for TARGET in $(SUB_TARGETS); do \
+                $(MAKE) -C $$TARGET run_tests; \