[PATCH] selftests: drivers/s390x: select uvdevice tests using the target architecture

[PATCH] selftests: drivers/s390x: select uvdevice tests using the target architecture

[Sasha Levin]

The uvdevice Makefile decides whether to build its test from uname -m,
which describes the build host. A cross build for s390 on another host
therefore silently omits the test, while the non-s390 branch provides
no-op build and installation targets but no emit_tests target.

Select the test from the target ARCH when it is given and from the
host's SUBARCH otherwise, accepting both the s390 and s390x spellings,
and include lib.mk unconditionally so that other architectures build,
install and emit an empty runlist. ARCH itself is left unset so that a
native LLVM=1 build keeps using the compiler's native target.

Drop the include path derived from tools/arch/$(ARCH): the test only
needs asm/uvdevice.h from the installed kernel headers, and the path
does not exist for the s390x spelling.

Fixes: cbac924200b8 ("selftests: drivers/s390x: Add uvdevice tests")
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 .../selftests/drivers/s390x/uvdevice/Makefile | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/tools/testing/selftests/drivers/s390x/uvdevice/Makefile b/tools/testing/selftests/drivers/s390x/uvdevice/Makefile
index 755d164384c46..586a9aa6fb158 100644
--- a/tools/testing/selftests/drivers/s390x/uvdevice/Makefile
+++ b/tools/testing/selftests/drivers/s390x/uvdevice/Makefile
@@ -1,20 +1,13 @@
 include ../../../../../build/Build.include
 
-UNAME_M := $(shell uname -m)
-
-ifneq ($(UNAME_M),s390x)
-nothing:
-.PHONY: all clean run_tests install
-.SILENT:
-else
+top_srcdir ?= ../../../../../..
+include $(top_srcdir)/scripts/subarch.include
+ARCH_PROCESSED := $(or $(ARCH),$(SUBARCH))
 
+ifneq (,$(filter s390 s390x,$(ARCH_PROCESSED)))
 TEST_GEN_PROGS := test_uvdevice
 
-top_srcdir ?= ../../../../../..
-LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/$(ARCH)/include
-
-CFLAGS += -Wall -Werror -static $(KHDR_INCLUDES) -I$(LINUX_TOOL_ARCH_INCLUDE)
+CFLAGS += -Wall -Werror -static $(KHDR_INCLUDES)
+endif
 
 include ../../../lib.mk
-
-endif

base-commit: 4eb2586bd40db27d77cc5b724ca9386ed0c71d53
-- 
2.53.0

Re: [PATCH] selftests: drivers/s390x: select uvdevice tests using the target architecture

[sashiko-bot]

> The uvdevice Makefile decides whether to build its test from uname -m,
> which describes the build host. A cross build for s390 on another host
> therefore silently omits the test, while the non-s390 branch provides
> no-op build and installation targets but no emit_tests target.
> 
> Select the test from the target ARCH when it is given and from the
> host's SUBARCH otherwise, accepting both the s390 and s390x spellings,
> and include lib.mk unconditionally so that other architectures build,
> install and emit an empty runlist. ARCH itself is left unset so that a
> native LLVM=1 build keeps using the compiler's native target.
> 
> Drop the include path derived from tools/arch/$(ARCH): the test only
> needs asm/uvdevice.h from the installed kernel headers, and the path
> does not exist for the s390x spelling.
> 
> Fixes: cbac924200b8 ("selftests: drivers/s390x: Add uvdevice tests")
> Signed-off-by: Sasha Levin <sashal@kernel.org>

Sashiko has reviewed this patch and found no issues. It looks great!

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261014200127.1363472-1-sashal@kernel.org?part=1

Re: [PATCH] selftests: drivers/s390x: select uvdevice tests using the target architecture

[Steffen Eiden]

On Wed, Oct 14, 2026 at 04:01:49PM -0400, Sasha Levin wrote:
> The uvdevice Makefile decides whether to build its test from uname -m,
> which describes the build host. A cross build for s390 on another host
> therefore silently omits the test, while the non-s390 branch provides
> no-op build and installation targets but no emit_tests target.
> 
> Select the test from the target ARCH when it is given and from the
> host's SUBARCH otherwise, accepting both the s390 and s390x spellings,
> and include lib.mk unconditionally so that other architectures build,
> install and emit an empty runlist. ARCH itself is left unset so that a
> native LLVM=1 build keeps using the compiler's native target.
> 
> Drop the include path derived from tools/arch/$(ARCH): the test only
> needs asm/uvdevice.h from the installed kernel headers, and the path
> does not exist for the s390x spelling.
> 
> Fixes: cbac924200b8 ("selftests: drivers/s390x: Add uvdevice tests")
> Signed-off-by: Sasha Levin <sashal@kernel.org>

LGTM.
Thanks.

Reviewed-by: Steffen Eiden <seiden@linux.ibm.com>

Re: [PATCH] selftests: drivers/s390x: select uvdevice tests using the target architecture

[Sasha Levin]

Ping. Steffen reviewed this and it still applies on 7.4-rc1.

The uvdevice tests still never get built when s390 is cross compiled
(KernelCI builds on x86, so uname -m never says s390x). Could one of you
pick it up, or should it go through Shuah's tree?

-- 
Thanks,
Sasha

Re: [PATCH] selftests: drivers/s390x: select uvdevice tests using the target architecture

[Christian Borntraeger]

Am 03.11.26 um 14:01 schrieb Sasha Levin:
> Ping. Steffen reviewed this and it still applies on 7.4-rc1.
> 
> The uvdevice tests still never get built when s390 is cross compiled
> (KernelCI builds on x86, so uname -m never says s390x). Could one of you
> pick it up, or should it go through Shuah's tree?

Applied and queued for kvms390/master https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git/commit/?id=fdbf9b6e8faf00b7bbfc6c87de09676c971d2fe7
Thank you and sorry for the delay.