summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Hesling <hesling@chromium.org>2021-07-25 23:07:45 -0400
committerCommit Bot <commit-bot@chromium.org>2021-08-09 18:45:12 +0000
commit469e1079a40773dc8cd0b0b048aea866ec49d242 (patch)
treeabe4e19e77203b3ce58f14dd9b30be660d2189c9
parent4b507515187aa031d0d3fe4ae4af5fa0c44e1ab8 (diff)
downloadchrome-ec-469e1079a40773dc8cd0b0b048aea866ec49d242.tar.gz
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 TkEST=make -j tests-dartmonkey tests-bloonchipper 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: Iee0cad2dc46aaf9a4499637fce0d446530ff49b2 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3078825 Reviewed-by: Josie Nordrum <josienordrum@google.com>
-rw-r--r--board/hatch_fp/board.h5
-rw-r--r--board/nocturne_fp/board.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/board/hatch_fp/board.h b/board/hatch_fp/board.h
index d8d4062320..21bec1751c 100644
--- a/board/hatch_fp/board.h
+++ b/board/hatch_fp/board.h
@@ -227,7 +227,6 @@
#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
@@ -238,6 +237,10 @@
#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 6da68130df..97eec20271 100644
--- a/board/nocturne_fp/board.h
+++ b/board/nocturne_fp/board.h
@@ -98,7 +98,6 @@
#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
@@ -167,6 +166,7 @@
#define CONFIG_CMD_FLASH
#ifdef SECTION_IS_RW
+#define CONFIG_LOW_POWER_IDLE
#define CONFIG_CMD_SPI_XFER
#endif