Merge remote-tracking branch cros/main into firmware-fpmcu-bloonchipper-releasefirmware-fpmcu-bloonchipper-release

Generated by: ./util/update_release_branch.py --board bloonchipper
--relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-
fpmcu-bloonchipper-release

Relevant changes:

git log --oneline e5fb0b9ba4..28712dae9d -- board/hatch_fp
board/bloonchipper common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh

ded9307b79 util/getversion.sh: Fix version when not in a git repo
956055e692 board: change Google USB vendor info
71b2ef709d Update license boilerplate text in source code files
33e11afda0 Revert "fpsensor: Build fpsensor source file with C++"
c8d0360723 fpsensor: Build fpsensor source file with C++
bc113abd53 fpsensor: Fix g++ compiler error
150a58a0dc fpsensor: Fix fp_set_sensor_mode return type
b33b5ce85b fpsensor: Remove nested designators for C++ compatibility
2e864b2539 tree-wide: const-ify argv for console commands
56d8b360f9 test: Add test for get ikm failure when seed not set
3a3d6c3690 test: Add test for fpsensor trivial key failure
233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256
0a041b285b docs/fingerprint: Typo correction
c03fab67e2 docs/fingerprint: Fix the path of fputils.py
0b5d4baf5a util/getversion.sh: Fix empty file list handling
6e128fe760 FPMCU dev board environment with Satlab
3eb29b6aa5 builtin: Move ssize_t to sys/types.h
345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release
c25ffdb316 common: Conditionally support printf %l and %i modifiers
9a3c514b45 test: Add a test to check if the debugger is connected
54e603413f Move standard library tests to their own file
43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release
25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format
4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format
738de2b575 trng: Rename rand to trng_rand
14b8270edd docs/fingerprint: Update dragonclaw power numbers
0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format
f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format
5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format
c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format
eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format
6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format
e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format
7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format
21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format
98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format
a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format
73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format
0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format
1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format
dc3e9008b8 board/hatch_fp/board.h: Format with clang-format
dca9d74321 Revert "trng: Rename rand to trng_rand"
a6b0b3554f trng: Rename rand to trng_rand
28d0b75b70 third_party/boringssl: Remove unused header

BRANCH=None
BUG=b:246424843 b:234181908 b:244781166 b:234181908 b:244387210
BUG=b:242720240 chromium:1098010 b:180945056 b:236025198 b:234181908
BUG=b:234181908 b:237344361 b:131913998 b:236386294 b:234143158
BUG=b:234781655 b:215613183 b:242720910
TEST=`make -j buildall`
TEST=./test/run_device_tests.py --board bloonchipper
     Test "aes": PASSED
     Test "cec": PASSED
     Test "cortexm_fpu": PASSED
     Test "crc": PASSED
     Test "flash_physical": PASSED
     Test "flash_write_protect": PASSED
     Test "fpsensor_hw": PASSED
     Test "fpsensor_spi_ro": PASSED
     Test "fpsensor_spi_rw": PASSED
     Test "fpsensor_uart_ro": PASSED
     Test "fpsensor_uart_rw": PASSED
     Test "mpu_ro": PASSED
     Test "mpu_rw": PASSED
     Test "mutex": PASSED
     Test "pingpong": PASSED
     Test "printf": PASSED
     Test "queue": PASSED
     Test "rollback_region0": PASSED
     Test "rollback_region1": PASSED
     Test "rollback_entropy": PASSED
     Test "rtc": PASSED
     Test "sha256": PASSED
     Test "sha256_unrolled": PASSED
     Test "static_if": PASSED
     Test "stdlib": PASSED
     Test "system_is_locked_wp_on": PASSED
     Test "system_is_locked_wp_off": PASSED
     Test "timer_dos": PASSED
     Test "utils": PASSED
     Test "utils_str": PASSED
     Test "stm32f_rtc": PASSED
     Test "panic_data_bloonchipper_v2.0.4277": PASSED
     Test "panic_data_bloonchipper_v2.0.5938": PASSED

Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I264ad0ffe7afcd507a1e483c6e934a9c4fea47c3

1 files changed, 100 insertions, 128 deletions

