kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/amba/bus.c
..
..
@@ -1,11 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  *  linux/arch/arm/common/amba.c
3
4
  *
4
5
  *  Copyright (C) 2003 Deep Blue Solutions Ltd, All Rights Reserved.
5
- *
6
- * This program is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License version 2 as
8
- * published by the Free Software Foundation.
9
6
  */
10
7
 #include <linux/module.h>
11
8
 #include <linux/init.h>
..
..
@@ -21,24 +18,42 @@
21
18
 #include <linux/limits.h>
22
19
 #include <linux/clk/clk-conf.h>
23
20
 #include <linux/platform_device.h>
21
+#include <linux/reset.h>
24
22
 
25
23
 #include <asm/irq.h>
26
24
 
27
25
 #define to_amba_driver(d)	container_of(d, struct amba_driver, drv)
28
26
 
27
+/* called on periphid match and class 0x9 coresight device. */
28
+static int
29
+amba_cs_uci_id_match(const struct amba_id *table, struct amba_device *dev)
30
+{
31
+	int ret = 0;
32
+	struct amba_cs_uci_id *uci;
33
+
34
+	uci = table->data;
35
+
36
+	/* no table data or zero mask - return match on periphid */
37
+	if (!uci || (uci->devarch_mask == 0))
38
+		return 1;
39
+
40
+	/* test against read devtype and masked devarch value */
41
+	ret = (dev->uci.devtype == uci->devtype) &&
42
+		((dev->uci.devarch & uci->devarch_mask) == uci->devarch);
43
+	return ret;
44
+}
45
+
29
46
 static const struct amba_id *
30
47
 amba_lookup(const struct amba_id *table, struct amba_device *dev)
31
48
 {
32
-	int ret = 0;
33
-
34
49
 	while (table->mask) {
35
-		ret = (dev->periphid & table->mask) == table->id;
36
-		if (ret)
37
-			break;
50
+		if (((dev->periphid & table->mask) == table->id) &&
51
+			((dev->cid != CORESIGHT_CID) ||
52
+			 (amba_cs_uci_id_match(table, dev))))
53
+			return table;
38
54
 		table++;
39
55
 	}
40
-
41
-	return ret ? table : NULL;
56
+	return NULL;
42
57
 }
43
58
 
44
59
 static int amba_match(struct device *dev, struct device_driver *drv)
..
..
@@ -284,11 +299,10 @@
284
299
 {
285
300
 	struct amba_device *pcdev = to_amba_device(dev);
286
301
 	struct amba_driver *drv = to_amba_driver(dev->driver);
287
-	int ret = 0;
288
302
 
289
303
 	pm_runtime_get_sync(dev);
290
304
 	if (drv->remove)
291
-		ret = drv->remove(pcdev);
305
+		drv->remove(pcdev);
292
306
 	pm_runtime_put_noidle(dev);
293
307
 
294
308
 	/* Undo the runtime PM settings in amba_probe() */
..
..
@@ -299,7 +313,7 @@
299
313
 	amba_put_disable_pclk(pcdev);
300
314
 	dev_pm_domain_detach(dev, true);
301
315
 
302
-	return ret;
316
+	return 0;
303
317
 }
304
318
 
305
319
 static void amba_shutdown(struct device *dev)
..
..
@@ -388,6 +402,21 @@
388
402
 	ret = amba_get_enable_pclk(dev);
389
403
 	if (ret == 0) {
390
404
 		u32 pid, cid;
405
+		struct reset_control *rstc;
406
+
407
+		/*
408
+		 * Find reset control(s) of the amba bus and de-assert them.
409
+		 */
410
+		rstc = of_reset_control_array_get_optional_shared(dev->dev.of_node);
411
+		if (IS_ERR(rstc)) {
412
+			ret = PTR_ERR(rstc);
413
+			if (ret != -EPROBE_DEFER)
414
+				dev_err(&dev->dev, "can't get reset: %d\n",
415
+					ret);
416
+			goto err_reset;
417
+		}
418
+		reset_control_deassert(rstc);
419
+		reset_control_put(rstc);
391
420
 
392
421
 		/*
393
422
 		 * Read pid and cid based on size of resource
..
..
@@ -400,10 +429,22 @@
400
429
 			cid |= (readl(tmp + size - 0x10 + 4 * i) & 255) <<
401
430
 				(i * 8);
402
431
 
432
+		if (cid == CORESIGHT_CID) {
433
+			/* set the base to the start of the last 4k block */
434
+			void __iomem *csbase = tmp + size - 4096;
435
+
436
+			dev->uci.devarch =
437
+				readl(csbase + UCI_REG_DEVARCH_OFFSET);
438
+			dev->uci.devtype =
439
+				readl(csbase + UCI_REG_DEVTYPE_OFFSET) & 0xff;
440
+		}
441
+
403
442
 		amba_put_disable_pclk(dev);
404
443
 
405
-		if (cid == AMBA_CID || cid == CORESIGHT_CID)
444
+		if (cid == AMBA_CID || cid == CORESIGHT_CID) {
406
445
 			dev->periphid = pid;
446
+			dev->cid = cid;
447
+		}
407
448
 
408
449
 		if (!dev->periphid)
409
450
 			ret = -ENODEV;
..
..
@@ -433,6 +474,12 @@
433
474
 	release_resource(&dev->res);
434
475
  err_out:
435
476
 	return ret;
477
+
478
+ err_reset:
479
+	amba_put_disable_pclk(dev);
480
+	iounmap(tmp);
481
+	dev_pm_domain_detach(&dev->dev, true);
482
+	goto err_release;
436
483
 }
437
484
 
438
485
 /*
..
..
@@ -458,7 +505,7 @@
458
505
 
459
506
 #define DEFERRED_DEVICE_TIMEOUT (msecs_to_jiffies(5 * 1000))
460
507
 
461
-static void amba_deferred_retry_func(struct work_struct *dummy)
508
+static int amba_deferred_retry(void)
462
509
 {
463
510
 	struct deferred_device *ddev, *tmp;
464
511
 
..
..
@@ -474,11 +521,19 @@
474
521
 		kfree(ddev);
475
522
 	}
476
523
 
524
+	mutex_unlock(&deferred_devices_lock);
525
+
526
+	return 0;
527
+}
528
+late_initcall(amba_deferred_retry);
529
+
530
+static void amba_deferred_retry_func(struct work_struct *dummy)
531
+{
532
+	amba_deferred_retry();
533
+
477
534
 	if (!list_empty(&deferred_devices))
478
535
 		schedule_delayed_work(&deferred_retry_work,
479
536
 				      DEFERRED_DEVICE_TIMEOUT);
480
-
481
-	mutex_unlock(&deferred_devices_lock);
482
537
 }
483
538
 
484
539
 /**
..
..
@@ -598,6 +653,7 @@
598
653
 	dev->dev.release = amba_device_release;
599
654
 	dev->dev.bus = &amba_bustype;
600
655
 	dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
656
+	dev->dev.dma_parms = &dev->dma_parms;
601
657
 	dev->res.name = dev_name(&dev->dev);
602
658
 }
603
659