ASoC: Intel: Skylake: Fix support for multiple pins in a module

For supporting multiple dynamic pins, module state check is
incorrect. In case of unbind, module state need to be changed to
uninit if all pins in the module is is unbind state.
To handle module state correctly add pin state and use pin
state check to set module state correctly.

Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c
index 50a109503a3fefbe41b1c153b8c96f975a4a6d1f..ee059589e9f0baacdafa8dc2e26c17a1db28734b 100644 (file)
--- a/sound/soc/intel/skylake/skl-messages.c
+++ b/sound/soc/intel/skylake/skl-messages.c
@@ -571,10 +571,10 @@ static int skl_get_queue_index(struct skl_module_pin *mpin,
  * In static, the pin_index is fixed based on module_id and instance id
  */
 static int skl_alloc_queue(struct skl_module_pin *mpin,
-                       struct skl_module_inst_id id, int max)
+                       struct skl_module_cfg *tgt_cfg, int max)
 {
        int i;
-
+       struct skl_module_inst_id id = tgt_cfg->id;
        /*
         * if pin in dynamic, find first free pin
         * otherwise find match module and instance id pin as topology will
@@ -583,16 +583,23 @@ static int skl_alloc_queue(struct skl_module_pin *mpin,
         */
        for (i = 0; i < max; i++)  {
                if (mpin[i].is_dynamic) {
-                       if (!mpin[i].in_use) {
+                       if (!mpin[i].in_use &&
+                               mpin[i].pin_state == SKL_PIN_UNBIND) {
+
                                mpin[i].in_use = true;
                                mpin[i].id.module_id = id.module_id;
                                mpin[i].id.instance_id = id.instance_id;
+                               mpin[i].tgt_mcfg = tgt_cfg;
                                return i;
                        }
                } else {
                        if (mpin[i].id.module_id == id.module_id &&
-                               mpin[i].id.instance_id == id.instance_id)
+                               mpin[i].id.instance_id == id.instance_id &&
+                               mpin[i].pin_state == SKL_PIN_UNBIND) {
+
+                               mpin[i].tgt_mcfg = tgt_cfg;
                                return i;
+                       }
                }
        }
 
@@ -606,6 +613,28 @@ static void skl_free_queue(struct skl_module_pin *mpin, int q_index)
                mpin[q_index].id.module_id = 0;
                mpin[q_index].id.instance_id = 0;
        }
+       mpin[q_index].pin_state = SKL_PIN_UNBIND;
+       mpin[q_index].tgt_mcfg = NULL;
+}
+
+/* Module state will be set to unint, if all the out pin state is UNBIND */
+
+static void skl_clear_module_state(struct skl_module_pin *mpin, int max,
+                                               struct skl_module_cfg *mcfg)
+{
+       int i;
+       bool found = false;
+
+       for (i = 0; i < max; i++)  {
+               if (mpin[i].pin_state == SKL_PIN_UNBIND)
+                       continue;
+               found = true;
+               break;
+       }
+
+       if (!found)
+               mcfg->m_state = SKL_MODULE_UNINIT;
+       return;
 }
 
 /*
@@ -682,37 +711,30 @@ int skl_unbind_modules(struct skl_sst *ctx,
        struct skl_module_inst_id dst_id = dst_mcfg->id;
        int in_max = dst_mcfg->max_in_queue;
        int out_max = src_mcfg->max_out_queue;
-       int src_index, dst_index;
+       int src_index, dst_index, src_pin_state, dst_pin_state;
 
        skl_dump_bind_info(ctx, src_mcfg, dst_mcfg);
 
-       if (src_mcfg->m_state != SKL_MODULE_BIND_DONE)
-               return 0;
-
-       /*
-        * if intra module unbind, check if both modules are BIND,
-        * then send unbind
-        */
-       if ((src_mcfg->pipe->ppl_id != dst_mcfg->pipe->ppl_id) &&
-                               dst_mcfg->m_state != SKL_MODULE_BIND_DONE)
-               return 0;
-       else if (src_mcfg->m_state < SKL_MODULE_INIT_DONE &&
-                                dst_mcfg->m_state < SKL_MODULE_INIT_DONE)
-               return 0;
-
        /* get src queue index */
        src_index = skl_get_queue_index(src_mcfg->m_out_pin, dst_id, out_max);
        if (src_index < 0)
                return -EINVAL;
 
-       msg.src_queue = src_mcfg->m_out_pin[src_index].pin_index;
+       msg.src_queue = src_index;
 
        /* get dst queue index */
        dst_index  = skl_get_queue_index(dst_mcfg->m_in_pin, src_id, in_max);
        if (dst_index < 0)
                return -EINVAL;
 
