ASoC: Intel: Skylake: Add support for specifying D0i3 configuration

Not all use cases can support Doi3. Only certain use cases like hot word
detection, deep buffering can support D0i3 based on resource requirement.

So, pass the D0i3 capability for the FE/BE copier using topology. This will
be used to take a decision for D0i3 mode entry/exit.

Signed-off-by: Jayachandran B <jayachandran.b@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/uapi/sound/snd_sst_tokens.h b/include/uapi/sound/snd_sst_tokens.h
index f4b8b34de51938c3d5fd293255158b993b5637d3..93392bedcc5870d64514ae84ab00095de4b9971f 100644 (file)
--- a/include/uapi/sound/snd_sst_tokens.h
+++ b/include/uapi/sound/snd_sst_tokens.h
@@ -159,6 +159,8 @@
  *
  * %SKL_TKN_U32_PMODE:         Specifies the power mode for pipe
  *
+ * %SKL_TKL_U32_D0I3_CAPS:     Specifies the D0i3 capability for module
+ *
  * module_id and loadable flags dont have tokens as these values will be
  * read from the DSP FW manifest
  */
@@ -211,7 +213,8 @@ enum SKL_TKNS {
        SKL_TKN_U32_LIB_COUNT,
        SKL_TKN_STR_LIB_NAME,
        SKL_TKN_U32_PMODE,
-       SKL_TKN_MAX = SKL_TKN_U32_PMODE,
+       SKL_TKL_U32_D0I3_CAPS,
+       SKL_TKN_MAX = SKL_TKL_U32_D0I3_CAPS,
 };
 
 #endif

diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 9a7a008f66892a795f90a1576ea78dcf57208a46..86597d491982f7507224b2fec9cece24e431de1a 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -1830,6 +1830,10 @@ static int skl_tplg_get_token(struct device *dev,
                mconfig->converter = tkn_elem->value;
                break;
 
+       case SKL_TKL_U32_D0I3_CAPS:
+               mconfig->d0i3_caps = tkn_elem->value;
+               break;
+
        case SKL_TKN_U32_PIPE_ID:
                ret = skl_tplg_add_pipe(dev,
                                mconfig, skl, tkn_elem);

diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index 11fd0a4b66031c9eb77b7eb90aca1cad57283007..38809f6d20d63c2e76f47c3e1c3188818360cc2d 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -294,6 +294,12 @@ enum skl_module_state {
        SKL_MODULE_UNLOADED = 4,
 };
 
+enum d0i3_capability {
+       SKL_D0I3_NONE = 0,
+       SKL_D0I3_STREAMING = 1,
+       SKL_D0I3_NON_STREAMING = 2,
+};
+
 struct skl_module_cfg {
        u8 guid[16];
        struct skl_module_inst_id id;
@@ -320,6 +326,7 @@ struct skl_module_cfg {
        u32 converter;
        u32 vbus_id;
        u32 mem_pages;
+       enum d0i3_capability d0i3_caps;
        struct skl_module_pin *m_in_pin;
        struct skl_module_pin *m_out_pin;
        enum skl_module_type m_type;