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 0A33C3DEAF7; Fri, 10 Apr 2026 12:20:53 +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=1775823654; cv=none; b=exciZ3bLp2yTQ2GG7EIg+Qu1qNClEWJChWdFsdkMsm5NQyWWW1GjLichkrp85nQ2RNRzMOItHbSEV/znOYeiWsdT8bnM8iCJBbQdcNLvviH+UaGn9TmpmiigvJ6EFkmFYicrjsQcjpUGcSUW/Z6ix+Whd4djDam3grcZrXNXQhs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775823654; c=relaxed/simple; bh=JK0/F7Ki9YiLWmMnKZ+Lr+3CWdB1is+mT2jM4Zqadew=; h=Date:Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=l0/uDF8ZKepWFqTVUQyjbv4bVkf+ilIvp9iTmFsEZTbO3/gdXjQlrXxMcqDrVY+H9mavE6TJ3XEiDZUA1vnaFJs/IYnBj7JOki2fl+HcvbzlNQeLqf6x3SefbwVBy0KjGNqe1IqZH8bvP/ca30u2Shjr3CxHLw6PKCfWseB3jVs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OB4z6rme; 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="OB4z6rme" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82A6BC2BCAF; Fri, 10 Apr 2026 12:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775823653; bh=JK0/F7Ki9YiLWmMnKZ+Lr+3CWdB1is+mT2jM4Zqadew=; h=Date:From:To:Cc:Subject:References:From; b=OB4z6rmedzjF/tihT238p7staUYI70l/WLyVpYQgd3G/0qlK9BetgUNbHaxUOTJJk qdDaLQwa1siZvXl47NXTJc0ORYA2dsT704qKM+lVSSRN4sldd+TbcnCJaaKLtMHkff SfKJlNkL5h8guSKmd0Me9uWsWZCYIBa85rKbdrV18Ca38UzELO7GQROVPWzrTHMCfJ QFdBWZuROAjUxl7+DX48sdEQxX7/xngz/AnUC+xaQ7wkdJF1oolh8aMOXz2mAve+hh C3LVdoPqlu6sGEaRdYNI50vZs10DhqwpaJqHFXY4YWja3gycAdllpb8XCooIJE8rT+ LUw8ufY+z6WgQ== Date: Fri, 10 Apr 2026 14:20:50 +0200 Message-ID: <20260410120319.528318344@kernel.org> User-Agent: quilt/0.68 From: Thomas Gleixner To: LKML Cc: Dinh Nguyen , Arnd Bergmann , x86@kernel.org, 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, 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 29/38] nios2: 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 non-architecture usage of get_cycles() is to provide random_get_entropy(). Switch nios2 over to the new scheme of selecting ARCH_HAS_RANDOM_ENTROPY and providing random_get_entropy() in asm/random.h. Add 'asm/timex.h' includes to the relevant files, so the global include can be removed once all architectures are converted over. Signed-off-by: Thomas Gleixner Cc: Dinh Nguyen --- arch/nios2/Kconfig | 1 + arch/nios2/include/asm/random.h | 14 ++++++++++++++ arch/nios2/include/asm/timex.h | 5 +---- arch/nios2/kernel/time.c | 4 ++-- 4 files changed, 18 insertions(+), 6 deletions(-) --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -7,6 +7,7 @@ config NIOS2 select ARCH_HAS_SYNC_DMA_FOR_CPU select ARCH_HAS_SYNC_DMA_FOR_DEVICE select ARCH_HAS_DMA_SET_UNCACHED + select ARCH_HAS_RANDOM_ENTROPY select ARCH_NO_SWAP select COMMON_CLK select TIMER_OF --- /dev/null +++ b/arch/nios2/include/asm/random.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _ASM_NIOS2_RANDOM_H +#define _ASM_NIOS2_RANDOM_H + +#include + +static inline unsigned long random_get_entropy(void) +{ + unsigned long c = get_cycles(); + + return c ? c : random_get_entropy_fallback(); +} + +#endif --- a/arch/nios2/include/asm/timex.h +++ b/arch/nios2/include/asm/timex.h @@ -5,9 +5,6 @@ #ifndef _ASM_NIOS2_TIMEX_H #define _ASM_NIOS2_TIMEX_H -extern cycles_t get_cycles(void); -#define get_cycles get_cycles - -#define random_get_entropy() (((unsigned long)get_cycles()) ?: random_get_entropy_fallback()) +cycles_t get_cycles(void); #endif --- a/arch/nios2/kernel/time.c +++ b/arch/nios2/kernel/time.c @@ -7,7 +7,6 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. */ - #include #include #include @@ -19,6 +18,8 @@ #include #include +#include + #define ALTR_TIMER_COMPATIBLE "altr,timer-1.0" #define ALTERA_TIMER_STATUS_REG 0 @@ -112,7 +113,6 @@ cycles_t get_cycles(void) return nios2_timer_read(&nios2_cs.cs); return 0; } -EXPORT_SYMBOL(get_cycles); static void nios2_timer_start(struct nios2_timer *timer) {