From cdcbb719366ed8e36237bf4f5e78ddbdb17077ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Thu, 5 Jan 2023 18:05:11 +0200 Subject: [PATCH] mb/google/link: Use chromeec_smi_sleep() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SMI handler previously did not evaluate input slp_typ parameter and apparently always acted as S3 was requested. With the change keyboard is no longer a wakeup source from S4/S5, it is assumed MAINBOARD_EC_S5_WAKE attribute defined in ec.h is correct. Change-Id: I54c7d7455a6737f731c65e57c91b6457643c7cb2 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/74603 Tested-by: build bot (Jenkins) Reviewed-by: Martin L Roth Reviewed-by: Matt DeVillier Reviewed-by: Boris Mittelberg --- src/mainboard/google/link/smihandler.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/mainboard/google/link/smihandler.c b/src/mainboard/google/link/smihandler.c index b75bd4aacb..3cbdfdced3 100644 --- a/src/mainboard/google/link/smihandler.c +++ b/src/mainboard/google/link/smihandler.c @@ -22,16 +22,7 @@ void mainboard_smi_sleep(u8 slp_typ) /* Disable USB charging if required */ chromeec_set_usb_charge_mode(slp_typ); - /* Disable SCI and SMI events */ - google_chromeec_set_smi_mask(0); - google_chromeec_set_sci_mask(0); - - /* Clear pending events that may trigger immediate wake */ - while (google_chromeec_get_event() != EC_HOST_EVENT_NONE) - ; - - /* Enable wake events */ - google_chromeec_set_wake_mask(MAINBOARD_EC_S3_WAKE_EVENTS); + chromeec_smi_sleep(slp_typ, MAINBOARD_EC_S3_WAKE_EVENTS, MAINBOARD_EC_S5_WAKE_EVENTS); } int mainboard_smi_apmc(u8 apmc)