Allocate remote processor structure with state machine if the MCU
has already been started by an external entity.
Signed-off-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
---
drivers/remoteproc/stm32_rproc.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
index 07be306c0fb1..f320ef9ee286 100644
--- a/drivers/remoteproc/stm32_rproc.c
+++ b/drivers/remoteproc/stm32_rproc.c
@@ -608,7 +608,7 @@ static struct rproc_ops st_rproc_ops = {
.get_boot_addr = rproc_elf_get_boot_addr,
};
-static __maybe_unused struct rproc_ops st_rproc_sync_ops = {
+static struct rproc_ops st_rproc_sync_ops = {
.start = stm32_rproc_sync_start,
.stop = stm32_rproc_sync_stop,
.kick = stm32_rproc_kick,
@@ -616,6 +616,12 @@ static __maybe_unused struct rproc_ops st_rproc_sync_ops = {
.find_loaded_rsc_table = stm32_rproc_sync_elf_find_loaded_rsc_table,
};
+static struct rproc_sync_states st_sync_states = {
+ .on_init = true, /* sync with MCU when the kernel boots */
+ .after_stop = false, /* don't resync with MCU if stopped from sysfs */
+ .after_crash = false, /* don't resync with MCU after a crash */
+};
+
static const struct of_device_id stm32_rproc_match[] = {
{ .compatible = "st,stm32mp1-m4" },
{},
@@ -847,15 +853,22 @@ static int stm32_rproc_probe(struct platform_device *pdev)
ret = stm32_rproc_get_loaded_rsc_table(pdev, ddata);
if (ret)
goto free_ddata;
+
+ rproc = rproc_alloc_state_machine(dev, np->name, &st_rproc_ops,
+ &st_rproc_sync_ops,
+ &st_sync_states, NULL,
+ sizeof(*ddata));
+ } else {
+ rproc = rproc_alloc(dev, np->name, &st_rproc_ops,
+ NULL, sizeof(*ddata));
+ rproc->auto_boot = auto_boot;
}
- rproc = rproc_alloc(dev, np->name, &st_rproc_ops, NULL, sizeof(*ddata));
if (!rproc) {
ret = -ENOMEM;
goto free_ddata;
}
- rproc->auto_boot = auto_boot;
rproc->has_iommu = false;
ddata->workqueue = create_workqueue(dev_name(dev));
if (!ddata->workqueue) {
--
2.20.1
