Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 21 Oct 2022 11:34:24 -0400
From:   Joe Korty <joe.korty@concurrent-rt.com>
To:     Marc Zyngier <maz@kernel.org>
Cc:     linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: [PATCH] arm64: arch_timer: XGene-1 has 31 bit, not 32 bit, arch
 timer.
Message-ID: <20221021153424.GA25677@zipoli.concurrent-rt.com>
Reply-To: Joe Korty <joe.korty@concurrent-rt.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hw3Y8t1OsW5eg1p50x96xJCDx8uWqUoWSy3huFbfsA5zxGmvXQBOLFikZJAN?=
 =?us-ascii?Q?NYlMVLoh0yCzQFnWbXs58kMKwTg85Y6W/ODEgRS3Dd5wtuydO8jnBhDC2hjg?=
 =?us-ascii?Q?7FyGgDNpAS2NLn0ziQJQttAO/1FBTheE2Dg2w8EpiUH9RoDmlNULduxaQMtO?=
 =?us-ascii?Q?46IhCSSnnIwT9mgf3gApuF/g9puu38zSghRFg09bKjP9+gmcQQFm68TVfvDD?=
 =?us-ascii?Q?GaqK8PPrp9TPfKpPLeutgMEmy2UgJVKuL2UAokNer22CIRmcVLTigEihna4N?=
 =?us-ascii?Q?LOF2L6EJWf1U6tMfp5oClC2eWanh2oaa115LoI+mtXXc4DWJOCEZSF2jLPN7?=
 =?us-ascii?Q?tzDqisTlbmn5sKyAOvvOeBR5jJsWMm5kO6tleMUFFERe0/XF3VgGTdOkTWc8?=
 =?us-ascii?Q?ocy2Xgd+vg2wo0nmhlYTXDbWVwG7+iifc6nAHgB1K5rs2oWEz7M8XY4+1CDL?=
 =?us-ascii?Q?o4osTrV3RB3VKRM04ifWg/mpdIRi7Vvj1AkOGtKBkv9wXXtp2yzIe9PFGvIW?=
 =?us-ascii?Q?d1UGDcGBFKd9daC2ccP6yc0oe3s9D8VjiF94yi0CriTPFpZebP+TsbLFyzSm?=
 =?us-ascii?Q?FbogQKNaWsZ3FIJfahltkssVYWQJAATIP3dyG1xtVHp5Oaii1MO9XWs6hIkX?=
 =?us-ascii?Q?1VVg2MQHu6Sp/sANJ4KShzM5smV6nPjIpVUU8j1jbpe1Sxreq0MUXLrJTJXJ?=
 =?us-ascii?Q?Gr6LdxNQOG06bFtBW6fIIuww0HbXiClhrFkRuPyhszEHhWZUSZddrdEk0JDp?=
 =?us-ascii?Q?N5c9Qo0rg0TGel8sTOYrjS2C3zL8W/D1AN6PqdS9iZdNUQddNfDH9p6WiqVK?=
 =?us-ascii?Q?fZC8HxjQjSt1LhtEhki+bfWkJlVYilKYPXO6Pj5SOfD0nEZbgywTEjJ9Kq54?=
 =?us-ascii?Q?sVfdGX2Hduw3dJO8Dg68Wjw272hLEpa29oalBaNAvy84RKAkVwdAPHzy6RaW?=
 =?us-ascii?Q?4haUGocB6UycWrUGHEM5eImBELy/r4o/78xzF/TtG5vaAcHO99mExiIC3MAf?=
 =?us-ascii?Q?VG5dQrrwHJc2pvlXh4Im8u6wBzH6Y/k9BQTVwOIyxW6lq10Xy7ZHtwOdfBhs?=
 =?us-ascii?Q?wxrwY9A+FYTOXHoX3r8YrsRvpo13x1PjsX7Xc+LpL7c6UH14LuusdgEd15Bt?=
 =?us-ascii?Q?P1igyO4d7xE26X741H25hfB3Fa7uecxyRGInphKwoASJRZmEQ8d7KcGOEXwE?=
 =?us-ascii?Q?d/tQ98LEXcQXkyF7Dov3Onmu5lI36FOnAd4eNGZddRuGXDxbRlm0ipfZPLoX?=
 =?us-ascii?Q?sTf+Wa35r1Ivohi77rhifnQyvxgcpd276CMyqwYm7MlKL9/ipjRof7xQrCxy?=
 =?us-ascii?Q?9CMF6dh5wNmR3flnil0wPzTHmfytbnP8umlaKrREzu81nAvLx4icMP4dQleV?=
 =?us-ascii?Q?+o/Cf8NZYEPxiNWp1z8XFVzmoWyWyubiFJcF/dPOEF2lW9L2RaOKdkYur4RE?=
 =?us-ascii?Q?sVmaJu4eZiIHJGuUVD7cLtKpBDQtEcNGu9GZVQjjvumBNCXMmEBYPyplaZIG?=
 =?us-ascii?Q?TTe2pz5LxHhKzwOosYQoigvE+LKKiW3WzGuCJWsc/FGkkxiWGb/5L1om3YjN?=
 =?us-ascii?Q?6P+w1mJ3Wqk/04OLxdg80Ou3PxDyikLKvBrCnRquYPSJLwqpcrsHIMIFLpTv?=
 =?us-ascii?Q?Rw=3D=3D?=
