From 5f03f53abc9970fc24f84f47c3bdf968bfd79966 Mon Sep 17 00:00:00 2001 From: Tarun Tuli Date: Fri, 3 Mar 2023 13:15:21 +0000 Subject: [PATCH] mb/{brya,hdaes}/include/ec: Add EC_HOST_EVENT_GPU EC_HOST_EVENT_GPU was renamed from EC_HOST_EVENT_USB_CHARGER and thought to no longer be used. It was subsequently removed in I9e3e0e9b45385766343489ae2d8fc43fb0954923 Add back the mask for this event as it is infact required on certain Brya (Agah) and Hades variants. Signed-off-by: Tarun Tuli BUG=b:216485035,b:258126464,b:266631157 BRANCH=none TEST=D-notifier events are received again from EC Change-Id: I9d7bf52efa9572e1bbd2f307420e09a7398a1ca9 Reviewed-on: https://review.coreboot.org/c/coreboot/+/73217 Reviewed-by: Eric Lai Tested-by: build bot (Jenkins) Reviewed-by: Caveh Jalali Reviewed-by: Nick Vaccaro --- .../variants/baseboard/brya/include/baseboard/ec.h | 10 +++++++++- .../variants/baseboard/hades/include/baseboard/ec.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/ec.h b/src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/ec.h index ef156f135d..8ca2dbd386 100644 --- a/src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/ec.h +++ b/src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/ec.h @@ -7,6 +7,13 @@ #include #include +#if CONFIG(INCLUDE_NVIDIA_GPU_ASL) + #define VARIANT_EC_SCI_EVENTS \ + EC_HOST_EVENT_MASK(EC_HOST_EVENT_GPU) +#else + #define VARIANT_EC_SCI_EVENTS 0 +#endif + #define MAINBOARD_EC_SCI_EVENTS \ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\ @@ -22,7 +29,8 @@ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_USB_MUX)) + EC_HOST_EVENT_MASK(EC_HOST_EVENT_USB_MUX) |\ + VARIANT_EC_SCI_EVENTS) #define MAINBOARD_EC_SMI_EVENTS \ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED)) /* EC can wake from S5 with lid or power button */ diff --git a/src/mainboard/google/brya/variants/baseboard/hades/include/baseboard/ec.h b/src/mainboard/google/brya/variants/baseboard/hades/include/baseboard/ec.h index 41091462fd..122cc0cbe8 100644 --- a/src/mainboard/google/brya/variants/baseboard/hades/include/baseboard/ec.h +++ b/src/mainboard/google/brya/variants/baseboard/hades/include/baseboard/ec.h @@ -16,6 +16,7 @@ EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_CRITICAL) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_STATUS) |\ + EC_HOST_EVENT_MASK(EC_HOST_EVENT_GPU) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_THRESHOLD) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP) |\