enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/drivers/watchdog/sbsa_gwdt.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * SBSA(Server Base System Architecture) Generic Watchdog driver
3
4
  *
..
..
@@ -6,15 +7,6 @@
6
7
  *         Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
7
8
  *         Al Stone <al.stone@linaro.org>
8
9
  *         Timur Tabi <timur@codeaurora.org>
9
- *
10
- * This program is free software; you can redistribute it and/or modify
11
- * it under the terms of the GNU General Public License 2 as published
12
- * by the Free Software Foundation.
13
- *
14
- * This program is distributed in the hope that it will be useful,
15
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
16
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
- * GNU General Public License for more details.
18
10
  *
19
11
  * ARM SBSA Generic Watchdog has two stage timeouts:
20
12
  * the first signal (WS0) is for alerting the system by interrupt,
..
..
@@ -46,7 +38,6 @@
46
38
  * by WOR, in the single stage mode, the timeout is (WOR * 2); in the two
47
39
  * stages mode, the timeout is WOR. The maximum timeout in the two stages mode
48
40
  * is half of that in the single stage mode.
49
- *
50
41
  */
51
42
 
52
43
 #include <linux/io.h>
..
..
@@ -161,7 +152,7 @@
161
152
 		timeleft += readl(gwdt->control_base + SBSA_GWDT_WOR);
162
153
 
163
154
 	timeleft += lo_hi_readq(gwdt->control_base + SBSA_GWDT_WCV) -
164
-		    arch_counter_get_cntvct();
155
+		    arch_timer_read_counter();
165
156
 
166
157
 	do_div(timeleft, gwdt->clk);
167
158
 
..
..
@@ -231,7 +222,6 @@
231
222
 	struct device *dev = &pdev->dev;
232
223
 	struct watchdog_device *wdd;
233
224
 	struct sbsa_gwdt *gwdt;
234
-	struct resource *res;
235
225
 	int ret, irq;
236
226
 	u32 status;
237
227
 
..
..
@@ -240,13 +230,11 @@
240
230
 		return -ENOMEM;
241
231
 	platform_set_drvdata(pdev, gwdt);
242
232
 
243
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
244
-	cf_base = devm_ioremap_resource(dev, res);
233
+	cf_base = devm_platform_ioremap_resource(pdev, 0);
245
234
 	if (IS_ERR(cf_base))
246
235
 		return PTR_ERR(cf_base);
247
236
 
248
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
249
-	rf_base = devm_ioremap_resource(dev, res);
237
+	rf_base = devm_platform_ioremap_resource(pdev, 1);
250
238
 	if (IS_ERR(rf_base))
251
239
 		return PTR_ERR(rf_base);
252
240
 
..
..
@@ -313,29 +301,14 @@
313
301
 	 */
314
302
 	sbsa_gwdt_set_timeout(wdd, wdd->timeout);
315
303
 
316
-	ret = watchdog_register_device(wdd);
304
+	watchdog_stop_on_reboot(wdd);
305
+	ret = devm_watchdog_register_device(dev, wdd);
317
306
 	if (ret)
318
307
 		return ret;
319
308
 
320
309
 	dev_info(dev, "Initialized with %ds timeout @ %u Hz, action=%d.%s\n",
321
310
 		 wdd->timeout, gwdt->clk, action,
322
311
 		 status & SBSA_GWDT_WCS_EN ? " [enabled]" : "");
323
-
324
-	return 0;
325
-}
326
-
327
-static void sbsa_gwdt_shutdown(struct platform_device *pdev)
328
-{
329
-	struct sbsa_gwdt *gwdt = platform_get_drvdata(pdev);
330
-
331
-	sbsa_gwdt_stop(&gwdt->wdd);
332
-}
333
-
334
-static int sbsa_gwdt_remove(struct platform_device *pdev)
335
-{
336
-	struct sbsa_gwdt *gwdt = platform_get_drvdata(pdev);
337
-
338
-	watchdog_unregister_device(&gwdt->wdd);
339
312
 
340
313
 	return 0;
341
314
 }
..
..
@@ -385,8 +358,6 @@
385
358
 		.of_match_table = sbsa_gwdt_of_match,
386
359
 	},
387
360
 	.probe = sbsa_gwdt_probe,
388
-	.remove = sbsa_gwdt_remove,
389
-	.shutdown = sbsa_gwdt_shutdown,
390
361
 	.id_table = sbsa_gwdt_pdev_match,
391
362
 };
392
363