mirror of https://gitee.com/openkylin/linux.git
ASoC: Intel: mrfld: add bytes control for modules
This patch add support for various modules like eq etc for mrfld DSP. All these modules will be exposed to usermode as bytes controls. Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Vinod Koul
Mark Brown
parent
d2b16b8fa1
commit
10615a5c49
|
|
@ -25,6 +25,179 @@
|
|||
#include "sst-mfld-platform.h"
|
||||
#include "sst-atom-controls.h"
|
||||
|
||||
static int sst_fill_byte_control(struct sst_data *drv,
|
||||
u8 ipc_msg, u8 block,
|
||||
u8 task_id, u8 pipe_id,
|
||||
u16 len, void *cmd_data)
|
||||
{
|
||||
struct snd_sst_bytes_v2 *byte_data = drv->byte_stream;
|
||||
|
||||
byte_data->type = SST_CMD_BYTES_SET;
|
||||
byte_data->ipc_msg = ipc_msg;
|
||||
byte_data->block = block;
|
||||
byte_data->task_id = task_id;
|
||||
byte_data->pipe_id = pipe_id;
|
||||
|
||||
if (len > SST_MAX_BIN_BYTES - sizeof(*byte_data)) {
|
||||
dev_err(&drv->pdev->dev, "command length too big (%u)", len);
|
||||
return -EINVAL;
|
||||
}
|
||||
byte_data->len = len;
|
||||
memcpy(byte_data->bytes, cmd_data, len);
|
||||
print_hex_dump_bytes("writing to lpe: ", DUMP_PREFIX_OFFSET,
|
||||
byte_data, len + sizeof(*byte_data));
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sst_fill_and_send_cmd_unlocked(struct sst_data *drv,
|
||||
u8 ipc_msg, u8 block, u8 task_id, u8 pipe_id,
|
||||
void *cmd_data, u16 len)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
ret = sst_fill_byte_control(drv, ipc_msg,
|
||||
block, task_id, pipe_id, len, cmd_data);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
return sst->ops->send_byte_stream(sst->dev, drv->byte_stream);
|
||||
}
|
||||
|
||||
/**
|
||||
* sst_fill_and_send_cmd - generate the IPC message and send it to the FW
|
||||
* @ipc_msg: type of IPC (CMD, SET_PARAMS, GET_PARAMS)
|
||||
* @cmd_data: the IPC payload
|
||||
*/
|
||||
static int sst_fill_and_send_cmd(struct sst_data *drv,
|
||||
u8 ipc_msg, u8 block, u8 task_id, u8 pipe_id,
|
||||
void *cmd_data, u16 len)
|
||||
{
|
||||
int ret;
|
||||
|
||||
mutex_lock(&drv->lock);
|
||||
ret = sst_fill_and_send_cmd_unlocked(drv, ipc_msg, block,
|
||||
task_id, pipe_id, cmd_data, len);
|
||||
mutex_unlock(&drv->lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int sst_send_algo_cmd(struct sst_data *drv,
|
||||
struct sst_algo_control *bc)
|
||||
{
|
||||
int len, ret = 0;
|
||||
struct sst_cmd_set_params *cmd;
|
||||
|
||||
/*bc->max includes sizeof algos + length field*/
|
||||
len = sizeof(cmd->dst) + sizeof(cmd->command_id) + bc->max;
|
||||
|
||||
cmd = kzalloc(len, GFP_KERNEL);
|
||||
if (cmd == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
SST_FILL_DESTINATION(2, cmd->dst, bc->pipe_id, bc->module_id);
|
||||
cmd->command_id = bc->cmd_id;
|
||||
memcpy(cmd->params, bc->params, bc->max);
|
||||
|
||||
ret = sst_fill_and_send_cmd_unlocked(drv, SST_IPC_IA_SET_PARAMS,
|
||||
SST_FLAG_BLOCKED, bc->task_id, 0, cmd, len);
|
||||
kfree(cmd);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int sst_algo_bytes_ctl_info(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_info *uinfo)
|
||||
{
|
||||
struct sst_algo_control *bc = (void *)kcontrol->private_value;
|
||||
|
||||
uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
|
||||
uinfo->count = bc->max;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sst_algo_control_get(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct sst_algo_control *bc = (void *)kcontrol->private_value;
|
||||
struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
|
||||
|
||||
switch (bc->type) {
|
||||
case SST_ALGO_PARAMS:
|
||||
memcpy(ucontrol->value.bytes.data, bc->params, bc->max);
|
||||
break;
|
||||
default:
|
||||
dev_err(component->dev, "Invalid Input- algo type:%d\n",
|
||||
bc->type);
|
||||
return -EINVAL;
|
||||
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sst_algo_control_set(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
int ret = 0;
|
||||
struct snd_soc_component *cmpnt = snd_soc_kcontrol_component(kcontrol);
|
||||
struct sst_data *drv = snd_soc_component_get_drvdata(cmpnt);
|
||||
struct sst_algo_control *bc = (void *)kcontrol->private_value;
|
||||
|
||||
dev_dbg(cmpnt->dev, "control_name=%s\n", kcontrol->id.name);
|
||||
mutex_lock(&drv->lock);
|
||||
switch (bc->type) {
|
||||
case SST_ALGO_PARAMS:
|
||||
memcpy(bc->params, ucontrol->value.bytes.data, bc->max);
|
||||
break;
|
||||
default:
|
||||
mutex_unlock(&drv->lock);
|
||||
dev_err(cmpnt->dev, "Invalid Input- algo type:%d\n",
|
||||
bc->type);
|
||||
return -EINVAL;
|
||||
}
|
||||
/*if pipe is enabled, need to send the algo params from here*/
|
||||
if (bc->w && bc->w->power)
|
||||
ret = sst_send_algo_cmd(drv, bc);
|
||||
mutex_unlock(&drv->lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static const struct snd_kcontrol_new sst_algo_controls[] = {
|
||||
SST_ALGO_KCONTROL_BYTES("media_loop1_out", "fir", 272, SST_MODULE_ID_FIR_24,
|
||||
SST_PATH_INDEX_MEDIA_LOOP1_OUT, 0, SST_TASK_SBA, SBA_VB_SET_FIR),
|
||||
SST_ALGO_KCONTROL_BYTES("media_loop1_out", "iir", 300, SST_MODULE_ID_IIR_24,
|
||||
SST_PATH_INDEX_MEDIA_LOOP1_OUT, 0, SST_TASK_SBA, SBA_VB_SET_IIR),
|
||||
SST_ALGO_KCONTROL_BYTES("media_loop1_out", "mdrp", 286, SST_MODULE_ID_MDRP,
|
||||
SST_PATH_INDEX_MEDIA_LOOP1_OUT, 0, SST_TASK_SBA, SBA_SET_MDRP),
|
||||
SST_ALGO_KCONTROL_BYTES("media_loop2_out", "fir", 272, SST_MODULE_ID_FIR_24,
|
||||
SST_PATH_INDEX_MEDIA_LOOP2_OUT, 0, SST_TASK_SBA, SBA_VB_SET_FIR),
|
||||
SST_ALGO_KCONTROL_BYTES("media_loop2_out", "iir", 300, SST_MODULE_ID_IIR_24,
|
||||
SST_PATH_INDEX_MEDIA_LOOP2_OUT, 0, SST_TASK_SBA, SBA_VB_SET_IIR),
|
||||
SST_ALGO_KCONTROL_BYTES("media_loop2_out", "mdrp", 286, SST_MODULE_ID_MDRP,
|
||||
SST_PATH_INDEX_MEDIA_LOOP2_OUT, 0, SST_TASK_SBA, SBA_SET_MDRP),
|
||||
SST_ALGO_KCONTROL_BYTES("sprot_loop_out", "lpro", 192, SST_MODULE_ID_SPROT,
|
||||
SST_PATH_INDEX_SPROT_LOOP_OUT, 0, SST_TASK_SBA, SBA_VB_LPRO),
|
||||
SST_ALGO_KCONTROL_BYTES("codec_in0", "dcr", 52, SST_MODULE_ID_FILT_DCR,
|
||||
SST_PATH_INDEX_CODEC_IN0, 0, SST_TASK_SBA, SBA_VB_SET_IIR),
|
||||
SST_ALGO_KCONTROL_BYTES("codec_in1", "dcr", 52, SST_MODULE_ID_FILT_DCR,
|
||||
SST_PATH_INDEX_CODEC_IN1, 0, SST_TASK_SBA, SBA_VB_SET_IIR),
|
||||
|
||||
};
|
||||
|
||||
static int sst_algo_control_init(struct device *dev)
|
||||
{
|
||||
int i = 0;
|
||||
struct sst_algo_control *bc;
|
||||
/*allocate space to cache the algo parameters in the driver*/
|
||||
for (i = 0; i < ARRAY_SIZE(sst_algo_controls); i++) {
|
||||
bc = (struct sst_algo_control *)sst_algo_controls[i].private_value;
|
||||
bc->params = devm_kzalloc(dev, bc->max, GFP_KERNEL);
|
||||
if (bc->params == NULL)
|
||||
return -ENOMEM;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sst_dsp_init_v2_dpcm(struct snd_soc_platform *platform)
|
||||
{
|
||||
int ret = 0;
|
||||
|
|
@ -35,5 +208,11 @@ int sst_dsp_init_v2_dpcm(struct snd_soc_platform *platform)
|
|||
if (!drv->byte_stream)
|
||||
return -ENOMEM;
|
||||
|
||||
/*Initialize algo control params*/
|
||||
ret = sst_algo_control_init(platform->dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
ret = snd_soc_add_platform_controls(platform, sst_algo_controls,
|
||||
ARRAY_SIZE(sst_algo_controls));
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -309,4 +309,134 @@ enum sst_swm_state {
|
|||
SST_SWM_ON = 3,
|
||||
};
|
||||
|
||||
#define SST_FILL_LOCATION_IDS(dst, cell_idx, pipe_id) do { \
|
||||
dst.location_id.p.cell_nbr_idx = (cell_idx); \
|
||||
dst.location_id.p.path_id = (pipe_id); \
|
||||
} while (0)
|
||||
#define SST_FILL_LOCATION_ID(dst, loc_id) (\
|
||||
dst.location_id.f = (loc_id))
|
||||
#define SST_FILL_MODULE_ID(dst, mod_id) (\
|
||||
dst.module_id = (mod_id))
|
||||
|
||||
#define SST_FILL_DESTINATION1(dst, id) do { \
|
||||
SST_FILL_LOCATION_ID(dst, (id) & 0xFFFF); \
|
||||
SST_FILL_MODULE_ID(dst, ((id) & 0xFFFF0000) >> 16); \
|
||||
} while (0)
|
||||
#define SST_FILL_DESTINATION2(dst, loc_id, mod_id) do { \
|
||||
SST_FILL_LOCATION_ID(dst, loc_id); \
|
||||
SST_FILL_MODULE_ID(dst, mod_id); \
|
||||
} while (0)
|
||||
#define SST_FILL_DESTINATION3(dst, cell_idx, path_id, mod_id) do { \
|
||||
SST_FILL_LOCATION_IDS(dst, cell_idx, path_id); \
|
||||
SST_FILL_MODULE_ID(dst, mod_id); \
|
||||
} while (0)
|
||||
|
||||
#define SST_FILL_DESTINATION(level, dst, ...) \
|
||||
SST_FILL_DESTINATION##level(dst, __VA_ARGS__)
|
||||
#define SST_FILL_DEFAULT_DESTINATION(dst) \
|
||||
SST_FILL_DESTINATION(2, dst, SST_DEFAULT_LOCATION_ID, SST_DEFAULT_MODULE_ID)
|
||||
|
||||
struct sst_destination_id {
|
||||
union sst_location_id {
|
||||
struct {
|
||||
u8 cell_nbr_idx; /* module index */
|
||||
u8 path_id; /* pipe_id */
|
||||
} __packed p; /* part */
|
||||
u16 f; /* full */
|
||||
} __packed location_id;
|
||||
u16 module_id;
|
||||
} __packed;
|
||||
struct sst_dsp_header {
|
||||
struct sst_destination_id dst;
|
||||
u16 command_id;
|
||||
u16 length;
|
||||
} __packed;
|
||||
|
||||
/*
|
||||
*
|
||||
* Common Commands
|
||||
*
|
||||
*/
|
||||
struct sst_cmd_generic {
|
||||
struct sst_dsp_header header;
|
||||
} __packed;
|
||||
struct sst_cmd_set_params {
|
||||
struct sst_destination_id dst;
|
||||
u16 command_id;
|
||||
char params[0];
|
||||
} __packed;
|
||||
#define SST_CONTROL_NAME(xpname, xmname, xinstance, xtype) \
|
||||
xpname " " xmname " " #xinstance " " xtype
|
||||
|
||||
#define SST_COMBO_CONTROL_NAME(xpname, xmname, xinstance, xtype, xsubmodule) \
|
||||
xpname " " xmname " " #xinstance " " xtype " " xsubmodule
|
||||
enum sst_algo_kcontrol_type {
|
||||
SST_ALGO_PARAMS,
|
||||
SST_ALGO_BYPASS,
|
||||
};
|
||||
|
||||
struct sst_algo_control {
|
||||
enum sst_algo_kcontrol_type type;
|
||||
int max;
|
||||
u16 module_id;
|
||||
u16 pipe_id;
|
||||
u16 task_id;
|
||||
u16 cmd_id;
|
||||
bool bypass;
|
||||
unsigned char *params;
|
||||
struct snd_soc_dapm_widget *w;
|
||||
};
|
||||
|
||||
/* size of the control = size of params + size of length field */
|
||||
#define SST_ALGO_CTL_VALUE(xcount, xtype, xpipe, xmod, xtask, xcmd) \
|
||||
(struct sst_algo_control){ \
|
||||
.max = xcount + sizeof(u16), .type = xtype, .module_id = xmod, \
|
||||
.pipe_id = xpipe, .task_id = xtask, .cmd_id = xcmd, \
|
||||
}
|
||||
|
||||
#define SST_ALGO_KCONTROL(xname, xcount, xmod, xpipe, \
|
||||
xtask, xcmd, xtype, xinfo, xget, xput) \
|
||||
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
|
||||
.name = xname, \
|
||||
.info = xinfo, .get = xget, .put = xput, \
|
||||
.private_value = (unsigned long)& \
|
||||
SST_ALGO_CTL_VALUE(xcount, xtype, xpipe, \
|
||||
xmod, xtask, xcmd), \
|
||||
}
|
||||
|
||||
#define SST_ALGO_KCONTROL_BYTES(xpname, xmname, xcount, xmod, \
|
||||
xpipe, xinstance, xtask, xcmd) \
|
||||
SST_ALGO_KCONTROL(SST_CONTROL_NAME(xpname, xmname, xinstance, "params"), \
|
||||
xcount, xmod, xpipe, xtask, xcmd, SST_ALGO_PARAMS, \
|
||||
sst_algo_bytes_ctl_info, \
|
||||
sst_algo_control_get, sst_algo_control_set)
|
||||
|
||||
#define SST_ALGO_KCONTROL_BOOL(xpname, xmname, xmod, xpipe, xinstance, xtask) \
|
||||
SST_ALGO_KCONTROL(SST_CONTROL_NAME(xpname, xmname, xinstance, "bypass"), \
|
||||
0, xmod, xpipe, xtask, 0, SST_ALGO_BYPASS, \
|
||||
snd_soc_info_bool_ext, \
|
||||
sst_algo_control_get, sst_algo_control_set)
|
||||
|
||||
#define SST_ALGO_BYPASS_PARAMS(xpname, xmname, xcount, xmod, xpipe, \
|
||||
xinstance, xtask, xcmd) \
|
||||
SST_ALGO_KCONTROL_BOOL(xpname, xmname, xmod, xpipe, xinstance, xtask), \
|
||||
SST_ALGO_KCONTROL_BYTES(xpname, xmname, xcount, xmod, xpipe, xinstance, xtask, xcmd)
|
||||
|
||||
#define SST_COMBO_ALGO_KCONTROL_BYTES(xpname, xmname, xsubmod, xcount, xmod, \
|
||||
xpipe, xinstance, xtask, xcmd) \
|
||||
SST_ALGO_KCONTROL(SST_COMBO_CONTROL_NAME(xpname, xmname, xinstance, "params", \
|
||||
xsubmod), \
|
||||
xcount, xmod, xpipe, xtask, xcmd, SST_ALGO_PARAMS, \
|
||||
sst_algo_bytes_ctl_info, \
|
||||
sst_algo_control_get, sst_algo_control_set)
|
||||
|
||||
|
||||
struct sst_enum {
|
||||
bool tx;
|
||||
unsigned short reg;
|
||||
unsigned int max;
|
||||
const char * const *texts;
|
||||
struct snd_soc_dapm_widget *w;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ struct sst_algo_int_control_v2 {
|
|||
struct sst_data {
|
||||
struct platform_device *pdev;
|
||||
struct sst_platform_data *pdata;
|
||||
char *byte_stream;
|
||||
struct snd_sst_bytes_v2 *byte_stream;
|
||||
struct mutex lock;
|
||||
};
|
||||
int sst_register_dsp(struct sst_device *sst);
|
||||
|
|
|
|||
Loading…
Reference in New Issue