From c6f5fe6d30fa6afde1b341d5cd83542078584046 Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Thu, 22 Feb 2018 14:50:51 -0800 Subject: [PATCH] npcx/fan: Avoid turning on disabled fans Fan enable state is controlled in common/fan.c. This patch prevents npcx fan driver from enabling it. BUG=b:73127788 BRANCH=none TEST=Verify no 'Fan 0 stalled' is printed in S3 and S5. Verify the fan spins in S0. Change-Id: I549253a64c91d8a23bb793c3506b5daf1f7642be Signed-off-by: Daisuke Nojiri Reviewed-on: https://chromium-review.googlesource.com/937941 Reviewed-by: Vincent Palatin --- chip/npcx/fan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/chip/npcx/fan.c b/chip/npcx/fan.c index ca0980a91a..8e08e4ec58 100644 --- a/chip/npcx/fan.c +++ b/chip/npcx/fan.c @@ -346,8 +346,11 @@ void fan_tick_func(void) /* Make sure rpm mode is enabled */ if (p_status->fan_mode != TACHO_FAN_RPM) { p_status->auto_status = FAN_STATUS_STOPPED; + /* Why isn't this 'continue'? */ return; } + if (!fan_get_enabled(ch)) + continue; /* Get actual rpm */ p_status->rpm_actual = mft_fan_rpm(ch); /* Do smart fan stuff */