From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 66DB53A3E9A; Fri, 10 Apr 2026 12:21:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775823691; cv=none; b=J1oNwjvmCLnfKhTbJ1jbkpZaNX4tmeLT+0TZIFwTNp8+dEHXD0BAJ8LjTQrfNOb+rnZEclzZskWt4JrQZlUZIRmusc5t+RIGeXLATMQLLeSgMXsUTp6u3vg5dfM3XMTb9/8+GKomJApf4bJmOeStWzurRmtjGR5cJNHYMElP/qg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775823691; c=relaxed/simple; bh=Q+IGONPkRqfayguG6Txkx/mXXA1oIi3CJxpKCndboyw=; h=Date:Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=S/c/hFRyqUT9ZOjZCcPINvPUyNOdY7cwTs2sraNpsn4SqQK6UFfoUq3dAPEBmdtG1389mpHFucbvHdVSwQTiOXz45nbeuxA4QzRJxEbBnzU0VaLmJWOwryF2dOJHSSQdWcjAUxJlsIXnfAXKOvwDMErNg53LzEXKTV0PKvl42S0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jCHje7Cb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jCHje7Cb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60A92C19421; Fri, 10 Apr 2026 12:21:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775823691; bh=Q+IGONPkRqfayguG6Txkx/mXXA1oIi3CJxpKCndboyw=; h=Date:From:To:Cc:Subject:References:From; b=jCHje7Cbtua5yolIUEErxzzrufBxMW0LYt1Kl8DVF/tR3HVJLQOi/32jC1MsFj4sU FuxQN5MUq6aUGx6W7VIPg9yzFSdqaZMbr1tHN5zCNxM830u3a1p54HzWCg2l8d0SzU xyIH4nNx8yib1hODU1iz6RiEcKM7mp5gg40/5f4Y1z++7yY40Cew7vRxlBQZnDz2BW SRGp9xUTNtuoCzThvYns7ndknYQX1oh8mSimdrkytbEv0fT97jYIikQFCA2/G5YDNs jkUQfDUfGpJwZkehI6Gounl+WGkLz5eknKnsUFvTrSUQCfxc7Qg1pWGasV1G+9O2Ak 9A3OklGLFCHng== Date: Fri, 10 Apr 2026 14:21:28 +0200 Message-ID: <20260410120320.081003009@kernel.org> User-Agent: quilt/0.68 From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Arnd Bergmann , Lu Baolu , iommu@lists.linux.dev, Michael Grzeschik , netdev@vger.kernel.org, linux-wireless@vger.kernel.org, Herbert Xu , linux-crypto@vger.kernel.org, Vlastimil Babka , linux-mm@kvack.org, David Woodhouse , Bernie Thompson , linux-fbdev@vger.kernel.org, "Theodore Tso" , linux-ext4@vger.kernel.org, Andrew Morton , Uladzislau Rezki , Marco Elver , Dmitry Vyukov , kasan-dev@googlegroups.com, Andrey Ryabinin , Thomas Sailer , linux-hams@vger.kernel.org, "Jason A. Donenfeld" , Richard Henderson , linux-alpha@vger.kernel.org, Russell King , linux-arm-kernel@lists.infradead.org, Catalin Marinas , Huacai Chen , loongarch@lists.linux.dev, Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org, Dinh Nguyen , Jonas Bonn , linux-openrisc@vger.kernel.org, Helge Deller , linux-parisc@vger.kernel.org, Michael Ellerman , linuxppc-dev@lists.ozlabs.org, Paul Walmsley , linux-riscv@lists.infradead.org, Heiko Carstens , linux-s390@vger.kernel.org, "David S. Miller" , sparclinux@vger.kernel.org Subject: [patch 37/38] x86: Select ARCH_HAS_RANDOM_ENTROPY References: <20260410120044.031381086@kernel.org> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 The only remaining usage of get_cycles() is to provide random_get_entropy(). Switch x86 over to the new scheme of selecting ARCH_HAS_RANDOM_ENTROPY and providing random_get_entropy() in asm/random.h. Remove asm/timex.h as it has no functionality anymore. Signed-off-by: Thomas Gleixner Cc: x86@kernel.org --- arch/x86/Kconfig | 1 + arch/x86/include/asm/random.h | 16 ++++++++++++++++ arch/x86/include/asm/timex.h | 17 ----------------- arch/x86/include/asm/tsc.h | 9 --------- 4 files changed, 17 insertions(+), 26 deletions(-) --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -101,6 +101,7 @@ config X86 select ARCH_HAS_PREEMPT_LAZY select ARCH_HAS_PTDUMP select ARCH_HAS_PTE_SPECIAL + select ARCH_HAS_RANDOM_ENTROPY select ARCH_HAS_HW_PTE_YOUNG select ARCH_HAS_NONLEAF_PMD_YOUNG if PGTABLE_LEVELS > 2 select ARCH_HAS_UACCESS_FLUSHCACHE if X86_64 --- /dev/null +++ b/arch/x86/include/asm/random.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_RANDOM_H +#define _ASM_X86_RANDOM_H + +#include +#include + +static inline unsigned long random_get_entropy(void) +{ + if (!IS_ENABLED(CONFIG_X86_TSC) && + !cpu_feature_enabled(X86_FEATURE_TSC)) + return random_get_entropy_fallback(); + return rdtsc(); +} + +#endif /* _ASM_X86_RANDOM_H */ --- a/arch/x86/include/asm/timex.h +++ /dev/null @@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_X86_TIMEX_H -#define _ASM_X86_TIMEX_H - -#include -#include - -static inline unsigned long random_get_entropy(void) -{ - if (!IS_ENABLED(CONFIG_X86_TSC) && - !cpu_feature_enabled(X86_FEATURE_TSC)) - return random_get_entropy_fallback(); - return rdtsc(); -} -#define random_get_entropy random_get_entropy - -#endif /* _ASM_X86_TIMEX_H */ --- a/arch/x86/include/asm/tsc.h +++ b/arch/x86/include/asm/tsc.h @@ -72,15 +72,6 @@ extern unsigned int tsc_khz; extern void disable_TSC(void); -static inline cycles_t get_cycles(void) -{ - if (!IS_ENABLED(CONFIG_X86_TSC) && - !cpu_feature_enabled(X86_FEATURE_TSC)) - return 0; - return rdtsc(); -} -#define get_cycles get_cycles - extern void tsc_early_init(void); extern void tsc_init(void); extern void mark_tsc_unstable(char *reason);