Thanks Cezary, the split makes it much easier to review. I have a couple of minor comments below, looks good otherwise.
On 8/8/19 5:24 AM, Cezary Rojewski wrote:
LARGE_CONFIG_GET is mainly used to retrieve requested module parameters but it may also carry TX payload with them. Update its implementation to account for both TX and RX data. First reply.header carries total payload size within data_off_sizefield. Make use of reply.header to realloc returned buffer with correct size.
Failure of IPC request is permissive - error-payload may be returned, an informative data why GET for given param failed - and thus function should not collapse before entire processing is finished. Caller is responsible for checking returned payload and bytes parameters.
but that is the same as before, yes? this patch does not change the behavior on errors?
Signed-off-by: Cezary Rojewski cezary.rojewski@intel.com
sound/soc/intel/skylake/skl-messages.c | 3 ++- sound/soc/intel/skylake/skl-sst-ipc.c | 27 ++++++++++++++++++++------ sound/soc/intel/skylake/skl-sst-ipc.h | 3 ++- 3 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c index e8cc710f092b..84f0e6f58eb5 100644 --- a/sound/soc/intel/skylake/skl-messages.c +++ b/sound/soc/intel/skylake/skl-messages.c @@ -1379,11 +1379,12 @@ int skl_get_module_params(struct skl_dev *skl, u32 *params, int size, u32 param_id, struct skl_module_cfg *mcfg) { struct skl_ipc_large_config_msg msg;
size_t bytes = size;
msg.module_id = mcfg->id.module_id; msg.instance_id = mcfg->id.pvt_id; msg.param_data_size = size; msg.large_param_id = param_id;
- return skl_ipc_get_large_config(&skl->ipc, &msg, params);
- return skl_ipc_get_large_config(&skl->ipc, &msg, ¶ms, &bytes); }
diff --git a/sound/soc/intel/skylake/skl-sst-ipc.c b/sound/soc/intel/skylake/skl-sst-ipc.c index 196c80dadb1f..9d269a5f8bd9 100644 --- a/sound/soc/intel/skylake/skl-sst-ipc.c +++ b/sound/soc/intel/skylake/skl-sst-ipc.c @@ -969,12 +969,18 @@ int skl_ipc_set_large_config(struct sst_generic_ipc *ipc, EXPORT_SYMBOL_GPL(skl_ipc_set_large_config);
int skl_ipc_get_large_config(struct sst_generic_ipc *ipc,
struct skl_ipc_large_config_msg *msg, u32 *param)
struct skl_ipc_large_config_msg *msg,unsigned int **payload, size_t *bytes)
is there a specific reason why we don't use e.g. u32 for the payload? u32 and u64 are used everywhere except here, is this intentional?
{ struct skl_ipc_header header = {0};
- struct sst_ipc_message request = {0}, reply = {0};
struct sst_ipc_message request, reply = {0};
unsigned int *buf; int ret;
reply.data = kzalloc(SKL_ADSP_W1_SZ, GFP_KERNEL);
if (!reply.data)
return -ENOMEM;header.primary = IPC_MSG_TARGET(IPC_MOD_MSG); header.primary |= IPC_MSG_DIR(IPC_MSG_REQUEST); header.primary |= IPC_GLB_TYPE(IPC_MOD_LARGE_CONFIG_GET);
@@ -986,12 +992,21 @@ int skl_ipc_get_large_config(struct sst_generic_ipc *ipc, header.extension |= IPC_FINAL_BLOCK(1); header.extension |= IPC_INITIAL_BLOCK(1);
- request.header = *(u64 *)(&header);
- reply.data = param;
- reply.size = msg->param_data_size;
- request.header = *(u64 *)&header;
- request.data = *payload;
- request.size = *bytes;
- reply.size = SKL_ADSP_W1_SZ;
- ret = sst_ipc_tx_message_wait(ipc, request, &reply); if (ret < 0)
dev_err(ipc->dev, "ipc: get large config fail, err: %d\n", ret);
dev_err(ipc->dev, "ipc: get large config fail: %d\n", ret);
nit-pick: cosmetic change unrelated to this patch.
reply.size = (reply.header >> 32) & IPC_DATA_OFFSET_SZ_MASK;
buf = krealloc(reply.data, reply.size, GFP_KERNEL);
if (!buf)
return -ENOMEM;*payload = buf;
*bytes = reply.size;
return ret; }
diff --git a/sound/soc/intel/skylake/skl-sst-ipc.h b/sound/soc/intel/skylake/skl-sst-ipc.h index 93af08cf41d2..a7ab2c589cc5 100644 --- a/sound/soc/intel/skylake/skl-sst-ipc.h +++ b/sound/soc/intel/skylake/skl-sst-ipc.h @@ -139,7 +139,8 @@ int skl_ipc_set_large_config(struct sst_generic_ipc *ipc, struct skl_ipc_large_config_msg *msg, u32 *param);
int skl_ipc_get_large_config(struct sst_generic_ipc *ipc,
struct skl_ipc_large_config_msg *msg, u32 *param);
struct skl_ipc_large_config_msg *msg,unsigned int **payload, size_t *bytes);int skl_sst_ipc_load_library(struct sst_generic_ipc *ipc, u8 dma_id, u8 table_id, bool wait);