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, 38 insertions, 39 deletions

diff --git a/chip/npcx/gpio.c b/chip/npcx/gpio.c
index 5f1e3c78b6..690615729d 100644
--- a/chip/npcx/gpio.c
+++ b/chip/npcx/gpio.c
@@ -1,10 +1,11 @@
-/* Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /* GPIO module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "gpio.h"
 #include "gpio_chip.h"
@@ -25,7 +26,7 @@
 #define CPRINTS(...)
 #else
 #define CPUTS(outstr) cputs(CC_GPIO, outstr)
-#define CPRINTS(format, args...) cprints(CC_GPIO, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_GPIO, format, ##args)
 #endif
 
 /* Constants for GPIO interrupt mapping */
@@ -40,12 +41,12 @@
 #define UNIMPLEMENTED(name)
 #endif
 static const struct npcx_wui gpio_wui_table[] = {
-	#include "gpio.wrap"
+#include "gpio.wrap"
 };
 
 struct npcx_gpio {
-	uint8_t port  : 4;
-	uint8_t bit   : 3;
+	uint8_t port : 4;
+	uint8_t bit : 3;
 	uint8_t valid : 1;
 };
 
@@ -54,21 +55,21 @@ BUILD_ASSERT(sizeof(struct npcx_gpio) == 1);
 #if NPCX_FAMILY_VERSION >= NPCX_FAMILY_NPCX9
 struct npcx_alt {
 	uint8_t group;
-	uint8_t bit       : 3;
-	uint8_t inverted  : 1;
-	uint8_t reserved  : 4;
+	uint8_t bit : 3;
+	uint8_t inverted : 1;
+	uint8_t reserved : 4;
 };
 #else
 struct npcx_alt {
-	uint8_t group     : 4;
-	uint8_t bit       : 3;
-	uint8_t inverted  : 1;
+	uint8_t group : 4;
+	uint8_t bit : 3;
+	uint8_t inverted : 1;
 };
 #endif
 
 struct gpio_alt_map {
 	struct npcx_gpio gpio;
-	struct npcx_alt  alt;
+	struct npcx_alt alt;
 };
 
 #if NPCX_FAMILY_VERSION >= NPCX_FAMILY_NPCX9
@@ -101,8 +102,7 @@ static uint8_t gpio_is_alt_sel(uint8_t port, uint8_t bit)
 	struct gpio_alt_map const *map;
 	uint8_t alt_mask, devalt;
 
-	for (map = ARRAY_BEGIN(gpio_alt_table);
-	     map < ARRAY_END(gpio_alt_table);
+	for (map = ARRAY_BEGIN(gpio_alt_table); map < ARRAY_END(gpio_alt_table);
 	     map++) {
 		if (gpio_match(port, bit, map->gpio)) {
 			alt_mask = 1 << map->alt.bit;
@@ -127,8 +127,7 @@ static int gpio_alt_sel(uint8_t port, uint8_t bit,
 {
 	struct gpio_alt_map const *map;
 
-	for (map = ARRAY_BEGIN(gpio_alt_table);
-	     map < ARRAY_END(gpio_alt_table);
+	for (map = ARRAY_BEGIN(gpio_alt_table); map < ARRAY_END(gpio_alt_table);
 	     map++) {
 		if (gpio_match(port, bit, map->gpio)) {
 			uint8_t alt_mask = 1 << map->alt.bit;
@@ -140,7 +139,7 @@ static int gpio_alt_sel(uint8_t port, uint8_t bit,
 			if ((func < GPIO_ALT_FUNC_DEFAULT) ^ map->alt.inverted)
 				NPCX_DEVALT(map->alt.group) &= ~alt_mask;
 			else
-				NPCX_DEVALT(map->alt.group) |=  alt_mask;
+				NPCX_DEVALT(map->alt.group) |= alt_mask;
 
 			return 1;
 		}
@@ -183,7 +182,7 @@ static void gpio_interrupt_type_sel(enum gpio_signal signal, uint32_t flags)
 		NPCX_WKMOD(table, group) &= ~pmask;
 		/* Handle interrupting on both edges */
 		if ((flags & GPIO_INT_F_RISING) &&
-			(flags & GPIO_INT_F_FALLING)) {
+		    (flags & GPIO_INT_F_FALLING)) {
 			/* Enable any edge */
 			NPCX_WKAEDG(table, group) |= pmask;
 		}
@@ -252,7 +251,7 @@ void gpio_low_voltage_level_sel(uint8_t port, uint8_t bit, uint8_t low_voltage)
 
 	if (low_voltage)
 		CPRINTS("Warn! No low voltage support in port:0x%x, bit:%d",
-								port, bit);
+			port, bit);
 }
 
 /* Set the low voltage detection level by mask */
@@ -290,7 +289,7 @@ static void gpio_enable_wake_up_input(enum gpio_signal signal, int enable)
 			SET_BIT(NPCX_WKINEN(wui->table, wui->group), wui->bit);
 		else
 			CLEAR_BIT(NPCX_WKINEN(wui->table, wui->group),
-						wui->bit);
+				  wui->bit);
 	}
 }
 
@@ -317,7 +316,7 @@ BUILD_ASSERT(ARRAY_SIZE(gpio_lvol_table[0].lvol_gpio) == 8);
 /* IC specific low-level driver */
 
 void gpio_set_alternate_function(uint32_t port, uint32_t mask,
-				enum gpio_alternate_func func)
+				 enum gpio_alternate_func func)
 {
 	/* Enable alternative pins by func */
 	int pin;
@@ -340,7 +339,7 @@ void gpio_set_level(enum gpio_signal signal, int value)
 	ASSERT(signal_is_gpio(signal));
 
 	if (value)
-		NPCX_PDOUT(gpio_list[signal].port) |=  gpio_list[signal].mask;
+		NPCX_PDOUT(gpio_list[signal].port) |= gpio_list[signal].mask;
 	else
 		NPCX_PDOUT(gpio_list[signal].port) &= ~gpio_list[signal].mask;
 }
@@ -410,14 +409,14 @@ void gpio_set_flags_by_mask(uint32_t port, uint32_t mask, uint32_t flags)
 	if (flags & GPIO_PULL_UP) {
 		if (flags & GPIO_SEL_1P8V) {
 			CPRINTS("Warn! enable internal PU and low voltage mode"
-					" at the same time is illegal. port 0x%x, mask 0x%x",
-					port, mask);
+				" at the same time is illegal. port 0x%x, mask 0x%x",
+				port, mask);
 		} else {
-			NPCX_PPUD(port)  &= ~mask;
+			NPCX_PPUD(port) &= ~mask;
 			NPCX_PPULL(port) |= mask; /* enable pull down/up */
 		}
 	} else if (flags & GPIO_PULL_DOWN) {
-		NPCX_PPUD(port)  |= mask;
+		NPCX_PPUD(port) |= mask;
 		NPCX_PPULL(port) |= mask; /* enable pull down/up */
 	} else {
 		/* No pull up/down */
@@ -455,7 +454,7 @@ void gpio_set_flags_by_mask(uint32_t port, uint32_t mask, uint32_t flags)
 	if (flags & GPIO_OUTPUT)
 		NPCX_PDIR(port) |= mask;
 
-	/* Lock GPIO output and configuration if need */
+		/* Lock GPIO output and configuration if need */
 #if NPCX_FAMILY_VERSION >= NPCX_FAMILY_NPCX7
 	if (flags & GPIO_LOCKED)
 		NPCX_PLOCK_CTL(port) |= mask;
@@ -598,7 +597,7 @@ void gpio_pre_init(void)
 		 * which may or may not be as a GPIO.
 		 */
 		gpio_set_alternate_function(g->port, g->mask,
-					GPIO_ALT_FUNC_NONE);
+					    GPIO_ALT_FUNC_NONE);
 	}
 
 	/* The bypass of low voltage IOs for better power consumption */