diff --git a/chip/mchp/clock.c b/chip/mchp/clock.c
index e646470ac6..4701d43b1f 100644
--- a/chip/mchp/clock.c
+++ b/chip/mchp/clock.c
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -25,17 +25,17 @@
 
 /* Console output macros */
 #define CPUTS(outstr) cputs(CC_CLOCK, outstr)
-#define CPRINTS(format, args...) cprints(CC_CLOCK, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_CLOCK, format, ##args)
 
 #ifdef CONFIG_LOW_POWER_IDLE
 
-#define HTIMER_DIV_1_US_MAX	(1998848)
-#define HTIMER_DIV_1_1SEC	(0x8012)
+#define HTIMER_DIV_1_US_MAX (1998848)
+#define HTIMER_DIV_1_1SEC (0x8012)
 
 /* Recovery time for HvySlp2 is 0 us */
-#define HEAVY_SLEEP_RECOVER_TIME_USEC   75
+#define HEAVY_SLEEP_RECOVER_TIME_USEC 75
 
-#define SET_HTIMER_DELAY_USEC           200
+#define SET_HTIMER_DELAY_USEC 200
 
 static int idle_sleep_cnt;
 static int idle_dsleep_cnt;
@@ -52,7 +52,7 @@ static uint32_t ecia_result[MCHP_INT_GIRQ_NUM];
  * boot in order to give a permanent window in which the heavy sleep
  * mode is not used.
  */
-#define CONSOLE_IN_USE_ON_BOOT_TIME (15*SECOND)
+#define CONSOLE_IN_USE_ON_BOOT_TIME (15 * SECOND)
 static int console_in_use_timeout_sec = 60;
 static timestamp_t console_expire_time;
 #endif /*CONFIG_LOW_POWER_IDLE */
@@ -62,7 +62,8 @@ static int freq = 48000000;
 void clock_wait_cycles(uint32_t cycles)
 {
 	asm volatile("1: subs %0, #1\n"
-		     "   bne 1b\n" : "+r"(cycles));
+		     "   bne 1b\n"
+		     : "+r"(cycles));
 }
 
 int clock_get_freq(void)
@@ -80,15 +81,13 @@ int clock_get_freq(void)
 /* 32 KHz crystal connected in parallel */
 static inline void config_32k_src_crystal(void)
 {
-	MCHP_VBAT_CSS = MCHP_VBAT_CSS_XTAL_EN
-			| MCHP_VBAT_CSS_SRC_XTAL;
+	MCHP_VBAT_CSS = MCHP_VBAT_CSS_XTAL_EN | MCHP_VBAT_CSS_SRC_XTAL;
 }
 
 /* 32 KHz source is 32KHZ_IN pin which must be configured */
 static inline void config_32k_src_se_input(void)
 {
-	MCHP_VBAT_CSS = MCHP_VBAT_CSS_SIL32K_EN
-				| MCHP_VBAT_CSS_SRC_SWPS;
+	MCHP_VBAT_CSS = MCHP_VBAT_CSS_SIL32K_EN | MCHP_VBAT_CSS_SRC_SWPS;
 }
 
 static inline void config_32k_src_sil_osc(void)
@@ -99,21 +98,21 @@ static inline void config_32k_src_sil_osc(void)
 #else
 static void config_32k_src_crystal(void)
 {
-	MCHP_VBAT_CE = MCHP_VBAT_CE_XOSEL_PAR
-			| MCHP_VBAT_CE_ALWAYS_ON_32K_SRC_CRYSTAL;
+	MCHP_VBAT_CE = MCHP_VBAT_CE_XOSEL_PAR |
+		       MCHP_VBAT_CE_ALWAYS_ON_32K_SRC_CRYSTAL;
 }
 
 /* 32 KHz source is 32KHZ_IN pin which must be configured */
 static inline void config_32k_src_se_input(void)
 {
-	MCHP_VBAT_CE = MCHP_VBAT_CE_32K_DOMAIN_32KHZ_IN_PIN
-			| MCHP_VBAT_CE_ALWAYS_ON_32K_SRC_INT;
+	MCHP_VBAT_CE = MCHP_VBAT_CE_32K_DOMAIN_32KHZ_IN_PIN |
+		       MCHP_VBAT_CE_ALWAYS_ON_32K_SRC_INT;
 }
 
 static inline void config_32k_src_sil_osc(void)
 {
-	MCHP_VBAT_CE = ~(MCHP_VBAT_CE_32K_DOMAIN_32KHZ_IN_PIN
-			| MCHP_VBAT_CE_ALWAYS_ON_32K_SRC_CRYSTAL);
+	MCHP_VBAT_CE = ~(MCHP_VBAT_CE_32K_DOMAIN_32KHZ_IN_PIN |
+			 MCHP_VBAT_CE_ALWAYS_ON_32K_SRC_CRYSTAL);
 }
 #endif
 
