Skip to contentSkip to conversation

drivers/amba: add reset control to primecell probe

PATCH Superseded Dinh Nguyen 2 participants 2 messages Aug 5, 2019 Arm primecell bus support

v2 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 drivers/amba: add reset control to primecell probe

The primecell controller on some SoCs, i.e. SoCFPGA, is held in reset by default. Until recently, the DMA controller was brought out of reset by the bootloader(i.e. U-Boot). But a recent change in U-Boot, the peripherals that are not used are held in reset and are left to Linux to bring them out of reset.

Add a mechanism for getting the reset property and de-assert the primecell module from reset if found. This is a not a hard fail if the reset property is not present in the device tree node, so the driver will continue to probe.

Because there are different variants of the controller that may have multiple reset signals, the code will find all reset(s) specified and de-assert them.

---
v2: move reset control to bus code
find all reset properties and de-assert them

---
 drivers/amba/bus.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
drivers/amba/bus.c +13 -0
index 100e798a5c82..75e18b9e4808 100644
@@ -18,6 +18,7 @@
 #include <linux/limits.h>
 #include <linux/clk/clk-conf.h>
 #include <linux/platform_device.h>
+#include <linux/reset.h>
 
 #include <asm/irq.h>
 
@@ -401,6 +402,18 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)
 	ret = amba_get_enable_pclk(dev);
 	if (ret == 0) {
 		u32 pid, cid;
+		int count;
+		struct reset_control *rstc;
+
+		/*
+		 * Find reset control(s) of the amba bus and de-assert them.
+		 */
+		count = reset_control_get_count(&dev->dev);
+		while (count > 0) {
+			rstc = of_reset_control_get_shared_by_index(dev->dev.of_node, count - 1);
+			reset_control_deassert(rstc);
+			count--;
+		}
 
 		/*
 		 * Read pid and cid based on size of resource
Signature · 1 line
2.20.0
#1 lore raw
Quoted 40 lines · Dinh Nguyen

The primecell controller on some SoCs, i.e. SoCFPGA, is held in reset by default. Until recently, the DMA controller was brought out of reset by the bootloader(i.e. U-Boot). But a recent change in U-Boot, the peripherals that are not used are held in reset and are left to Linux to bring them out of reset.

Add a mechanism for getting the reset property and de-assert the primecell module from reset if found. This is a not a hard fail if the reset property is not present in the device tree node, so the driver will continue to probe.

Because there are different variants of the controller that may have multiple reset signals, the code will find all reset(s) specified and de-assert them.

---
v2: move reset control to bus code
find all reset properties and de-assert them

---
 drivers/amba/bus.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
drivers/amba/bus.c +3 -0
index 100e798a5c82..75e18b9e4808 100644
@@ -18,6 +18,7 @@
 #include <linux/limits.h>
 #include <linux/clk/clk-conf.h>
 #include <linux/platform_device.h>
+#include <linux/reset.h>
 
 #include <asm/irq.h>
 
@@ -401,6 +402,18 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)
        ret = amba_get_enable_pclk(dev);
        if (ret == 0) {
                u32 pid, cid;
+               int count;
+               struct reset_control *rstc;

drivers/amba/bus.c static int amba_device_try_add(struct amba_device *dev, struct resource *parent) · line 416

Quoted 10 lines
drivers/amba/bus.c +10 -0
+
+               /*
+                * Find reset control(s) of the amba bus and de-assert them.
+                */
+               count = reset_control_get_count(&dev->dev);
+               while (count > 0) {
+                       rstc = of_reset_control_get_shared_by_index(dev->dev.of_node, count - 1);
+                       reset_control_deassert(rstc);
+                       count--;
+               }

Aren't you going to need a put somewhere?

And then there's the fun possibility of deferred probe which could happen on any of the resets.

Rob