From 316162198f241a19091e006b82276a1cc21fe60c Mon Sep 17 00:00:00 2001 From: Yu-An Chen Date: Fri, 4 Jun 2021 14:53:48 +0800 Subject: Chronicler: Change thermal and fan configuration This patch changes thermal halt/alert, fan maximum/off temperature point and fan minimum/maximum speed. BUG=b:190087114 BRANCH=volteer TEST=Thermal team verified thermal policy is expected. Signed-off-by: Yu-An Chen Change-Id: I40892b928613d29e38f6b7de1c94017671adad96 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2940324 Reviewed-by: Keith Short --- board/chronicler/board.c | 49 ++++++++++++++---------------------------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/board/chronicler/board.c b/board/chronicler/board.c index 469fa68615..4f34763651 100644 --- a/board/chronicler/board.c +++ b/board/chronicler/board.c @@ -47,17 +47,10 @@ const struct fan_conf fan_conf_0 = { .enable_gpio = GPIO_EN_PP5000_FAN, }; -/* - * Fan specs from datasheet: - * Max speed 5900 rpm (+/- 7%), minimum duty cycle 30%. - * Minimum speed not specified by RPM. Set minimum RPM to max speed (with - * margin) x 30%. - * 5900 x 1.07 x 0.30 = 1894, round up to 1900 - */ const struct fan_rpm fan_rpm_0 = { - .rpm_min = 1900, - .rpm_start = 1900, - .rpm_max = 5900, + .rpm_min = 3400, + .rpm_start = 3400, + .rpm_max = 5700, }; const struct fan_t fans[FAN_CH_COUNT] = { @@ -73,49 +66,35 @@ const struct fan_t fans[FAN_CH_COUNT] = { /* * Tiger Lake specifies 100 C as maximum TDP temperature. THRMTRIP# occurs at * 130 C. However, sensor is located next to DDR, so we need to use the lower - * DDR temperature limit (85 C) + * DDR temperature limit (80 C) */ -const static struct ec_thermal_config thermal_cpu = { +const static struct ec_thermal_config thermal_config_without_fan = { .temp_host = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(70), + [EC_TEMP_THRESH_HIGH] = C_TO_K(77), [EC_TEMP_THRESH_HALT] = C_TO_K(80), }, .temp_host_release = { [EC_TEMP_THRESH_HIGH] = C_TO_K(65), }, - .temp_fan_off = C_TO_K(35), - .temp_fan_max = C_TO_K(50), }; -/* - * Inductor limits - used for both charger and PP3300 regulator - * - * Need to use the lower of the charger IC, PP3300 regulator, and the inductors - * - * Charger max recommended temperature 100C, max absolute temperature 125C - * PP3300 regulator: operating range -40 C to 145 C - * - * Inductors: limit of 125c - * PCB: limit is 80c - */ -const static struct ec_thermal_config thermal_inductor = { +const static struct ec_thermal_config thermal_config_with_fan = { .temp_host = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(75), + [EC_TEMP_THRESH_HIGH] = C_TO_K(77), [EC_TEMP_THRESH_HALT] = C_TO_K(80), }, .temp_host_release = { [EC_TEMP_THRESH_HIGH] = C_TO_K(65), }, - .temp_fan_off = C_TO_K(40), - .temp_fan_max = C_TO_K(55), + .temp_fan_off = C_TO_K(41), + .temp_fan_max = C_TO_K(59), }; - struct ec_thermal_config thermal_params[] = { - [TEMP_SENSOR_1_CHARGER] = thermal_inductor, - [TEMP_SENSOR_2_PP3300_REGULATOR] = thermal_inductor, - [TEMP_SENSOR_3_DDR_SOC] = thermal_cpu, - [TEMP_SENSOR_4_FAN] = thermal_cpu, + [TEMP_SENSOR_1_CHARGER] = thermal_config_with_fan, + [TEMP_SENSOR_2_PP3300_REGULATOR] = thermal_config_without_fan, + [TEMP_SENSOR_3_DDR_SOC] = thermal_config_without_fan, + [TEMP_SENSOR_4_FAN] = thermal_config_without_fan, }; BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT); -- cgit v1.2.1