@@ -173,9 +172,7 @@ static void clock_turbo_disable(void)
 		/* Use 12 MHz processor clock for power savings */
 		MCHP_PCR_PROC_CLK_CTL = MCHP_PCR_CLK_CTL_12MHZ;
 }
-DECLARE_HOOK(HOOK_INIT,
-		clock_turbo_disable,
-		HOOK_PRIO_INIT_VBOOT_HASH + 1);
+DECLARE_HOOK(HOOK_INIT, clock_turbo_disable, HOOK_PRIO_INIT_VBOOT_HASH + 1);
 
 /**
  * initialization of Hibernation timer 0
@@ -208,8 +205,7 @@ void htimer_init(void)
  * 1 is divide by 4096 for 0.125 s per LSB for a maximum of ~2 hours.
  *	65535 * 0.125 s ~ 8192 s = 2.27 hours
  */
-void system_set_htimer_alarm(uint32_t seconds,
-		uint32_t microseconds)
+void system_set_htimer_alarm(uint32_t seconds, uint32_t microseconds)
 {
 	uint32_t hcnt, ns;
 	uint8_t hctrl;
@@ -226,7 +222,7 @@ void system_set_htimer_alarm(uint32_t seconds,
 	}
 
 	if (seconds > 1) {
-		hcnt = (seconds << 3);	/* divide by 0.125 */
+		hcnt = (seconds << 3); /* divide by 0.125 */
 		if (hcnt > 0xfffful)
 			hcnt = 0xfffful;
 		hctrl = 1;
@@ -236,7 +232,7 @@ void system_set_htimer_alarm(uint32_t seconds,
 		 * seconds / 30.5e-6 + microseconds / 30.5
 		 */
 		hcnt = (seconds << 15) + (microseconds >> 5) +
-			(microseconds >> 10);
+		       (microseconds >> 10);
 		hctrl = 0;
 	}
 
@@ -254,19 +250,18 @@ static timestamp_t system_get_htimer(void)
 	uint16_t count;
 	timestamp_t time;
 
-	count =  MCHP_HTIMER_COUNT(0);
-
+	count = MCHP_HTIMER_COUNT(0);
 
 	if (MCHP_HTIMER_CONTROL(0) == 1) /* if > 2 sec */
 		/* 0.125 sec per count */
 		time.le.lo = (uint32_t)(count * 125000);
-	else    /* if < 2 sec */
+	else /* if < 2 sec */
 		/* 30.5(=61/2) us per count */
 		time.le.lo = (uint32_t)(count * 61 / 2);
 
 	time.le.hi = 0;
 
-	return time;  /* in uSec */
+	return time; /* in uSec */
 }
 
 /**
@@ -275,8 +270,7 @@ static timestamp_t system_get_htimer(void)
 static void system_reset_htimer_alarm(void)
 {
 	MCHP_HTIMER_PRELOAD(0) = 0;
-	MCHP_INT_SOURCE(MCHP_HTIMER_GIRQ) =
-			MCHP_HTIMER_GIRQ_BIT(0);
+	MCHP_INT_SOURCE(MCHP_HTIMER_GIRQ) = MCHP_HTIMER_GIRQ_BIT(0);
 }
 
 #ifdef CONFIG_MCHP_DEEP_SLP_DEBUG
@@ -286,10 +280,10 @@ static void print_pcr_regs(void)
 
 	trace0(0, MEC, 0, "Current PCR registers");
 	for (i = 0; i < 5; i++) {
-		trace12(0, MEC, 0, "REG  SLP_EN[%d] = 0x%08X",
-			i, MCHP_PCR_SLP_EN(i));
-		trace12(0, MEC, 0, "REG CLK_REQ[%d] = 0x%08X",
-			i, MCHP_PCR_CLK_REQ(i));
+		trace12(0, MEC, 0, "REG  SLP_EN[%d] = 0x%08X", i,
+			MCHP_PCR_SLP_EN(i));
+		trace12(0, MEC, 0, "REG CLK_REQ[%d] = 0x%08X", i,
+			MCHP_PCR_CLK_REQ(i));
 	}
 }
 
@@ -298,10 +292,9 @@ static void print_ecia_regs(void)
 	int i;
 
 	trace0(0, MEC, 0, "Current GIRQn.Result registers");
-	for (i = MCHP_INT_GIRQ_FIRST;
-			i <= MCHP_INT_GIRQ_LAST; i++)
-		trace12(0, MEC, 0, "GIRQ[%d].Result = 0x%08X",
-			i, MCHP_INT_RESULT(i));
+	for (i = MCHP_INT_GIRQ_FIRST; i <= MCHP_INT_GIRQ_LAST; i++)
+		trace12(0, MEC, 0, "GIRQ[%d].Result = 0x%08X", i,
+			MCHP_INT_RESULT(i));
 }
 
 static void save_regs(void)
@@ -314,8 +307,7 @@ static void save_regs(void)
 	}
 
 	for (i = 0; i < MCHP_INT_GIRQ_NUM; i++)
-		ecia_result[i] =
-			MCHP_INT_RESULT(MCHP_INT_GIRQ_FIRST + i);
+		ecia_result[i] = MCHP_INT_RESULT(MCHP_INT_GIRQ_FIRST + i);
 }
 
 static void print_saved_regs(void)
@@ -324,21 +316,29 @@ static void print_saved_regs(void)
 
 	trace0(0, BRD, 0, "Before sleep saved registers");
 	for (i = 0; i < MCHP_PCR_SLP_RST_REG_MAX; i++) {
-		trace12(0, BRD, 0, "PCR_SLP_EN[%d]  = 0x%08X",
-			i, pcr_slp_en[i]);
-		trace12(0, BRD, 0, "PCR_CLK_REQ[%d] = 0x%08X",
-			i, pcr_clk_req[i]);
+		trace12(0, BRD, 0, "PCR_SLP_EN[%d]  = 0x%08X", i,
+			pcr_slp_en[i]);
+		trace12(0, BRD, 0, "PCR_CLK_REQ[%d] = 0x%08X", i,
+			pcr_clk_req[i]);
 	}
 
 	for (i = 0; i < MCHP_INT_GIRQ_NUM; i++)
 		trace12(0, BRD, 0, "GIRQ[%d].Result = 0x%08X",
-			(i+MCHP_INT_GIRQ_FIRST), ecia_result[i]);
+			(i + MCHP_INT_GIRQ_FIRST), ecia_result[i]);
 }
 #else
-static __maybe_unused void print_pcr_regs(void) {}
-static __maybe_unused void print_ecia_regs(void) {}
-static __maybe_unused void save_regs(void) {}
-static __maybe_unused void print_saved_regs(void) {}
+static __maybe_unused void print_pcr_regs(void)
+{
+}
+static __maybe_unused void print_ecia_regs(void)
+{
+}
+static __maybe_unused void save_regs(void)
+{
+}
+static __maybe_unused void print_saved_regs(void)
+{
+}
 #endif /* #ifdef CONFIG_MCHP_DEEP_SLP_DEBUG */
 
 /**
@@ -377,24 +377,19 @@ static void prepare_for_deep_sleep(void)
 	MCHP_TMR32_CTL(1) &= ~1;
 #ifdef CONFIG_WATCHDOG_HELP
 	MCHP_TMR16_CTL(0) &= ~1;
-	MCHP_INT_DISABLE(MCHP_TMR16_GIRQ) =
-			MCHP_TMR16_GIRQ_BIT(0);
-	MCHP_INT_SOURCE(MCHP_TMR16_GIRQ) =
-			MCHP_TMR16_GIRQ_BIT(0);
+	MCHP_INT_DISABLE(MCHP_TMR16_GIRQ) = MCHP_TMR16_GIRQ_BIT(0);
+	MCHP_INT_SOURCE(MCHP_TMR16_GIRQ) = MCHP_TMR16_GIRQ_BIT(0);
 #endif
 	MCHP_INT_DISABLE(MCHP_TMR32_GIRQ) =
-			MCHP_TMR32_GIRQ_BIT(0) +
-			MCHP_TMR32_GIRQ_BIT(1);
+		MCHP_TMR32_GIRQ_BIT(0) + MCHP_TMR32_GIRQ_BIT(1);
 	MCHP_INT_SOURCE(MCHP_TMR32_GIRQ) =
-			MCHP_TMR32_GIRQ_BIT(0) +
-			MCHP_TMR32_GIRQ_BIT(1);
+		MCHP_TMR32_GIRQ_BIT(0) + MCHP_TMR32_GIRQ_BIT(1);
 
 #ifdef CONFIG_WATCHDOG
 	/* Stop watchdog */
 	MCHP_WDG_CTL &= ~1;
 #endif
 
-
 #ifdef CONFIG_HOST_INTERFACE_ESPI
 	MCHP_INT_SOURCE(22) = MCHP_INT22_WAKE_ONLY_ESPI;
 	MCHP_INT_ENABLE(22) = MCHP_INT22_WAKE_ONLY_ESPI;
@@ -448,7 +443,7 @@ static void prepare_for_deep_sleep(void)
 
 static void resume_from_deep_sleep(void)
 {
-	MCHP_PCR_SYS_SLP_CTL = 0x00;  /* default */
+	MCHP_PCR_SYS_SLP_CTL = 0x00; /* default */
 
 	/* Disable assertion of DeepSleep signal when core executes WFI */
 	CPU_SCB_SYSCTRL &= ~BIT(2);
@@ -476,19 +471,19 @@ static void resume_from_deep_sleep(void)
 	MCHP_PCR_SLP_EN3 |= (MCHP_PCR_SLP_EN3_HTMR0);
 
 #ifdef CONFIG_HOST_INTERFACE_ESPI
-	#ifdef CONFIG_POWER_S0IX
+#ifdef CONFIG_POWER_S0IX
 	MCHP_INT_DISABLE(22) = MCHP_INT22_WAKE_ONLY_ESPI;
 	MCHP_INT_SOURCE(22) = MCHP_INT22_WAKE_ONLY_ESPI;
-	#else
+#else
 	MCHP_ESPI_ACTIVATE |= 1;
-	#endif
+#endif
 #else
-	#ifdef CONFIG_POWER_S0IX
+#ifdef CONFIG_POWER_S0IX
 	MCHP_INT_DISABLE(22) = MCHP_INT22_WAKE_ONLY_LPC;
 	MCHP_INT_SOURCE(22) = MCHP_INT22_WAKE_ONLY_LPC;
-	#else
+#else
 	MCHP_LPC_ACT |= 1;
-	#endif
+#endif
 #endif
 
 	/* re-enable Port 80 capture */
@@ -505,10 +500,8 @@ static void resume_from_deep_sleep(void)
 	MCHP_TMR32_CTL(1) |= 1;
 	MCHP_TMR16_CTL(0) |= 1;
 	MCHP_INT_ENABLE(MCHP_TMR32_GIRQ) =
-			MCHP_TMR32_GIRQ_BIT(0) +
-			MCHP_TMR32_GIRQ_BIT(1);
-	MCHP_INT_ENABLE(MCHP_TMR16_GIRQ) =
-			MCHP_TMR16_GIRQ_BIT(0);
+		MCHP_TMR32_GIRQ_BIT(0) + MCHP_TMR32_GIRQ_BIT(1);
+	MCHP_INT_ENABLE(MCHP_TMR16_GIRQ) = MCHP_TMR16_GIRQ_BIT(0);
 
 	/* Enable watchdog */
 #ifdef CONFIG_WATCHDOG
@@ -521,7 +514,6 @@ static void resume_from_deep_sleep(void)
 #endif
 }
 
-
 void clock_refresh_console_in_use(void)
 {
 	disable_sleep(SLEEP_MASK_CONSOLE);
@@ -547,9 +539,7 @@ void __idle(void)
 	htimer_init(); /* hibernation timer initialize */
 
 	disable_sleep(SLEEP_MASK_CONSOLE);
-	console_expire_time.val = get_time().val +
-			CONSOLE_IN_USE_ON_BOOT_TIME;
-
+	console_expire_time.val = get_time().val + CONSOLE_IN_USE_ON_BOOT_TIME;
 
 	/*
 	 * Print when the idle task starts. This is the lowest priority
@@ -562,17 +552,15 @@ void __idle(void)
 		/* Disable interrupts */
 		interrupt_disable();
 
-		t0 = get_time();  /* uSec */
+		t0 = get_time(); /* uSec */
 
 		/* __hw_clock_event_get() is next programmed timer event */
 		next_delay = __hw_clock_event_get() - t0.le.lo;
 
-		time_for_dsleep = next_delay >
-			(HEAVY_SLEEP_RECOVER_TIME_USEC +
-			SET_HTIMER_DELAY_USEC);
+		time_for_dsleep = next_delay > (HEAVY_SLEEP_RECOVER_TIME_USEC +
+						SET_HTIMER_DELAY_USEC);
 
-		max_sleep_time = next_delay -
-				HEAVY_SLEEP_RECOVER_TIME_USEC;
+		max_sleep_time = next_delay - HEAVY_SLEEP_RECOVER_TIME_USEC;
 
 		/* check if there enough time for deep sleep */
 		if (DEEP_SLEEP_ALLOWED && time_for_dsleep) {
@@ -582,7 +570,7 @@ void __idle(void)
 			 * interrupt.
 			 */
 			if ((sleep_mask & SLEEP_MASK_CONSOLE) &&
-				t0.val > console_expire_time.val) {
+			    t0.val > console_expire_time.val) {
 				/* allow console to sleep. */
 				enable_sleep(SLEEP_MASK_CONSOLE);
 
@@ -598,12 +586,10 @@ void __idle(void)
 						"in deep sleep");
 			}
 
-
 			/* UART is not being used  */
 			uart_ready_for_deepsleep =
 				LOW_SPEED_DEEP_SLEEP_ALLOWED &&
-					!uart_tx_in_progress() &&
-					uart_buffer_empty();
+				!uart_tx_in_progress() && uart_buffer_empty();
 
 			/*
 			 * Since MCHP's heavy sleep mode requires all
@@ -612,7 +598,6 @@ void __idle(void)
 			 * heavy sleep of EC.
 			 */
 			if (uart_ready_for_deepsleep) {
-
 				idle_dsleep_cnt++;
 
 				/*
@@ -630,18 +615,14 @@ void __idle(void)
 				 * interrupt triggers only after 'wfi'
 				 * completes its execution.
 				 */
-				max_sleep_time -=
-					(get_time().le.lo - t0.le.lo);
+				max_sleep_time -= (get_time().le.lo - t0.le.lo);
 
 				/* setup/enable htimer wakeup interrupt */
-				system_set_htimer_alarm(0,
-						max_sleep_time);
+				system_set_htimer_alarm(0, max_sleep_time);
 
 				/* set sleep all just before WFI */
-				MCHP_PCR_SYS_SLP_CTL |=
-						MCHP_PCR_SYS_SLP_HEAVY;
-				MCHP_PCR_SYS_SLP_CTL |=
-						MCHP_PCR_SYS_SLP_ALL;
+				MCHP_PCR_SYS_SLP_CTL |= MCHP_PCR_SYS_SLP_HEAVY;
+				MCHP_PCR_SYS_SLP_CTL |= MCHP_PCR_SYS_SLP_ALL;
 
 			} else {
 				idle_sleep_cnt++;
@@ -649,12 +630,11 @@ void __idle(void)
 
 			/* Wait for interrupt: goes into deep sleep. */
 			asm("dsb");
-			asm("wfi");
+			cpu_enter_suspend_mode();
 			asm("isb");
 			asm("nop");
 
 			if (uart_ready_for_deepsleep) {
-
 				resume_from_deep_sleep();
 
 				/*
@@ -673,9 +653,8 @@ void __idle(void)
 				/* disable/clear htimer wakeup interrupt */
 				system_reset_htimer_alarm();
 
-				t1.val = t0.val +
-					(uint64_t)(max_sleep_time -
-							ht_t1.le.lo);
+				t1.val = t0.val + (uint64_t)(max_sleep_time -
+							     ht_t1.le.lo);
 
 				force_time(t1);
 
@@ -685,15 +664,14 @@ void __idle(void)
 				/* Record time spent in deep sleep. */
 				total_idle_dsleep_time_us +=
 					(uint64_t)(max_sleep_time -
-							ht_t1.le.lo);
+						   ht_t1.le.lo);
 			}
 
 		} else { /* CPU 'Sleep' mode */
 
 			idle_sleep_cnt++;
 
-			asm("wfi");
-
+			cpu_enter_suspend_mode();
 		}
 
 		interrupt_enable();
@@ -705,34 +683,30 @@ void __idle(void)
  * Print low power idle statistics
  */
 
-static int command_idle_stats(int argc, char **argv)
+static int command_idle_stats(int argc, const char **argv)
 {
 	timestamp_t ts = get_time();
 
-	ccprintf("Num idle calls that sleep:           %d\n",
-			idle_sleep_cnt);
-	ccprintf("Num idle calls that deep-sleep:      %d\n",
-			idle_dsleep_cnt);
+	ccprintf("Num idle calls that sleep:           %d\n", idle_sleep_cnt);
+	ccprintf("Num idle calls that deep-sleep:      %d\n", idle_dsleep_cnt);
 
 	ccprintf("Total Time spent in deep-sleep(sec): %.6lld(s)\n",
-			total_idle_dsleep_time_us);
-	ccprintf("Total time on:                       %.6llds\n\n",
-			ts.val);
+		 total_idle_dsleep_time_us);
+	ccprintf("Total time on:                       %.6llds\n\n", ts.val);
 
 	if (IS_ENABLED(CONFIG_MCHP_DEEP_SLP_DEBUG))
-		print_pcr_regs();	/* debug */
+		print_pcr_regs(); /* debug */
 
 	return EC_SUCCESS;
 }
