ish: Trim down the release branchstabilize-wristpin-14469.59.B-ishstabilize-voshyr-14637.B-ishstabilize-quickfix-14695.187.B-ishstabilize-quickfix-14695.124.B-ishstabilize-quickfix-14526.91.B-ishstabilize-14695.85.B-ishstabilize-14695.107.B-ishstabilize-14682.B-ishstabilize-14633.B-ishstabilize-14616.B-ishstabilize-14589.B-ishstabilize-14588.98.B-ishstabilize-14588.14.B-ishstabilize-14588.123.B-ishstabilize-14536.B-ishstabilize-14532.B-ishstabilize-14528.B-ishstabilize-14526.89.B-ishstabilize-14526.84.B-ishstabilize-14526.73.B-ishstabilize-14526.67.B-ishstabilize-14526.57.B-ishstabilize-14498.B-ishstabilize-14496.B-ishstabilize-14477.B-ishstabilize-14469.9.B-ishstabilize-14469.8.B-ishstabilize-14469.58.B-ishstabilize-14469.41.B-ishstabilize-14442.B-ishstabilize-14438.B-ishstabilize-14411.B-ishstabilize-14396.B-ishstabilize-14395.B-ishstabilize-14388.62.B-ishstabilize-14388.61.B-ishstabilize-14388.52.B-ishstabilize-14385.B-ishstabilize-14345.B-ishstabilize-14336.B-ishstabilize-14333.B-ishrelease-R99-14469.B-ishrelease-R98-14388.B-ishrelease-R102-14695.B-ishrelease-R101-14588.B-ishrelease-R100-14526.B-ishfirmware-cherry-14454.B-ishfirmware-brya-14505.B-ishfirmware-brya-14505.71.B-ishfactory-kukui-14374.B-ishfactory-guybrush-14600.B-ishfactory-cherry-14455.B-ishfactory-brya-14517.B-ish

In the interest of making long-term branch maintenance incur as little
technical debt on us as possible, we should not maintain any files on
the branch we are not actually using.

This has the added effect of making it extremely clear when merging CLs
from the main branch when changes have the possibility to affect us.

The follow-on CL adds a convenience script to actually pull updates from
the main branch and generate a CL for the update.

BUG=b:204206272
BRANCH=ish
TEST=make BOARD=arcada_ish && make BOARD=drallion_ish

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

1 files changed, 0 insertions, 528 deletions

