ASoC: qdsp6: audioreach: add support to enable SAL Module
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Thu, 27 Oct 2022 10:27:08 +0000 (11:27 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 28 Oct 2022 16:19:23 +0000 (17:19 +0100)
Add support to Simple Accumulator-Limiter module.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20221027102710.21407-8-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/qcom/qdsp6/audioreach.c
sound/soc/qcom/qdsp6/audioreach.h

index 99cade6..be70687 100644 (file)
@@ -658,6 +658,77 @@ static int audioreach_codec_dma_set_media_format(struct q6apm_graph *graph,
        return rc;
 }
 
+static int audioreach_sal_limiter_enable(struct q6apm_graph *graph,
+                                        struct audioreach_module *module, bool enable)
+{
+       struct apm_module_param_data *param_data;
+       struct param_id_sal_limiter_enable *limiter_enable;
+       int payload_size;
+       struct gpr_pkt *pkt;
+       int rc;
+       void *p;
+
+       payload_size = sizeof(*limiter_enable) + APM_MODULE_PARAM_DATA_SIZE;
+
+       pkt = audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0);
+       if (IS_ERR(pkt))
+               return PTR_ERR(pkt);
+
+       p = (void *)pkt + GPR_HDR_SIZE + APM_CMD_HDR_SIZE;
+
+       param_data = p;
+       param_data->module_instance_id = module->instance_id;
+       param_data->error_code = 0;
+       param_data->param_id = PARAM_ID_SAL_LIMITER_ENABLE;
+       param_data->param_size = sizeof(*limiter_enable);
+       p = p + APM_MODULE_PARAM_DATA_SIZE;
+       limiter_enable = p;
+
+       limiter_enable->enable_lim = enable;
+
+       rc = q6apm_send_cmd_sync(graph->apm, pkt, 0);
+
+       kfree(pkt);
+
+       return rc;
+}
+
+static int audioreach_sal_set_media_format(struct q6apm_graph *graph,
+                                          struct audioreach_module *module,
+                                          struct audioreach_module_config *cfg)
+{
+       struct apm_module_param_data *param_data;
+       struct param_id_sal_output_config *media_format;
+       int payload_size;
+       struct gpr_pkt *pkt;
+       int rc;
+       void *p;
+
+       payload_size = sizeof(*media_format) + APM_MODULE_PARAM_DATA_SIZE;
+
+       pkt = audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0);
+       if (IS_ERR(pkt))
+               return PTR_ERR(pkt);
+
+       p = (void *)pkt + GPR_HDR_SIZE + APM_CMD_HDR_SIZE;
+
+       param_data = p;
+       param_data->module_instance_id = module->instance_id;
+       param_data->error_code = 0;
+       param_data->param_id = PARAM_ID_SAL_OUTPUT_CFG;
+       param_data->param_size = sizeof(*media_format);
+       p = p + APM_MODULE_PARAM_DATA_SIZE;
+       media_format = p;
+
+       media_format->bits_per_sample = cfg->bit_width;
+
+       rc = q6apm_send_cmd_sync(graph->apm, pkt, 0);
+
+       kfree(pkt);
+
+       return rc;
+}
+
 static int audioreach_i2s_set_media_format(struct q6apm_graph *graph,
                                           struct audioreach_module *module,
                                           struct audioreach_module_config *cfg)
@@ -978,6 +1049,12 @@ int audioreach_set_media_format(struct q6apm_graph *graph, struct audioreach_mod
        case MODULE_ID_CODEC_DMA_SOURCE:
                rc = audioreach_codec_dma_set_media_format(graph, module, cfg);
                break;
+       case MODULE_ID_SAL:
+               rc = audioreach_sal_set_media_format(graph, module, cfg);
+               if (!rc)
+                       rc = audioreach_sal_limiter_enable(graph, module, true);
+               break;
+
        default:
                rc = 0;
        }
index df5026b..f2b51d8 100644 (file)
@@ -15,6 +15,7 @@ struct q6apm_graph;
 #define MODULE_ID_PCM_CNV              0x07001003
 #define MODULE_ID_PCM_ENC              0x07001004
 #define MODULE_ID_PCM_DEC              0x07001005
+#define MODULE_ID_SAL                  0x07001010
 #define MODULE_ID_CODEC_DMA_SINK       0x07001023
 #define MODULE_ID_CODEC_DMA_SOURCE     0x07001024
 #define MODULE_ID_I2S_SINK             0x0700100A
@@ -499,6 +500,16 @@ struct data_logging_config {
        uint32_t mode;
 } __packed;
 
+#define PARAM_ID_SAL_OUTPUT_CFG                        0x08001016
+struct param_id_sal_output_config {
+       uint32_t bits_per_sample;
+} __packed;
+
+#define PARAM_ID_SAL_LIMITER_ENABLE            0x0800101E
+struct param_id_sal_limiter_enable {
+       uint32_t enable_lim;
+} __packed;
+
 #define PARAM_ID_MFC_OUTPUT_MEDIA_FORMAT       0x08001024
 
 struct param_id_mfc_media_format {