-DECLARE_CONSOLE_COMMAND(idlestats, command_idle_stats,
-			"",
+DECLARE_CONSOLE_COMMAND(idlestats, command_idle_stats, "",
 			"Print last idle stats");
 #endif /* defined(CONFIG_CMD_IDLE_STATS) */
 
 /**
  * Configure deep sleep clock settings.
  */
-static int command_dsleep(int argc, char **argv)
+static int command_dsleep(int argc, const char **argv)
 {
 	int v;
 
@@ -742,12 +716,10 @@ static int command_dsleep(int argc, char **argv)
 			 * Force deep sleep not to use heavy sleep mode or
 			 * allow it to use the heavy sleep mode.
 			 */
-			if (v)  /* 'on' */
-				disable_sleep(
-					SLEEP_MASK_FORCE_NO_LOW_SPEED);
-			else    /* 'off' */
-				enable_sleep(
-					SLEEP_MASK_FORCE_NO_LOW_SPEED);
+			if (v) /* 'on' */
+				disable_sleep(SLEEP_MASK_FORCE_NO_LOW_SPEED);
+			else /* 'off' */
+				enable_sleep(SLEEP_MASK_FORCE_NO_LOW_SPEED);
 		} else {
 			/* Set console in use timeout. */
 			char *e;
@@ -765,16 +737,16 @@ static int command_dsleep(int argc, char **argv)
 
 	ccprintf("Sleep mask: %08x\n", (int)sleep_mask);
 	ccprintf("Console in use timeout:   %d sec\n",
-			console_in_use_timeout_sec);
+		 console_in_use_timeout_sec);
 
 	return EC_SUCCESS;
 }
-DECLARE_CONSOLE_COMMAND(dsleep, command_dsleep,
-		"[ on | off | <timeout> sec]",
-		"Deep sleep clock settings:\nUse 'on' to force deep "
-		"sleep NOT to enter heavy sleep mode.\nUse 'off' to "
-		"allow deep sleep to use heavy sleep whenever conditions "
-		"allow.\n"
-		"Give a timeout value for the console in use timeout.\n"
-		"See also 'sleep mask'.");
+DECLARE_CONSOLE_COMMAND(
+	dsleep, command_dsleep, "[ on | off | <timeout> sec]",
+	"Deep sleep clock settings:\nUse 'on' to force deep "
+	"sleep NOT to enter heavy sleep mode.\nUse 'off' to "
+	"allow deep sleep to use heavy sleep whenever conditions "
+	"allow.\n"
+	"Give a timeout value for the console in use timeout.\n"
+	"See also 'sleep mask'.");
 #endif /* CONFIG_LOW_POWER_IDLE */