From: "Subhransu S. Prusty" subhransu.s.prusty@intel.com
Signed-off-by: Subhransu S. Prusty subhransu.s.prusty@intel.com Signed-off-by: Vinod Koul vinod.koul@intel.com --- sound/soc/intel/common/sst-ipc.c | 15 +++++++++++++++ sound/soc/intel/common/sst-ipc.h | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/sound/soc/intel/common/sst-ipc.c b/sound/soc/intel/common/sst-ipc.c index a7699f35a8d2..137bdfc35063 100644 --- a/sound/soc/intel/common/sst-ipc.c +++ b/sound/soc/intel/common/sst-ipc.c @@ -128,6 +128,21 @@ static int msg_empty_list_init(struct sst_generic_ipc *ipc) if (ipc->msg == NULL) return -ENOMEM;
+ ipc->msg->tx_data = devm_kzalloc(ipc->dev, + sizeof(ipc->tx_data_max_size), GFP_KERNEL); + if (ipc->msg->tx_data == NULL) { + kfree(ipc->msg); + return -ENOMEM; + } + + ipc->msg->rx_data = devm_kzalloc(ipc->dev, + sizeof(ipc->rx_data_max_size), GFP_KERNEL); + if (ipc->msg->rx_data == NULL) { + kfree(ipc->msg->tx_data); + kfree(ipc->msg); + return -ENOMEM; + } + for (i = 0; i < IPC_EMPTY_LIST_SIZE; i++) { init_waitqueue_head(&ipc->msg[i].waitq); list_add(&ipc->msg[i].list, &ipc->empty_list); diff --git a/sound/soc/intel/common/sst-ipc.h b/sound/soc/intel/common/sst-ipc.h index 7139afd2547f..ceb7e468a3fa 100644 --- a/sound/soc/intel/common/sst-ipc.h +++ b/sound/soc/intel/common/sst-ipc.h @@ -32,9 +32,9 @@ struct ipc_message { u64 header;
/* direction wrt host CPU */ - char tx_data[IPC_MAX_MAILBOX_BYTES]; + char *tx_data; size_t tx_size; - char rx_data[IPC_MAX_MAILBOX_BYTES]; + char *rx_data; size_t rx_size;
wait_queue_head_t waitq;