ARM: davinci: complete the conversion to using the reset framework

From: Bartosz Golaszewski <[email protected]>

Switch to using the reset framework instead of handcoded reset routines we used so far.

Signed-off-by Bartosz Golaszewski <[email protected]>

Reviewed-by Sekhar Nori <[email protected]>

Reviewed-by Philipp Zabel <[email protected]>

---
 drivers/remoteproc/da8xx_remoteproc.c | 34 +++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

drivers/remoteproc/da8xx_remoteproc.c +29 -6

index b668e32996e2..76c06b70a1c6 100644
@@ -10,6 +10,7 @@
 
 #include <linux/bitops.h>
 #include <linux/clk.h>
+#include <linux/reset.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>

@@ -20,8 +21,6 @@
 #include <linux/platform_device.h>
 #include <linux/remoteproc.h>
 
-#include <mach/clock.h>   /* for davinci_clk_reset_assert/deassert() */
-
 #include "remoteproc_internal.h"
 
 static char *da8xx_fw_name;

@@ -72,6 +71,7 @@ struct da8xx_rproc {
        struct da8xx_rproc_mem *mem;
        int num_mems;
        struct clk *dsp_clk;
+       struct reset_control *dsp_reset;
        void (*ack_fxn)(struct irq_data *data);
        struct irq_data *irq_data;
        void __iomem *chipsig;

@@ -138,6 +138,7 @@ static int da8xx_rproc_start(struct rproc *rproc)
        struct device *dev = rproc->dev.parent;
        struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv;
        struct clk *dsp_clk = drproc->dsp_clk;
+       struct reset_control *dsp_reset = drproc->dsp_reset;
        int ret;
 
        /* hw requires the start (boot) address be on 1KB boundary */

@@ -155,7 +156,12 @@ static int da8xx_rproc_start(struct rproc *rproc)
                return ret;
        }
 
-       davinci_clk_reset_deassert(dsp_clk);
+       ret = reset_control_deassert(dsp_reset);
+       if (ret) {
+               dev_err(dev, "reset_control_deassert() failed: %d\n", ret);
+               clk_disable_unprepare(dsp_clk);
+               return ret;
+       }
 
        return 0;
 }

@@ -163,8 +169,15 @@ static int da8xx_rproc_start(struct rproc *rproc)
 static int da8xx_rproc_stop(struct rproc *rproc)
 {
        struct da8xx_rproc *drproc = rproc->priv;
+       struct device *dev = rproc->dev.parent;
+       int ret;
+
+       ret = reset_control_assert(drproc->dsp_reset);
+       if (ret) {
+               dev_err(dev, "reset_control_assert() failed: %d\n", ret);
+               return ret;
+       }
 
-       davinci_clk_reset_assert(drproc->dsp_clk);
        clk_disable_unprepare(drproc->dsp_clk);
 
        return 0;

@@ -232,6 +245,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
        struct resource *bootreg_res;
        struct resource *chipsig_res;
        struct clk *dsp_clk;
+       struct reset_control *dsp_reset;
        void __iomem *chipsig;
        void __iomem *bootreg;
        int irq;

@@ -268,6 +282,15 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
                return PTR_ERR(dsp_clk);
        }
 
