修改内核路径

hc

2024-05-14 bedbef8ad3e75a304af6361af235302bcc61d06b

 kernel/drivers/watchdog/renesas_wdt.c
..
..
@@ -1,15 +1,13 @@
1
+// SPDX-License-Identifier: GPL-2.0
1
2
 /*
2
3
  * Watchdog driver for Renesas WDT watchdog
3
4
  *
4
5
  * Copyright (C) 2015-17 Wolfram Sang, Sang Engineering <wsa@sang-engineering.com>
5
6
  * Copyright (C) 2015-17 Renesas Electronics Corporation
6
- *
7
- * This program is free software; you can redistribute it and/or modify it
8
- * under the terms of the GNU General Public License version 2 as published by
9
- * the Free Software Foundation.
10
7
  */
11
8
 #include <linux/bitops.h>
12
9
 #include <linux/clk.h>
10
+#include <linux/delay.h>
13
11
 #include <linux/io.h>
14
12
 #include <linux/kernel.h>
15
13
 #include <linux/module.h>
..
..
@@ -51,7 +49,6 @@
51
49
 	void __iomem *base;
52
50
 	struct watchdog_device wdev;
53
51
 	unsigned long clk_rate;
54
-	u16 time_left;
55
52
 	u8 cks;
56
53
 };
57
54
 
..
..
@@ -74,6 +71,15 @@
74
71
 	return 0;
75
72
 }
76
73
 
74
+static void rwdt_wait_cycles(struct rwdt_priv *priv, unsigned int cycles)
75
+{
76
+	unsigned int delay;
77
+
78
+	delay = DIV_ROUND_UP(cycles * 1000000, priv->clk_rate);
79
+
80
+	usleep_range(delay, 2 * delay);
81
+}
82
+
77
83
 static int rwdt_start(struct watchdog_device *wdev)
78
84
 {
79
85
 	struct rwdt_priv *priv = watchdog_get_drvdata(wdev);
..
..
@@ -84,6 +90,8 @@
84
90
 	/* Stop the timer before we modify any register */
85
91
 	val = readb_relaxed(priv->base + RWTCSRA) & ~RWTCSRA_TME;
86
92
 	rwdt_write(priv, val, RWTCSRA);
93
+	/* Delay 2 cycles before setting watchdog counter */
94
+	rwdt_wait_cycles(priv, 2);
87
95
 
88
96
 	rwdt_init_timeout(wdev);
89
97
 	rwdt_write(priv, priv->cks, RWTCSRA);
..
..
@@ -102,6 +110,8 @@
102
110
 	struct rwdt_priv *priv = watchdog_get_drvdata(wdev);
103
111
 
104
112
 	rwdt_write(priv, priv->cks, RWTCSRA);
113
+	/* Delay 3 cycles before disabling module clock */
114
+	rwdt_wait_cycles(priv, 3);
105
115
 	pm_runtime_put(wdev->parent);
106
116
 
107
117
 	return 0;
..
..
@@ -155,7 +165,6 @@
155
165
 		.data = (void *)1,	/* needs single CPU */
156
166
 	}, {
157
167
 		.soc_id = "r8a7792",
158
-		.revision = "*",
159
168
 		.data = (void *)0,	/* needs SMP disabled */
160
169
 	},
161
170
 	{ /* sentinel */ }
..
..
@@ -180,34 +189,34 @@
180
189
 
181
190
 static int rwdt_probe(struct platform_device *pdev)
