diff options
| author | Yu-Che Cheng <giver@chromium.org> | 2025-02-19 15:07:48 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-07 18:25:34 +0100 |
| commit | 806437d047472a81f4df5960451ec705b8c45a4f (patch) | |
| tree | bae849859740b2d3cb30e8f502289e5d4ef17d71 /drivers | |
| parent | 99dcd630ac2136a11918de111e1f1a41dfc17098 (diff) | |
| download | linux-806437d047472a81f4df5960451ec705b8c45a4f.tar.gz linux-806437d047472a81f4df5960451ec705b8c45a4f.tar.bz2 linux-806437d047472a81f4df5960451ec705b8c45a4f.zip | |
thermal: gov_power_allocator: Fix incorrect calculation in divvy_up_power()
[ Upstream commit 4ecaa75771a75f2b78a431bf67dea165d19d72a6 ]
divvy_up_power() should use weighted_req_power instead of req_power to
calculate granted_power. Otherwise, granted_power may be unexpected as
the denominator total_req_power is a weighted sum.
This is a mistake made during the previous refactor.
Replace req_power with weighted_req_power in divvy_up_power()
calculation.
Fixes: 912e97c67cc3 ("thermal: gov_power_allocator: Move memory allocation out of throttle()")
Signed-off-by: Yu-Che Cheng <giver@chromium.org>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Link: https://patch.msgid.link/20250219-fix-power-allocator-calc-v1-1-48b860291919@chromium.org
[ rjw: Subject and changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/thermal/gov_power_allocator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/gov_power_allocator.c b/drivers/thermal/gov_power_allocator.c index 1b2345a697c5..d59549e61639 100644 --- a/drivers/thermal/gov_power_allocator.c +++ b/drivers/thermal/gov_power_allocator.c @@ -364,7 +364,7 @@ static void divvy_up_power(struct power_actor *power, int num_actors, for (i = 0; i < num_actors; i++) { struct power_actor *pa = &power[i]; - u64 req_range = (u64)pa->req_power * power_range; + u64 req_range = (u64)pa->weighted_req_power * power_range; pa->granted_power = DIV_ROUND_CLOSEST_ULL(req_range, total_req_power); |