diff --git a/zephyr/test/drivers/src/bb_retimer.c b/zephyr/test/drivers/src/bb_retimer.c
deleted file mode 100644
index cecee6020f..0000000000
--- a/zephyr/test/drivers/src/bb_retimer.c
+++ /dev/null
@@ -1,528 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <zephyr.h>
-#include <ztest.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
-
-#include "common.h"
-#include "ec_tasks.h"
-#include "emul/emul_bb_retimer.h"
-#include "emul/emul_common_i2c.h"
-#include "hooks.h"
-#include "i2c.h"
-#include "stubs.h"
-#include "usb_prl_sm.h"
-#include "usb_tc_sm.h"
-
-#include "driver/retimer/bb_retimer.h"
-
-#define GPIO_USB_C1_LS_EN_PATH DT_PATH(named_gpios, usb_c1_ls_en)
-#define GPIO_USB_C1_LS_EN_PORT DT_GPIO_PIN(GPIO_USB_C1_LS_EN_PATH, gpios)
-#define GPIO_USB_C1_RT_RST_ODL_PATH DT_PATH(named_gpios, usb_c1_rt_rst_odl)
-#define GPIO_USB_C1_RT_RST_ODL_PORT	\
-		DT_GPIO_PIN(GPIO_USB_C1_RT_RST_ODL_PATH, gpios)
-#define EMUL_LABEL DT_NODELABEL(usb_c1_bb_retimer_emul)
-
-#define BB_RETIMER_ORD DT_DEP_ORD(EMUL_LABEL)
-
-/** Test is retimer fw update capable function. */
-static void test_bb_is_fw_update_capable(void)
-{
-	/* BB retimer is fw update capable */
-	zassert_true(bb_usb_retimer.is_retimer_fw_update_capable(), NULL);
-}
-
-/** Test is retimer fw update capable function. */
-static void test_bb_set_state(void)
-{
-	struct pd_discovery *disc;
-	uint32_t conn, exp_conn;
-	struct i2c_emul *emul;
-	bool ack_required;
-
-	emul = bb_emul_get(BB_RETIMER_ORD);
-
-	set_test_runner_tid();
-
-	/* Setup emulator fail on write */
-	i2c_common_emul_set_write_fail_reg(emul,
-					   BB_RETIMER_REG_CONNECTION_STATE);
-
-	/* Test fail on reset register write */
-	zassert_equal(EC_ERROR_INVAL,
-		      bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-					 USB_PD_MUX_NONE, &ack_required),
-		      NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-
-	/* Do not fail on write */
-	i2c_common_emul_set_write_fail_reg(emul, I2C_COMMON_EMUL_NO_FAIL_REG);
-
-	/* Set UFP role for whole test */
-	tc_set_data_role(USBC_PORT_C1, PD_ROLE_UFP);
-
-	/* Test none mode */
-	bb_emul_set_reg(emul, BB_RETIMER_REG_CONNECTION_STATE, 0x12144678);
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						     USB_PD_MUX_NONE,
-						     &ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	/* Only UFP mode is set */
-	exp_conn = BB_RETIMER_USB_DATA_ROLE;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Test USB3 gen1 mode */
-	prl_set_rev(USBC_PORT_C1, TCPCI_MSG_SOP_PRIME, PD_REV10);
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						     USB_PD_MUX_USB_ENABLED,
-						     &ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_USB_DATA_ROLE |
-		   BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_USB_3_CONNECTION;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Test USB3 gen2 mode */
-	disc = pd_get_am_discovery_and_notify_access(
-					USBC_PORT_C1, TCPCI_MSG_SOP_PRIME);
-	disc->identity.product_t1.p_rev20.ss = USB_R20_SS_U31_GEN1_GEN2;
-	prl_set_rev(USBC_PORT_C1, TCPCI_MSG_SOP_PRIME, PD_REV30);
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						     USB_PD_MUX_USB_ENABLED,
-						     &ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_USB_DATA_ROLE |
-		   BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_USB_3_CONNECTION |
-		   BB_RETIMER_USB_3_SPEED;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Test TBT mode */
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						USB_PD_MUX_TBT_COMPAT_ENABLED,
-						&ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_USB_DATA_ROLE |
-		   BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_TBT_CONNECTION;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Test USB4 mode */
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						     USB_PD_MUX_USB4_ENABLED,
-						     &ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_USB_DATA_ROLE |
-		   BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_USB4_ENABLED;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Test USB4 mode with polarity inverted */
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						USB_PD_MUX_USB4_ENABLED |
-						USB_PD_MUX_POLARITY_INVERTED,
-						&ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_USB_DATA_ROLE |
-		   BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_CONNECTION_ORIENTATION |
-		   BB_RETIMER_USB4_ENABLED;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Test DP mode */
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						     USB_PD_MUX_DP_ENABLED,
-						     &ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_USB_DATA_ROLE |
-		   BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_DP_CONNECTION;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						     USB_PD_MUX_DP_ENABLED |
-						     USB_PD_MUX_HPD_IRQ,
-						     &ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_USB_DATA_ROLE |
-		   BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_DP_CONNECTION |
-		   BB_RETIMER_IRQ_HPD;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						     USB_PD_MUX_DP_ENABLED |
-						     USB_PD_MUX_HPD_LVL,
-						     &ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_USB_DATA_ROLE |
-		   BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_DP_CONNECTION |
-		   BB_RETIMER_HPD_LVL;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-}
-
-/** Test setting different options for DFP role */
-static void test_bb_set_dfp_state(void)
-{
-	union tbt_mode_resp_device device_resp;
-	union tbt_mode_resp_cable cable_resp;
-	struct pd_discovery *disc, *dev_disc;
-	uint32_t conn, exp_conn;
-	struct i2c_emul *emul;
-	bool ack_required;
-
-	emul = bb_emul_get(BB_RETIMER_ORD);
-
-	set_test_runner_tid();
-
-	tc_set_data_role(USBC_PORT_C1, PD_ROLE_DFP);
-
-	/* Test PD mux none mode with DFP should clear all bits in state */
-	bb_emul_set_reg(emul, BB_RETIMER_REG_CONNECTION_STATE, 0x12144678);
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						     USB_PD_MUX_NONE,
-						     &ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = 0;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Set active cable type */
-	disc = pd_get_am_discovery_and_notify_access(
-					USBC_PORT_C1, TCPCI_MSG_SOP_PRIME);
-	disc->identity.idh.product_type = IDH_PTYPE_ACABLE;
-	disc->identity.product_t2.a2_rev30.active_elem = ACTIVE_RETIMER;
-	prl_set_rev(USBC_PORT_C1, TCPCI_MSG_SOP_PRIME, PD_REV30);
-
-	/* Set cable VDO */
-	disc->svid_cnt = 1;
-	disc->svids[0].svid = USB_VID_INTEL;
-	disc->svids[0].discovery = PD_DISC_COMPLETE;
-	disc->svids[0].mode_cnt = 1;
-	cable_resp.tbt_alt_mode = TBT_ALTERNATE_MODE;
-	cable_resp.tbt_cable_speed = TBT_SS_RES_0;
-	cable_resp.tbt_rounded = TBT_GEN3_NON_ROUNDED;
-	cable_resp.tbt_cable = TBT_CABLE_NON_OPTICAL;
-	cable_resp.retimer_type = USB_NOT_RETIMER;
-	cable_resp.lsrx_comm = BIDIR_LSRX_COMM;
-	cable_resp.tbt_active_passive = TBT_CABLE_PASSIVE;
-	disc->svids[0].mode_vdo[0] = cable_resp.raw_value;
-
-	/* Set device VDO */
-	dev_disc = pd_get_am_discovery_and_notify_access(
-						USBC_PORT_C1, TCPCI_MSG_SOP);
-	dev_disc->svid_cnt = 1;
-	dev_disc->svids[0].svid = USB_VID_INTEL;
-	dev_disc->svids[0].discovery = PD_DISC_COMPLETE;
-	dev_disc->svids[0].mode_cnt = 1;
-	device_resp.tbt_alt_mode = TBT_ALTERNATE_MODE;
-	device_resp.tbt_adapter = TBT_ADAPTER_TBT3;
-	device_resp.intel_spec_b0 = VENDOR_SPECIFIC_NOT_SUPPORTED;
-	device_resp.vendor_spec_b0 = VENDOR_SPECIFIC_NOT_SUPPORTED;
-	device_resp.vendor_spec_b1 = VENDOR_SPECIFIC_NOT_SUPPORTED;
-	dev_disc->svids[0].mode_vdo[0] = device_resp.raw_value;
-
-	/* Test USB mode with active cable */
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						     USB_PD_MUX_USB_ENABLED,
-						     &ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_USB_3_CONNECTION |
-		   BB_RETIMER_USB_3_SPEED |
-		   BB_RETIMER_RE_TIMER_DRIVER |
-		   BB_RETIMER_ACTIVE_PASSIVE;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Test TBT mode with active cable */
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						USB_PD_MUX_TBT_COMPAT_ENABLED,
-						&ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_TBT_CONNECTION |
-		   BB_RETIMER_ACTIVE_PASSIVE;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Test TBT mode with retimer */
-	cable_resp.retimer_type = USB_RETIMER;
-	disc->svids[0].mode_vdo[0] = cable_resp.raw_value;
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						USB_PD_MUX_TBT_COMPAT_ENABLED,
-						&ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_TBT_CONNECTION |
-		   BB_RETIMER_RE_TIMER_DRIVER |
-		   BB_RETIMER_ACTIVE_PASSIVE;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Test TBT mode with optical cable */
-	cable_resp.retimer_type = USB_NOT_RETIMER;
-	cable_resp.tbt_cable = TBT_CABLE_OPTICAL;
-	disc->svids[0].mode_vdo[0] = cable_resp.raw_value;
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						USB_PD_MUX_TBT_COMPAT_ENABLED,
-						&ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_TBT_CONNECTION |
-		   BB_RETIMER_TBT_CABLE_TYPE |
-		   BB_RETIMER_ACTIVE_PASSIVE;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Test TBT mode with active link training */
-	cable_resp.tbt_cable = TBT_CABLE_NON_OPTICAL;
-	cable_resp.lsrx_comm = UNIDIR_LSRX_COMM;
-	disc->svids[0].mode_vdo[0] = cable_resp.raw_value;
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						USB_PD_MUX_TBT_COMPAT_ENABLED,
-						&ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_TBT_CONNECTION |
-		   BB_RETIMER_TBT_ACTIVE_LINK_TRAINING |
-		   BB_RETIMER_ACTIVE_PASSIVE;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Test TBT mode with different cable speeds */
-	cable_resp.lsrx_comm = BIDIR_LSRX_COMM;
-	cable_resp.tbt_cable_speed = TBT_SS_U31_GEN1;
-	disc->svids[0].mode_vdo[0] = cable_resp.raw_value;
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						USB_PD_MUX_TBT_COMPAT_ENABLED,
-						&ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_TBT_CONNECTION |
-		   BB_RETIMER_USB4_TBT_CABLE_SPEED_SUPPORT(1) |
-		   BB_RETIMER_ACTIVE_PASSIVE;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	cable_resp.tbt_cable_speed = TBT_SS_U32_GEN1_GEN2;
-	disc->svids[0].mode_vdo[0] = cable_resp.raw_value;
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						USB_PD_MUX_TBT_COMPAT_ENABLED,
-						&ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_TBT_CONNECTION |
-		   BB_RETIMER_USB4_TBT_CABLE_SPEED_SUPPORT(2) |
-		   BB_RETIMER_ACTIVE_PASSIVE;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	cable_resp.tbt_cable_speed = TBT_SS_TBT_GEN3;
-	disc->svids[0].mode_vdo[0] = cable_resp.raw_value;
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						USB_PD_MUX_TBT_COMPAT_ENABLED,
-						&ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_TBT_CONNECTION |
-		   BB_RETIMER_USB4_TBT_CABLE_SPEED_SUPPORT(3) |
-		   BB_RETIMER_ACTIVE_PASSIVE;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Test TBT mode with TBT gen4 cable */
-	cable_resp.tbt_cable_speed = TBT_SS_RES_0;
-	cable_resp.tbt_rounded = TBT_GEN3_GEN4_ROUNDED_NON_ROUNDED;
-	disc->svids[0].mode_vdo[0] = cable_resp.raw_value;
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						USB_PD_MUX_TBT_COMPAT_ENABLED,
-						&ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_TBT_CONNECTION |
-		   BB_RETIMER_TBT_CABLE_GENERATION(1) |
-		   BB_RETIMER_ACTIVE_PASSIVE;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Test TBT mode with legacy TBT adapter */
-	cable_resp.tbt_rounded = TBT_GEN3_NON_ROUNDED;
-	disc->svids[0].mode_vdo[0] = cable_resp.raw_value;
-	device_resp.tbt_adapter = TBT_ADAPTER_TBT2_LEGACY;
-	dev_disc->svids[0].mode_vdo[0] = device_resp.raw_value;
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						USB_PD_MUX_TBT_COMPAT_ENABLED,
-						&ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_TBT_CONNECTION |
-		   BB_RETIMER_TBT_TYPE |
-		   BB_RETIMER_ACTIVE_PASSIVE;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Test TBT mode with Intel specific b0 */
-	device_resp.tbt_adapter = TBT_ADAPTER_TBT3;
-	device_resp.intel_spec_b0 = VENDOR_SPECIFIC_SUPPORTED;
-	dev_disc->svids[0].mode_vdo[0] = device_resp.raw_value;
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						USB_PD_MUX_TBT_COMPAT_ENABLED,
-						&ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_TBT_CONNECTION |
-		   BB_RETIMER_VPRO_DOCK_DP_OVERDRIVE |
-		   BB_RETIMER_ACTIVE_PASSIVE;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-
-	/* Test TBT mode with vendor specific b1 */
-	device_resp.intel_spec_b0 = VENDOR_SPECIFIC_NOT_SUPPORTED;
-	device_resp.vendor_spec_b1 = VENDOR_SPECIFIC_SUPPORTED;
-	dev_disc->svids[0].mode_vdo[0] = device_resp.raw_value;
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.set(&usb_muxes[USBC_PORT_C1],
-						USB_PD_MUX_TBT_COMPAT_ENABLED,
-						&ack_required), NULL);
-	zassert_false(ack_required, "ACK is never required for BB retimer");
-	conn = bb_emul_get_reg(emul, BB_RETIMER_REG_CONNECTION_STATE);
-	exp_conn = BB_RETIMER_DATA_CONNECTION_PRESENT |
-		   BB_RETIMER_TBT_CONNECTION |
-		   BB_RETIMER_VPRO_DOCK_DP_OVERDRIVE |
-		   BB_RETIMER_ACTIVE_PASSIVE;
-	zassert_equal(exp_conn, conn, "Expected state 0x%lx, got 0x%lx",
-		      exp_conn, conn);
-}
-
-/** Test BB retimer init */
-static void test_bb_init(void)
-{
-	const struct device *gpio_dev =
-		DEVICE_DT_GET(DT_GPIO_CTLR(GPIO_USB_C1_LS_EN_PATH, gpios));
-	struct i2c_emul *emul;
-
-	zassert_not_null(gpio_dev, "Cannot get GPIO device");
-
-	emul = bb_emul_get(BB_RETIMER_ORD);
-
-	/* Set AP to normal state and wait for chipset task */
-	set_mock_power_state(POWER_S0);
-	k_msleep(1);
-
-	/* Setup emulator fail on read */
-	i2c_common_emul_set_read_fail_reg(emul, BB_RETIMER_REG_VENDOR_ID);
-	/* Test fail on vendor ID read */
-	zassert_equal(EC_ERROR_INVAL,
-		      bb_usb_retimer.init(&usb_muxes[USBC_PORT_C1]), NULL);
-	/* Enable pins should be set always after init, when AP is on */
-	zassert_equal(1, gpio_emul_output_get(gpio_dev, GPIO_USB_C1_LS_EN_PORT),
-		      NULL);
-	zassert_equal(1, gpio_emul_output_get(gpio_dev,
-					      GPIO_USB_C1_RT_RST_ODL_PORT),
-		      NULL);
-
-	/* Setup wrong vendor ID */
-	i2c_common_emul_set_read_fail_reg(emul, I2C_COMMON_EMUL_NO_FAIL_REG);
-	bb_emul_set_reg(emul, BB_RETIMER_REG_VENDOR_ID, 0x12144678);
-	/* Test fail on wrong vendor ID */
-	zassert_equal(EC_ERROR_INVAL,
-		      bb_usb_retimer.init(&usb_muxes[USBC_PORT_C1]), NULL);
-	zassert_equal(1, gpio_emul_output_get(gpio_dev, GPIO_USB_C1_LS_EN_PORT),
-		      NULL);
-	zassert_equal(1, gpio_emul_output_get(gpio_dev,
-					      GPIO_USB_C1_RT_RST_ODL_PORT),
-		      NULL);
-
-	/* Setup emulator fail on device ID read */
-	i2c_common_emul_set_read_fail_reg(emul, BB_RETIMER_REG_DEVICE_ID);
-	bb_emul_set_reg(emul, BB_RETIMER_REG_VENDOR_ID, BB_RETIMER_VENDOR_ID_1);
-	/* Test fail on device ID read */
-	zassert_equal(EC_ERROR_INVAL,
-		      bb_usb_retimer.init(&usb_muxes[USBC_PORT_C1]), NULL);
-	zassert_equal(1, gpio_emul_output_get(gpio_dev, GPIO_USB_C1_LS_EN_PORT),
-		      NULL);
-	zassert_equal(1, gpio_emul_output_get(gpio_dev,
-					      GPIO_USB_C1_RT_RST_ODL_PORT),
-		      NULL);
-
-	/* Setup wrong device ID */
-	i2c_common_emul_set_read_fail_reg(emul, I2C_COMMON_EMUL_NO_FAIL_REG);
-	bb_emul_set_reg(emul, BB_RETIMER_REG_DEVICE_ID, 0x12144678);
-	/* Test fail on wrong device ID */
-	zassert_equal(EC_ERROR_INVAL,
-		      bb_usb_retimer.init(&usb_muxes[USBC_PORT_C1]), NULL);
-	zassert_equal(1, gpio_emul_output_get(gpio_dev, GPIO_USB_C1_LS_EN_PORT),
-		      NULL);
-	zassert_equal(1, gpio_emul_output_get(gpio_dev,
-					      GPIO_USB_C1_RT_RST_ODL_PORT),
-		      NULL);
-
-	/* Test successful init */
-	bb_emul_set_reg(emul, BB_RETIMER_REG_DEVICE_ID, BB_RETIMER_DEVICE_ID);
-	zassert_equal(EC_SUCCESS, bb_usb_retimer.init(&usb_muxes[USBC_PORT_C1]),
-		      NULL);
-	zassert_equal(1, gpio_emul_output_get(gpio_dev, GPIO_USB_C1_LS_EN_PORT),
-		      NULL);
-	zassert_equal(1, gpio_emul_output_get(gpio_dev,
-					      GPIO_USB_C1_RT_RST_ODL_PORT),
-		      NULL);
-
-	/* Set AP to off state and wait for chipset task */
-	set_mock_power_state(POWER_G3);
-	k_msleep(1);
-
-	/* With AP off, init should fail and pins should be unset */
-	zassert_equal(EC_ERROR_NOT_POWERED,
-		      bb_usb_retimer.init(&usb_muxes[USBC_PORT_C1]), NULL);
-	zassert_equal(0, gpio_emul_output_get(gpio_dev, GPIO_USB_C1_LS_EN_PORT),
-		      NULL);
-	zassert_equal(0, gpio_emul_output_get(gpio_dev,
-					      GPIO_USB_C1_RT_RST_ODL_PORT),
-		      NULL);
-}
-
-
-void test_suite_bb_retimer(void)
-{
-	ztest_test_suite(bb_retimer,
-			 ztest_user_unit_test(test_bb_is_fw_update_capable),
-			 ztest_user_unit_test(test_bb_set_state),
-			 ztest_user_unit_test(test_bb_set_dfp_state),
-			 ztest_user_unit_test(test_bb_init));
-	ztest_run_test_suite(bb_retimer);
-}