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, 107 insertions, 105 deletions

diff --git a/driver/usb_mux/usb_mux.c b/driver/usb_mux/usb_mux.c
index 1dea4b8d29..1edcf25179 100644
--- a/driver/usb_mux/usb_mux.c
+++ b/driver/usb_mux/usb_mux.c
@@ -1,4 +1,4 @@
-/* Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 2015 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -6,9 +6,11 @@
 /* USB mux high-level driver. */
 
 #include "atomic.h"
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "chipset.h"
+#include "ec_commands.h"
 #include "hooks.h"
 #include "host_command.h"
 #include "queue.h"
@@ -19,8 +21,8 @@
 #include "util.h"
 
 #ifdef CONFIG_COMMON_RUNTIME
-#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
-#define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ##args)
+#define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ##args)
 #else
 #define CPRINTS(format, args...)
 #define CPRINTF(format, args...)
@@ -35,17 +37,18 @@ static int enable_debug_prints;
 static atomic_t flags[CONFIG_USB_PD_PORT_MAX_COUNT];
 
 /* Device is in low power mode. */
-#define USB_MUX_FLAG_IN_LPM		BIT(0)
+#define USB_MUX_FLAG_IN_LPM BIT(0)
 
 /* Device initialized at least once */
-#define USB_MUX_FLAG_INIT		BIT(1)
+#define USB_MUX_FLAG_INIT BIT(1)
 
 /* Coordinate mux accesses by-port among the tasks */
 static mutex_t mux_lock[CONFIG_USB_PD_PORT_MAX_COUNT];
 
 /* Coordinate which task requires an ACK event */
 static task_id_t ack_task[CONFIG_USB_PD_PORT_MAX_COUNT] = {
-	[0 ... CONFIG_USB_PD_PORT_MAX_COUNT - 1] = TASK_ID_INVALID };
+	[0 ... CONFIG_USB_PD_PORT_MAX_COUNT - 1] = TASK_ID_INVALID
+};
 
 static void perform_mux_set(int port, int index, mux_state_t mux_mode,
 			    enum usb_switch usb_mode, int polarity);
@@ -60,9 +63,6 @@ enum mux_config_type {
 	USB_MUX_HPD_UPDATE,
 };
 
-/* Set all muxes for this board's port */
-#define USB_MUX_ALL_CHIPS -1
-
 /* Define a USB mux task ID for the purpose of linking */
 #ifndef HAS_TASK_USB_MUX
 #define TASK_ID_USB_MUX TASK_ID_INVALID
