diff options
author | Hsu Wei-Cheng <mojahsu@chromium.org> | 2021-08-06 08:29:37 +0000 |
---|---|---|
committer | Hsu Wei-Cheng <mojahsu@chromium.org> | 2021-08-06 09:21:30 +0000 |
commit | a867f0d358d6f5689545b9a80cdce7cbe768362d (patch) | |
tree | fa780c250a750b7f5e8dac1378ce5b2c3775a580 | |
parent | d66d8ae928aeb26b05606a6dd0b878f45a375890 (diff) | |
download | chrome-ec-a867f0d358d6f5689545b9a80cdce7cbe768362d.tar.gz |
Revert "dartmonkey/bloonchipper: Disable low-power-idle in RO"
This reverts commit 6c3977530eaf07da7c3568cedc3cacde2f3d9eaa.
Reason for revert: It may broke CQ
BUG=b:195718112
Original change's description:
> dartmonkey/bloonchipper: Disable low-power-idle in RO
>
> In https://crrev.com/c/2657778 and https://crrev.com/c/2673909
> sleeping was explicitly forbidden in RO, in addition to moving
> the sleep lines explicitly to RW.
>
> CLs https://crrev.com/c/3012241 and https://crrev.com/c/3052750
> bring the sleep lines back to RO (and RW), since they serve to
> gate host interface communications when the AP is sleeping.
>
> This CL restores the part of the original two refactoring CLs that
> blocks the more complicated low power sleeping.
>
> BRANCH=none
> BUG=b:178746753
> TEST=# Connect servo_micro and J-Link to an icetower board.
> make proj-dartmonkey -j
> sudo servod --board=icetower
> ./util/flash_jlink.py --board=dartmonkey --image=./build/dartmonkey/ec.bin
> # Unplug J-Link
>
> dut-control fpmcu_slp:off fpmcu_slp_alt:off
> dut-control pp3300_dx_mcu_mw # Should be more than 40mw
> dut-control fpmcu_slp:on fpmcu_slp_alt:off
> dut-control pp3300_dx_mcu_mw # Should be less than 10mw
> dut-control fpmcu_slp:off fpmcu_slp_alt:on
> dut-control pp3300_dx_mcu_mw # Should be less than 10mw
> dut-control fpmcu_slp:on fpmcu_slp_alt:on
> dut-control pp3300_dx_mcu_mw # Should be less than 10mw
> dut-control fpmcu_slp:off fpmcu_slp_alt:off
>
> minicom -D$(dut-control -o raw_fpmcu_console_uart_pty)
> > reboot ro
> # Ctrl-A Q
>
> # RO no longer enters low-power-idle.
> dut-control fpmcu_slp:off fpmcu_slp_alt:off
> dut-control pp3300_dx_mcu_mw # Should be more than 40mw
> dut-control fpmcu_slp:on fpmcu_slp_alt:off
> dut-control pp3300_dx_mcu_mw # Should be more than 40mw
> dut-control fpmcu_slp:off fpmcu_slp_alt:on
> dut-control pp3300_dx_mcu_mw # Should be more than 40mw
> dut-control fpmcu_slp:on fpmcu_slp_alt:on
> dut-control pp3300_dx_mcu_mw # Should be more than 40mw
> dut-control fpmcu_slp:off fpmcu_slp_alt:off
>
> minicom -D$(dut-control -o raw_fpmcu_console_uart_pty)
> > reboot
> > fpenroll
> > fpmatch
> # Ctrl-A Q
> TEST=# Connect servo_micro to a dragonclaw board.
> make proj-bloonchipper -j
> sudo servod --board=dragonclaw
> ./util/flash_ec --board=bloonchipper
>
> dut-control fpmcu_slp:off fpmcu_slp_alt:off
> dut-control pp3300_dx_mcu_mw # Should be around 20mw
> dut-control fpmcu_slp:on fpmcu_slp_alt:off
> dut-control pp3300_dx_mcu_mw # Should be less the 5mw
> dut-control fpmcu_slp:off fpmcu_slp_alt:on
> dut-control pp3300_dx_mcu_mw # Should be less the 5mw
> dut-control fpmcu_slp:on fpmcu_slp_alt:on
> dut-control pp3300_dx_mcu_mw # Should be less the 5mw
> dut-control fpmcu_slp:off fpmcu_slp_alt:off
>
> minicom -D$(dut-control -o raw_fpmcu_console_uart_pty)
> > reboot ro
> # Ctrl-A Q
>
> # RO no longer enters low-power-idle.
> dut-control fpmcu_slp:off fpmcu_slp_alt:off
> dut-control pp3300_dx_mcu_mw # Should be around 20mw
> dut-control fpmcu_slp:on fpmcu_slp_alt:off
> dut-control pp3300_dx_mcu_mw # Should be around 20mw
> dut-control fpmcu_slp:off fpmcu_slp_alt:on
> dut-control pp3300_dx_mcu_mw # Should be around 20mw
> dut-control fpmcu_slp:on fpmcu_slp_alt:on
> dut-control pp3300_dx_mcu_mw # Should be around 20mw
> dut-control fpmcu_slp:off fpmcu_slp_alt:off
>
> minicom -D$(dut-control -o raw_fpmcu_console_uart_pty)
> > reboot
> > fpenroll
> > fpmatch
> # Ctrl-A Q
>
> Signed-off-by: Craig Hesling <hesling@chromium.org>
> Change-Id: I7654ec6aa5f56cb0ddfd27784db61784aad9e10f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3052754
> Commit-Queue: Josie Nordrum <josienordrum@google.com>
> Reviewed-by: Josie Nordrum <josienordrum@google.com>
Bug: b:178746753
Change-Id: Ibe946f73601b52eed38b0f7a9093b942f251a90e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3077587
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Owners-Override: Hsu Wei-Cheng <mojahsu@chromium.org>
Auto-Submit: Hsu Wei-Cheng <mojahsu@chromium.org>
-rw-r--r-- | board/hatch_fp/board.h | 5 | ||||
-rw-r--r-- | board/nocturne_fp/board.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/board/hatch_fp/board.h b/board/hatch_fp/board.h index 21bec1751c..d8d4062320 100644 --- a/board/hatch_fp/board.h +++ b/board/hatch_fp/board.h @@ -227,6 +227,7 @@ #define CONFIG_DMA #define CONFIG_FPU #define CONFIG_HOST_COMMAND_STATUS +#define CONFIG_LOW_POWER_IDLE #define CONFIG_MKBP_EVENT #define CONFIG_MKBP_USE_GPIO #define CONFIG_PRINTF_LEGACY_LI_FORMAT @@ -237,10 +238,6 @@ #define CONFIG_STM_HWTIMER32 #define CONFIG_WP_ACTIVE_HIGH -#ifdef SECTION_IS_RW -#define CONFIG_LOW_POWER_IDLE -#endif /* SECTION_IS_RW */ - #ifndef __ASSEMBLER__ /* Timer selection */ diff --git a/board/nocturne_fp/board.h b/board/nocturne_fp/board.h index 97eec20271..6da68130df 100644 --- a/board/nocturne_fp/board.h +++ b/board/nocturne_fp/board.h @@ -98,6 +98,7 @@ #define CONFIG_HOST_COMMAND_STATUS #undef CONFIG_I2C #undef CONFIG_LID_SWITCH +#define CONFIG_LOW_POWER_IDLE #define CONFIG_MKBP_EVENT #define CONFIG_MKBP_USE_GPIO #define CONFIG_PRINTF_LEGACY_LI_FORMAT @@ -166,7 +167,6 @@ #define CONFIG_CMD_FLASH #ifdef SECTION_IS_RW -#define CONFIG_LOW_POWER_IDLE #define CONFIG_CMD_SPI_XFER #endif |