From 99dfbeaec3b8797e0707a722c8abb440e60ace98 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Mon, 15 May 2023 16:26:23 -0600 Subject: [PATCH] power: Set PL4 based on AC state on all boards Limit PL4 based on AC state for all units, not just those with dGPUs. This will allow setting standard values in coreboot. Signed-off-by: Tim Crawford --- src/board/system76/common/power.c | 8 -------- src/board/system76/darp5/board.mk | 5 +++++ src/board/system76/darp7/board.mk | 5 +++++ src/board/system76/darp8/board.mk | 5 +++++ src/board/system76/galp3-c/board.mk | 5 +++++ src/board/system76/galp6/board.mk | 5 +++++ src/board/system76/lemp10/board.mk | 5 +++++ src/board/system76/lemp11/board.mk | 5 +++++ src/board/system76/lemp12/board.mk | 5 +++++ src/board/system76/lemp9/board.mk | 5 +++++ 10 files changed, 45 insertions(+), 8 deletions(-) diff --git a/src/board/system76/common/power.c b/src/board/system76/common/power.c index a0e89b6..66fedc7 100644 --- a/src/board/system76/common/power.c +++ b/src/board/system76/common/power.c @@ -320,7 +320,6 @@ void power_off(void) { update_power_state(); } -#ifdef HAVE_DGPU // Set the CPU power limit appropriately static bool power_peci_limit(bool ac) { if (peci_available()) { @@ -333,13 +332,6 @@ static bool power_peci_limit(bool ac) { return false; } } -#else // HAVE_DGPU -static bool power_peci_limit(bool ac) { - // Use unused argument - ac = ac; - return true; -} -#endif // HAVE_DGPU // This function is run when the CPU is reset void power_cpu_reset(void) { diff --git a/src/board/system76/darp5/board.mk b/src/board/system76/darp5/board.mk index ab1cc00..a2b75bb 100644 --- a/src/board/system76/darp5/board.mk +++ b/src/board/system76/darp5/board.mk @@ -27,5 +27,10 @@ CFLAGS+=\ -DCHARGER_CHARGE_VOLTAGE=17600 \ -DCHARGER_INPUT_CURRENT=3420 +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=65 \ + -DPOWER_LIMIT_DC=45 + # Add system76 common code include src/board/system76/common/common.mk diff --git a/src/board/system76/darp7/board.mk b/src/board/system76/darp7/board.mk index 33fe68a..364bed9 100644 --- a/src/board/system76/darp7/board.mk +++ b/src/board/system76/darp7/board.mk @@ -29,5 +29,10 @@ CFLAGS+=\ -DCHARGER_CHARGE_VOLTAGE=8800 \ -DCHARGER_INPUT_CURRENT=3420 +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=65 \ + -DPOWER_LIMIT_DC=45 + # Add system76 common code include src/board/system76/common/common.mk diff --git a/src/board/system76/darp8/board.mk b/src/board/system76/darp8/board.mk index 1e3d4d4..b5628fb 100644 --- a/src/board/system76/darp8/board.mk +++ b/src/board/system76/darp8/board.mk @@ -30,5 +30,10 @@ CFLAGS+=\ -DCHARGER_CHARGE_VOLTAGE=8800 \ -DCHARGER_INPUT_CURRENT=4740 +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=65 \ + -DPOWER_LIMIT_DC=45 + # Add system76 common code include src/board/system76/common/common.mk diff --git a/src/board/system76/galp3-c/board.mk b/src/board/system76/galp3-c/board.mk index b74a8c7..c617567 100644 --- a/src/board/system76/galp3-c/board.mk +++ b/src/board/system76/galp3-c/board.mk @@ -28,5 +28,10 @@ CFLAGS+=\ -DCHARGER_CHARGE_VOLTAGE=13056 \ -DCHARGER_INPUT_CURRENT=2100 +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=40 \ + -DPOWER_LIMIT_DC=28 + # Add system76 common code include src/board/system76/common/common.mk diff --git a/src/board/system76/galp6/board.mk b/src/board/system76/galp6/board.mk index 1099fae..4a119dd 100644 --- a/src/board/system76/galp6/board.mk +++ b/src/board/system76/galp6/board.mk @@ -32,5 +32,10 @@ CFLAGS+=\ -DCHARGER_CHARGE_VOLTAGE=17400 \ -DCHARGER_INPUT_CURRENT=4740 +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=90 \ + -DPOWER_LIMIT_DC=45 + # Add system76 common code include src/board/system76/common/common.mk diff --git a/src/board/system76/lemp10/board.mk b/src/board/system76/lemp10/board.mk index 2832a3c..f052ed2 100644 --- a/src/board/system76/lemp10/board.mk +++ b/src/board/system76/lemp10/board.mk @@ -30,5 +30,10 @@ CFLAGS+=\ -DCHARGER_CHARGE_VOLTAGE=8800 \ -DCHARGER_INPUT_CURRENT=3420 +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=65 \ + -DPOWER_LIMIT_DC=45 + # Add system76 common code include src/board/system76/common/common.mk diff --git a/src/board/system76/lemp11/board.mk b/src/board/system76/lemp11/board.mk index 296f740..d6a670f 100644 --- a/src/board/system76/lemp11/board.mk +++ b/src/board/system76/lemp11/board.mk @@ -31,5 +31,10 @@ CFLAGS+=\ -DCHARGER_CHARGE_VOLTAGE=8800 \ -DCHARGER_INPUT_CURRENT=3420 +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=65 \ + -DPOWER_LIMIT_DC=45 + # Add system76 common code include src/board/system76/common/common.mk diff --git a/src/board/system76/lemp12/board.mk b/src/board/system76/lemp12/board.mk index f716504..d2d2e6e 100644 --- a/src/board/system76/lemp12/board.mk +++ b/src/board/system76/lemp12/board.mk @@ -36,5 +36,10 @@ CFLAGS+=\ -DCHARGER_INPUT_CURRENT=3420 \ -DCHARGER_PSYS_GAIN=500 +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=65 \ + -DPOWER_LIMIT_DC=45 + # Add system76 common code include src/board/system76/common/common.mk diff --git a/src/board/system76/lemp9/board.mk b/src/board/system76/lemp9/board.mk index 2ec0ec0..128ccc0 100644 --- a/src/board/system76/lemp9/board.mk +++ b/src/board/system76/lemp9/board.mk @@ -27,5 +27,10 @@ CFLAGS+=\ -DCHARGER_CHARGE_VOLTAGE=8800 \ -DCHARGER_INPUT_CURRENT=3420 +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=65 \ + -DPOWER_LIMIT_DC=45 + # Add system76 common code include src/board/system76/common/common.mk