@@ -79,7 +79,7 @@ enum mux_config_type {
  * Depth must be a power of 2, which is normally enforced by the queue init
  * code, but must be manually enforced here.
  */
-#define MUX_QUEUE_DEPTH		4
+#define MUX_QUEUE_DEPTH 4
 BUILD_ASSERT(POWER_OF_TWO(MUX_QUEUE_DEPTH));
 
 /* Define in order to enable debug info about how long the queue takes */
@@ -87,10 +87,10 @@ BUILD_ASSERT(POWER_OF_TWO(MUX_QUEUE_DEPTH));
 
 struct mux_queue_entry {
 	enum mux_config_type type;
-	int index;			/* Index to set, or USB_MUX_ALL_CHIPS */
-	mux_state_t mux_mode;		/* For both HPD and mux set */
-	enum usb_switch usb_config;	/* Set only */
-	int polarity;			/* Set only */
+	int index; /* Index to set, or TYPEC_USB_MUX_SET_ALL_CHIPS */
+	mux_state_t mux_mode; /* For both HPD and mux set */
+	enum usb_switch usb_config; /* Set only */
+	int polarity; /* Set only */
 #ifdef DEBUG_MUX_QUEUE_TIME
 	timestamp_t enqueued_time;
 #endif
@@ -108,10 +108,9 @@ struct mux_queue_entry {
  */
 static struct queue mux_queue[CONFIG_USB_PD_PORT_MAX_COUNT];
 __maybe_unused static struct queue_state
-				queue_states[CONFIG_USB_PD_PORT_MAX_COUNT];
+	queue_states[CONFIG_USB_PD_PORT_MAX_COUNT];
 __maybe_unused static struct mux_queue_entry
-				queue_buffers[CONFIG_USB_PD_PORT_MAX_COUNT]
-					     [MUX_QUEUE_DEPTH];
+	queue_buffers[CONFIG_USB_PD_PORT_MAX_COUNT][MUX_QUEUE_DEPTH];
 static mutex_t queue_lock[CONFIG_USB_PD_PORT_MAX_COUNT];
 #else
 extern struct queue const mux_queue[];
@@ -136,11 +135,9 @@ static int init_mux_mutex(const struct device *dev)
 SYS_INIT(init_mux_mutex, POST_KERNEL, 50);
 #endif /* CONFIG_ZEPHYR */
 
-__maybe_unused static void mux_task_enqueue(int port, int index,
-					    enum mux_config_type type,
-					    mux_state_t mux_mode,
-					    enum usb_switch usb_config,
-					    int polarity)
+__maybe_unused static void
+mux_task_enqueue(int port, int index, enum mux_config_type type,
+		 mux_state_t mux_mode, enum usb_switch usb_config, int polarity)
 {
 	struct mux_queue_entry new_entry;
 
@@ -177,7 +174,7 @@ static void init_queue_structs(void)
 		mux_queue[i].buffer_units = MUX_QUEUE_DEPTH;
 		mux_queue[i].buffer_units_mask = MUX_QUEUE_DEPTH - 1;
 		mux_queue[i].unit_bytes = sizeof(struct mux_queue_entry);
-		mux_queue[i].buffer = (uint8_t *) &queue_buffers[i][0];
+		mux_queue[i].buffer = (uint8_t *)&queue_buffers[i][0];
 	}
 }
 DECLARE_HOOK(HOOK_INIT, init_queue_structs, HOOK_PRIO_FIRST);
@@ -227,7 +224,8 @@ __maybe_unused void usb_mux_task(void *u)
 							       next.mux_mode);
 				else
 					CPRINTS("Error: Unknown mux task type:"
-						"%d", next.type);
+						"%d",
+						next.type);
 
 #ifdef DEBUG_MUX_QUEUE_TIME
 				CPRINTS("C%d: Completed mux set queued %d "
@@ -254,16 +252,14 @@ __maybe_unused void usb_mux_task(void *u)
 }
 
 /* Configure the MUX */
