All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vinod Koul <vinod.koul@intel.com>
To: alsa-devel@alsa-project.org
Cc: patches.audio@intel.com, Divya Prakash <divya1.prakash@intel.com>,
	liam.r.girdwood@linux.intel.com,
	Vinod Koul <vinod.koul@intel.com>,
	broonie@kernel.org, Jeeja KP <jeeja.kp@intel.com>
Subject: [PATCH 03/16] ASoC: Intel: Skylake: Add helper routine to handle Algo parameter
Date: Sat, 28 Nov 2015 15:01:48 +0530	[thread overview]
Message-ID: <1448703121-5831-4-git-send-email-vinod.koul@intel.com> (raw)
In-Reply-To: <1448703121-5831-1-git-send-email-vinod.koul@intel.com>

From: Jeeja KP <jeeja.kp@intel.com>

Some DSP modules has user configurable parameters, which are
required by some modules at module initialization.

To configure the module algorithm parameter during initialization
we add helpers here

Signed-off-by: Divya Prakash <divya1.prakash@intel.com>
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 sound/soc/intel/skylake/skl-messages.c       | 31 ++++++++++++++++++++++++++++
 sound/soc/intel/skylake/skl-topology.h       |  5 +++++
 sound/soc/intel/skylake/skl-tplg-interface.h |  3 ++-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c
index 30762734d859..7770a7e4162f 100644
--- a/sound/soc/intel/skylake/skl-messages.c
+++ b/sound/soc/intel/skylake/skl-messages.c
@@ -387,6 +387,28 @@ static void skl_set_copier_format(struct skl_sst *ctx,
 	skl_setup_cpr_gateway_cfg(ctx, mconfig, cpr_mconfig);
 }
 
