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, 40 insertions, 43 deletions

diff --git a/zephyr/shim/src/led_driver/led_pwm.c b/zephyr/shim/src/led_driver/led_pwm.c
index 7935bc0d8a..00002fc32e 100644
--- a/zephyr/shim/src/led_driver/led_pwm.c
+++ b/zephyr/shim/src/led_driver/led_pwm.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.
  *
@@ -27,54 +27,44 @@ LOG_MODULE_REGISTER(pwm_led, LOG_LEVEL_ERR);
  * e.g. freq = 500 Hz, period_ns = 1000000000/500 = 2000000ns
  * duty_cycle = 50 %, pulse_ns  = (2000000*50)/100 = 1000000ns
  */
-const uint32_t period_ns =
-		(NSEC_PER_SEC / DT_PROP(PWM_LED_PINS_NODE, pwm_frequency));
-
-#define SET_PIN(node_id, prop, i)					\
-{									\
-	.pwm = DEVICE_DT_GET(						\
-		DT_PWMS_CTLR(DT_PHANDLE_BY_IDX(node_id, prop, i))),	\
-	.channel = DT_PWMS_CHANNEL(					\
-			DT_PHANDLE_BY_IDX(node_id, prop, i)),		\
-	.flags = DT_PWMS_FLAGS(DT_PHANDLE_BY_IDX(node_id, prop, i)),	\
-	.pulse_ns = DIV_ROUND_NEAREST(					\
-	   period_ns * DT_PHA_BY_IDX(node_id, prop, i, value), 100),	\
-},
-
-#define SET_PWM_PIN(node_id)						\
-{									\
-	DT_FOREACH_PROP_ELEM(node_id, led_pins, SET_PIN)		\
-};
-
-#define GEN_PINS_ARRAY(id)						\
-struct pwm_pin_t PINS_ARRAY(id)[] = SET_PWM_PIN(id)
+
+#define SET_PIN(node_id, prop, i)                                             \
+	{                                                                     \
+		.pwm = PWM_DT_SPEC_GET(DT_PHANDLE_BY_IDX(node_id, prop, i)),  \
+		.pulse_ns = DIV_ROUND_NEAREST(                                \
+			DT_PWMS_PERIOD(DT_PHANDLE_BY_IDX(node_id, prop, i)) * \
+				DT_PHA_BY_IDX(node_id, prop, i, value),       \
+			100),                                                 \
+	},
+
+#define SET_PWM_PIN(node_id) \
+	{ DT_FOREACH_PROP_ELEM(node_id, led_pins, SET_PIN) };
+
+#define GEN_PINS_ARRAY(id) struct pwm_pin_t PINS_ARRAY(id)[] = SET_PWM_PIN(id)
 
 DT_FOREACH_CHILD(PWM_LED_PINS_NODE, GEN_PINS_ARRAY)
 
-#define SET_PIN_NODE(node_id)						\
-{									\
-	.led_color = GET_PROP(node_id, led_color),			\
-	.led_id = GET_PROP(node_id, led_id),				\
-	.br_color = GET_PROP_NVE(node_id, br_color),			\
-	.pwm_pins = PINS_ARRAY(node_id),				\
-	.pins_count = DT_PROP_LEN(node_id, led_pins)			\
-};
+#define SET_PIN_NODE(node_id)                          \
+	{ .led_color = GET_PROP(node_id, led_color),   \
+	  .led_id = GET_PROP(node_id, led_id),         \
+	  .br_color = GET_PROP_NVE(node_id, br_color), \
+	  .pwm_pins = PINS_ARRAY(node_id),             \
+	  .pins_count = DT_PROP_LEN(node_id, led_pins) };
 
 /*
  * Initialize led_pins_node_t struct for each pin node defined
  */
-#define GEN_PINS_NODES(id)						\
-const struct led_pins_node_t PINS_NODE(id) = SET_PIN_NODE(id)
+#define GEN_PINS_NODES(id) \
+	const struct led_pins_node_t PINS_NODE(id) = SET_PIN_NODE(id)
 
 DT_FOREACH_CHILD(PWM_LED_PINS_NODE, GEN_PINS_NODES)
 
 /*
  * Array of pointers to each pin node
  */
-#define PINS_NODE_PTR(id)	&PINS_NODE(id),
-const struct led_pins_node_t *pins_node[] = {
-	DT_FOREACH_CHILD(PWM_LED_PINS_NODE, PINS_NODE_PTR)
-};
+#define PINS_NODE_PTR(id) &PINS_NODE(id),
+const struct led_pins_node_t *pins_node[] = { DT_FOREACH_CHILD(
+	PWM_LED_PINS_NODE, PINS_NODE_PTR) };
 
 /*
  * Set all the PWM channels defined in the node to the defined value,
@@ -83,13 +73,9 @@ const struct led_pins_node_t *pins_node[] = {
  */
 void led_set_color_with_node(const struct led_pins_node_t *pins_node)
 {
+	struct pwm_pin_t *pwm_pins = pins_node->pwm_pins;
 	for (int j = 0; j < pins_node->pins_count; j++) {
-		pwm_set(
-			pins_node->pwm_pins[j].pwm,
-			pins_node->pwm_pins[j].channel,
-			period_ns,
-			pins_node->pwm_pins[j].pulse_ns,
-			pins_node->pwm_pins[j].flags);
+		pwm_set_pulse_dt(&pwm_pins[j].pwm, pwm_pins[j].pulse_ns);
 	}
 }
 
@@ -109,11 +95,18 @@ void led_set_color(enum led_color color, enum ec_led_id led_id)
 
 void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
 {
+	memset(brightness_range, 0, EC_LED_COLOR_COUNT);
+
 	for (int i = 0; i < ARRAY_SIZE(pins_node); i++) {
 		int br_color = pins_node[i]->br_color;
 
-		if (br_color != -1)
+		if (pins_node[i]->led_id != led_id) {
+			continue;
+		}
+
+		if (br_color != -1) {
 			brightness_range[br_color] = 100;
+		}
 	}
 }
 
@@ -124,6 +117,10 @@ int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
 	for (int i = 0; i < ARRAY_SIZE(pins_node); i++) {
 		int br_color = pins_node[i]->br_color;
 
+		if (pins_node[i]->led_id != led_id) {
+			continue;
+		}
+
 		if ((br_color != -1) && (brightness[br_color] != 0)) {
 			color_set = true;
 			led_set_color(pins_node[i]->led_color, led_id);