-static int configure_mux(int port, int index,
-			 enum mux_config_type config,
+static int configure_mux(int port, int index, enum mux_config_type config,
 			 mux_state_t *mux_state)
 {
 	int rv = EC_SUCCESS;
-	const struct usb_mux *mux_ptr;
+	const struct usb_mux_chain *mux_chain;
 	int chip = 0;
 
-	if (config == USB_MUX_SET_MODE ||
-	    config == USB_MUX_GET_MODE) {
+	if (config == USB_MUX_SET_MODE || config == USB_MUX_GET_MODE) {
 		if (mux_state == NULL)
 			return EC_ERROR_INVAL;
 
@@ -276,14 +272,15 @@ static int configure_mux(int port, int index,
 	 * MUXes.  So when we change one, we traverse the whole list
 	 * to make sure they are all updated appropriately.
 	 */
-	for (mux_ptr = &usb_muxes[port];
-	     rv == EC_SUCCESS && mux_ptr != NULL;
-	     mux_ptr = mux_ptr->next_mux, chip++) {
+	for (mux_chain = &usb_muxes[port];
+	     rv == EC_SUCCESS && mux_chain != NULL && mux_chain->mux != NULL;
+	     mux_chain = mux_chain->next, chip++) {
 		mux_state_t lcl_state;
+		const struct usb_mux *mux_ptr = mux_chain->mux;
 		const struct usb_mux_driver *drv = mux_ptr->driver;
 		bool ack_required = false;
 
-		if (index != USB_MUX_ALL_CHIPS && index != chip)
+		if (index != TYPEC_USB_MUX_SET_ALL_CHIPS && index != chip)
 			continue;
 
 		/* Action time!  Lock this mux */
@@ -321,6 +318,10 @@ static int configure_mux(int port, int index,
 			if (mux_ptr->flags & USB_MUX_FLAG_SET_WITHOUT_FLIP)
 				lcl_state &= ~USB_PD_MUX_POLARITY_INVERTED;
 
+			if ((lcl_state != USB_PD_MUX_NONE) &&
+			    (mux_ptr->flags & USB_MUX_FLAG_POLARITY_INVERTED))
+				lcl_state ^= USB_PD_MUX_POLARITY_INVERTED;
+
 			if (drv && drv->set) {
 				rv = drv->set(mux_ptr, lcl_state,
 					      &ack_required);
@@ -335,10 +336,12 @@ static int configure_mux(int port, int index,
 			/* Inform the AP its selected mux is set */
 			if (IS_ENABLED(CONFIG_USB_MUX_AP_CONTROL)) {
 				if (chip == 0)
-					pd_notify_event(port,
+					pd_notify_event(
+						port,
 						PD_STATUS_EVENT_MUX_0_SET_DONE);
 				else if (chip == 1)
-					pd_notify_event(port,
+					pd_notify_event(
+						port,
 						PD_STATUS_EVENT_MUX_1_SET_DONE);
 			}
 
@@ -363,7 +366,6 @@ static int configure_mux(int port, int index,
 			if (mux_ptr->hpd_update)
 				mux_ptr->hpd_update(mux_ptr, *mux_state,
 						    &ack_required);
-
 		}
 
 		/* Unlock before any host command waits */
@@ -380,10 +382,10 @@ static int configure_mux(int port, int index,
 				assert(task_get_current() == TASK_ID_USB_MUX);
 			} else {
 #if defined(CONFIG_ZEPHYR) && defined(TEST_BUILD)
-				assert(port ==
-				       TASK_ID_TO_PD_PORT(task_get_current()) ||
+				assert(port == TASK_ID_TO_PD_PORT(
+						       task_get_current()) ||
 				       task_get_current() ==
-				       TASK_ID_TEST_RUNNER);
+					       TASK_ID_TEST_RUNNER);
 #else
 				assert(port ==
 				       TASK_ID_TO_PD_PORT(task_get_current()));
@@ -397,7 +399,7 @@ static int configure_mux(int port, int index,
 			 * mux, but could be made configurable for other
 			 * purposes.
 			 */
-			task_wait_event_mask(PD_EVENT_AP_MUX_DONE, 100*MSEC);
+			task_wait_event_mask(PD_EVENT_AP_MUX_DONE, 100 * MSEC);
 			ack_task[port] = TASK_ID_INVALID;
 
 			usleep(12.5 * MSEC);
@@ -405,8 +407,7 @@ static int configure_mux(int port, int index,
 	}
 
 	if (rv)
-		CPRINTS("mux config:%d, port:%d, rv:%d",
-			config, port, rv);
+		CPRINTS("mux config:%d, port:%d, rv:%d", config, port, rv);
 
 	return rv;
 }
@@ -421,7 +422,8 @@ static void enter_low_power_mode(int port)
 	atomic_or(&flags[port], USB_MUX_FLAG_IN_LPM);
 
 	/* Apply any low power customization if present */
-	configure_mux(port, USB_MUX_ALL_CHIPS, USB_MUX_LOW_POWER, NULL);
+	configure_mux(port, TYPEC_USB_MUX_SET_ALL_CHIPS, USB_MUX_LOW_POWER,
+		      NULL);
 }
 
 static int exit_low_power_mode(int port)
@@ -453,7 +455,8 @@ void usb_mux_init(int port)
 		return;
 	}
 
-	rv = configure_mux(port, USB_MUX_ALL_CHIPS, USB_MUX_INIT, NULL);
+	rv = configure_mux(port, TYPEC_USB_MUX_SET_ALL_CHIPS, USB_MUX_INIT,
+			   NULL);
 
 	if (rv == EC_SUCCESS)
 		atomic_or(&flags[port], USB_MUX_FLAG_INIT);
@@ -474,7 +477,7 @@ static void perform_mux_set(int port, int index, mux_state_t mux_mode,
 	mux_state_t mux_state;
 	const int should_enter_low_power_mode =
 		(mux_mode == USB_PD_MUX_NONE &&
-		usb_mode == USB_SWITCH_DISCONNECT);
+		 usb_mode == USB_SWITCH_DISCONNECT);
 
 	/* Perform initialization if not initialized yet */
 	if (!(flags[port] & USB_MUX_FLAG_INIT))
@@ -496,17 +499,16 @@ static void perform_mux_set(int port, int index, mux_state_t mux_mode,
 		return;
 
 	/* Configure superspeed lanes */
-	mux_state = ((mux_mode != USB_PD_MUX_NONE) && polarity)
-			? mux_mode | USB_PD_MUX_POLARITY_INVERTED
-			: mux_mode;
+	mux_state = ((mux_mode != USB_PD_MUX_NONE) && polarity) ?
+			    mux_mode | USB_PD_MUX_POLARITY_INVERTED :
+			    mux_mode;
 
 	if (configure_mux(port, index, USB_MUX_SET_MODE, &mux_state))
 		return;
 
 	if (enable_debug_prints)
-		CPRINTS(
-		     "usb/dp mux: port(%d) typec_mux(%d) usb2(%d) polarity(%d)",
-		     port, mux_mode, usb_mode, polarity);
+		CPRINTS("usb/dp mux: port(%d) typec_mux(%d) usb2(%d) polarity(%d)",
+			port, mux_mode, usb_mode, polarity);
 
 	/*
 	 * If we are completely disconnecting the mux, then we should put it in
@@ -516,20 +518,20 @@ static void perform_mux_set(int port, int index, mux_state_t mux_mode,
 		enter_low_power_mode(port);
 }
 
-void usb_mux_set(int port, mux_state_t mux_mode,
-		 enum usb_switch usb_mode, int polarity)
+void usb_mux_set(int port, mux_state_t mux_mode, enum usb_switch usb_mode,
+		 int polarity)
 {
 	if (port >= board_get_usb_pd_port_count())
 		return;
 
 	/* Block if we have no mux task, but otherwise queue it up and return */
 	if (IS_ENABLED(HAS_TASK_USB_MUX))
-		mux_task_enqueue(port, USB_MUX_ALL_CHIPS,
-				 USB_MUX_SET_MODE, mux_mode,
-				 usb_mode, polarity);
+		mux_task_enqueue(port, TYPEC_USB_MUX_SET_ALL_CHIPS,
+				 USB_MUX_SET_MODE, mux_mode, usb_mode,
+				 polarity);
 	else
-		perform_mux_set(port, USB_MUX_ALL_CHIPS,
-				mux_mode, usb_mode, polarity);
+		perform_mux_set(port, TYPEC_USB_MUX_SET_ALL_CHIPS, mux_mode,
+				usb_mode, polarity);
 }
 
 void usb_mux_set_single(int port, int index, mux_state_t mux_mode,
@@ -540,12 +542,10 @@ void usb_mux_set_single(int port, int index, mux_state_t mux_mode,
 
 	/* Block if we have no mux task, but otherwise queue it up and return */
 	if (IS_ENABLED(HAS_TASK_USB_MUX))
-		mux_task_enqueue(port, index,
-				 USB_MUX_SET_MODE, mux_mode,
+		mux_task_enqueue(port, index, USB_MUX_SET_MODE, mux_mode,
 				 usb_mode, polarity);
 	else
-		perform_mux_set(port, index,
-				mux_mode, usb_mode, polarity);
+		perform_mux_set(port, index, mux_mode, usb_mode, polarity);
 }
 
 bool usb_mux_set_completed(int port)
@@ -561,9 +561,9 @@ bool usb_mux_set_completed(int port)
 	mutex_lock(&queue_lock[port]);
 
 	for (queue_begin(&mux_queue[port], &it); it.ptr != NULL;
-					queue_next(&mux_queue[port], &it)) {
+	     queue_next(&mux_queue[port], &it)) {
 		const struct mux_queue_entry *check =
-					(struct mux_queue_entry *) it.ptr;
+			(struct mux_queue_entry *)it.ptr;
 
 		if (check->type == USB_MUX_SET_MODE) {
 			sets_pending = true;
@@ -590,8 +590,8 @@ static enum ec_error_list try_usb_mux_get(int port, mux_state_t *mux_state)
 		return EC_SUCCESS;
 	}
 
-	return configure_mux(port, USB_MUX_ALL_CHIPS, USB_MUX_GET_MODE,
-			     mux_state);
+	return configure_mux(port, TYPEC_USB_MUX_SET_ALL_CHIPS,
+			     USB_MUX_GET_MODE, mux_state);
 }
 
 mux_state_t usb_mux_get(int port)
@@ -619,7 +619,7 @@ void usb_mux_flip(int port)
 	if (exit_low_power_mode(port) != EC_SUCCESS)
 		return;
 
-	if (configure_mux(port, USB_MUX_ALL_CHIPS, USB_MUX_GET_MODE,
+	if (configure_mux(port, TYPEC_USB_MUX_SET_ALL_CHIPS, USB_MUX_GET_MODE,
 			  &mux_state))
 		return;
 
@@ -628,7 +628,8 @@ void usb_mux_flip(int port)
 	else
 		mux_state |= USB_PD_MUX_POLARITY_INVERTED;
 
-	configure_mux(port, USB_MUX_ALL_CHIPS, USB_MUX_SET_MODE, &mux_state);
+	configure_mux(port, TYPEC_USB_MUX_SET_ALL_CHIPS, USB_MUX_SET_MODE,
+		      &mux_state);
 }
 
 static void perform_mux_hpd_update(int port, int index, mux_state_t hpd_state)
@@ -650,10 +651,11 @@ void usb_mux_hpd_update(int port, mux_state_t hpd_state)
 
 	/* Send to the mux task if present to maintain sequencing with sets */
 	if (IS_ENABLED(HAS_TASK_USB_MUX))
-		mux_task_enqueue(port, USB_MUX_ALL_CHIPS, USB_MUX_HPD_UPDATE,
-				 hpd_state, 0, 0);
+		mux_task_enqueue(port, TYPEC_USB_MUX_SET_ALL_CHIPS,
+				 USB_MUX_HPD_UPDATE, hpd_state, 0, 0);
 	else
-		perform_mux_hpd_update(port, USB_MUX_ALL_CHIPS, hpd_state);
+		perform_mux_hpd_update(port, TYPEC_USB_MUX_SET_ALL_CHIPS,
+				       hpd_state);
 }
 
 int usb_mux_retimer_fw_update_port_info(void)
@@ -661,15 +663,17 @@ int usb_mux_retimer_fw_update_port_info(void)
 	int i;
 	int port_info = 0;
 	const struct usb_mux *mux_ptr;
+	const struct usb_mux_chain *mux_chain;
 
 	for (i = 0; i < CONFIG_USB_PD_PORT_MAX_COUNT; i++) {
-		mux_ptr = &usb_muxes[i];
-		while (mux_ptr) {
+		mux_chain = &usb_muxes[i];
+		while (mux_chain && mux_chain->mux) {
+			mux_ptr = mux_chain->mux;
 			if (mux_ptr->driver &&
-				mux_ptr->driver->is_retimer_fw_update_capable &&
-				mux_ptr->driver->is_retimer_fw_update_capable())
+			    mux_ptr->driver->is_retimer_fw_update_capable &&
+			    mux_ptr->driver->is_retimer_fw_update_capable())
 				port_info |= BIT(i);
-			mux_ptr = mux_ptr->next_mux;
+			mux_chain = mux_chain->next;
 		}
 	}
 	return port_info;
@@ -680,8 +684,8 @@ static void mux_chipset_reset(void)
 	int port;
 
 	for (port = 0; port < board_get_usb_pd_port_count(); ++port)
-		configure_mux(port, USB_MUX_ALL_CHIPS, USB_MUX_CHIPSET_RESET,
-			      NULL);
+		configure_mux(port, TYPEC_USB_MUX_SET_ALL_CHIPS,
+			      USB_MUX_CHIPSET_RESET, NULL);
 }
 DECLARE_HOOK(HOOK_CHIPSET_RESET, mux_chipset_reset, HOOK_PRIO_DEFAULT);
 
@@ -693,26 +697,28 @@ static void usb_mux_reset_in_g3(void)
 {
 	int port;
 	const struct usb_mux *mux_ptr;
+	const struct usb_mux_chain *mux_chain;
 
 	for (port = 0; port < board_get_usb_pd_port_count(); port++) {
-		mux_ptr = &usb_muxes[port];
+		mux_chain = &usb_muxes[port];
 
-		while (mux_ptr) {
+		while (mux_chain && mux_chain->mux) {
+			mux_ptr = mux_chain->mux;
 			if (mux_ptr->flags & USB_MUX_FLAG_RESETS_IN_G3) {
 				atomic_clear_bits(&flags[port],
 						  USB_MUX_FLAG_INIT |
-						  USB_MUX_FLAG_IN_LPM);
+							  USB_MUX_FLAG_IN_LPM);
 			}
-			mux_ptr = mux_ptr->next_mux;
+			mux_chain = mux_chain->next;
 		}
 	}
 }
 DECLARE_HOOK(HOOK_CHIPSET_HARD_OFF, usb_mux_reset_in_g3, HOOK_PRIO_DEFAULT);
 
 #ifdef CONFIG_CMD_TYPEC
-static int command_typec(int argc, char **argv)
+static int command_typec(int argc, const char **argv)
 {
-	const char * const mux_name[] = {"none", "usb", "dp", "dock"};
+	const char *const mux_name[] = { "none", "usb", "dp", "dock" };
 	char *e;
 	int port;
 	mux_state_t mux = USB_PD_MUX_NONE;
@@ -735,16 +741,16 @@ static int command_typec(int argc, char **argv)
 
 		mux_state = usb_mux_get(port);
 		ccprintf("Port %d: USB=%d DP=%d POLARITY=%s HPD_IRQ=%d "
-			"HPD_LVL=%d SAFE=%d TBT=%d USB4=%d\n", port,
-			!!(mux_state & USB_PD_MUX_USB_ENABLED),
-			!!(mux_state & USB_PD_MUX_DP_ENABLED),
-			mux_state & USB_PD_MUX_POLARITY_INVERTED ?
-				"INVERTED" : "NORMAL",
-			!!(mux_state & USB_PD_MUX_HPD_IRQ),
-			!!(mux_state & USB_PD_MUX_HPD_LVL),
-			!!(mux_state & USB_PD_MUX_SAFE_MODE),
-			!!(mux_state & USB_PD_MUX_TBT_COMPAT_ENABLED),
-			!!(mux_state & USB_PD_MUX_USB4_ENABLED));
+			 "HPD_LVL=%d SAFE=%d TBT=%d USB4=%d\n",
+			 port, !!(mux_state & USB_PD_MUX_USB_ENABLED),
+			 !!(mux_state & USB_PD_MUX_DP_ENABLED),
+			 mux_state & USB_PD_MUX_POLARITY_INVERTED ? "INVERTED" :
+								    "NORMAL",
+			 !!(mux_state & USB_PD_MUX_HPD_IRQ),
+			 !!(mux_state & USB_PD_MUX_HPD_LVL),
+			 !!(mux_state & USB_PD_MUX_SAFE_MODE),
+			 !!(mux_state & USB_PD_MUX_TBT_COMPAT_ENABLED),
+			 !!(mux_state & USB_PD_MUX_USB4_ENABLED));
 
 		return EC_SUCCESS;
 	}
@@ -752,14 +758,13 @@ static int command_typec(int argc, char **argv)
 	for (i = 0; i < ARRAY_SIZE(mux_name); i++)
 		if (!strcasecmp(argv[2], mux_name[i]))
 			mux = i;
-	usb_mux_set(port, mux, mux == USB_PD_MUX_NONE ?
-				      USB_SWITCH_DISCONNECT :
-				      USB_SWITCH_CONNECT,
-			  polarity_rm_dts(pd_get_polarity(port)));
+	usb_mux_set(port, mux,
+		    mux == USB_PD_MUX_NONE ? USB_SWITCH_DISCONNECT :
+					     USB_SWITCH_CONNECT,
+		    polarity_rm_dts(pd_get_polarity(port)));
 	return EC_SUCCESS;
 }
-DECLARE_CONSOLE_COMMAND(typec, command_typec,
-			"[port|debug] [none|usb|dp|dock]",
+DECLARE_CONSOLE_COMMAND(typec, command_typec, "[port|debug] [none|usb|dp|dock]",
 			"Control type-C connector muxing");
 #endif
 
@@ -786,8 +791,7 @@ static enum ec_status hc_usb_pd_mux_info(struct host_cmd_handler_args *args)
 	args->response_size = sizeof(*r);
 	return EC_RES_SUCCESS;
 }
-DECLARE_HOST_COMMAND(EC_CMD_USB_PD_MUX_INFO,
-		     hc_usb_pd_mux_info,
+DECLARE_HOST_COMMAND(EC_CMD_USB_PD_MUX_INFO, hc_usb_pd_mux_info,
 		     EC_VER_MASK(0));
 
 static enum ec_status hc_usb_pd_mux_ack(struct host_cmd_handler_args *args)
@@ -802,6 +806,4 @@ static enum ec_status hc_usb_pd_mux_ack(struct host_cmd_handler_args *args)
 
 	return EC_RES_SUCCESS;
 }
-DECLARE_HOST_COMMAND(EC_CMD_USB_PD_MUX_ACK,
-		     hc_usb_pd_mux_ack,
-		     EC_VER_MASK(0));
+DECLARE_HOST_COMMAND(EC_CMD_USB_PD_MUX_ACK, hc_usb_pd_mux_ack, EC_VER_MASK(0));