diff options
| author | Joel Kitching <kitching@chromium.org> | 2018-06-25 18:24:16 +0000 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-06-25 18:26:01 +0000 |
| commit | d7757afb6069e5ac81dc94c934368b2f8f4a5558 (patch) | |
| tree | fb7b8d23c67ac33070c06d20688f082ada168ec6 | |
| parent | 54d5355a471c54b5bf38f32b9ac76040144416d0 (diff) | |
| download | chrome-ec-d7757afb6069e5ac81dc94c934368b2f8f4a5558.tar.gz | |
Revert "host_event_commands: Fix lpc_get_next_host_event for 64-bit events"
This reverts commit 54d5355a471c54b5bf38f32b9ac76040144416d0.
Reason for revert: Re-using 32-bit host events instead. See b/110292722
Original change's description:
> host_event_commands: Fix lpc_get_next_host_event for 64-bit events
>
> __builtin_ffs takes an int as argument, and, therefore, does not
> find bits >= 32. Fix this up when CONFIG_HOST_EVENT64.
>
> BUG=b:69329196
> BRANCH=fizz,poppy
> TEST=Patch coreboot to add bit 33 in SCI mask, add EC code to send
> such events, EC does not watchdog anymore
>
> Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
> Reviewed-on: https://chromium-review.googlesource.com/989514
> Reviewed-by: Furquan Shaikh <furquan@chromium.org>
> (cherry picked from commit da1b429c79ac591fb077a705ac41cb188a2500a9)
>
> Change-Id: Id400538bb88019c02137b1605b71865ac61d450b
> Reviewed-on: https://chromium-review.googlesource.com/1013900
> Reviewed-by: Joel Kitching <kitching@chromium.org>
> Commit-Queue: Joel Kitching <kitching@chromium.org>
> Tested-by: Joel Kitching <kitching@chromium.org>
> Trybot-Ready: Joel Kitching <kitching@chromium.org>
Bug: b:69329196
Change-Id: I3d2ae6e729ee2be676175f4df61ee2e9fecd7798
Reviewed-on: https://chromium-review.googlesource.com/1113779
Reviewed-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Trybot-Ready: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | common/host_event_commands.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/common/host_event_commands.c b/common/host_event_commands.c index 5fad82b4b6..0f092f6bea 100644 --- a/common/host_event_commands.c +++ b/common/host_event_commands.c @@ -129,15 +129,6 @@ int lpc_get_next_host_event(void) host_event_t ev; int evt_idx = __builtin_ffs(lpc_host_events); -#ifdef CONFIG_HOST_EVENT64 - if (evt_idx == 0) { - int evt_idx_high = __builtin_ffs(lpc_host_events >> 32); - - if (evt_idx_high) - evt_idx = 32 + evt_idx_high; - } -#endif - if (evt_idx) { host_event_set_bit(&ev, evt_idx); host_clear_events(ev); |