Received-SPF: pass (google.com: domain of linux-kernel+bounces-176485-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Aleksandar Rikalo <arikalo@gmail.com>,
	Chao-ying Fu <cfu@wavecomp.com>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	Greg Ungerer <gerg@kernel.org>,
	Hauke Mehrtens <hauke@hauke-m.de>,
	Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>,
	Jiaxun Yang <jiaxun.yang@flygoat.com>,
	linux-kernel@vger.kernel.org,
	linux-mips@vger.kernel.org,
	Marc Zyngier <maz@kernel.org>,
	Paul Burton <paulburton@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Serge Semin <fancer.lancer@gmail.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Tiezhu Yang <yangtiezhu@loongson.cn>
Subject: [PATCH v4 08/14] clocksource: mips-gic-timer: Enable counter when CPUs start
Date: Sat, 11 May 2024 12:43:35 +0200
Message-Id: <20240511104341.151550-9-aleksandar.rikalo@syrmia.com>
In-Reply-To: <20240511104341.151550-1-aleksandar.rikalo@syrmia.com>
References: <20240511104341.151550-1-aleksandar.rikalo@syrmia.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?ne0e9sHvlIwq7OmQJSg24/4foc6irr0jMD6n87OqbDY4VNrhnF70MJCkAW/A?=
 =?us-ascii?Q?Hex0TTNgxpjlZ8tHVodTUBqLQf2KVNnOUOOuXptJijHgyXvHAM1ncjFbH2WS?=
 =?us-ascii?Q?rUsWOxQkNPqJqZkZIYSuLUi7ud4Gs7DZr36kmEfJfa4HpM3gFNpIkIAFq+/h?=
 =?us-ascii?Q?tu6bZp6GDVL8LDZBX4aP7SrUzbz9Q4+HuEpVzVNrQEI2nZSkKvNuj2s4GKV3?=
 =?us-ascii?Q?oN3yUAmV6tgvj7LocvBKep1yZkGbQcIFYthUCPD/MADYcyo5fgdtiA7hYOyA?=
 =?us-ascii?Q?AbWwYpM9g3AgW9sFMFHDfC5Fb+Gj2r1F7DWgfl0KGiBAk1yTUhInDQmED1sr?=
 =?us-ascii?Q?rN/J8tOOvOHG68hLSuLTK/zguEyhQrThdBpLGrydN738pMviCO6fnOB/4jGh?=
 =?us-ascii?Q?eo2bfAmLtu4ZHovs1jdKCD/N3cW6voRMXQXOcjSewGo7qK/aSMzpvsikjW6s?=
 =?us-ascii?Q?pEOsp1AHXV7MqWehA95sLQO24h7Jfcwk/mbvS82O10HMpkfM/g5l8zriLg2T?=
 =?us-ascii?Q?ODl3Gv4v1XYnO0s7RFGElocWnzafe0tKRRBVY5BsLF7JM1g7ojWX5f/mdjjl?=
 =?us-ascii?Q?dKcA148HB0RlGzXYy0D2bR6wKRWm7TZtHZsPS+yCX+mL4HAnFuSP5YDSJCWi?=
 =?us-ascii?Q?bW1mn0XIysY0l9rKQr8TdMwwxiz4vA1ukDZ9ZWZFHvAIsRyp7MUidSnWzaec?=
 =?us-ascii?Q?ik35ps8M793hnounv+VUihcZOnVpALh3PtTs6Py7KtX5q8XtY2XGpBx7a2EC?=
 =?us-ascii?Q?T852BEwum+Aet6Gu/62O5+Ewkg19T2BZmX8NGm7SAu5bKeq1sCatnh/y+ia6?=
 =?us-ascii?Q?DySs35fppIHvUmsikr6krMqygLfGkMNHvWvLdXLTgct0NUnpaaPs9BE2eulE?=
 =?us-ascii?Q?HyL1I+ejTzNX9R3kRYjp8kaRnKVY+kmx1diiGHvn8vW9O7mAd2q8UT3yxzYi?=
 =?us-ascii?Q?urcf4BkmN16BZw5L99q5Vq6iVQRgU58BksP7CClD6jxyGVRFzNdFwfJYdO7n?=
 =?us-ascii?Q?F52AQ+5A6hqGOjMyCcnwYlLe5OuPM2j2sWMWLxgJOwWOAJb0pgN48+DuNca2?=
 =?us-ascii?Q?Yv+5VZluFSOVQhuRO+0Yma2wh3rhHhMf6C0AKyypc9SG2un66BKX7eibFo00?=
 =?us-ascii?Q?YbHSldOEt5x64ShYtRcg/G/EjqEABeF8mirPlagP4RirIq11FJZPvl0x1D1n?=
 =?us-ascii?Q?gdnue/gJwruQD4GrPBkCGiYAbFPlutHUkClZ9asgDZwAL55BwW0ac1islzqV?=
 =?us-ascii?Q?c4iN73k4d4RvOIeax0o71hH/u72j1bzchcvG960Sa6ntMcJniMc1B4knN5yW?=
 =?us-ascii?Q?eKi9LVnMHfc5CSOXtonGlQXpLzW2qHWB2Awl3DiSK6As3UWEHPUG86z79cbI?=
 =?us-ascii?Q?M5dzNISfl5slnh64kiXtHf6Kcmy76gsA66uhR9vauPcr044tdqxNKgcdXWHz?=
 =?us-ascii?Q?PHOH9wmbBuV/uqZ/9da56O4ulw2NaIsIxwK8TD/a61nKzjmFG1YVW/xjKr7M?=
 =?us-ascii?Q?JsrKdNXP56MCWOM7h8Z14O/1YUgnmevcUKRF3ebTa+otoCaa2IWgbHuHv/lg?=
 =?us-ascii?Q?6/9LCpJLwlTDgN6tUBwk3AQ4LkMhX4xpLyKXmyXWyIq83oU2LfHtQSJy/gws?=
 =?us-ascii?Q?qw=3D=3D?=
X-OriginatorOrg: syrmia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0d327e19-d0f4-4464-c944-08dc71a74229
X-MS-Exchange-CrossTenant-AuthSource: AM9PR03MB6916.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 10:43:56.3987
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 19214a73-c1ab-4e19-8f59-14bdcb09a66e
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: lPitt4rsU0l09X7QcscaCQjurfaIqdlOURttv11feJ7lThRB2HgvM1pJPSrPSNR5CCGCCKz1wUE5kXlJ5YYKgxTpg+HHOKKrCO4KiwI4Vog=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR03MB8449

From: Paul Burton <paulburton@kernel.org>

In multi-cluster MIPS I6500 systems we have a GIC in each cluster, each
with its own counter. When a cluster powers up the counter will be
stopped, with the COUNTSTOP bit set in the GIC_CONFIG register.

In single cluster systems it has been fine for us to clear COUNTSTOP
once in gic_clocksource_of_init() in order to start the counter, since
with only one cluster we know that we won't be resetting that cluster's
GIC at any point (ignoring suspend/resume cycles which would need to
handle clearing COUNTSTOP in the resume path). Once we support
multi-cluster systems this will only have started the counter in the
boot cluster, and any CPUs in other clusters will find their counter
stopped which will break the GIC clock_event_device.

Resolve this by having CPUs clear the COUNTSTOP bit when they come
online, using the existing gic_starting_cpu() CPU hotplug callback. This
will allow CPUs in secondary clusters to ensure that the cluster's GIC
counter is running as expected.

Signed-off-by: Paul Burton <paulburton@kernel.org>
Signed-off-by: Chao-ying Fu <cfu@wavecomp.com>
Signed-off-by: Dragan Mladjenovic <dragan.mladjenovic@syrmia.com>
Signed-off-by: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
---
 drivers/clocksource/mips-gic-timer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index ebf308916fb1..4d7659c119e1 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -114,6 +114,9 @@ static void gic_update_frequency(void *data)
 
 static int gic_starting_cpu(unsigned int cpu)
 {
+	/* Ensure the GIC counter is running */
+	clear_gic_config(GIC_CONFIG_COUNTSTOP);
+
 	gic_clockevent_cpu_init(cpu, this_cpu_ptr(&gic_clockevent_device));
 	return 0;
 }
@@ -284,9 +287,6 @@ static int __init gic_clocksource_of_init(struct device_node *node)
 			pr_warn("Unable to register clock notifier\n");
 	}
 
-	/* And finally start the counter */
-	clear_gic_config(GIC_CONFIG_COUNTSTOP);
-
 	/*
 	 * It's safe to use the MIPS GIC timer as a sched clock source only if
 	 * its ticks are stable, which is true on either the platforms with
-- 
2.25.1