From 6f5ef069388fa5cdfb02aaf205d0a8e70f6b677a Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Mon, 30 Oct 2017 19:09:22 -0700 Subject: [PATCH] port80: Provide default routine for logging port80 resume Add a common hook handler on CHIPSET_RESUME to log port80 resume message instead of duplicating the same code in all chip lpc_resume. BUG=b:68669668 BRANCH=None TEST=Verified that port80 resume is logged on S0ix and S3 resume. Change-Id: I313692f5499717d0d8f62be2ba3b8566c46e4dde Signed-off-by: Furquan Shaikh Reviewed-on: https://chromium-review.googlesource.com/745362 Reviewed-by: Aaron Durbin --- chip/it83xx/lpc.c | 7 ------- chip/lm4/lpc.c | 7 ------- chip/mec1322/lpc.c | 7 ------- chip/npcx/lpc.c | 7 ------- common/port80.c | 7 +++++++ 5 files changed, 7 insertions(+), 28 deletions(-) diff --git a/chip/it83xx/lpc.c b/chip/it83xx/lpc.c index c860a372b9..251d007f28 100644 --- a/chip/it83xx/lpc.c +++ b/chip/it83xx/lpc.c @@ -718,13 +718,6 @@ void lpc_disable_acpi_interrupts(void) task_disable_irq(IT83XX_IRQ_PMC_IN); } -static void lpc_resume(void) -{ - /* Store port 80 event so we know where resume happened */ - port_80_write(PORT_80_EVENT_RESUME); -} -DECLARE_HOOK(HOOK_CHIPSET_RESUME, lpc_resume, HOOK_PRIO_DEFAULT); - /* Get protocol information */ static int lpc_get_protocol_info(struct host_cmd_handler_args *args) { diff --git a/chip/lm4/lpc.c b/chip/lm4/lpc.c index 91c4959862..8068940d70 100644 --- a/chip/lm4/lpc.c +++ b/chip/lm4/lpc.c @@ -801,13 +801,6 @@ static void lpc_init(void) */ DECLARE_HOOK(HOOK_INIT, lpc_init, HOOK_PRIO_INIT_LPC); -static void lpc_resume(void) -{ - /* Store port 80 event so we know where resume happened */ - port_80_write(PORT_80_EVENT_RESUME); -} -DECLARE_HOOK(HOOK_CHIPSET_RESUME, lpc_resume, HOOK_PRIO_DEFAULT); - static void lpc_tick(void) { /* diff --git a/chip/mec1322/lpc.c b/chip/mec1322/lpc.c index 52ed7d5a58..acc3e11b45 100644 --- a/chip/mec1322/lpc.c +++ b/chip/mec1322/lpc.c @@ -261,13 +261,6 @@ static void setup_lpc(void) } DECLARE_HOOK(HOOK_CHIPSET_STARTUP, setup_lpc, HOOK_PRIO_FIRST); -static void lpc_resume(void) -{ - /* Store port 80 event so we know where resume happened */ - port_80_write(PORT_80_EVENT_RESUME); -} -DECLARE_HOOK(HOOK_CHIPSET_RESUME, lpc_resume, HOOK_PRIO_DEFAULT); - static void lpc_init(void) { /* Activate LPC interface */ diff --git a/chip/npcx/lpc.c b/chip/npcx/lpc.c index 7166294deb..c97713d34b 100644 --- a/chip/npcx/lpc.c +++ b/chip/npcx/lpc.c @@ -1045,13 +1045,6 @@ static void lpc_init(void) */ DECLARE_HOOK(HOOK_INIT, lpc_init, HOOK_PRIO_INIT_LPC); -static void lpc_resume(void) -{ - /* Store port 80 event so we know where resume happened */ - port_80_write(PORT_80_EVENT_RESUME); -} -DECLARE_HOOK(HOOK_CHIPSET_RESUME, lpc_resume, HOOK_PRIO_DEFAULT); - /* Get protocol information */ static int lpc_get_protocol_info(struct host_cmd_handler_args *args) { diff --git a/common/port80.c b/common/port80.c index b82a4d4b5b..537623e339 100644 --- a/common/port80.c +++ b/common/port80.c @@ -196,3 +196,10 @@ int port80_command_read(struct host_cmd_handler_args *args) DECLARE_HOST_COMMAND(EC_CMD_PORT80_READ, port80_command_read, EC_VER_MASK(0) | EC_VER_MASK(1)); + +static void port80_log_resume(void) +{ + /* Store port 80 event so we know where resume happened */ + port_80_write(PORT_80_EVENT_RESUME); +} +DECLARE_HOOK(HOOK_CHIPSET_RESUME, port80_log_resume, HOOK_PRIO_DEFAULT);