182
191
 {
192
+	struct device *dev = &pdev->dev;
183
193
 	struct rwdt_priv *priv;
184
-	struct resource *res;
185
194
 	struct clk *clk;
186
195
 	unsigned long clks_per_sec;
187
196
 	int ret, i;
197
+	u8 csra;
188
198
 
189
-	if (rwdt_blacklisted(&pdev->dev))
199
+	if (rwdt_blacklisted(dev))
190
200
 		return -ENODEV;
191
201
 
192
-	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
202
+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
193
203
 	if (!priv)
194
204
 		return -ENOMEM;
195
205
 
196
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
197
-	priv->base = devm_ioremap_resource(&pdev->dev, res);
206
+	priv->base = devm_platform_ioremap_resource(pdev, 0);
198
207
 	if (IS_ERR(priv->base))
199
208
 		return PTR_ERR(priv->base);
200
209
 
201
-	clk = devm_clk_get(&pdev->dev, NULL);
210
+	clk = devm_clk_get(dev, NULL);
202
211
 	if (IS_ERR(clk))
203
212
 		return PTR_ERR(clk);
204
213
 
205
-	pm_runtime_enable(&pdev->dev);
206
-	pm_runtime_get_sync(&pdev->dev);
214
+	pm_runtime_enable(dev);
215
+	pm_runtime_get_sync(dev);
207
216
 	priv->clk_rate = clk_get_rate(clk);
208
-	priv->wdev.bootstatus = (readb_relaxed(priv->base + RWTCSRA) &
209
-				RWTCSRA_WOVF) ? WDIOF_CARDRESET : 0;
210
-	pm_runtime_put(&pdev->dev);
217
+	csra = readb_relaxed(priv->base + RWTCSRA);
218
+	priv->wdev.bootstatus = csra & RWTCSRA_WOVF ? WDIOF_CARDRESET : 0;
219
+	pm_runtime_put(dev);
211
220
 
212
221
 	if (!priv->clk_rate) {
213
222
 		ret = -ENOENT;
..
..
@@ -223,14 +232,14 @@
223
232
 	}
224
233
 
225
234
 	if (i < 0) {
226
-		dev_err(&pdev->dev, "Can't find suitable clock divider\n");
235
+		dev_err(dev, "Can't find suitable clock divider\n");
227
236
 		ret = -ERANGE;
228
237
 		goto out_pm_disable;
229
238
 	}
230
239
 
231
-	priv->wdev.info = &rwdt_ident,
232
-	priv->wdev.ops = &rwdt_ops,
233
-	priv->wdev.parent = &pdev->dev;
240
+	priv->wdev.info = &rwdt_ident;
241
+	priv->wdev.ops = &rwdt_ops;
242
+	priv->wdev.parent = dev;
234
243
 	priv->wdev.min_timeout = 1;
235
244
 	priv->wdev.max_timeout = DIV_BY_CLKS_PER_SEC(priv, 65536);
236
245
 	priv->wdev.timeout = min(priv->wdev.max_timeout, RWDT_DEFAULT_TIMEOUT);
..
..
@@ -242,9 +251,14 @@
242
251
 	watchdog_stop_on_unregister(&priv->wdev);
243
252
 
244
253
 	/* This overrides the default timeout only if DT configuration was found */
245
-	ret = watchdog_init_timeout(&priv->wdev, 0, &pdev->dev);
246
-	if (ret)
247
-		dev_warn(&pdev->dev, "Specified timeout value invalid, using default\n");
254
+	watchdog_init_timeout(&priv->wdev, 0, dev);
255
+
256
+	/* Check if FW enabled the watchdog */
257
+	if (csra & RWTCSRA_TME) {
258
+		/* Ensure properly initialized dividers */
259
+		rwdt_start(&priv->wdev);
260
+		set_bit(WDOG_HW_RUNNING, &priv->wdev.status);
261
+	}
248
262
 
249
263
 	ret = watchdog_register_device(&priv->wdev);
250
264
 	if (ret < 0)
..
..
@@ -253,7 +267,7 @@
253
267
 	return 0;
254
268
 
255
269
  out_pm_disable:
256
-	pm_runtime_disable(&pdev->dev);
270
+	pm_runtime_disable(dev);
257
271
 	return ret;
258
272
 }
259
273
 
..
..
@@ -271,10 +285,9 @@
271
285
 {
272
286
 	struct rwdt_priv *priv = dev_get_drvdata(dev);
273
287
 
274
-	if (watchdog_active(&priv->wdev)) {
275
-		priv->time_left = readw(priv->base + RWTCNT);
288
+	if (watchdog_active(&priv->wdev))
276
289
 		rwdt_stop(&priv->wdev);
277
-	}
290
+
278
291
 	return 0;
279
292
 }
280
293
 
..
..
@@ -282,10 +295,9 @@
282
295
 {
283
296
 	struct rwdt_priv *priv = dev_get_drvdata(dev);
284
297
 
285
-	if (watchdog_active(&priv->wdev)) {
298
+	if (watchdog_active(&priv->wdev))
286
299
 		rwdt_start(&priv->wdev);
287
-		rwdt_write(priv, priv->time_left, RWTCNT);
288
-	}
300
+
289
301
 	return 0;
290
302
 }
291
303