nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-25 02:32:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvadsp: Fixing adsp_ff_exit function

Browse Source 
- ADSP thread was waiting on a sempaphore to wake up
- In case of shutdown when kthread_stop is called, kthread_should_stop
- will not be called if thread is not woken up

- Solution: Replace semaphore with wait_queue and use
- wait_event_interruptible
- wake up the thread if either there is a message in the list or
- kthread_should_stop is true

Bug 2739934
Bug 200560194
Bug 200463529

Change-Id: Iea04e0100248f554076aaed8627d40f5b96df2bf
Signed-off-by: Uday Gupta <udayg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2232868
(cherry picked from commit a3a81a984a933a8f580154b76098119427f5e19e)
Signed-off-by: Dipesh Gandhi <dipeshg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2238825
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Swati Sachdeva <ssachdeva@nvidia.com>
Reviewed-by: Nitin Pai <npai@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Swati Sachdeva
2019-10-25 16:28:13 +05:30
committed by Laxman Dewangan
parent b72af873f4
commit 0f6dc52655
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/platform/tegra/nvadsp/adspff.c
View File

@@ -517,8 +517,8 @@ static const struct sched_param param = {
.sched_priority = 1,
};
static struct task_struct *adspff_kthread;
static DECLARE_COMPLETION(adspff_kthread_completion);
static struct list_head adspff_kthread_msgq_head;
static wait_queue_head_t wait_queue;
struct adspff_kthread_msg {
uint32_t msg_id;
@@ -533,13 +533,12 @@ static int adspff_kthread_fn(void *data)
unsigned long flags;
while (1) {
if (kthread_should_stop())
do_exit(ret);
/* Wait for 10 secs or until woken up (earlier) */
if (!wait_for_completion_timeout(&adspff_kthread_completion,
msecs_to_jiffies(10 * 1000)))
continue; /* Timeout */
ret = wait_event_interruptible(wait_queue, kthread_should_stop()
|| !list_empty(&adspff_kthread_msgq_head));
if (kthread_should_stop())
do_exit(0);
if (!list_empty(&adspff_kthread_msgq_head)) {
kmsg = list_first_entry(&adspff_kthread_msgq_head,
@@ -593,7 +592,7 @@ static int adspff_msg_handler(uint32_t msg, void *data)
kmsg->msg_id = msg;
list_add_tail(&kmsg->list, &adspff_kthread_msgq_head);
complete(&adspff_kthread_completion);
wake_up(&wait_queue);
spin_unlock_irqrestore(&adspff_lock, flags);
return 0;
@@ -676,6 +675,8 @@ int adspff_init(struct platform_device *pdev)
INIT_LIST_HEAD(&adspff_kthread_msgq_head);
INIT_LIST_HEAD(&file_list);
// kthread inIt
init_waitqueue_head(&wait_queue);
adspff_kthread = kthread_create(adspff_kthread_fn,
NULL, "adspp_kthread");
sched_setscheduler(adspff_kthread, SCHED_FIFO, &param);