@@ -649,8 +648,8 @@ void gpio_interrupt(struct npcx_wui wui_int)
 		uint8_t pin_mask = 1 << gpio_wui_table[i].bit;
 
 		if ((gpio_wui_table[i].table == table) &&
-			(gpio_wui_table[i].group == group) &&
-			(wui_mask & pin_mask)) {
+		    (gpio_wui_table[i].group == group) &&
+		    (wui_mask & pin_mask)) {
 			/* Clear pending bit of GPIO */
 			NPCX_WKPCL(table, group) = pin_mask;
 			/* Execute GPIO's ISR */
@@ -671,7 +670,7 @@ void gpio_interrupt(struct npcx_wui wui_int)
  * Command used to disable input buffer of gpios one by one to
  * investigate power consumption
  */
-static int command_gpiodisable(int argc, char **argv)
+static int command_gpiodisable(int argc, const char **argv)
 {
 	uint8_t i;
 	uint8_t offset;
@@ -691,7 +690,7 @@ static int command_gpiodisable(int argc, char **argv)
 
 			ccprintf("Total GPIO declaration: %d\n", GPIO_COUNT);
 			ccprintf("Total Non-ISR GPIO declaration: %d\n",
-						non_isr_gpio_num);
+				 non_isr_gpio_num);
 			ccprintf("Next GPIO Num to check by ");
 			ccprintf("\"gpiodisable next\"\n");
 			ccprintf("  offset: %d\n", offset);
@@ -714,8 +713,8 @@ static int command_gpiodisable(int argc, char **argv)
 				offset = idx + GPIO_IH_COUNT;
 				g_list = gpio_list + offset;
 				flags = g_list->flags;
-				ccprintf("current GPIO : %d %s --> ",
-							offset, g_list->name);
+				ccprintf("current GPIO : %d %s --> ", offset,
+					 g_list->name);
 				if (gpio_is_i2c_pin(offset)) {
 					ccprintf("Ignore I2C pin!\n");
 					idx++;
@@ -726,10 +725,10 @@ static int command_gpiodisable(int argc, char **argv)
 					continue;
 				} else {
 					if ((flags & GPIO_INPUT) ||
-						    (flags & GPIO_OPEN_DRAIN)) {
+					    (flags & GPIO_OPEN_DRAIN)) {
 						ccprintf("Disable WKINEN!\n");
 						gpio_enable_wake_up_input(
-								offset, 0);
+							offset, 0);
 						idx++;
 						break;
 					}
@@ -759,7 +758,7 @@ static int command_gpiodisable(int argc, char **argv)
 	}
 	return EC_ERROR_INVAL;
 }
-DECLARE_CONSOLE_COMMAND(gpiodisable, command_gpiodisable,
-		"info/list/next/<num> on|off",
-		"Disable GPIO input buffer to investigate power consumption");
+DECLARE_CONSOLE_COMMAND(
+	gpiodisable, command_gpiodisable, "info/list/next/<num> on|off",
+	"Disable GPIO input buffer to investigate power consumption");
 #endif