diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-12-04 19:39:24 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-12-04 19:39:24 +1100 |
| commit | 9587573f4be085f949e1eed36f62fef98a77a394 (patch) | |
| tree | 68aea61c35de95ea4cf08d6f30d89df79e2e339f | |
| parent | 7ca21767be956d7de6956fbe857890be01e10361 (diff) | |
| download | blackbird-skiboot-9587573f4be085f949e1eed36f62fef98a77a394.tar.gz blackbird-skiboot-9587573f4be085f949e1eed36f62fef98a77a394.zip | |
sreset_kernel: only run SMT tests due to not supporting re-entry
Fixes: 0d84ea6bda03a00a1765dd7240a9e5231a537e96
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
| -rw-r--r-- | test/sreset_world/Makefile.check | 9 | ||||
| -rw-r--r-- | test/sreset_world/sreset_kernel/sreset_kernel.S | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/test/sreset_world/Makefile.check b/test/sreset_world/Makefile.check index 528acd60..02e03f34 100644 --- a/test/sreset_world/Makefile.check +++ b/test/sreset_world/Makefile.check @@ -1,10 +1,9 @@ SRESET_WORLD_TEST := test/sreset_world/sreset_kernel/sreset_kernel .PHONY: sreset_world-tests +# We only do the SMT tests as we don't do OPAL re-entry sreset_world-tests: $(SRESET_WORLD_TEST:%=%-check-smt-mambo) sreset_world-tests: $(SRESET_WORLD_TEST:%=%-check-smt-p9-mambo) -sreset_world-tests: $(SRESET_WORLD_TEST:%=%-check-mambo) -sreset_world-tests: $(SRESET_WORLD_TEST:%=%-check-p9-mambo) boot-tests: sreset_world-tests check: sreset_world-tests @@ -15,12 +14,6 @@ $(SRESET_WORLD_TEST:%=%-check-smt-mambo): %-check-smt-mambo: % skiboot.lid $(SRESET_WORLD_TEST:%=%-check-smt-p9-mambo): %-check-smt-p9-mambo: % skiboot.lid $(call Q , BOOT TEST , THREADS=2 ./test/sreset_world/run_mambo_p9_sreset.sh , $@) -$(SRESET_WORLD_TEST:%=%-check-mambo): %-check-mambo: % skiboot.lid - $(call Q , BOOT TEST , ./test/sreset_world/run_mambo_sreset.sh, $@) - -$(SRESET_WORLD_TEST:%=%-check-p9-mambo): %-check-p9-mambo: % skiboot.lid - $(call Q , BOOT TEST , ./test/sreset_world/run_mambo_p9_sreset.sh, $@) - test/sreset_world/sreset_kernel/sreset_kernel.o: test/sreset_world/sreset_kernel/sreset_kernel.S test/sreset_world/sreset_kernel/sreset_kernel.ld $(call Q,CC, $(CC) -mbig-endian -m64 -c -MMD -o $@ $< ,$@) diff --git a/test/sreset_world/sreset_kernel/sreset_kernel.S b/test/sreset_world/sreset_kernel/sreset_kernel.S index 33ad8110..aae5fb73 100644 --- a/test/sreset_world/sreset_kernel/sreset_kernel.S +++ b/test/sreset_world/sreset_kernel/sreset_kernel.S @@ -63,7 +63,7 @@ c: bctrl li %r0, 145 /* OPAL_SIGNAL_SYSTEM_RESET */ - li %r3, -1 /* All CPUs */ + li %r3, -2 /* All *OTHER* CPUs */ mr %r2, %r13 mtctr %r14 bctrl |