-       msg.dst_queue = dst_mcfg->m_in_pin[dst_index].pin_index;
+       msg.dst_queue = dst_index;
+
+       src_pin_state = src_mcfg->m_out_pin[src_index].pin_state;
+       dst_pin_state = dst_mcfg->m_in_pin[dst_index].pin_state;
+
+       if (src_pin_state != SKL_PIN_BIND_DONE ||
+               dst_pin_state != SKL_PIN_BIND_DONE)
+               return 0;
 
        msg.module_id = src_mcfg->id.module_id;
        msg.instance_id = src_mcfg->id.instance_id;
@@ -722,10 +744,15 @@ int skl_unbind_modules(struct skl_sst *ctx,
 
        ret = skl_ipc_bind_unbind(&ctx->ipc, &msg);
        if (!ret) {
-               src_mcfg->m_state = SKL_MODULE_UNINIT;
                /* free queue only if unbind is success */
                skl_free_queue(src_mcfg->m_out_pin, src_index);
                skl_free_queue(dst_mcfg->m_in_pin, dst_index);
+
+               /*
+                * check only if src module bind state, bind is
+                * always from src -> sink
+                */
+               skl_clear_module_state(src_mcfg->m_out_pin, out_max, src_mcfg);
        }
 
        return ret;
@@ -744,8 +771,6 @@ int skl_bind_modules(struct skl_sst *ctx,
 {
        int ret;
        struct skl_ipc_bind_unbind_msg msg;
-       struct skl_module_inst_id src_id = src_mcfg->id;
-       struct skl_module_inst_id dst_id = dst_mcfg->id;
        int in_max = dst_mcfg->max_in_queue;
        int out_max = src_mcfg->max_out_queue;
        int src_index, dst_index;
@@ -756,18 +781,18 @@ int skl_bind_modules(struct skl_sst *ctx,
                dst_mcfg->m_state < SKL_MODULE_INIT_DONE)
                return 0;
 
-       src_index = skl_alloc_queue(src_mcfg->m_out_pin, dst_id, out_max);
+       src_index = skl_alloc_queue(src_mcfg->m_out_pin, dst_mcfg, out_max);
        if (src_index < 0)
                return -EINVAL;
 
-       msg.src_queue = src_mcfg->m_out_pin[src_index].pin_index;
-       dst_index = skl_alloc_queue(dst_mcfg->m_in_pin, src_id, in_max);
+       msg.src_queue = src_index;
+       dst_index = skl_alloc_queue(dst_mcfg->m_in_pin, src_mcfg, in_max);
        if (dst_index < 0) {
                skl_free_queue(src_mcfg->m_out_pin, src_index);
                return -EINVAL;
        }
 
-       msg.dst_queue = dst_mcfg->m_in_pin[dst_index].pin_index;
+       msg.dst_queue = dst_index;
 
        dev_dbg(ctx->dev, "src queue = %d dst queue =%d\n",
                         msg.src_queue, msg.dst_queue);
@@ -782,6 +807,8 @@ int skl_bind_modules(struct skl_sst *ctx,
 
        if (!ret) {
                src_mcfg->m_state = SKL_MODULE_BIND_DONE;
+               src_mcfg->m_out_pin[src_index].pin_state = SKL_PIN_BIND_DONE;
+               dst_mcfg->m_in_pin[dst_index].pin_state = SKL_PIN_BIND_DONE;
        } else {
                /* error case , if IPC fails, clear the queue index */
                skl_free_queue(src_mcfg->m_out_pin, src_index);

diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index e11a9e44d064b62510ba165e2c4a2cef407ed4d7..e8258d4807ffbff6c6161404e7e5dfb04c8846d5 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -1049,6 +1049,7 @@ static void skl_fill_module_pin_info(struct skl_dfw_module_pin *dfw_pin,
                m_pin[i].id.instance_id = dfw_pin[i].instance_id;
                m_pin[i].in_use = false;
                m_pin[i].is_dynamic = is_dynamic;
+               m_pin[i].pin_state = SKL_PIN_UNBIND;
        }
 }
 

diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index 76053a8de41cf255bfe77d24673c320cf5d2fd0a..cd8768308f29e92a80406f8fab54843f313658d6 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -180,16 +180,24 @@ struct skl_module_fmt {
        u32 ch_cfg;
 };
 
+struct skl_module_cfg;
+
 struct skl_module_inst_id {
        u32 module_id;
        u32 instance_id;
 };
 
+enum skl_module_pin_state {
+       SKL_PIN_UNBIND = 0,
+       SKL_PIN_BIND_DONE = 1,
+};
+
 struct skl_module_pin {
        struct skl_module_inst_id id;
-       u8 pin_index;
        bool is_dynamic;
        bool in_use;
+       enum skl_module_pin_state pin_state;
+       struct skl_module_cfg *tgt_mcfg;
 };
 
 struct skl_specific_cfg {