kernel/linux.git/arch/s390/include/asm/machine.h, branch v7.0.10

s390: Replace ASSEMBLY with ASSEMBLER in non-uapi headers

2025-06-16T14:23:02+00:00

While the GCC and Clang compilers already define __ASSEMBLER__ automatically when compiling assembler code, __ASSEMBLY__ is a macro that only gets defined by the Makefiles in the kernel. This is bad since macros starting with two underscores are names that are reserved by the C language. It can also be very confusing for the developers when switching between userspace and kernelspace coding, or when dealing with uapi headers that rather should use __ASSEMBLER__ instead. So let's now standardize on the __ASSEMBLER__ macro that is provided by the compilers. This is a completely mechanical patch (done with a simple "sed -i" statement), with some manual fixups done later while rebasing the patch. Signed-off-by: Thomas Huth Acked-by: Heiko Carstens Link: https://lore.kernel.org/r/20250611140046.137739-3-thuth@redhat.com Signed-off-by: Alexander Gordeev

watchdog: diag288_wdt: Implement module autoload

2025-04-16T07:26:49+00:00

The s390 specific diag288_wdt watchdog driver makes use of the virtual watchdog timer, which is available in most machine configurations. If executing the diagnose instruction with subcode 0x288 results in an exception the watchdog timer is not available, otherwise it is available. In order to allow module autoload of the diag288_wdt module, move the detection of the virtual watchdog timer to early boot code, and provide its availability as a cpu feature. This allows to make use of module_cpu_feature_match() to automatically load the module iff the virtual watchdog timer is available. Suggested-by: Marc Hartmayer Tested-by: Mete Durlu Acked-by: Guenter Roeck Link: https://lore.kernel.org/r/20250410095036.1525057-1-hca@linux.ibm.com Signed-off-by: Heiko Carstens

s390: Convert MACHINE_IS_[LPAR|VM|KVM], etc, machine_is_[lpar|vm|kvm]()

2025-03-04T16:18:07+00:00

Move machine type detection to the decompressor and use static branches to implement and use machine_is_[lpar|vm|kvm]() instead of a runtime check via MACHINE_IS_[LPAR|VM|KVM]. Reviewed-by: Vasily Gorbik Signed-off-by: Heiko Carstens Signed-off-by: Vasily Gorbik

s390/diag: Convert MACHINE_HAS_DIAG9C to machine_has_diag9c()

2025-03-04T16:18:06+00:00

Use static branch(es) to implement and use machine_has_diag9c() instead of a runtime check via MACHINE_HAS_DIAG9C. Reviewed-by: Vasily Gorbik Signed-off-by: Heiko Carstens Signed-off-by: Vasily Gorbik

s390/kvm: Convert MACHINE_HAS_ESOP to machine_has_esop()

2025-03-04T16:18:06+00:00

Use static branch(es) to implement and use machine_has_esop() instead of a runtime check via MACHINE_HAS_ESOP. Reviewed-by: Vasily Gorbik Signed-off-by: Heiko Carstens Signed-off-by: Vasily Gorbik

s390/tx: Convert MACHINE_HAS_TE to machine_has_tx()

2025-03-04T16:18:06+00:00

Use static branch(es) to implement and use machine_has_tx() instead of a runtime check with MACHINE_HAS_TE. Reviewed-by: Vasily Gorbik Signed-off-by: Heiko Carstens Signed-off-by: Vasily Gorbik

s390/tlb: Convert MACHINE_HAS_TLB_GUEST to machine_has_tlb_guest()

2025-03-04T16:18:06+00:00

Use static branch(es) to implement and use machine_has_tlb_guest() instead of a runtime check via MACHINE_HAS_TLB_GUEST. Also add sclp_early_detect_machine_features() in order to allow for feature detection from the decompressor. Reviewed-by: Vasily Gorbik Signed-off-by: Heiko Carstens Signed-off-by: Vasily Gorbik

s390/time: Convert MACHINE_HAS_SCC to machine_has_scc()

2025-03-04T16:18:06+00:00

Use static branch(es) to implement and use machine_has_scc() instead of a runtime check via MACHINE_HAS_SCC. This comes with a cleanup of early time initialization: the initial tod_clock_base value is now passed via the bootdata mechanism, instead of using absolute lowcore as transport vehicle from the decompressor to the kernel. Also the early tod clock initialization is moved to the decompressor which allows to use a static branch with machine_has_scc() within the kernel. Reviewed-by: Vasily Gorbik Signed-off-by: Heiko Carstens Signed-off-by: Vasily Gorbik

s390/pci: Get rid of MACHINE_HAS_PCI_MIO

2025-03-04T16:18:06+00:00

Remove MACHINE_FLAG_PCI_MIO/MACHINE_HAS_PCI_MIO and implement the identical functionality with set_machine_feature(), clear_machine_feature() and test_machine_feature(). Acked-by: Niklas Schnelle Tested-by: Niklas Schnelle Reviewed-by: Vasily Gorbik Signed-off-by: Heiko Carstens Signed-off-by: Vasily Gorbik

s390/lowcore: Convert relocated lowcore alternative to machine feature

2025-03-04T16:18:05+00:00

Convert the explicit relocated lowcore alternative type to a more generic machine feature. This only reduces the number of alternative types, but has no impact on code generation. Reviewed-by: Vasily Gorbik Signed-off-by: Heiko Carstens Signed-off-by: Vasily Gorbik

kernel/linux.git/arch/s390/include/asm/machine.h, branch v7.0.10

s390: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers

watchdog: diag288_wdt: Implement module autoload

s390: Convert MACHINE_IS_[LPAR|VM|KVM], etc, machine_is_[lpar|vm|kvm]()

s390/diag: Convert MACHINE_HAS_DIAG9C to machine_has_diag9c()

s390/kvm: Convert MACHINE_HAS_ESOP to machine_has_esop()

s390/tx: Convert MACHINE_HAS_TE to machine_has_tx()

s390/tlb: Convert MACHINE_HAS_TLB_GUEST to machine_has_tlb_guest()

s390/time: Convert MACHINE_HAS_SCC to machine_has_scc()

s390/pci: Get rid of MACHINE_HAS_PCI_MIO

s390/lowcore: Convert relocated lowcore alternative to machine feature

s390: Replace ASSEMBLY with ASSEMBLER in non-uapi headers