Skip to content

Commit

Permalink
ASoC: Intel: Allocate for the mailbox with max size
Browse files Browse the repository at this point in the history
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Subhransu S. Prusty authored and Mark Brown committed Jun 2, 2015
1 parent edd8ed4 commit 859c34b
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 3 deletions.
29 changes: 28 additions & 1 deletion sound/soc/intel/common/sst-ipc.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,31 @@ static int msg_empty_list_init(struct sst_generic_ipc *ipc)
return -ENOMEM;

for (i = 0; i < IPC_EMPTY_LIST_SIZE; i++) {
ipc->msg[i].tx_data = kzalloc(ipc->tx_data_max_size, GFP_KERNEL);
if (ipc->msg[i].tx_data == NULL)
goto free_mem;

ipc->msg[i].rx_data = kzalloc(ipc->rx_data_max_size, GFP_KERNEL);
if (ipc->msg[i].rx_data == NULL) {
kfree(ipc->msg[i].tx_data);
goto free_mem;
}

init_waitqueue_head(&ipc->msg[i].waitq);
list_add(&ipc->msg[i].list, &ipc->empty_list);
}

return 0;

free_mem:
while (i > 0) {
kfree(ipc->msg[i-1].tx_data);
kfree(ipc->msg[i-1].rx_data);
--i;
}
kfree(ipc->msg);

return -ENOMEM;
}

static void ipc_tx_msgs(struct kthread_work *work)
Expand Down Expand Up @@ -279,11 +299,18 @@ EXPORT_SYMBOL_GPL(sst_ipc_init);

void sst_ipc_fini(struct sst_generic_ipc *ipc)
{
int i;

if (ipc->tx_thread)
kthread_stop(ipc->tx_thread);

if (ipc->msg)
if (ipc->msg) {
for (i = 0; i < IPC_EMPTY_LIST_SIZE; i++) {
kfree(ipc->msg[i].tx_data);
kfree(ipc->msg[i].rx_data);
}
kfree(ipc->msg);
}
}
EXPORT_SYMBOL_GPL(sst_ipc_fini);

Expand Down
4 changes: 2 additions & 2 deletions sound/soc/intel/common/sst-ipc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 859c34b

Please sign in to comment.