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

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

Relevant changes:

git log --oneline 6c1587ca70..28712dae9d -- board/nocturne_fp
board/dartmonkey 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
a0751778f4 board/nocturne_fp/ro_workarounds.c: 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
58f0246dbe board/nocturne_fp/board_ro.c: 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
84e53a65da board/nocturne_fp/board.h: 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
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:244387210 b:242720240 b:215613183 b:242720910 b:236386294
BUG=b:234181908 b:244781166 b:234781655 b:234143158 b:234181908
BUG=b:237344361 b:236025198 b:234181908 b:180945056 chromium:1098010
BUG=b:246424843 b:234181908 b:131913998
TEST=`make -j buildall`
TEST=./util/run_device_tests.py --board dartmonkey
     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 "panic_data_dartmonkey_v2.0.2887": PASSED
     Test "panic_data_nocturne_fp_v2.2.64": PASSED
     Test "panic_data_nami_fp_v2.2.144": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>

Change-Id: I2c312583a709fedae8fe11d92c22328c3b634bc7

1 files changed, 30 insertions, 27 deletions

diff --git a/common/rgb_keyboard.c b/common/rgb_keyboard.c
index 815e4a3435..5b5b6c6cf3 100644
--- a/common/rgb_keyboard.c
+++ b/common/rgb_keyboard.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+/* Copyright 2022 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -24,7 +24,7 @@
 #define CPRINTS(fmt, args...) cprints(CC_RGBKBD, "RGBKBD: " fmt, ##args)
 
 test_export_static enum ec_rgbkbd_demo demo =
-#if   defined(CONFIG_RGBKBD_DEMO_FLOW)
+#if defined(CONFIG_RGBKBD_DEMO_FLOW)
 	EC_RGBKBD_DEMO_FLOW;
 #elif defined(CONFIG_RGBKBD_DEMO_DOT)
 	EC_RGBKBD_DEMO_DOT;
@@ -35,15 +35,14 @@ test_export_static enum ec_rgbkbd_demo demo =
 const int default_demo_interval_ms = 250;
 test_export_static int demo_interval_ms = -1;
 
-test_export_static
-uint8_t rgbkbd_table[EC_RGBKBD_MAX_KEY_COUNT];
+test_export_static uint8_t rgbkbd_table[EC_RGBKBD_MAX_KEY_COUNT];
 
 static enum rgbkbd_state rgbkbd_state;
 
 const struct rgbkbd_init rgbkbd_init_default = {
 	.gcc = RGBKBD_MAX_GCC_LEVEL / 2,
 	.scale = { RGBKBD_MAX_SCALE, RGBKBD_MAX_SCALE, RGBKBD_MAX_SCALE },
-	.color = { .r = 0xff, .g = 0xff, .b = 0xff },  /* white */
+	.color = { .r = 0xff, .g = 0xff, .b = 0xff }, /* white */
 };
 
 const struct rgbkbd_init *rgbkbd_init_setting = &rgbkbd_init_default;
@@ -88,8 +87,8 @@ static int set_color_single(struct rgb_s color, int x, int y)
 	rv = ctx->cfg->drv->set_color(ctx, offset, &ctx->buf[offset], 1);
 
 	CPRINTS("%set (%d,%d) to color=(%d,%d,%d) grid=%u offset=%u (%d)",
-		rv ? "Failed to s" : "S",
-		x, y, color.r, color.g, color.b, grid, offset, rv);
+		rv ? "Failed to s" : "S", x, y, color.r, color.g, color.b, grid,
+		offset, rv);
 
 	return rv;
 }
@@ -214,14 +213,13 @@ static void rgbkbd_demo_run(enum ec_rgbkbd_demo id)
 	}
 }
 
-test_export_static
-void rgbkbd_init_lookup_table(void)
+test_export_static void rgbkbd_init_lookup_table(void)
 {
 	bool add = true;
 	int i, k = 0;
 
 	if (rgbkbd_map[0] != RGBKBD_DELM ||
-			rgbkbd_map[rgbkbd_map_size - 1] != RGBKBD_DELM) {
+	    rgbkbd_map[rgbkbd_map_size - 1] != RGBKBD_DELM) {
 		CPRINTS("Invalid Key-LED map");
 		return;
 	}
@@ -267,8 +265,8 @@ static int rgbkbd_set_global_brightness(uint8_t gcc)
 
 		e = ctx->cfg->drv->set_gcc(ctx, gcc);
 		if (e) {
-			CPRINTS("Failed to set GCC to %u for grid=%d (%d)",
-				gcc, grid, e);
+			CPRINTS("Failed to set GCC to %u for grid=%d (%d)", gcc,
+				grid, e);
 			rv = e;
 			continue;
 		}
@@ -356,8 +354,8 @@ static int rgbkbd_init(void)
 
 		e = ctx->cfg->drv->set_gcc(ctx, gcc);
 		if (e) {
-			CPRINTS("Failed to set GCC to %u for grid=%d (%d)",
-				gcc, i, e);
+			CPRINTS("Failed to set GCC to %u for grid=%d (%d)", gcc,
+				i, e);
 			rv = e;
 			continue;
 		}
@@ -423,8 +421,8 @@ static int rgbkbd_enable(int enable)
 	}
 
 	if (rv == EC_SUCCESS) {
-		rgbkbd_state = enable ?
-				RGBKBD_STATE_ENABLED : RGBKBD_STATE_DISABLED;
+		rgbkbd_state = enable ? RGBKBD_STATE_ENABLED :
+					RGBKBD_STATE_DISABLED;
 	}
 
 	/* Return EC_SUCCESS or the last error. */
