diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2023-05-03 17:31:08 -0700 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-05-05 19:22:18 +0000 |
| commit | 3f279f30d48c527fffb430004262d76a46ece8c2 (patch) | |
| tree | 28e1063f11154a413b31c16b22f54becb8d0af40 | |
| parent | dc0e942d7c42adc34352c2c7c994f2b067df033d (diff) | |
| download | chrome-ec-3f279f30d48c527fffb430004262d76a46ece8c2.tar.gz | |
GPU: Rename DC_ATLEAST_SOC to DC_ATMOST_SOC
When a D-Notify level is being searched, a battery percentage is
compared against an upper threshold defined by DC_ATLEAST_SOC(x) macro.
This CL renames the macro to avoid confusion.
There is no functionality change.
BUG=b:216485035
TEST=make run-nvidia_gpu
Change-Id: Ic970a96881c61be62445258d1f0927db5d6e6b48
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4504734
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Edward Hill <ecgh@chromium.org>
Auto-Submit: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Edward Hill <ecgh@chromium.org>
| -rw-r--r-- | board/agah/board.c | 4 | ||||
| -rw-r--r-- | board/hades/board.c | 4 | ||||
| -rw-r--r-- | driver/nvidia_gpu.c | 2 | ||||
| -rw-r--r-- | driver/nvidia_gpu.h | 6 | ||||
| -rw-r--r-- | test/nvidia_gpu.c | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/board/agah/board.c b/board/agah/board.c index 91b326c868..7884ac1e97 100644 --- a/board/agah/board.c +++ b/board/agah/board.c @@ -39,8 +39,8 @@ struct d_notify_policy d_notify_policies[] = { [D_NOTIFY_1] = AC_ATLEAST_W(100), [D_NOTIFY_2] = AC_ATLEAST_W(65), [D_NOTIFY_3] = AC_DC, - [D_NOTIFY_4] = DC_ATLEAST_SOC(20), - [D_NOTIFY_5] = DC_ATLEAST_SOC(5), + [D_NOTIFY_4] = DC_ATMOST_SOC(20), + [D_NOTIFY_5] = DC_ATMOST_SOC(5), }; BUILD_ASSERT(ARRAY_SIZE(d_notify_policies) == D_NOTIFY_COUNT); diff --git a/board/hades/board.c b/board/hades/board.c index a8cd55e56c..91721d6b59 100644 --- a/board/hades/board.c +++ b/board/hades/board.c @@ -40,8 +40,8 @@ struct d_notify_policy d_notify_policies[] = { [D_NOTIFY_1] = AC_ATLEAST_W(100), [D_NOTIFY_2] = AC_ATLEAST_W(65), [D_NOTIFY_3] = AC_DC, - [D_NOTIFY_4] = DC_ATLEAST_SOC(20), - [D_NOTIFY_5] = DC_ATLEAST_SOC(5), + [D_NOTIFY_4] = DC_ATMOST_SOC(20), + [D_NOTIFY_5] = DC_ATMOST_SOC(5), }; BUILD_ASSERT(ARRAY_SIZE(d_notify_policies) == D_NOTIFY_COUNT); diff --git a/driver/nvidia_gpu.c b/driver/nvidia_gpu.c index b8a2195470..ff6e5fe39b 100644 --- a/driver/nvidia_gpu.c +++ b/driver/nvidia_gpu.c @@ -100,7 +100,7 @@ static void evaluate_d_notify_level(void) for (lvl = D_NOTIFY_5; lvl >= D_NOTIFY_1; lvl--) { if (policy[lvl].power_source == D_NOTIFY_DC) { - if (soc <= policy[lvl].dc.min_battery_soc) { + if (soc <= policy[lvl].dc.max_battery_soc) { set_d_notify_level(lvl); break; } diff --git a/driver/nvidia_gpu.h b/driver/nvidia_gpu.h index bfd1bba287..9d87914a91 100644 --- a/driver/nvidia_gpu.h +++ b/driver/nvidia_gpu.h @@ -35,7 +35,7 @@ struct d_notify_policy { unsigned int min_charger_watts; } ac; struct { - unsigned int min_battery_soc; + unsigned int max_battery_soc; } dc; }; }; @@ -50,9 +50,9 @@ struct d_notify_policy { .power_source = D_NOTIFY_AC_DC, \ } -#define DC_ATLEAST_SOC(S) \ +#define DC_ATMOST_SOC(S) \ { \ - .power_source = D_NOTIFY_DC, .dc.min_battery_soc = (S), \ + .power_source = D_NOTIFY_DC, .dc.max_battery_soc = (S), \ } void nvidia_gpu_init_policy(const struct d_notify_policy *policies); diff --git a/test/nvidia_gpu.c b/test/nvidia_gpu.c index b660943e04..3e03197e50 100644 --- a/test/nvidia_gpu.c +++ b/test/nvidia_gpu.c @@ -20,8 +20,8 @@ #include <stdio.h> struct d_notify_policy d_notify_policies[] = { - AC_ATLEAST_W(100), AC_ATLEAST_W(65), AC_DC, - DC_ATLEAST_SOC(20), DC_ATLEAST_SOC(5), + AC_ATLEAST_W(100), AC_ATLEAST_W(65), AC_DC, + DC_ATMOST_SOC(20), DC_ATMOST_SOC(5), }; extern enum d_notify_level d_notify_level; |