X-OriginatorOrg: concurrent-rt.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c05c053d-a16d-4c7d-4543-08dab379be79
X-MS-Exchange-CrossTenant-AuthSource: DB8PR09MB3580.eurprd09.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 15:34:29.5160
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 6cce74a3-3975-45e0-9893-b072988b30b6
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Trsj/awzwBjkABz8ZT6mzhBFWMBmXgLpQlUJB39alDXojWgvM73W6EQ9YsfQ6vE9HjDstoN78OFGOj47lTVoOaxLXm4a/DLPYO3EiM78k7o=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR09MB6079
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

arm64: XGene-1 has a 31 bit, not a 32 bit, arch timer.

Fixes: 012f188504528b8cb32f441ac3bd9ea2eba39c9e ("clocksource/drivers/arm_arch_timer:
  Work around broken CVAL implementations")

Testing:
  On an 8-cpu Mustang, the following sequence no longer locks up the system:

     echo 0 >/proc/sys/kernel/watchdog
     for i in {0..7}; do taskset -c $i echo hi there $i; done

Stable:
  To be applied to 5.16 and above, once accepted by mainline.

Signed-off-by: Joe Korty <joe.korty@concurrent-rt.com>

Index: b/drivers/clocksource/arm_arch_timer.c
===================================================================
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -805,7 +805,7 @@ static u64 __arch_timer_check_delta(void
 	const struct midr_range broken_cval_midrs[] = {
 		/*
 		 * XGene-1 implements CVAL in terms of TVAL, meaning
-		 * that the maximum timer range is 32bit. Shame on them.
+		 * that the maximum timer range is 31bit. Shame on them.
 		 */
 		MIDR_ALL_VERSIONS(MIDR_CPU_MODEL(ARM_CPU_IMP_APM,
 						 APM_CPU_PART_POTENZA)),
@@ -813,8 +813,8 @@ static u64 __arch_timer_check_delta(void
 	};
 
 	if (is_midr_in_range_list(read_cpuid_id(), broken_cval_midrs)) {
-		pr_warn_once("Broken CNTx_CVAL_EL1, limiting width to 32bits");
-		return CLOCKSOURCE_MASK(32);
+		pr_warn_once("Broken CNTx_CVAL_EL1, limiting width to 31bits");
+		return CLOCKSOURCE_MASK(31);
 	}
 #endif
 	return CLOCKSOURCE_MASK(arch_counter_get_width());