drivers/amba: add reset control to amba bus probe
PATCH v5 1/1 drivers/amba: add reset control to amba bus 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 properti 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.
---
v5: use of_reset_control_array_get_optional_shared()
v4: cleaned up indentation in loop
fix up a few checkpatch warnings
add Reviewed-by:
v3: add a reset_control_put()
add error handling
v2: move reset control to bus code
find all reset properties and de-assert them
--- drivers/amba/bus.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/amba/bus.c +19 -0
@@ -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,24 @@ 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_array_get_optional_shared (dev->dev.of_node); +if (IS_ERR (rstc)) { +if (PTR_ERR (rstc) != -EPROBE_DEFER ) +dev_err (&dev->dev,"Can't get amba reset!\n" ); +return PTR_ERR (rstc); + } +reset_control_deassert (rstc); +reset_control_put (rstc); + count--; + }/* * Read pid and cid based on size of resource
Signature · 1 line
2.20.0
Quoted 45 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 properti 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.
Signed-off-by Dinh Nguyen <[email protected]>Reviewed-by Rob Herring <[email protected]>---
v5: useof_reset_control_array_get_optional_shared()
v4: cleaned up indentation in loop
fix up a few checkpatch warnings
add Reviewed-by:
v3: add areset_control_put()
add error handling
v2: move reset control to bus code
find all reset properties and de-assert them--- drivers/amba/bus.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)drivers/amba/bus.c +1
-0@@ -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,24 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent) ret =amba_get_enable_pclk (dev);if (ret ==0 ) {
drivers/amba/bus.c static int amba_device_try_add(struct amba_device *dev, struct resource *parent) · line 413
Quoted 10 lines
drivers/amba/bus.c +9
-0u32 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_array_get_optional_shared (dev->dev.of_node);
You can drop the loop, the rstc returned by of_reset_control_array_get() already controls all resets together.
regards
Philipp
Quoted 10 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 properti is not present in the device tree node, so the driver will continue to probe.
Does this DTRT for both old and new U-Boots? My naive reading of this patch says on an old U-Boot, we end up attempting to bring it out of reset even though they had already been brought out.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Quoted 7 lines · Valdis Kl?tnieks
Quoted 6 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.
Quoted 7 lines
Quoted 4 lines
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 properti is not present in the device tree node, so the driver will continue to probe.
Does this DTRT for both old and new U-Boots? My naive reading of this patch
What is a DTRT?
Quoted 3 lines
says on an old U-Boot, we end up attempting to bring it out of reset even though they had already been brought out.
If the peripheral is already out of reset, de-asserting the reset has no affect.
Dinh
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEoHhMeiyk5VmwVMwNGZQEC4GjKPQFAl1mgtYACgkQGZQEC4Gj KPRKMRAArFO9bQ7FCE4oiVgO/sOLm2M/ngGD3Czi6Y8TcAbIk4EylBGVw634Gs4Z v5vuyxShlfApBb0PqfhLOo5cXrTyMdpWOq9AQ4vEcEU2MPKN8QcyLczvEagyYcwA ianhTLR21v1Gdfm5MHqpKrNxSrb6Nt6cWmYCXjpabLYZg0gKJnsYl2XheHIdUJ02 kD2P6sQC3mf3OC5Gou4JXZGvDMgEwLG9lHsb7YoFq6tzZW3YQvAi3HcxIZZh4J8b jFcPR3RxxQgGwESEGDWQu2EzY/d9qStEQ9VYHl/v6QIL77S1oXUAXLbh3e6ZoSgt M93eK2G9wGCL5JlUbHXQ402OfewHchgQW1bDpjkaZLL+d9jUiGLqALAj0Az2FqX1 HtPPtifB4z6TuaLkxNTZ1Oz7UR0cWtKeSYjsuIwi0XzQMXopgH7oKdzJajNlAfRJ In6fSVuwp47p43wj2dmUtuCSYvzKTHAg/sVGaufEfsT8ZINSOZJY9ivDqkJIzlDR nsOclhfOGs5PgL4NPFW5U5O58DzZ5yl9NEotB4ahacuOqJv1PUdT3gABbL5hUogx QTAPNREbYesG3osFLeEXeachiNChyJ7r+NyWFly7RXA/ukxoer2Rkxt3h0hQib6Q /jhAsa1ar1NEk8dJJfNO7R5pZkG7ZCbhzuSDKPB2yRZPDeQGol8= =SFzc
-----END PGP SIGNATURE-----
Quoted 4 lines · Dinh Nguyen
Quoted 2 lines
Does this DTRT for both old and new U-Boots? My naive reading of this patch
What is a DTRT?
Do The Right Thing, sorry...
Quoted 6 lines
Quoted 3 lines
says on an old U-Boot, we end up attempting to bring it out of reset even though they had already been brought out.
If the peripheral is already out of reset, de-asserting the reset has no affect.
OK, thanks. There's been hardware where doing that sort of thing twice will confuse the device and cause issues.