sravan/system76-embedded-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fan_max keeping fan on when in S0iX

Browse Source
This commit is contained in:
Jeremy Soller 2021-04-02 10:21:39 -06:00 committed by Jeremy Soller
parent 2401fcc50d
commit a04d353096
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/board/system76/common/dgpu.c
View File

@ -6,6 +6,7 @@
#include <board/fan.h>
#include <board/gpio.h>
#include <board/peci.h>
#include <board/power.h>
#include <common/debug.h>
#include <common/macro.h>
@ -81,7 +82,7 @@ void dgpu_event(void) {
duty = PWM_DUTY(0);
}
if (fan_max) {
if (peci_on && fan_max) {
// Override duty if fans are manually set to maximum
duty = PWM_DUTY(100);
} else {

1
src/board/system76/common/include/board/peci.h
View File

@ -5,6 +5,7 @@
#include <ec/peci.h>
extern bool peci_on;
extern int16_t peci_temp;
void peci_init(void);

10
src/board/system76/common/peci.c
View File

@ -27,6 +27,7 @@ static uint8_t FAN_COOLDOWN[BOARD_COOLDOWN] = { 0 };
// Tjunction = 100C for i7-8565U (and probably the same for all WHL-U)
#define T_JUNCTION 100
bool peci_on = false;
int16_t peci_temp = 0;
#define PECI_TEMP(X) (((int16_t)(X)) << 6)
@ -123,12 +124,13 @@ void peci_event(void) {
#if EC_ESPI
// Use PECI if CPU is not in C10 state
if (gpio_get(&CPU_C10_GATE_N))
peci_on = gpio_get(&CPU_C10_GATE_N);
#else // EC_ESPI
// Use PECI if in S0 state
if (power_state == POWER_STATE_S0)
peci_on = power_state == POWER_STATE_S0;
#endif // EC_ESPI
{
if (peci_on) {
// Wait for completion
while (HOSTAR & 1) {}
// Clear status
@ -169,7 +171,7 @@ void peci_event(void) {
duty = PWM_DUTY(0);
}
if (fan_max) {
if (peci_on && fan_max) {
// Override duty if fans are manually set to maximum
duty = PWM_DUTY(100);
} else {