Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
From:   Dragan Mladjenovic <Dragan.Mladjenovic@syrmia.com>
To:     Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc:     Paul Burton <paulburton@kernel.org>,
        Serge Semin <fancer.lancer@gmail.com>,
        Daniel Lezcano <daniel.lezcano@linaro.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
        Chao-ying Fu <cfu@wavecomp.com>
Subject: [PATCH 08/12] clocksource: mips-gic-timer: Enable counter when CPUs start
Date:   Thu, 19 May 2022 20:51:21 +0200
Message-Id: <20220519185125.11686-9-Dragan.Mladjenovic@syrmia.com>
In-Reply-To: <20220519185125.11686-1-Dragan.Mladjenovic@syrmia.com>
References: <20220519185125.11686-1-Dragan.Mladjenovic@syrmia.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lZBmzsKD2DjSq5vhtk3x4Sj9uuv6z6SA12/xkKRBrFeaiRHHIHvjjnsk/nY6?=
 =?us-ascii?Q?AgCGoo/EA7m/HjvZk2f7dnJfORNqt9VgFXJ7Fucd65fG5j2CXwJ2m566WsVD?=
 =?us-ascii?Q?r7MNljMk5lgLl1P8bsvWyhZB0SDBJMJeSn5fpIHoddAXNwrwtmsUgF0DxLgG?=
 =?us-ascii?Q?mJOIz4+it4cb6os3wcYSARquTuriEYfwVTrokTHdYrrAg2xhG8pFSXxalqJW?=
 =?us-ascii?Q?jIScPKrDHA0YXxvGxVViHSQp3+C5sIxVmQQdtGacbXD0zBi8MMLBgstXd7BZ?=
 =?us-ascii?Q?BzGrFBgrOT0lIOimSGc+raMTnCec0mtiM8nsEiTL0UqgKeLrzjdpaHiM8QNp?=
 =?us-ascii?Q?Iw7NsfAmkCe4WRRneAJ3dC9nGVoM29hLAU3fSxqi0hV1fMl0Wwjesk7ejMoi?=
 =?us-ascii?Q?loVQl0sgKHBuVNssM+7OCmYE8NoYUEv2o9StYzRWs+88U6bIj5Njvj6FFP7J?=
 =?us-ascii?Q?nD+zXkwiWtxcubSAmUsAadOQWFF9eFejIpL7qgl6SaScJhKmyTSMHG3W65ce?=
 =?us-ascii?Q?ZSmfMEqJ1SIiw3w/Q0sCYRGP/BHqW2lXGvq7m9qeqHTFk8VRLXCo4qnQzTxa?=
 =?us-ascii?Q?EyBQXMtY04L5+5IS/XsH5b81uWau9F1+khe/9jvOz/v0/o8/FFRCmZ1p4Yml?=
 =?us-ascii?Q?1INT86GJHbER/JLbfU1We2v+aKaPedaD/8XCXZKksbL/KUnyBO3HT92k520M?=
 =?us-ascii?Q?hwfwuQo0TA2qlQVb/iaG0QXehxx0BtyTMihj75mmGWSrSTYJHPhA12/KAVAz?=
 =?us-ascii?Q?f1Qow+5C7mqeHKoNQwP5eIhhT9AnZTLyyjODrDpLZznt4JQkNjFkxwhXbFJf?=
 =?us-ascii?Q?4WYJQssEAQofY7pzPp7iOC0B3rNBGGfCXxIgo3/f0KBKdE3hr4N1ZDpYBDA3?=
 =?us-ascii?Q?xrpbO0QqsEbqc4nRf3NT3NVglEgjltqNTvulwCHTvkcB1PEkXrmad+gmYaaL?=
 =?us-ascii?Q?vWsGkmwVlF939K1ntVOQ25uRxQfWNpG4/ASYIYmpNS1/Dhy2U7zWvJGPri2E?=
 =?us-ascii?Q?OQalTyYrNhhnR214/RDuhEUz5x3fgHhwSjUP/mjG4FY6I1/5TQobPSC27gZg?=
 =?us-ascii?Q?10cvhr1m4ai7TYg58O3GkiT9Ons9vfsI+3XnlwzQLfxiYfd0sEBla1o9GjHb?=
 =?us-ascii?Q?FrMrYJFU2+0lfk0/vK8pZ4yWf4430iolkPjRw8lTfIPvUtqdtP6VXn73o2e6?=
 =?us-ascii?Q?H7Jg+SEcFqmaKpzZTZAxJJVkueYaKkxgw4Hkm0layVUGP/yKApMTHLl40iVG?=
 =?us-ascii?Q?Krqa6nrjneCqMiKHg9ostjF8CYktwmuUXNqkjGFmw5D8tSAuEJR3WPahZZRI?=
 =?us-ascii?Q?oVchDTTsQ1GEFrSTsHQF2MPzMmMpJELRVGgu70rUK7/rxTCDsDs1BOBCvg1X?=
 =?us-ascii?Q?nvOnt4gpKHt91lsryxI5NKr3k7QjwWQndK2AicZwmdxeXCaHhWqsr4b4y8oW?=
 =?us-ascii?Q?B/OrP+R3CLEu9y2xW42OLC2TaRiG/WexCCYx/p7LPHEcQ5j4MS+e446dKAEI?=
 =?us-ascii?Q?LSYSz5WgrYox/w+W7grin02oM179pcHFgRYwCkf4mp7Pmke3kO/Ta7hIjOnA?=
 =?us-ascii?Q?gfXotg35F7R+kd4y04tDKHgd2D1XQGH7VyJrQcmt+Zgoi1ChkX6FmF4ce8x8?=
 =?us-ascii?Q?anBmiKKCKFEX4kL96mJaXAl2GJo28qDW+/455AXRuog+sujpZKN3MkXwQNGs?=
 =?us-ascii?Q?sYUP99YrBzCeDf1pI1XOPUaUSI1T0t0mPDTJlQFBI/QefUz7f6gChAHDs7EZ?=
 =?us-ascii?Q?RwfN0dCsSbEmOWZVfxe/0xK6wQlZiuc=3D?=
X-OriginatorOrg: syrmia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3661252d-f3c6-48f5-1bc6-08da39c8a018
X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB4208.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 18:51:46.9773
 (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: NF4zaHWBryPKXSigaLzvjJspb3AVreDMDOUpdYuUgKqGZ9/WtkdgJJzXgjm8uDUGEtIyiWgR/SH1rEdageP3jpWZxqbqMInLIOUIJNa/4jI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0301MB2546
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no 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

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>

diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index 6632d314a2c0..90a736a13115 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -119,6 +119,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;
 }
@@ -289,9 +292,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.17.1