Skip to content

dmic: change spin_lock to spin_try_lock in dmic_work() #2078

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
lgirdwood merged 3 commits into from
Nov 11, 2019
Merged

dmic: change spin_lock to spin_try_lock in dmic_work() #2078

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
ea947e4
dmic: add missing schedule_task_cancel() in dmic_stop()
bkokoszx Nov 8, 2019
dee098c
spinlock: add return value to spin_try_lock macro
bkokoszx Nov 8, 2019
44c507a
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 @@ -159,9 +159,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 @@ -1396,6 +1403,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); \

@paulstelian97 paulstelian97 Nov 8, 2019 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't a better approach be to use a block expression? (GNU extension). As in,

#define spin_try_lock(lock) ({ \
              spin_lock_dbg();  \
              arch_try_lock(lock); \
})

(with the proper alignment)? That would also be of lower impact to the remainder of the code.

@bkokoszx bkokoszx Nov 8, 2019

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For consistency I think that we can change it for every spin_lock*() macro in another PR.

@lgirdwood lgirdwood Nov 11, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, we could make this an incremental update in another PR.

} while (0)

#define spin_unlock(lock) \
Expand Down