shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

regulator: core: Consistently set mutex_owner when using ww_mutex_lock_slow()

Browse Source 
[ Upstream commit b83a1772be ]

When a codepath locks a rdev using ww_mutex_lock_slow() directly then
that codepath is responsible for incrementing the "ref_cnt" and also
setting the "mutex_owner" to "current".

The regulator core consistently got that right for "ref_cnt" but
didn't always get it right for "mutex_owner". Let's fix this.

It's unlikely that this truly matters because the "mutex_owner" is
only needed if we're going to do subsequent locking of the same
rdev. However, even though it's not truly needed it seems less
surprising if we consistently set "mutex_owner" properly.

Fixes: f8702f9e4a ("regulator: core: Use ww_mutex for regulators locking")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20230329143317.RFC.v2.1.I4e9d433ea26360c06dd1381d091c82bb1a4ce843@changeid
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Douglas Anderson
2023-03-29 14:33:53 -07:00
committed by Greg Kroah-Hartman
parent d2151c5d9d
commit fd092b355a
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/regulator/core.c
View File

@@ -334,6 +334,7 @@ static void regulator_lock_dependent(struct regulator_dev *rdev,
ww_mutex_lock_slow(&new_contended_rdev->mutex, ww_ctx); ww_mutex_lock_slow(&new_contended_rdev->mutex, ww_ctx);
old_contended_rdev = new_contended_rdev; old_contended_rdev = new_contended_rdev;
old_contended_rdev->ref_cnt++; old_contended_rdev->ref_cnt++;
old_contended_rdev->mutex_owner = current;
} }
err = regulator_lock_recursive(rdev, err = regulator_lock_recursive(rdev,
@@ -6042,6 +6043,7 @@ static void regulator_summary_lock(struct ww_acquire_ctx *ww_ctx)
ww_mutex_lock_slow(&new_contended_rdev->mutex, ww_ctx); ww_mutex_lock_slow(&new_contended_rdev->mutex, ww_ctx);
old_contended_rdev = new_contended_rdev; old_contended_rdev = new_contended_rdev;
old_contended_rdev->ref_cnt++; old_contended_rdev->ref_cnt++;
old_contended_rdev->mutex_owner = current;
} }
err = regulator_summary_lock_all(ww_ctx, err = regulator_summary_lock_all(ww_ctx,