diff mbox

[v2,3/3] remoteproc/keystone: Ensure the DSPs are in reset in probe

Message ID 20170608002447.47580-4-s-anna@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Suman Anna June 8, 2017, 12:24 a.m. UTC 
From: "Andrew F. Davis" <afd@ti.com>

The DSPs are expected to be in reset when the driver probes a device.
If the DSPs are out of reset in probe, the system may crash when the
firmware is being loaded. So, add a check to make sure the DSP resets
are asserted, and if not, throw a eye-catchy warning and assert the
resets specifically.

Signed-off-by: Andrew F. Davis <afd@ti.com>
[s-anna@ti.com: replace warning with a WARN]
Signed-off-by: Suman Anna <s-anna@ti.com>
---
v2: No code changes

 drivers/remoteproc/keystone_remoteproc.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

Santosh Shilimkar June 10, 2017, 7:32 p.m. UTC | #1 
On 6/7/2017 5:24 PM, Suman Anna wrote:
> From: "Andrew F. Davis" <afd@ti.com>
> 
> The DSPs are expected to be in reset when the driver probes a device.
> If the DSPs are out of reset in probe, the system may crash when the
> firmware is being loaded. So, add a check to make sure the DSP resets
> are asserted, and if not, throw a eye-catchy warning and assert the
> resets specifically.
> 
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> [s-anna@ti.com: replace warning with a WARN]
> Signed-off-by: Suman Anna <s-anna@ti.com>
> ---
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
diff mbox

Patch

diff --git a/drivers/remoteproc/keystone_remoteproc.c b/drivers/remoteproc/keystone_remoteproc.c
index 6e09ef76f7c7..5f776bfd674a 100644
--- a/drivers/remoteproc/keystone_remoteproc.c
+++ b/drivers/remoteproc/keystone_remoteproc.c
@@ -456,6 +456,16 @@  static int keystone_rproc_probe(struct platform_device *pdev)
 	if (of_reserved_mem_device_init(dev))
 		dev_warn(dev, "device does not have specific CMA pool\n");
 
+	/* ensure the DSP is in reset before loading firmware */
+	ret = reset_control_status(ksproc->reset);
+	if (ret < 0) {
+		dev_err(dev, "failed to get reset status, status = %d\n", ret);
+		goto release_mem;
+	} else if (ret == 0) {
+		WARN(1, "device is not in reset\n");
+		keystone_rproc_dsp_reset(ksproc);
+	}
+
 	ret = rproc_add(rproc);
 	if (ret) {
 		dev_err(dev, "failed to add register device with remoteproc core, status = %d\n",