+/*
+ * Algo module are DSP pre processing modules. Algo module take base module
+ * configuration and params
+ */
+
+static void skl_set_algo_format(struct skl_sst *ctx,
+			struct skl_module_cfg *mconfig,
+			struct skl_algo_cfg *algo_mcfg)
+{
+	struct skl_base_cfg *base_cfg = (struct skl_base_cfg *)algo_mcfg;
+
+	skl_set_base_module_format(ctx, mconfig, base_cfg);
+
+	if (mconfig->formats_config.caps_size == 0)
+		return;
+
+	memcpy(algo_mcfg->params,
+			mconfig->formats_config.caps,
+			mconfig->formats_config.caps_size);
+
+}
+
 static u16 skl_get_module_param_size(struct skl_sst *ctx,
 			struct skl_module_cfg *mconfig)
 {
@@ -404,6 +426,11 @@ static u16 skl_get_module_param_size(struct skl_sst *ctx,
 	case SKL_MODULE_TYPE_UPDWMIX:
 		return sizeof(struct skl_up_down_mixer_cfg);
 
+	case SKL_MODULE_TYPE_ALGO:
+		param_size = sizeof(struct skl_base_cfg);
+		param_size += mconfig->formats_config.caps_size;
+		return param_size;
+
 	default:
 		/*
 		 * return only base cfg when no specific module type is
@@ -450,6 +477,10 @@ static int skl_set_module_format(struct skl_sst *ctx,
 		skl_set_updown_mixer_format(ctx, module_config, *param_data);
 		break;
 
+	case SKL_MODULE_TYPE_ALGO:
+		skl_set_algo_format(ctx, module_config, *param_data);
+		break;
+
 	default:
 		skl_set_base_module_format(ctx, module_config, *param_data);
 		break;
diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index 5ba985b36227..0a66fab59828 100644
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -140,6 +140,11 @@ struct skl_up_down_mixer_cfg {
 	s32 coeff[UP_DOWN_MIXER_MAX_COEFF];
 } __packed;
 
+struct skl_algo_cfg {
+	struct skl_base_cfg  base_cfg;
+	char params[0];
+} __packed;
+
 enum skl_dma_type {
 	SKL_DMA_HDA_HOST_OUTPUT_CLASS = 0,
 	SKL_DMA_HDA_HOST_INPUT_CLASS = 1,
diff --git a/sound/soc/intel/skylake/skl-tplg-interface.h b/sound/soc/intel/skylake/skl-tplg-interface.h
index 20c068754d08..63c83a3eeb7e 100644
--- a/sound/soc/intel/skylake/skl-tplg-interface.h
+++ b/sound/soc/intel/skylake/skl-tplg-interface.h
@@ -81,7 +81,8 @@ enum skl_module_type {
 	SKL_MODULE_TYPE_MIXER = 0,
 	SKL_MODULE_TYPE_COPIER,
 	SKL_MODULE_TYPE_UPDWMIX,
-	SKL_MODULE_TYPE_SRCINT
+	SKL_MODULE_TYPE_SRCINT,
+	SKL_MODULE_TYPE_ALGO
 };
 
 enum skl_core_affinity {
-- 
2.4.3

  parent reply	other threads:[~2015-11-28  9:32 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-28  9:31 [PATCH 00/16] ASoC: Intel: Skylake: Add support for loadable modules Vinod Koul
2015-11-28  9:31 ` [PATCH 01/16] ASoC: Intel: Skylake: Update DMIC DAIs and capabilities Vinod Koul
2015-12-01 21:32   ` Mark Brown
2015-12-02  4:53     ` Vinod Koul
2015-12-03  0:59       ` Mark Brown
2015-12-01 22:59   ` Applied "ASoC: Intel: Skylake: Update DMIC DAIs and capabilities" to the asoc tree Mark Brown
2015-11-28  9:31 ` [PATCH 02/16] ASoC: Intel: Skylake: Add helper routines to handle module params Vinod Koul
2015-12-01 22:59   ` Applied "ASoC: Intel: Skylake: Add helper routines to handle module params" to the asoc tree Mark Brown
2015-11-28  9:31 ` Vinod Koul [this message]
2015-12-01 22:59   ` Applied "ASoC: Intel: Skylake: Add helper routine to handle Algo parameter" " Mark Brown
2015-11-28  9:31 ` [PATCH 04/16] ASoC: Intel: Skylake: Add support to configure module params Vinod Koul
2015-12-01 22:59   ` Applied "ASoC: Intel: Skylake: Add support to configure module params" to the asoc tree Mark Brown
2015-11-28  9:31 ` [PATCH 05/16] ASoC: Intel: Skylake: Add tlv byte kcontrols Vinod Koul
2015-12-01 22:59   ` Applied "ASoC: Intel: Skylake: Add tlv byte kcontrols" to the asoc tree Mark Brown
2015-11-28  9:31 ` [PATCH 06/16] ASoC: Intel: Skylake: Add support for Load/Unload IPCs Vinod Koul
2015-12-01 22:58   ` Mark Brown
2015-12-02  5:07     ` Vinod Koul
2015-12-03  0:59       ` Mark Brown
2015-12-03  5:51         ` Vinod Koul
2015-11-28  9:31 ` [PATCH 07/16] ASoC: Intel: Skylake: Add support for Loadable modules Vinod Koul
2015-11-28  9:31 ` [PATCH 08/16] ASoC: Intel: Skylake: Add memory pages to widget data Vinod Koul
2015-12-08 19:11   ` Applied "ASoC: Intel: Skylake: Add memory pages to widget data." to the asoc tree Mark Brown
2015-11-28  9:31 ` [PATCH 09/16] ASoC: Intel: Skylake: Add support for Mic Select module Vinod Koul
2015-12-08 19:11   ` Applied "ASoC: Intel: Skylake: Add support for Mic Select module" to the asoc tree Mark Brown
2015-11-28  9:31 ` [PATCH 10/16] ASoC: Intel: Skylake: Fix module init data correctly Vinod Koul
2015-12-08 19:11   ` Applied "ASoC: Intel: Skylake: Fix module init data correctly" to the asoc tree Mark Brown
2015-11-28  9:31 ` [PATCH 11/16] ASoC: Intel: Skylake: update mailbox uplink window offset and size Vinod Koul
2015-12-08 19:11   ` Applied "ASoC: Intel: Skylake: update mailbox uplink window offset and size" to the asoc tree Mark Brown
2015-11-28  9:31 ` [PATCH 12/16] ASoC: Intel: Skylake: add LARGE_CONFIG_GET IPC support Vinod Koul
2015-12-08 19:11   ` Applied "ASoC: Intel: Skylake: add LARGE_CONFIG_GET IPC support" to the asoc tree Mark Brown
2015-11-28  9:31 ` [PATCH 13/16] ASoC: Intel: Skylake: read params from DSP if module is on Vinod Koul
2015-11-28  9:31 ` [PATCH 14/16] ASoC: Intel: Skylake: Add dai link for DMIC capture Vinod Koul
2015-12-08 19:11   ` Applied "ASoC: Intel: Skylake: Add dai link for DMIC capture" to the asoc tree Mark Brown
2015-11-28  9:32 ` [PATCH 15/16] ASoC: Intel: Skylake: add wov as int sink Vinod Koul
2015-12-08 19:11   ` Applied "ASoC: Intel: Skylake: add wov as int sink" to the asoc tree Mark Brown
2015-11-28  9:32 ` [PATCH 16/16] ASoc: Intel: Skylake: Fix the dapm machine map Vinod Koul
2015-12-08 19:11   ` Applied "ASoC: Intel: Skylake: Fix the dapm machine map" to the asoc tree Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1448703121-5831-4-git-send-email-vinod.koul@intel.com \
    --to=vinod.koul@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=divya1.prakash@intel.com \
    --cc=jeeja.kp@intel.com \
    --cc=liam.r.girdwood@linux.intel.com \
    --cc=patches.audio@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.