@@ -518,8 +516,8 @@ static enum ec_status hc_rgbkbd_set_color(struct host_cmd_handler_args *args)
 			if (led.u8 == RGBKBD_DELM)
 				/* Reached end of the group. */
 				break;
-			if (set_color_single(p->color[i],
-					     led.coord.x, led.coord.y))
+			if (set_color_single(p->color[i], led.coord.x,
+					     led.coord.y))
 				return EC_RES_ERROR;
 		} while (led.u8 != RGBKBD_DELM);
 	}
@@ -532,8 +530,11 @@ DECLARE_HOST_COMMAND(EC_CMD_RGBKBD_SET_COLOR, hc_rgbkbd_set_color,
 static enum ec_status hc_rgbkbd(struct host_cmd_handler_args *args)
 {
 	const struct ec_params_rgbkbd *p = args->params;
+	struct ec_response_rgbkbd *r = args->response;
 	enum ec_status rv = EC_RES_SUCCESS;
 
+	args->response_size = sizeof(*r);
+
 	if (rgbkbd_late_init())
 		return EC_RES_ERROR;
 
@@ -550,6 +551,9 @@ static enum ec_status hc_rgbkbd(struct host_cmd_handler_args *args)
 		if (rgbkbd_set_scale(p->set_scale.scale, p->set_scale.key))
 			rv = EC_RES_ERROR;
 		break;
+	case EC_RGBKBD_SUBCMD_GET_CONFIG:
+		r->rgbkbd_type = rgbkbd_type;
+		break;
 	default:
 		rv = EC_RES_INVALID_PARAM;
 		break;
@@ -575,7 +579,7 @@ static int int_to_rgb(const char *code, struct rgb_s *rgb)
 	return EC_SUCCESS;
 }
 
-test_export_static int cc_rgb(int argc, char **argv)
+test_export_static int cc_rgb(int argc, const char **argv)
 {
 	char *end, *comma;
 	struct rgb_s rgb, scale;
@@ -606,19 +610,19 @@ test_export_static int cc_rgb(int argc, char **argv)
 
 		if (y < 0) {
 			/* Set all LEDs on column x. */
-			ccprintf("Set column %d to 0x%02x%02x%02x\n",
-				 x, rgb.r, rgb.g, rgb.b);
+			ccprintf("Set column %d to 0x%02x%02x%02x\n", x, rgb.r,
+				 rgb.g, rgb.b);
 			for (i = 0; i < rgbkbd_vsize; i++)
 				rv = set_color_single(rgb, x, i);
 		} else if (x < 0) {
 			/* Set all LEDs on row y. */
-			ccprintf("Set row %d to 0x%02x%02x%02x\n",
-				 y, rgb.r, rgb.g, rgb.b);
+			ccprintf("Set row %d to 0x%02x%02x%02x\n", y, rgb.r,
+				 rgb.g, rgb.b);
 			for (i = 0; i < rgbkbd_hsize; i++)
 				rv = set_color_single(rgb, i, y);
 		} else {
-			ccprintf("Set (%d,%d) to 0x%02x%02x%02x\n",
-				 x, y, rgb.r, rgb.g, rgb.b);
+			ccprintf("Set (%d,%d) to 0x%02x%02x%02x\n", x, y, rgb.r,
+				 rgb.g, rgb.b);
 			rv = set_color_single(rgb, x, y);
 		}
 	} else if (!strcasecmp(argv[1], "all")) {
@@ -680,6 +684,5 @@ DECLARE_CONSOLE_COMMAND(rgb, cc_rgb,
 			"4. rgb demo <id>\n"
 			"5. rgb reset/enable/disable/red\n"
 			"6. rgb scale <24-bit RGB scale>\n",
-			"Control RGB keyboard"
-			);
+			"Control RGB keyboard");
 #endif