From 29f76884092dbd8de492437e9656e48671a12530 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Mon, 15 Jul 2013 09:17:09 -0700 Subject: [PATCH] haswell boards: Use PECI temp sensor id 0 The EC temperature sensors were renumbered and now PECI is at index 0. 1) boot on falco 2) check /sys/class/thermal/thermal_zone0/temp 3) check 'temps' on ec console Change-Id: Idde1457c42c80850b5b8ac22781060ed9b224d13 Signed-off-by: Duncan Laurie Reviewed-on: https://gerrit.chromium.org/gerrit/61896 Reviewed-on: http://review.coreboot.org/4367 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- src/mainboard/google/bolt/thermal.h | 2 +- src/mainboard/google/falco/acpi_tables.c | 1 + src/mainboard/google/falco/thermal.h | 2 ++ src/mainboard/google/peppy/thermal.h | 2 +- src/mainboard/google/slippy/thermal.h | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mainboard/google/bolt/thermal.h b/src/mainboard/google/bolt/thermal.h index fceaeca6b9..eeedf2551d 100644 --- a/src/mainboard/google/bolt/thermal.h +++ b/src/mainboard/google/bolt/thermal.h @@ -21,7 +21,7 @@ #define THERMAL_H /* Config TDP Sensor ID */ -#define CTDP_SENSOR_ID 1 /* PECI */ +#define CTDP_SENSOR_ID 0 /* PECI */ /* Config TDP Nominal */ #define CTDP_NOMINAL_THRESHOLD_OFF 0 diff --git a/src/mainboard/google/falco/acpi_tables.c b/src/mainboard/google/falco/acpi_tables.c index b5045601e4..34c4407628 100644 --- a/src/mainboard/google/falco/acpi_tables.c +++ b/src/mainboard/google/falco/acpi_tables.c @@ -44,6 +44,7 @@ unsigned long acpi_create_slic(unsigned long current); static void acpi_update_thermal_table(global_nvs_t *gnvs) { + gnvs->tmps = TEMPERATURE_SENSOR_ID; gnvs->tcrt = CRITICAL_TEMPERATURE; gnvs->tpsv = PASSIVE_TEMPERATURE; gnvs->tmax = MAX_TEMPERATURE; diff --git a/src/mainboard/google/falco/thermal.h b/src/mainboard/google/falco/thermal.h index 0ae3edb23f..cfda67d66c 100644 --- a/src/mainboard/google/falco/thermal.h +++ b/src/mainboard/google/falco/thermal.h @@ -20,6 +20,8 @@ #ifndef THERMAL_H #define THERMAL_H +#define TEMPERATURE_SENSOR_ID 0 /* PECI */ + /* Temperature which OS will shutdown at */ #define CRITICAL_TEMPERATURE 104 diff --git a/src/mainboard/google/peppy/thermal.h b/src/mainboard/google/peppy/thermal.h index a038502038..74ec0b54cc 100644 --- a/src/mainboard/google/peppy/thermal.h +++ b/src/mainboard/google/peppy/thermal.h @@ -21,7 +21,7 @@ #define THERMAL_H /* Control TDP Settings */ -#define CTL_TDP_SENSOR_ID 1 /* PECI */ +#define CTL_TDP_SENSOR_ID 0 /* PECI */ #define CTL_TDP_POWER_LIMIT 12 /* 12W */ #define CTL_TDP_THRESHOLD_OFF 68 /* Normal at 68C */ #define CTL_TDP_THRESHOLD_ON 73 /* Limited at 73C */ diff --git a/src/mainboard/google/slippy/thermal.h b/src/mainboard/google/slippy/thermal.h index fceaeca6b9..eeedf2551d 100644 --- a/src/mainboard/google/slippy/thermal.h +++ b/src/mainboard/google/slippy/thermal.h @@ -21,7 +21,7 @@ #define THERMAL_H /* Config TDP Sensor ID */ -#define CTDP_SENSOR_ID 1 /* PECI */ +#define CTDP_SENSOR_ID 0 /* PECI */ /* Config TDP Nominal */ #define CTDP_NOMINAL_THRESHOLD_OFF 0