ASoC: msm: qdsp6v2: Limit codec register config packet size
APR packet size is now capped at 512 bytes. The codec register config data is 740 bytes. We now break up this data into multiple packets no larger than the defined maximum. CRs-fixed: 974874 Change-Id: I2bd3cb01ff389ffd1d319239019e11d35d8c16b6 Signed-off-by: Stephen Oglesby <soglesby@codeaurora.org>
This commit is contained in:
Stephen Oglesby
Jeevan Shriram
parent
de210aad0f
commit
634f85a4ab
1 changed files with 61 additions and 38 deletions
|
|
@ -26,6 +26,7 @@
|
||||||
#include "msm-pcm-routing-v2.h"
|
#include "msm-pcm-routing-v2.h"
|
||||||
#include <sound/audio_cal_utils.h>
|
#include <sound/audio_cal_utils.h>
|
||||||
#include <sound/adsp_err.h>
|
#include <sound/adsp_err.h>
|
||||||
|
#include <linux/qdsp6v2/apr_tal.h>
|
||||||
|
|
||||||
#define WAKELOCK_TIMEOUT 5000
|
#define WAKELOCK_TIMEOUT 5000
|
||||||
enum {
|
enum {
|
||||||
|
|
@ -1503,53 +1504,75 @@ static int afe_send_codec_reg_page_config(
|
||||||
static int afe_send_codec_reg_config(
|
static int afe_send_codec_reg_config(
|
||||||
struct afe_param_cdc_reg_cfg_data *cdc_reg_cfg)
|
struct afe_param_cdc_reg_cfg_data *cdc_reg_cfg)
|
||||||
{
|
{
|
||||||
int i, ret;
|
int i, j, ret;
|
||||||
int pkt_size, payload_size;
|
int pkt_size, payload_size, reg_per_pkt, num_pkts, num_regs;
|
||||||
struct afe_svc_cmd_cdc_reg_cfg *config;
|
struct afe_svc_cmd_cdc_reg_cfg *config;
|
||||||
struct afe_svc_cmd_set_param *param;
|
struct afe_svc_cmd_set_param *param;
|
||||||
|
|
||||||
payload_size = sizeof(struct afe_param_cdc_reg_cfg_payload) *
|
reg_per_pkt = (APR_MAX_BUF - sizeof(*config)) /
|
||||||
cdc_reg_cfg->num_registers;
|
sizeof(struct afe_param_cdc_reg_cfg_payload);
|
||||||
pkt_size = sizeof(*config) + payload_size;
|
if (reg_per_pkt > 0) {
|
||||||
|
num_pkts = (cdc_reg_cfg->num_registers / reg_per_pkt) +
|
||||||
pr_debug("%s: pkt_size %d, payload_size %d\n", __func__, pkt_size,
|
(cdc_reg_cfg->num_registers % reg_per_pkt == 0 ? 0 : 1);
|
||||||
payload_size);
|
} else {
|
||||||
config = kzalloc(pkt_size, GFP_KERNEL);
|
pr_err("%s: Failed to build codec reg config APR packet\n",
|
||||||
if (!config) {
|
__func__);
|
||||||
pr_warn("%s: Not enought memory, pkt_size %d\n", __func__,
|
return -EINVAL;
|
||||||
pkt_size);
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
config->hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD,
|
for (j = 0; j < num_pkts; ++j) {
|
||||||
APR_HDR_LEN(APR_HDR_SIZE),
|
/*
|
||||||
APR_PKT_VER);
|
* num_regs is set to reg_per_pkt on each pass through the loop
|
||||||
config->hdr.pkt_size = pkt_size;
|
* except the last, when it is set to the number of registers
|
||||||
config->hdr.src_port = 0;
|
* remaining from the total
|
||||||
config->hdr.dest_port = 0;
|
*/
|
||||||
config->hdr.token = IDX_GLOBAL_CFG;
|
num_regs = (j < (num_pkts - 1) ? reg_per_pkt :
|
||||||
config->hdr.opcode = AFE_SVC_CMD_SET_PARAM;
|
cdc_reg_cfg->num_registers - (reg_per_pkt * j));
|
||||||
|
payload_size = sizeof(struct afe_param_cdc_reg_cfg_payload) *
|
||||||
|
num_regs;
|
||||||
|
pkt_size = sizeof(*config) + payload_size;
|
||||||
|
pr_debug("%s: pkt_size %d, payload_size %d\n", __func__,
|
||||||
|
pkt_size, payload_size);
|
||||||
|
config = kzalloc(pkt_size, GFP_KERNEL);
|
||||||
|
if (!config)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
param = &config->param;
|
config->hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD,
|
||||||
param->payload_size = payload_size;
|
APR_HDR_LEN(APR_HDR_SIZE),
|
||||||
param->payload_address_lsw = 0x00;
|
APR_PKT_VER);
|
||||||
param->payload_address_msw = 0x00;
|
config->hdr.pkt_size = pkt_size;
|
||||||
param->mem_map_handle = 0x00;
|
config->hdr.src_port = 0;
|
||||||
|
config->hdr.dest_port = 0;
|
||||||
|
config->hdr.token = IDX_GLOBAL_CFG;
|
||||||
|
config->hdr.opcode = AFE_SVC_CMD_SET_PARAM;
|
||||||
|
|
||||||
for (i = 0; i < cdc_reg_cfg->num_registers; i++) {
|
param = &config->param;
|
||||||
config->reg_data[i].common.module_id = AFE_MODULE_CDC_DEV_CFG;
|
param->payload_size = payload_size;
|
||||||
config->reg_data[i].common.param_id = AFE_PARAM_ID_CDC_REG_CFG;
|
param->payload_address_lsw = 0x00;
|
||||||
config->reg_data[i].common.param_size =
|
param->payload_address_msw = 0x00;
|
||||||
sizeof(config->reg_data[i].reg_cfg);
|
param->mem_map_handle = 0x00;
|
||||||
config->reg_data[i].reg_cfg = cdc_reg_cfg->reg_data[i];
|
|
||||||
|
for (i = 0; i < num_regs; i++) {
|
||||||
|
config->reg_data[i].common.module_id =
|
||||||
|
AFE_MODULE_CDC_DEV_CFG;
|
||||||
|
config->reg_data[i].common.param_id =
|
||||||
|
AFE_PARAM_ID_CDC_REG_CFG;
|
||||||
|
config->reg_data[i].common.param_size =
|
||||||
|
sizeof(config->reg_data[i].reg_cfg);
|
||||||
|
config->reg_data[i].reg_cfg =
|
||||||
|
cdc_reg_cfg->reg_data[i + (j * reg_per_pkt)];
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = afe_apr_send_pkt(config, &this_afe.wait[IDX_GLOBAL_CFG]);
|
||||||
|
if (ret) {
|
||||||
|
pr_err("%s: AFE_PARAM_ID_CDC_REG_CFG failed %d\n",
|
||||||
|
__func__, ret);
|
||||||
|
kfree(config);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
kfree(config);
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = afe_apr_send_pkt(config, &this_afe.wait[IDX_GLOBAL_CFG]);
|
|
||||||
if (ret)
|
|
||||||
pr_err("%s: AFE_PARAM_ID_CDC_REG_CFG failed %d\n", __func__,
|
|
||||||
ret);
|
|
||||||
|
|
||||||
kfree(config);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue