riscv: vdso: Untangle Kconfig logic

On riscv32 the generic vDSO infrastructure is used but without its
time-related functionality. The Kconfig logic to implement this
treats HAVE_GENERIC_VDSO as a synonym for GENERIC_GETTIMEOFDAY.
This works today due to some underlying issues in how the generic vDSO
library works. Some future cleanups will break this logic.

Restructure the Kconfig logic, so HAVE_GENERIC_VDSO refers to the generic
library in general and GENERIC_GETTIMEOFDAY refers to its time-related
functionality.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250826-vdso-cleanups-v1-6-d9b65750e49f@linutronix.de

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index a4b233a0659ed80c0eb6b118ea8c8db81ed3fdba..e4ac0e833ecfdb976134e9009a2cdfdea789f13d 100644 (file)
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -52,7 +52,7 @@ config RISCV
        select ARCH_HAS_SYSCALL_WRAPPER
        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
        select ARCH_HAS_UBSAN
-       select ARCH_HAS_VDSO_ARCH_DATA if GENERIC_VDSO_DATA_STORE
+       select ARCH_HAS_VDSO_ARCH_DATA if HAVE_GENERIC_VDSO
        select ARCH_KEEP_MEMBLOCK if ACPI
        select ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE if 64BIT && MMU
        select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX
@@ -107,7 +107,7 @@ config RISCV
        select GENERIC_CPU_VULNERABILITIES
        select GENERIC_EARLY_IOREMAP
        select GENERIC_ENTRY
-       select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO
+       select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO && 64BIT
        select GENERIC_IDLE_POLL_SETUP
        select GENERIC_IOREMAP if MMU
        select GENERIC_IRQ_IPI if SMP
@@ -120,9 +120,9 @@ config RISCV
        select GENERIC_PCI_IOMAP
        select GENERIC_SCHED_CLOCK
        select GENERIC_SMP_IDLE_THREAD
-       select GENERIC_TIME_VSYSCALL if MMU && 64BIT
-       select GENERIC_VDSO_DATA_STORE if MMU
-       select GENERIC_VDSO_TIME_NS if HAVE_GENERIC_VDSO
+       select GENERIC_TIME_VSYSCALL if GENERIC_GETTIMEOFDAY
+       select GENERIC_VDSO_DATA_STORE if HAVE_GENERIC_VDSO
+       select GENERIC_VDSO_TIME_NS if GENERIC_GETTIMEOFDAY
        select HARDIRQS_SW_RESEND
        select HAS_IOPORT if MMU
        select HAVE_ALIGNED_STRUCT_PAGE
@@ -165,7 +165,7 @@ config RISCV
        select HAVE_FUNCTION_ARG_ACCESS_API
        select HAVE_FUNCTION_ERROR_INJECTION
        select HAVE_GCC_PLUGINS
-       select HAVE_GENERIC_VDSO if MMU && 64BIT
+       select HAVE_GENERIC_VDSO if MMU
        select HAVE_IRQ_TIME_ACCOUNTING
        select HAVE_KERNEL_BZIP2 if !XIP_KERNEL && !EFI_ZBOOT
        select HAVE_KERNEL_GZIP if !XIP_KERNEL && !EFI_ZBOOT
@@ -221,7 +221,7 @@ config RISCV
        select THREAD_INFO_IN_TASK
        select TRACE_IRQFLAGS_SUPPORT
        select UACCESS_MEMCPY if !MMU
-       select VDSO_GETRANDOM if HAVE_GENERIC_VDSO
+       select VDSO_GETRANDOM if HAVE_GENERIC_VDSO && 64BIT
        select USER_STACKTRACE_SUPPORT
        select ZONE_DMA32 if 64BIT