shinys000114/kernel_common_drivers
1
0
Fork 0
mirror of https://github.com/hardkernel/kernel_common_drivers.git synced 2026-06-25 12:03:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

dsp: dsp logbuff issue [1/1]

Browse Source 
PD#SWPL-152090

Problem:
kernel5.15 dsp logbuff overrun

Solution:
fix logbuff overrun

Verify:
t3x,t7c

Change-Id: Iefa7f288e7039a8e9acf7f4d1fdc2da713c44187
Signed-off-by: Liming Xue <liming.xue@amlogic.com>
This commit is contained in:
Liming Xue
2024-01-02 10:33:13 +08:00
committed by Luan Yuan
parent b33b36ca3c
commit ef6be79557
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/host/host.h
+1
View File
@@ -126,6 +126,7 @@ struct host_module {
struct delayed_work host_monitor_work;
struct delayed_work host_logbuff_work;
struct workqueue_struct *host_wq;
struct workqueue_struct *host_logbuff_wq;
u32 hang;
u32 firmware_load;
struct host_data *host_data;
drivers/host/host_poll.c
+13 -12
View File
@@ -116,6 +116,7 @@ static u32 host_get_logbuff(struct ring_buffer *rbuf, char *name)
{
char buff[BUFF_LEN + 1] = {0};
u32 idx = 0;
char *ringbuff;
u32 len = 0;
len = get_buff_len(ring_buffer);
@@ -124,9 +125,9 @@ static u32 host_get_logbuff(struct ring_buffer *rbuf, char *name)
if (len > BUFF_LEN)
len = BUFF_LEN;
ringbuff = rbuf->buffer;
for (idx = 0; idx < len; idx++) {
buff[idx] = rbuf->buffer[rbuf->headr];
idx += 1;
buff[idx] = *(ringbuff + rbuf->headr);
rbuf->headr += 1;
rbuf->headr %= rbuf->size;
}
@@ -149,19 +150,20 @@ static void host_polling_logbuff(struct work_struct *work)
if (IS_ERR_OR_NULL(ring_buffer))
return;
host_get_logbuff(ring_buffer, host_firm->host_data->name);
queue_delayed_work(host_firm->host_wq, &host_firm->host_logbuff_work,
queue_delayed_work(host_firm->host_logbuff_wq, &host_firm->host_logbuff_work,
msecs_to_jiffies(logbuff_polling_ms));
}
static void host_polling_logbuff_start(struct host_module *host)
{
if (host->logbuff_polling_ms)
host->host_wq = create_workqueue("host_wq");
host->host_logbuff_wq = create_workqueue("host_logbuff_wq");
INIT_DEFERRABLE_WORK(&host->host_monitor_work, host_polling_logbuff);
queue_delayed_work(host->host_wq, &host->host_monitor_work,
msecs_to_jiffies(health_polling_ms));
INIT_DEFERRABLE_WORK(&host->host_logbuff_work, host_polling_logbuff);
queue_delayed_work(host->host_logbuff_wq, &host->host_logbuff_work,
msecs_to_jiffies(logbuff_polling_ms));
}
int host_logbuff_start(struct host_module *host)
@@ -175,7 +177,6 @@ int host_logbuff_start(struct host_module *host)
// wait for remote mcu boot up
msleep(100);
ret = aml_mbox_transfer_data(host->mbox_chan, MBOX_CMD_HIFI5_SYSLOG_START,
data, sizeof(data), &rbuf, sizeof(rbuf),
MBOX_SYNC);
@@ -214,13 +215,13 @@ void host_logbuff_stop(struct host_module *host)
{
if (IS_ERR_OR_NULL(ring_buffer))
return;
if (!host->host_wq)
if (!host->host_logbuff_wq)
return;
pr_debug("[%s %d]\n", __func__, __LINE__);
cancel_delayed_work_sync(&host->host_logbuff_work);
flush_workqueue(host->host_wq);
flush_workqueue(host->host_logbuff_wq);
unregister_die_notifier(&host->nb);
destroy_workqueue(host->host_wq);
host->host_wq = NULL;
destroy_workqueue(host->host_logbuff_wq);
host->host_logbuff_wq = NULL;
}