From nobody Mon Sep 28 17:49:01 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 EFBDB440631 for ; Wed, 19 Aug 2026 21:43:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787175809; cv=none; b=HUNKoOnliZhjLjztTmNA9QyZ/kqzekTbThXZ65EOlEWwK8EXxjqV4o5J69E5P1WqoMnE4WDzDugNNkxZjtiV6L/OEVmOxuJ5R0bHEtp4zrf7dQ6kpbD1A0j8txeabEyZGpV+mMGAGgfSWR5Ln/3jnM2ej0VrQiS0CwPcX3yTu4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787175809; c=relaxed/simple; bh=MYnAPnoNMKML0+3kgfTLZViy+yttVpW5NVcsf68p3aQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=B/jDatUxYtaB3L3twlP8/hdJJVFc4BusJaWKk14B52IVqdJKrGtzTt2RcS1B5daAg2Y8XBOTPC9xGQ81r9sS1ocRQ5T1Cg2+T8jAT1K5nWafO6XiFN/BtdrgGDRdyg3eVCHJyqAolaY/Zh7X6p+Tu9mGWKwBv4MIAUTwOsj09cI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GIAixZTJ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GIAixZTJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6D161F000E9; Wed, 19 Aug 2026 21:43:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787175807; bh=vi5QAYiMDnF99Mnv4hD7NRbZKx+oy6oJnuMEE5F+H70=; h=From:Date:Subject:To:Cc; b=GIAixZTJIpKaqc1+bLP9cAGF6QFzFJMnRSPKsJwqewuzEKyBjYe5oLebB7Xbd67uO 9qCwM3Lx2o0NkdIh3f//S+BCXcAIFRSa6zYPy0xQhMOYfVjWIgpG5rFHxR3voKcQTG ADL4JTUqXe0vYX3eSYgobQQdMjn13WjC2WHv3yfGuYOegNCfQ8Tkv12sSFNyzKmzl3 kaYRwU7Y+FiAwpciIWV3FAAKxX8dISz9EnJV4C9q14MbCGUH18MjDMsCbPwrN+nZnK mza5FC4VqV/rrATbQw8EltPxEa4oqog5GetBBxwPRq0GbFVbDav0xMcdMAkkKeQLf8 TZL/iIn/JuVNw== From: Nathan Chancellor Date: Wed, 19 Aug 2026 14:43:21 -0700 Subject: [PATCH] ARM: Fix get_cycles() after delay_read_timer() conversion Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260819-fix-arm-get_cycles-v1-1-208bf07ac540@kernel.org> X-B4-Tracking: v=1; b=H4sIAAAAAAAC/yXMUQrCMBCE4auUfXYhqVASryIi6TqtK1ol2xal9 O5G+/jBzL+QISuMDtVCGbOaPocCv6tIrmnowXopptrVjQs+cqdvTvnBPcazfOQOYwl7FxtI8Cl SOb4yyuofPZ4229TeIOOvROv6Bci62eF2AAAA X-Change-ID: 20260819-fix-arm-get_cycles-c83096ec81a9 To: Thomas Gleixner Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Nathan Chancellor X-Mailer: b4 0.17-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=1429; i=nathan@kernel.org; h=from:subject:message-id; bh=MYnAPnoNMKML0+3kgfTLZViy+yttVpW5NVcsf68p3aQ=; b=owGbwMvMwCUmm602sfCA1DTG02pJDFltyjVKb/b49adt00n6s7gzaNGBGNtXSz5P1isJetkcn XVCU4K5o5SFQYyLQVZMkaX6sepxQ8M5ZxlvnJoEM4eVCWQIAxenAEzE5jEjw61v398/jgtW5ktR fBO+OLpoizHH6d9dZw9+Fd65Xvfn/zqG/8Grg7RjAiOYg/kuP+6VtVrsv3ADw81ZFXWZFTeYD56 5zwYA X-Developer-Key: i=nathan@kernel.org; a=openpgp; fpr=2437CB76E544CB6AB3D9DFD399739260CB6CB716 After commit dfc256dac54c ("calibrate: Rework delay timer calibration"), certain ARM configurations (such as multi_v5_defconfig) hang during boot. The use of read_current_timer() in arch/arm's get_cycles() was improperly converted to delay_read_timer(), resulting in get_cycles() returning 0 even when the timer has been read or an uninitialized stack value when delay_read_timer() returns false. Flip the branches of the ternary condition to fix get_cycles(). Fixes: dfc256dac54c ("calibrate: Rework delay timer calibration") Signed-off-by: Nathan Chancellor Reviewed-by: Jinjie Ruan --- arch/arm/include/asm/timex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/timex.h b/arch/arm/include/asm/timex.h index 94e40c19cfc5..4d31eab9dba2 100644 --- a/arch/arm/include/asm/timex.h +++ b/arch/arm/include/asm/timex.h @@ -13,7 +13,7 @@ typedef unsigned long cycles_t; // Temporary workaround until timex.h is cleaned up bool delay_read_timer(unsigned long *t); =20 -#define get_cycles() ({ cycles_t c; delay_read_timer(&c) ? 0 : c; }) +#define get_cycles() ({ cycles_t c; delay_read_timer(&c) ? c : 0; }) #define random_get_entropy() (((unsigned long)get_cycles()) ?: random_get_= entropy_fallback()) =20 #endif --- base-commit: dfc256dac54c8b692110bf905c64cb130e15963d change-id: 20260819-fix-arm-get_cycles-c83096ec81a9 Best regards, -- =20 Cheers, Nathan