Received-SPF: pass (google.com: domain of linux-kernel+bounces-38477-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
Date: Thu, 25 Jan 2024 19:09:48 +0800
Subject: [PATCH v2 2/3] clocksource/drivers/imx-sysctr: drop use global
 variables
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240125-imx-sysctr-v2-2-7332470cd7ae@nxp.com>
References: <20240125-imx-sysctr-v2-0-7332470cd7ae@nxp.com>
In-Reply-To: <20240125-imx-sysctr-v2-0-7332470cd7ae@nxp.com>
To: Daniel Lezcano <daniel.lezcano@linaro.org>, 
 Thomas Gleixner <tglx@linutronix.de>, Rob Herring <robh+dt@kernel.org>, 
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, 
 Conor Dooley <conor+dt@kernel.org>, Bai Ping <ping.bai@nxp.com>, 
 Shawn Guo <shawnguo@kernel.org>, Sascha Hauer <s.hauer@pengutronix.de>, 
 Pengutronix Kernel Team <kernel@pengutronix.de>, 
 Fabio Estevam <festevam@gmail.com>, NXP Linux Team <linux-imx@nxp.com>, 
 Marco Felsch <m.felsch@pengutronix.de>
Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, 
 linux-arm-kernel@lists.infradead.org, Peng Fan <peng.fan@nxp.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|PA4PR04MB8013:EE_
X-MS-Office365-Filtering-Correlation-Id: 56f1e9df-12a3-4207-9563-08dc1d959213
X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	65D27arOJpganCZP8lOdCqJHgYNh/iPFiU43cEXcQdachQpNQ4uNCRsgyFZyFAJNemPiGGAOOOaLiJYW0Gwz+ps73MrBXYDry4fLekMmx7SNyZyQwOGjmzOyntBzFRKg8Ztxduv8LQ+0pFcOSMmNZKdiYBuHsAqKo5fJCeDj7mmkL40SsVjn3iFDXsiqnx+fWeM+xdBVsJva5JH29INwPFB2QyoILoZfFwJOyVSbZcnVhCc3iAOPzffA/MUiYaroGkxqSj+fEdchNm4RW7y0ouIiuWXin6iayDVufSK2C4FJSJBVn1jlFhYZZ07fIF4YSbnVApzDEBSsdzswpQwT/FKwfqCmdBFoJc1ngtSY0leu8POo5y55XBfJMzY0tKsq+jPPNvg7WKbhwbzKKS4/dbP8L9K8YcFgdjve8q02efdN9Jm91NU+KLdnQnsNA9nrjRgBhFgkbrp+4vrs2msNJ/TTlEoAKbbpqkp0fNR0OXvm8Uscs7WUVRgaAieC4ANsuFmhPfuhwVS8vFCNMKYx0Q9q+wu8x0uts2kAfBLl7hvhVbv2UTYHONkknjRVItivqtasxw32hJvj0pFo8T653OwJ6AVBzRp+b84H4u8of6Jklv+dx8IVyP7jb0cSVA4ap07xfh3BbuIJQRgfCvAGjQ==
X-Forefront-Antispam-Report:
	CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(396003)(136003)(39860400002)(366004)(376002)(346002)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(4326008)(2906002)(8936002)(110136005)(7416002)(66476007)(8676002)(5660300002)(66946007)(83380400001)(26005)(38350700005)(86362001)(36756003)(66556008)(316002)(921011)(52116002)(6486002)(9686003)(6512007)(6506007)(478600001)(41300700001)(38100700002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?VE5uamNkeTNDU2QyR2xzSHdNOFZ4QnMrYURRbzFYS1pCY0crNHJGa3lKUUJl?=
 =?utf-8?B?QVpNckxWdTZ6aUxnNnhWbmJOLytSNDJGUkRuUHFSWUQ3U2FMNGpNcGFMQmxI?=
 =?utf-8?B?RVNzaGRyRjc0azdRQk5wWXNmZ1VMNnorWGhIZ0pXdm5JaFdYNmxud3ZpamI5?=
 =?utf-8?B?QStSVDMvZEkrdzBwZjhDRTlDYWw5eVFUTVJ3ckRMN3lHKzJnZXNBMURLd0lF?=
 =?utf-8?B?OXZlSm54bU0wNWhTdkw1QnY0R3BLTGFaYUdPM1ZqdmRVd3R0UjU1YmI4akxu?=
 =?utf-8?B?WVFjUTF3VXJuVzI1aW90TDJCYXBYODJPRmt4VFdsMnk5UEwwZU41RjhEUEll?=
 =?utf-8?B?T0FkUFFRREpMVkxFdE1HVE9hbndSdWs4emlOVFRZQTZ1dFNrSWdLbWxzM2NZ?=
 =?utf-8?B?Yk1YWXBlOVczSHJRUGRxTXZndENsSC80MmdVMlF5U3NEZGVLSlljL3I5VnZU?=
 =?utf-8?B?SVhFbkMwK2o4WkN6NiswZDRhZDZIVWdJVDBsOUVLRXozenNHRlNpWmRLT3pT?=
 =?utf-8?B?d3FZVE1WejBPVW9QclhBeXM1cUQzRi9ZZWdZb1lienAxRHRkYTFTRExnWUp1?=
 =?utf-8?B?dHFpMEU2aEpMN00vNmdaOVByTmUwMTJBQ2YvWm5Fd1k4enJ1aEhpeTJ5SjJY?=
 =?utf-8?B?NmZXV21rQkFsc3ErQUZYR0lhcDRlZzZ2YkFkcmNLUERVaHpyek1oUU4wQXo1?=
 =?utf-8?B?Uk5XQnVuS1h5Vkl0dXdwSDBQYTFSZHl3R1lyOFR0Q0laMlNkMVhEWmZUV1Az?=
 =?utf-8?B?Q0tmWXJMWjBGdmxsZnJCd1hxTGdrWEI0ajZTT256bHRRM1hpczlKd1VLNGtV?=
 =?utf-8?B?UEIwQXFHS3VZaDNlcWw0a3l4ZWMyRHp6cHpUZHdJeDR2QzhJQmNaUnM5Ungz?=
 =?utf-8?B?K2ZpNlpZUTZMeHVDS2RMeE44QVBBMGpjY1BSTmxqaGpmNDNYQ1d1dGJNd2Zq?=
 =?utf-8?B?OERUbG1rdzNDMGRrRUJZRkVLOFBWKzEySzRvcEdWekl0MlhtRTJRNGRnOEJF?=
 =?utf-8?B?SHJ3RTdnTHNmTDAwbEJTMlhBR0JMMVBQT29LWnhNbFlWL0JJVFB6T1lpSmFo?=
 =?utf-8?B?TzhIYjVWcFB1OHNmVXY5N1UzTjRpU1dxcWNPUStOdnhFMEIydEJVemp3Ly9U?=
 =?utf-8?B?b0kvY3pTeTdxUmlwRW00YU1veEgrYmJzaVlha29KSHB5M3pqeVVNQ2dlcmUz?=
 =?utf-8?B?clVqS1BGMFBYTjRZQVZzbEFvN1VWZCtOekc5MHZWeHpSbUpFa1lHZmdCbGVa?=
 =?utf-8?B?VlR4azJ3RU9QL2Y2eUZkdGdXeDV1aUs4ektGR1NSdjU5emlTMnF1MDZlSnpN?=
 =?utf-8?B?TTRYMkpQdWJ6eGtWNDZuRHRmckJHSkNnRXlieXRtN2Z2Z01MUUpYU1dSVnZN?=
 =?utf-8?B?dVJmV3VETzdUL2xNSStZNkpYenVxRmZLU3F5TDhESXIwMk40QzNBVm9vTmRP?=
 =?utf-8?B?QUVsbkhZc2ZTenRMZzBNK1RuR2RiOGpINW1ndnJIZFJIbDNJWktVakV1NEdS?=
 =?utf-8?B?UGlPQ2ZKV2RsOEdCZ2NsUno5QlIvQkUxNUZmaDU3RWhNeVVkdXdHK0oxWnc3?=
 =?utf-8?B?cU02dnFlNDd4cit1dUZyd0lTZkozSktEM3FaV0hUQ3IyY0Y5TU5nakczcWw1?=
 =?utf-8?B?MHFJc1pwY0Q3SWhZcGxyczBUMGp0bmZld2tEZ3JwcEtOR0I2UVpGUVU1M080?=
 =?utf-8?B?ZmlSSmFwbDNoTWlCclZ6VFlvMUk1eXAwZWtEVWVUVGJzcncrYTRvQm1uNXIz?=
 =?utf-8?B?RktjcjdYZnlIVGRBM2NYMzhjUjM5S1ZrTG8xVUxNRlZ3SFUxWG84di9HSzN5?=
 =?utf-8?B?S09rQkZTSlhHVmdyYlB6Z0swY28vSVUyQTFFNjdnOHhBZUhuQ0wwNWNQVFFO?=
 =?utf-8?B?c1NmRTVuazBNZTluUlN1Q1ZuMWdteU9VWjJCeW54Ym5ST0RHTjlLRTZyakpB?=
 =?utf-8?B?NFhRbXp5QlR4QzY5RzliTU5vNXo4RitteXN4YmhESDRsMmtIWVlmVldGR1dX?=
 =?utf-8?B?ZUZ6d21LbEdTWTFSV0lLMG5CRmZNTnRYWmY0N1JBc1p3b1M0Qnh0aUM5eGRD?=
 =?utf-8?B?RmtBSHhMbTFQN25KNmJQUjFFbWMrRHVBelZZN1B1dVpsQTN6aE5xYndIQ0ZI?=
 =?utf-8?Q?I+Gc/9xKmUTLJgTYFx3s1HlzO?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 56f1e9df-12a3-4207-9563-08dc1d959213
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 11:05:41.9789
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /eLFqH0X0w3OKLt/iTYTvnVEYP3KxZVXELKiAb2URe0j7qYyg/jgKPeoG5BNrghEbAG3xzAct6ZOpi9t1o3DrQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB8013

From: Peng Fan <peng.fan@nxp.com>

Clean up code to not use global variables and introduce sysctr_private
structure to prepare the support for i.MX95.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/clocksource/timer-imx-sysctr.c | 75 +++++++++++++++++++---------------
 1 file changed, 43 insertions(+), 32 deletions(-)

diff --git a/drivers/clocksource/timer-imx-sysctr.c b/drivers/clocksource/timer-imx-sysctr.c
index 5a7a951c4efc..8d5bfb8470fb 100644
--- a/drivers/clocksource/timer-imx-sysctr.c
+++ b/drivers/clocksource/timer-imx-sysctr.c
@@ -20,32 +20,39 @@
 
 #define SYS_CTR_CLK_DIV		0x3
 
-static void __iomem *sys_ctr_base __ro_after_init;
-static u32 cmpcr __ro_after_init;
+struct sysctr_private {
+	u32 cmpcr;
+};
 
-static void sysctr_timer_enable(bool enable)
+static void sysctr_timer_enable(struct clock_event_device *evt, bool enable)
 {
-	writel(enable ? cmpcr | SYS_CTR_EN : cmpcr, sys_ctr_base + CMPCR);
+	struct timer_of *to = to_timer_of(evt);
+	struct sysctr_private *priv = to->private_data;
+	void __iomem *base = timer_of_base(to);
+
+	writel(enable ? priv->cmpcr | SYS_CTR_EN : priv->cmpcr, base + CMPCR);
 }
 
-static void sysctr_irq_acknowledge(void)
+static void sysctr_irq_acknowledge(struct clock_event_device *evt)
 {
 	/*
 	 * clear the enable bit(EN =0) will clear
 	 * the status bit(ISTAT = 0), then the interrupt
 	 * signal will be negated(acknowledged).
 	 */
-	sysctr_timer_enable(false);
+	sysctr_timer_enable(evt, false);
 }
 
-static inline u64 sysctr_read_counter(void)
+static inline u64 sysctr_read_counter(struct clock_event_device *evt)
 {
+	struct timer_of *to = to_timer_of(evt);
+	void __iomem *base = timer_of_base(to);
 	u32 cnt_hi, tmp_hi, cnt_lo;
 
 	do {
-		cnt_hi = readl_relaxed(sys_ctr_base + CNTCV_HI);
-		cnt_lo = readl_relaxed(sys_ctr_base + CNTCV_LO);
-		tmp_hi = readl_relaxed(sys_ctr_base + CNTCV_HI);
+		cnt_hi = readl_relaxed(base + CNTCV_HI);
+		cnt_lo = readl_relaxed(base + CNTCV_LO);
+		tmp_hi = readl_relaxed(base + CNTCV_HI);
 	} while (tmp_hi != cnt_hi);
 
 	return  ((u64) cnt_hi << 32) | cnt_lo;
@@ -54,22 +61,24 @@ static inline u64 sysctr_read_counter(void)
 static int sysctr_set_next_event(unsigned long delta,
 				 struct clock_event_device *evt)
 {
+	struct timer_of *to = to_timer_of(evt);
+	void __iomem *base = timer_of_base(to);
 	u32 cmp_hi, cmp_lo;
 	u64 next;
 
-	sysctr_timer_enable(false);
+	sysctr_timer_enable(evt, false);
 
-	next = sysctr_read_counter();
+	next = sysctr_read_counter(evt);
 
 	next += delta;
 
 	cmp_hi = (next >> 32) & 0x00fffff;
 	cmp_lo = next & 0xffffffff;
 
-	writel_relaxed(cmp_hi, sys_ctr_base + CMPCV_HI);
-	writel_relaxed(cmp_lo, sys_ctr_base + CMPCV_LO);
+	writel_relaxed(cmp_hi, base + CMPCV_HI);
+	writel_relaxed(cmp_lo, base + CMPCV_LO);
 
-	sysctr_timer_enable(true);
+	sysctr_timer_enable(evt, true);
 
 	return 0;
 }
@@ -81,7 +90,7 @@ static int sysctr_set_state_oneshot(struct clock_event_device *evt)
 
 static int sysctr_set_state_shutdown(struct clock_event_device *evt)
 {
-	sysctr_timer_enable(false);
+	sysctr_timer_enable(evt, false);
 
 	return 0;
 }
@@ -90,7 +99,7 @@ static irqreturn_t sysctr_timer_interrupt(int irq, void *dev_id)
 {
 	struct clock_event_device *evt = dev_id;
 
-	sysctr_irq_acknowledge();
+	sysctr_irq_acknowledge(evt);
 
 	evt->event_handler(evt);
 
@@ -117,34 +126,36 @@ static struct timer_of to_sysctr = {
 	},
 };
 
-static void __init sysctr_clockevent_init(void)
-{
-	to_sysctr.clkevt.cpumask = cpu_possible_mask;
-
-	clockevents_config_and_register(&to_sysctr.clkevt,
-					timer_of_rate(&to_sysctr),
-					0xff, 0x7fffffff);
-}
-
 static int __init sysctr_timer_init(struct device_node *np)
 {
-	int ret = 0;
+	struct sysctr_private *priv;
+	void __iomem *base;
+	int ret;
+
+	priv = kzalloc(sizeof(struct sysctr_private), GFP_KERNEL);
+	if (!priv)
+		return -ENOMEM;
 
 	ret = timer_of_init(np, &to_sysctr);
-	if (ret)
+	if (ret) {
+		kfree(priv);
 		return ret;
+	}
 
 	if (!of_property_read_bool(np, "nxp,no-divider")) {
 		/* system counter clock is divided by 3 internally */
 		to_sysctr.of_clk.rate /= SYS_CTR_CLK_DIV;
 	}
 
-	sys_ctr_base = timer_of_base(&to_sysctr);
-	cmpcr = readl(sys_ctr_base + CMPCR);
-	cmpcr &= ~SYS_CTR_EN;
+	to_sysctr.clkevt.cpumask = cpu_possible_mask;
+	to_sysctr.private_data = priv;
 
-	sysctr_clockevent_init();
+	base = timer_of_base(&to_sysctr);
+	priv->cmpcr = readl(base + CMPCR) & ~SYS_CTR_EN;
 
+	clockevents_config_and_register(&to_sysctr.clkevt,
+					timer_of_rate(&to_sysctr),
+					0xff, 0x7fffffff);
 	return 0;
 }
 TIMER_OF_DECLARE(sysctr_timer, "nxp,sysctr-timer", sysctr_timer_init);

-- 
2.37.1