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 D217D3CD8B5; Fri, 10 Apr 2026 12:20:29 +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=1775823629; cv=none; b=fgvGLK9QvpNS98Bhjjb9i0aTw8UZr7f90SuvH9ZMi+Vk2hZlWBZiIJYLNylxpXVVqmmFZ6iqQ75K/6ejzKFn/ynDla28rTlQg52xPyxf6N9cS5FrCSdLc25KENkK2rL+xmBwgMlVN6HkwB9I1mSPXGzjcU8lCaazIqyPZ6Qdngw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775823629; c=relaxed/simple; bh=Xj914OB0ywB5KtjAdUFbVTIri4m7J0/9GAWloccpVyg=; h=Date:Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=H2GCUz2KT+SoxPKaVXy8PbUO11xism9fwtAnwZeYciKxJ5yDNWqp6Qxcv/fyBHruroV1S/2dMo2plV68PJE/P63fyNuFdIoio0Qgz9Pq6Ia1Om55rtGtGzGUSGICMv+tHDOI9YgF6PacuUwIr/FYBcHzzfYuQnycW4XMI3F4Czo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UacNbv5z; 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="UacNbv5z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8258C2BCAF; Fri, 10 Apr 2026 12:20:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775823629; bh=Xj914OB0ywB5KtjAdUFbVTIri4m7J0/9GAWloccpVyg=; h=Date:From:To:Cc:Subject:References:From; b=UacNbv5zzA6AzbAlRM4n4U5NaKejyQd8mANj0iWZ5RQiRAJWixjyMgZjbiDhDTyzO ay62PPnTA47MG/rmdeWa/4KfjNAnW4xtTzJ34RAhThlg0KY8nNByGNrsu9zE469dPQ hWtTJvAZ4ZE2brA8ZCckIrkzYMvi5clv/chlzjJ3PYteh92RUSFzhMNQu3+ZTJTDCI kJ6mPTSZ1AZhD1XvkSSEOtM9nEZR/77fxCsYwUjbpiFSE3ESK6EP7pbE6Ao/WrdTRD AlaT3EdsheI/WmWdaf0zz7rbsJUIcktKioLIztC89PcrEqXmxk39mPCnXjzI5yFh8X xNx6W4PqnkQAQ== Date: Fri, 10 Apr 2026 14:20:26 +0200 Message-ID: <20260410120319.197793115@kernel.org> User-Agent: quilt/0.68 From: Thomas Gleixner To: LKML Cc: Russell King , linux-arm-kernel@lists.infradead.org, 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, 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 24/38] ARM: Select ARCH_HAS_RANDOM_ENTROPY References: <20260410120044.031381086@kernel.org> Precedence: bulk X-Mailing-List: linux-s390@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 ARM 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: Russell King Cc: linux-arm-kernel@lists.infradead.org --- arch/arm/Kconfig | 1 + arch/arm/include/asm/random.h | 14 ++++++++++++++ arch/arm/include/asm/timex.h | 18 ------------------ arch/arm/lib/delay.c | 4 ++-- 4 files changed, 17 insertions(+), 20 deletions(-) --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -22,6 +22,7 @@ config ARM select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE select ARCH_HAS_PTE_SPECIAL if ARM_LPAE + select ARCH_HAS_RANDOM_ENTROPY select ARCH_HAS_SETUP_DMA_OPS select ARCH_HAS_SET_MEMORY select ARCH_STACKWALK --- /dev/null +++ b/arch/arm/include/asm/random.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _ASMARM_RANDOM_H +#define _ASMARM_RANDOM_H + +bool delay_read_timer(unsigned long *t); + +static inline unsigned long random_get_entropy(void) +{ + unsigned long t; + + return delay_read_timer(&t) ? t : random_get_entropy_fallback(); +} + +#endif --- a/arch/arm/include/asm/timex.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * arch/arm/include/asm/timex.h - * - * Copyright (C) 1997,1998 Russell King - * - * Architecture Specific TIME specifications - */ -#ifndef _ASMARM_TIMEX_H -#define _ASMARM_TIMEX_H - -// Temporary workaround -bool delay_read_timer(unsigned long *t); - -#define get_cycles() ({ cycles_t c; delay_read_timer(&c) ? 0 : c; }) -#define random_get_entropy() (((unsigned long)get_cycles()) ?: random_get_entropy_fallback()) - -#endif --- a/arch/arm/lib/delay.c +++ b/arch/arm/lib/delay.c @@ -42,9 +42,9 @@ static inline u64 cyc_to_ns(u64 cyc, u32 static void __timer_delay(unsigned long cycles) { - cycles_t start = get_cycles(); + cycles_t start = delay_timer->read_current_timer(); - while ((get_cycles() - start) < cycles) + while ((delay_timer->read_current_timer() - start) < cycles) cpu_relax(); }