+       dsp_reset = devm_reset_control_get_exclusive(dev, NULL);
+       if (IS_ERR(dsp_reset)) {
+               if (PTR_ERR(dsp_reset) != -EPROBE_DEFER)
+                       dev_err(dev, "unable to get reset control: %ld\n",
+                               PTR_ERR(dsp_reset));
+
+               return PTR_ERR(dsp_reset);
+       }
+
        if (dev->of_node) {
                ret = of_reserved_mem_device_init(dev);
                if (ret) {

@@ -287,6 +310,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
        drproc = rproc->priv;
        drproc->rproc = rproc;
        drproc->dsp_clk = dsp_clk;
+       drproc->dsp_reset = dsp_reset;
        rproc->has_iommu = false;
 
        ret = da8xx_rproc_get_internal_memories(pdev, drproc);

@@ -309,7 +333,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
         * *not* in reset, but da8xx_rproc_start() needs the DSP to be
         * held in reset at the time it is called.
         */
-       ret = davinci_clk_reset_assert(drproc->dsp_clk);
+       ret = reset_control_assert(dsp_reset);
        if (ret)
                goto free_rproc;
 
--

2.17.1

From: Bartosz Golaszewski <[email protected]>

Switch to using the reset framework instead of handcoded reset routines we used so far.

Signed-off-by Bartosz Golaszewski <[email protected]>

Reviewed-by Sekhar Nori <[email protected]>

Reviewed-by Philipp Zabel <[email protected]>

---
 drivers/remoteproc/da8xx_remoteproc.c | 34 +++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

drivers/remoteproc/da8xx_remoteproc.c +29 -5

index b668e32996e2..76c06b70a1c6 100644
@@ -10,6 +10,7 @@
 
 #include <linux/bitops.h>
 #include <linux/clk.h>
+#include <linux/reset.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>

@@ -20,8 +21,6 @@
 #include <linux/platform_device.h>
 #include <linux/remoteproc.h>
 
-#include <mach/clock.h>   /* for davinci_clk_reset_assert/deassert() */
-
 #include "remoteproc_internal.h"
 
 static char *da8xx_fw_name;

@@ -72,6 +71,7 @@ struct da8xx_rproc {
 	struct da8xx_rproc_mem *mem;
 	int num_mems;
 	struct clk *dsp_clk;
+	struct reset_control *dsp_reset;
 	void (*ack_fxn)(struct irq_data *data);
 	struct irq_data *irq_data;
 	void __iomem *chipsig;

@@ -138,6 +138,7 @@ static int da8xx_rproc_start(struct rproc *rproc)
 	struct device *dev = rproc->dev.parent;
 	struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv;
 	struct clk *dsp_clk = drproc->dsp_clk;
+	struct reset_control *dsp_reset = drproc->dsp_reset;
 	int ret;
 
 	/* hw requires the start (boot) address be on 1KB boundary */

@@ -155,7 +156,12 @@ static int da8xx_rproc_start(struct rproc *rproc)
 		return ret;
 	}
 
-	davinci_clk_reset_deassert(dsp_clk);
+	ret = reset_control_deassert(dsp_reset);
+	if (ret) {
+		dev_err(dev, "reset_control_deassert() failed: %d\n", ret);
+		clk_disable_unprepare(dsp_clk);
+		return ret;
+	}
 
 	return 0;
 }

@@ -163,8 +169,15 @@ static int da8xx_rproc_start(struct rproc *rproc)
 static int da8xx_rproc_stop(struct rproc *rproc)
 {
 	struct da8xx_rproc *drproc = rproc->priv;
+	struct device *dev = rproc->dev.parent;
+	int ret;
+
+	ret = reset_control_assert(drproc->dsp_reset);
+	if (ret) {
+		dev_err(dev, "reset_control_assert() failed: %d\n", ret);
+		return ret;
+	}
 
-	davinci_clk_reset_assert(drproc->dsp_clk);
 	clk_disable_unprepare(drproc->dsp_clk);
 
 	return 0;

@@ -232,6 +245,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
 	struct resource *bootreg_res;
 	struct resource *chipsig_res;
 	struct clk *dsp_clk;
+	struct reset_control *dsp_reset;
 	void __iomem *chipsig;
 	void __iomem *bootreg;
 	int irq;

@@ -268,6 +282,15 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
 		return PTR_ERR(dsp_clk);
 	}
 
+	dsp_reset = devm_reset_control_get_exclusive(dev, NULL);
+	if (IS_ERR(dsp_reset)) {
+		if (PTR_ERR(dsp_reset) != -EPROBE_DEFER)
+			dev_err(dev, "unable to get reset control: %ld\n",
+				PTR_ERR(dsp_reset));
+
+		return PTR_ERR(dsp_reset);
+	}
+
 	if (dev->of_node) {
 		ret = of_reserved_mem_device_init(dev);
 		if (ret) {

@@ -287,6 +310,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
 	drproc = rproc->priv;
 	drproc->rproc = rproc;
 	drproc->dsp_clk = dsp_clk;
+	drproc->dsp_reset = dsp_reset;
 	rproc->has_iommu = false;
 
 	ret = da8xx_rproc_get_internal_memories(pdev, drproc);

@@ -309,7 +333,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
 	 * *not* in reset, but da8xx_rproc_start() needs the DSP to be
 	 * held in reset at the time it is called.
 	 */
-	ret = davinci_clk_reset_assert(drproc->dsp_clk);
+	ret = reset_control_assert(dsp_reset);
 	if (ret)
 		goto free_rproc;
 

Signature · 1 line

2.17.1

Quoted 9 lines

From: Bartosz Golaszewski <[email protected]>

Switch to using the reset framework instead of handcoded reset routines we used so far.

Signed-off-by Bartosz Golaszewski <[email protected]>

Reviewed-by Sekhar Nori <[email protected]>

Reviewed-by Philipp Zabel <[email protected]>

Acked-by Bjorn Andersson <[email protected]>

Regards,
Bjorn

Quoted 116 lines

---
 drivers/remoteproc/da8xx_remoteproc.c | 34 +++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

drivers/remoteproc/da8xx_remoteproc.c +29 -6

index b668e32996e2..76c06b70a1c6 100644
@@ -10,6 +10,7 @@
 
 #include <linux/bitops.h>
 #include <linux/clk.h>
+#include <linux/reset.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>

@@ -20,8 +21,6 @@
 #include <linux/platform_device.h>
 #include <linux/remoteproc.h>
 
-#include <mach/clock.h>   /* for davinci_clk_reset_assert/deassert() */
-
 #include "remoteproc_internal.h"
 
 static char *da8xx_fw_name;

@@ -72,6 +71,7 @@ struct da8xx_rproc {
      struct da8xx_rproc_mem *mem;
      int num_mems;
      struct clk *dsp_clk;
+     struct reset_control *dsp_reset;
      void (*ack_fxn)(struct irq_data *data);
      struct irq_data *irq_data;
      void __iomem *chipsig;

@@ -138,6 +138,7 @@ static int da8xx_rproc_start(struct rproc *rproc)
      struct device *dev = rproc->dev.parent;
      struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv;
      struct clk *dsp_clk = drproc->dsp_clk;
+     struct reset_control *dsp_reset = drproc->dsp_reset;
      int ret;
 
      /* hw requires the start (boot) address be on 1KB boundary */

@@ -155,7 +156,12 @@ static int da8xx_rproc_start(struct rproc *rproc)
              return ret;
      }
 
-     davinci_clk_reset_deassert(dsp_clk);
+     ret = reset_control_deassert(dsp_reset);
+     if (ret) {
+             dev_err(dev, "reset_control_deassert() failed: %d\n", ret);
+             clk_disable_unprepare(dsp_clk);
+             return ret;
+     }
 
      return 0;
 }

@@ -163,8 +169,15 @@ static int da8xx_rproc_start(struct rproc *rproc)
 static int da8xx_rproc_stop(struct rproc *rproc)
 {
      struct da8xx_rproc *drproc = rproc->priv;
+     struct device *dev = rproc->dev.parent;
+     int ret;
+
+     ret = reset_control_assert(drproc->dsp_reset);
+     if (ret) {
+             dev_err(dev, "reset_control_assert() failed: %d\n", ret);
+             return ret;
+     }
 
-     davinci_clk_reset_assert(drproc->dsp_clk);
      clk_disable_unprepare(drproc->dsp_clk);
 
      return 0;

@@ -232,6 +245,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
      struct resource *bootreg_res;
      struct resource *chipsig_res;
      struct clk *dsp_clk;
+     struct reset_control *dsp_reset;
      void __iomem *chipsig;
      void __iomem *bootreg;
      int irq;

@@ -268,6 +282,15 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
              return PTR_ERR(dsp_clk);
      }
 
+     dsp_reset = devm_reset_control_get_exclusive(dev, NULL);
+     if (IS_ERR(dsp_reset)) {
+             if (PTR_ERR(dsp_reset) != -EPROBE_DEFER)
+                     dev_err(dev, "unable to get reset control: %ld\n",
+                             PTR_ERR(dsp_reset));
+
+             return PTR_ERR(dsp_reset);
+     }
+
      if (dev->of_node) {
              ret = of_reserved_mem_device_init(dev);
              if (ret) {

@@ -287,6 +310,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
      drproc = rproc->priv;
      drproc->rproc = rproc;
      drproc->dsp_clk = dsp_clk;
+     drproc->dsp_reset = dsp_reset;
      rproc->has_iommu = false;
 
      ret = da8xx_rproc_get_internal_memories(pdev, drproc);

@@ -309,7 +333,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
       * *not* in reset, but da8xx_rproc_start() needs the DSP to be
       * held in reset at the time it is called.
       */
-     ret = davinci_clk_reset_assert(drproc->dsp_clk);
+     ret = reset_control_assert(dsp_reset);
      if (ret)
              goto free_rproc;
 
--

2.17.1

2018-07-31 6:25 GMT+02:00 Bjorn Andersson <[email protected]>:

Quoted 11 lines · Bartosz Golaszewski

Quoted 9 lines

From: Bartosz Golaszewski <[email protected]>

Switch to using the reset framework instead of handcoded reset routines we used so far.

Signed-off-by Bartosz Golaszewski <[email protected]>

Reviewed-by Sekhar Nori <[email protected]>

Reviewed-by Philipp Zabel <[email protected]>

Quoted 2 lines

Acked-by Bjorn Andersson <[email protected]>

Sekhar,

can you take this through your tree or is it already too late?

From: Bartosz Golaszewski <[email protected]>

This code is no longer used. Remove it.

Signed-off-by Bartosz Golaszewski <[email protected]>

Reviewed-by David Lechner <[email protected]>

Acked-by Stephen Boyd <[email protected]>

---

Quoted 4 lines

From: Bartosz Golaszewski <[email protected]>

This code is no longer used. Remove it.

Quoted 4 lines

Signed-off-by Bartosz Golaszewski <[email protected]>

Reviewed-by David Lechner <[email protected]>

Acked-by Stephen Boyd <[email protected]>

---

I've picked this up in clk-davinci-4.20, so it will just hang out there for a while until the rest of this series gets merged.

pt., 6 lip 2018 o 19:54 David Lechner <[email protected]> napisa?(a):

Quoted 6 lines · Bartosz Golaszewski

Quoted 4 lines

From: Bartosz Golaszewski <[email protected]>

This code is no longer used. Remove it.

Quoted 8 lines

Quoted 4 lines

Signed-off-by Bartosz Golaszewski <[email protected]>

Reviewed-by David Lechner <[email protected]>

Acked-by Stephen Boyd <[email protected]>

---

I've picked this up in clk-davinci-4.20, so it will just hang out there for a while until the rest of this series gets merged.

Hi David,

I don't see this patch in next yet. Is it queued for 4.20?

Thanks in advance,
Bartosz

Quoted 20 lines

pt., 6 lip 2018 o 19:54 David Lechner <[email protected]> napisa?(a):

Quoted 6 lines · Bartosz Golaszewski

Quoted 4 lines

From: Bartosz Golaszewski <[email protected]>

This code is no longer used. Remove it.

Quoted 8 lines

Quoted 4 lines

Signed-off-by Bartosz Golaszewski <[email protected]>

Reviewed-by David Lechner <[email protected]>

Acked-by Stephen Boyd <[email protected]>

---

I've picked this up in clk-davinci-4.20, so it will just hang out there for a while until the rest of this series gets merged.

Hi David,

I don't see this patch in next yet. Is it queued for 4.20?

Quoted 3 lines

Thanks in advance,
Bartosz

This is currently the only clk-davinici patch I have queued, so it might be easier to just resend it and let Stephen/Mike pick it up directly instead of me sending a pull request for one patch.

From: Bartosz Golaszewski <[email protected]>

The psc driver registers with the reset framework as a provider. Add the #reset-cells property to the psc0 node.

Signed-off-by Bartosz Golaszewski <[email protected]>

Reviewed-by David Lechner <[email protected]>

From: Bartosz Golaszewski <[email protected]>

The davinci-rproc driver will soon use the reset framework. Add the resets property to the dsp node in da850.dtsi.

Signed-off-by Bartosz Golaszewski <[email protected]>

Reviewed-by David Lechner <[email protected]>

---
 arch/arm/boot/dts/da850.dtsi | 1 +
 1 file changed, 1 insertion(+)

arch/arm/boot/dts/da850.dtsi +0 -0

index 1bc0e4bc0697..225e0cf4b7bc 100644

From: Bartosz Golaszewski <[email protected]>

These are the remaining patches that still need to be merged in order to complete the conversion of the davinci dsp driver to using the reset framework.

They apply on top of v4.18-rc1 with David Lechner's remaining patches merged.

Hi Bartosz,

Quoted 8 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

These are the remaining patches that still need to be merged in order to complete the conversion of the davinci dsp driver to using the reset framework.

They apply on top of v4.18-rc1 with David Lechner's remaining patches merged.

Series looks good to me.

To preserve bisect, shouldn't the order of applying be patch #3, #4, #1 and #2 ?

Given the dependencies and to preserve bisect its easiest if I take the series with acks from remoteproc and clock maintainers.

Open to other suggestions as well.

Thanks,
Sekhar

2018-06-21 12:52 GMT+02:00 Sekhar Nori <[email protected]>:

Quoted 20 lines

Hi Bartosz,

Quoted 8 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

These are the remaining patches that still need to be merged in order to complete the conversion of the davinci dsp driver to using the reset framework.

They apply on top of v4.18-rc1 with David Lechner's remaining patches merged.

Series looks good to me.

To preserve bisect, shouldn't the order of applying be patch #3, #4, #1 and #2 ?

Given the dependencies and to preserve bisect its easiest if I take the series with acks from remoteproc and clock maintainers.

Quoted 4 lines

Open to other suggestions as well.

Thanks,
Sekhar

Oops you're right about the order. Do you want me to resend?

Hi Bjorn,

Quoted 26 lines · Bartosz Golaszewski

2018-06-21 12:52 GMT+02:00 Sekhar Nori <[email protected]>:

Quoted 24 lines

Hi Bartosz,

Quoted 8 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

These are the remaining patches that still need to be merged in order to complete the conversion of the davinci dsp driver to using the reset framework.

They apply on top of v4.18-rc1 with David Lechner's remaining patches merged.

Series looks good to me.

To preserve bisect, shouldn't the order of applying be patch #3, #4, #1 and #2 ?

Given the dependencies and to preserve bisect its easiest if I take the series with acks from remoteproc and clock maintainers.

Open to other suggestions as well.

Thanks,
Sekhar

Quoted 1 line

Oops you're right about the order. Do you want me to resend?

With your ack, I can queue 1/4 for v4.19 and provide an immutable commit to you (on top of v4.18-rc1) for you to merge any further changes you want to queue from your tree.

Bartosz, given the number of moving pieces, I think its better to keep 2/4 for v4.20 release - once all other other dependencies have been merged.

Quoted 36 lines · Sekhar Nori

Hi Bjorn,

Quoted 22 lines · Bartosz Golaszewski

2018-06-21 12:52 GMT+02:00 Sekhar Nori <[email protected]>:

Quoted 21 lines

Hi Bartosz,

Quoted 9 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

These are the remaining patches that still need to be merged in order to complete the conversion of the davinci dsp driver to using the reset
framework.

They apply on top of v4.18-rc1 with David Lechner's remaining patches merged.

Series looks good to me.

To preserve bisect, shouldn't the order of applying be patch #3, #4, #1 and #2 ?

Given the dependencies and to preserve bisect its easiest if I take the series with acks from remoteproc and clock maintainers.

Quoted 6 lines

Quoted 4 lines

Open to other suggestions as well.

Thanks,
Sekhar

Oops you're right about the order. Do you want me to resend?

With your ack, I can queue 1/4 for v4.19 and provide an immutable commit to you (on top of v4.18-rc1) for you to merge any further changes you want to queue from your tree.

Quoted 3 lines

Bartosz, given the number of moving pieces, I think its better to keep 2/4 for v4.20 release - once all other other dependencies have been merged.

I was thinking the same thing as well. I will pick it up in a clk-davinci-4.20 branch if that sounds OK.

Hi Bjorn,

Quoted 23 lines · Bartosz Golaszewski

2018-06-21 12:52 GMT+02:00 Sekhar Nori <[email protected]>:

Quoted 22 lines

Hi Bartosz,

Quoted 8 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

These are the remaining patches that still need to be merged in order to complete the conversion of the davinci dsp driver to using the reset framework.

They apply on top of v4.18-rc1 with David Lechner's remaining patches merged.

Series looks good to me.

To preserve bisect, shouldn't the order of applying be patch #3, #4, #1 and #2 ?

Given the dependencies and to preserve bisect its easiest if I take the series with acks from remoteproc and clock maintainers.

Open to other suggestions as well.

Quoted 4 lines

Quoted 2 lines

Thanks,
Sekhar

Oops you're right about the order. Do you want me to resend?

With your ack, I can queue 1/4 for v4.19 and provide an immutable commit to you (on top of v4.18-rc1) for you to merge any further changes you want to queue from your tree.