3 files changed, 25 insertions, 7 deletions

diff --git a/drivers/soc/ti/knav_qmss.h b/drivers/soc/ti/knav_qmss.h
index c31b8d826794..6ff936cacb70 100644
--- a/drivers/soc/ti/knav_qmss.h
+++ b/drivers/soc/ti/knav_qmss.h
@@ -137,6 +137,8 @@ struct knav_pdsp_info {
         u32 __iomem                                     *iram;
         u32                                             id;
         struct list_head                                list;
+        bool                                            loaded;
+        bool                                            started;
 };
 
 struct knav_qmgr_info {
diff --git a/drivers/soc/ti/knav_qmss_acc.c b/drivers/soc/ti/knav_qmss_acc.c
index ef6f69db0bd0..37c4aa95492d 100644
--- a/drivers/soc/ti/knav_qmss_acc.c
+++ b/drivers/soc/ti/knav_qmss_acc.c
@@ -482,8 +482,8 @@ struct knav_range_ops knav_acc_range_ops = {
  * Return 0 on success or error
  */
 int knav_init_acc_range(struct knav_device *kdev,
-                                struct device_node *node,
-                                struct knav_range_info *range)
+                        struct device_node *node,
+                        struct knav_range_info *range)
 {
         struct knav_acc_channel *acc;
         struct knav_pdsp_info *pdsp;
@@ -526,6 +526,12 @@ int knav_init_acc_range(struct knav_device *kdev,
                 return -EINVAL;
         }
 
+        if (!pdsp->started) {
+                dev_err(kdev->dev, "pdsp id %d not started for range %s\n",
+                        info->pdsp_id, range->name);
+                return -ENODEV;
+        }
+
         info->pdsp = pdsp;
         channels = range->num_queues;
         if (of_get_property(node, "multi-queue", NULL)) {
diff --git a/drivers/soc/ti/knav_qmss_queue.c b/drivers/soc/ti/knav_qmss_queue.c
index 06d9de826758..f3a0b6a4b54e 100644
--- a/drivers/soc/ti/knav_qmss_queue.c
+++ b/drivers/soc/ti/knav_qmss_queue.c
@@ -1504,6 +1504,8 @@ static int knav_queue_stop_pdsp(struct knav_device *kdev,
                 dev_err(kdev->dev, "timed out on pdsp %s stop\n", pdsp->name);
                 return ret;
         }
+        pdsp->loaded = false;
+        pdsp->started = false;
         return 0;
 }
 
@@ -1592,16 +1594,24 @@ static int knav_queue_start_pdsps(struct knav_device *kdev)
         int ret;
 
         knav_queue_stop_pdsps(kdev);
-        /* now load them all */
+        /* now load them all. We return success even if pdsp
+         * is not loaded as acc channels are optional on having
+         * firmware availability in the system. We set the loaded
+         * and stated flag and when initialize the acc range, check
+         * it and init the range only if pdsp is started.
+         */
         for_each_pdsp(kdev, pdsp) {
                 ret = knav_queue_load_pdsp(kdev, pdsp);
-                if (ret < 0)
-                        return ret;
+                if (!ret)
+                        pdsp->loaded = true;
         }
 
         for_each_pdsp(kdev, pdsp) {
-                ret = knav_queue_start_pdsp(kdev, pdsp);
-                WARN_ON(ret);
+                if (pdsp->loaded) {
+                        ret = knav_queue_start_pdsp(kdev, pdsp);
+                        if (!ret)
+                                pdsp->started = true;
+                }
         }
         return 0;
 }