Skip to content

IPC command timeout in record test #5617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brentlu merged 3 commits into from
Mar 31, 2022
Merged

IPC command timeout in record test #5617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a821464
dmic: add missing schedule_task_cancel() in dmic_stop()
bkokoszx Nov 8, 2019
fe5665f
spinlock: add return value to spin_try_lock macro
bkokoszx Nov 8, 2019
dcf99d0
dmic: change spin_lock to spin_try_lock in dmic_work()
bkokoszx Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/drivers/intel/cavs/dmic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,16 @@ static enum task_state dmic_work(void *data)
int32_t gval;
uint32_t val;
int i;
int ret;

tracev_dmic("dmic_work()");
spin_lock(dai->lock);

spin_try_lock(dai->lock, ret);
if (!ret) {
tracev_dmic("dmic_work(): spin_try_lock(dai->lock, ret)"
"failed: RESCHEDULE");
return SOF_TASK_STATE_RESCHEDULE;
}

/* Increment gain with logarithmic step.
* Gain is Q2.30 and gain modifier is Q12.20.
Expand Down Expand Up @@ -1417,6 +1424,7 @@ static void dmic_stop(struct dai *dai)

dmic_active_fifos--;

schedule_task_cancel(&dmic->dmicwork);
out:
spin_unlock(dai->lock);
}
Expand Down
4 changes: 2 additions & 2 deletions src/include/sof/spinlock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@ extern uint32_t lock_dbg_user[DBG_LOCK_USERS];
arch_spin_lock(lock); \
} while (0)

#define spin_try_lock(lock) \
#define spin_try_lock(lock, ret) \
do { \
spin_lock_dbg(); \
arch_try_lock(lock); \
ret = arch_try_lock(lock); \
} while (0)

#define spin_unlock(lock) \
Expand Down