platform/chrome: cros_ec_proto: Use EC_HOST_EVENT_MASK not BIT
authorEvan Benn <evanbenn@chromium.org>
Wed, 9 Dec 2020 22:03:54 +0000 (22:03 +0000)
committerEnric Balletbo i Serra <enric.balletbo@collabora.com>
Wed, 20 Jan 2021 15:19:17 +0000 (16:19 +0100)
The host_event_code enum is 1-based, use EC_HOST_EVENT_MASK not BIT to
generate the intended mask. This patch changes the behaviour of the
mask, a following patch will restore the intended behaviour:
'Add LID and BATTERY to default mask'

Fixes: c214e564acb2 ("platform/chrome: cros_ec_proto: ignore unnecessary wakeups on old ECs")
Signed-off-by: Evan Benn <evanbenn@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Link: https://lore.kernel.org/r/20201209220306.1.I6133572c0ab3c6b95426f804bac2d3833e24acb1@changeid
drivers/platform/chrome/cros_ec_proto.c

index 7c92a6e..3ad6019 100644 (file)
@@ -526,11 +526,11 @@ int cros_ec_query_all(struct cros_ec_device *ec_dev)
                 * power), not wake up.
                 */
                ec_dev->host_event_wake_mask = U32_MAX &
-                       ~(BIT(EC_HOST_EVENT_AC_DISCONNECTED) |
-                         BIT(EC_HOST_EVENT_BATTERY_LOW) |
-                         BIT(EC_HOST_EVENT_BATTERY_CRITICAL) |
-                         BIT(EC_HOST_EVENT_PD_MCU) |
-                         BIT(EC_HOST_EVENT_BATTERY_STATUS));
+                       ~(EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED) |
+                         EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_LOW) |
+                         EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_CRITICAL) |
+                         EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU) |
+                         EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_STATUS));
                /*
                 * Old ECs may not support this command. Complain about all
                 * other errors.