Merge remote-tracking branch cros/main into firmware-brya-14505.B-mainfirmware-brya-14505.B-main

Generated by: util/update_release_branch.py --board brya firmware-brya-14505.B-main

Relevant changes:

git log --oneline 8641442366..b34dc2ae90 -- board/brya board/brya
util/getversion.sh

BRANCH=None

TEST=`make -j buildall`

Force-Relevant-Builds: all
Change-Id: I63149b4c1782b3ed57f2556755901c21f5f1e3e9
Signed-off-by: Ivan Chen <yulunchen@google.com>

3 files changed, 48 insertions, 10 deletions

diff --git a/zephyr/test/drivers/amd_fp6_usb_mux/src/amd_fp6_usb_mux_test.c b/zephyr/test/drivers/amd_fp6_usb_mux/src/amd_fp6_usb_mux_test.c
index d900b2d3c2..8d8a6982cf 100644
--- a/zephyr/test/drivers/amd_fp6_usb_mux/src/amd_fp6_usb_mux_test.c
+++ b/zephyr/test/drivers/amd_fp6_usb_mux/src/amd_fp6_usb_mux_test.c
@@ -140,7 +140,7 @@ ZTEST_F(amd_fp6_usb_mux, test_chipset_reset)
 ZTEST_F(amd_fp6_usb_mux, test_long_command)
 {
 	/* Allow the mux to take a while, like on real systems */
-	amd_fp6_emul_set_delay(fixture->amd_fp6_emul, 100);
+	amd_fp6_emul_set_delay(fixture->amd_fp6_emul, 6);
 
 	/* Send a basic set to USB mode */
 	usb_mux_set(TEST_PORT, USB_PD_MUX_USB_ENABLED, USB_SWITCH_CONNECT, 1);
diff --git a/zephyr/test/drivers/common_charger/src/test_charge_state_v2.c b/zephyr/test/drivers/common_charger/src/test_charge_state_v2.c
index a62ec2b0ea..b900e97661 100644
--- a/zephyr/test/drivers/common_charger/src/test_charge_state_v2.c
+++ b/zephyr/test/drivers/common_charger/src/test_charge_state_v2.c
@@ -12,35 +12,35 @@
 
 int battery_outside_charging_temperature(void);
 
-struct charge_state_v2_fixture {
+struct charge_state_fixture {
 	struct charge_state_data charge_state_data;
 };
 
 static void *setup(void)
 {
-	static struct charge_state_v2_fixture fixture;
+	static struct charge_state_fixture fixture;
 
 	return &fixture;
 }
 
 static void before(void *f)
 {
-	struct charge_state_v2_fixture *fixture = f;
+	struct charge_state_fixture *fixture = f;
 
 	fixture->charge_state_data = *charge_get_status();
 }
 
 static void after(void *f)
 {
-	struct charge_state_v2_fixture *fixture = f;
+	struct charge_state_fixture *fixture = f;
 
 	*charge_get_status() = fixture->charge_state_data;
 }
 
-ZTEST_SUITE(charge_state_v2, drivers_predicate_post_main, setup, before, after,
+ZTEST_SUITE(charge_state, drivers_predicate_post_main, setup, before, after,
 	    NULL);
 
-ZTEST(charge_state_v2, test_battery_flag_bad_temperature)
+ZTEST(charge_state, test_battery_flag_bad_temperature)
 {
 	struct charge_state_data *curr = charge_get_status();
 
@@ -48,7 +48,7 @@ ZTEST(charge_state_v2, test_battery_flag_bad_temperature)
 	zassert_ok(battery_outside_charging_temperature());
 }
 
-ZTEST(charge_state_v2, test_battery_temperature_range)
+ZTEST(charge_state, test_battery_temperature_range)
 {
 	struct charge_state_data *curr = charge_get_status();
 	const struct battery_info *batt_info = battery_get_info();
@@ -98,7 +98,7 @@ ZTEST(charge_state_v2, test_battery_temperature_range)
 	zassert_ok(battery_outside_charging_temperature());
 }
 
-ZTEST(charge_state_v2, test_current_limit_derating)
+ZTEST(charge_state, test_current_limit_derating)
 {
 	int charger_current_limit;
 
@@ -115,7 +115,7 @@ ZTEST(charge_state_v2, test_current_limit_derating)
 		charger_current_limit);
 }
 
-ZTEST(charge_state_v2, test_minimum_current_limit)
+ZTEST(charge_state, test_minimum_current_limit)
 {
 	int charger_current_limit;
 
diff --git a/zephyr/test/drivers/usbc_usb4_mode/src/usbc_usb4_mode.c b/zephyr/test/drivers/usbc_usb4_mode/src/usbc_usb4_mode.c
index 4c21aaeac4..25fcff61e1 100644
--- a/zephyr/test/drivers/usbc_usb4_mode/src/usbc_usb4_mode.c
+++ b/zephyr/test/drivers/usbc_usb4_mode/src/usbc_usb4_mode.c
@@ -259,6 +259,44 @@ ZTEST_F(usbc_usb4_mode, test_verify_usb4_passive_entry_exit)
 		      USB_PD_MUX_USB_ENABLED, "Failed to see USB set");
 }
 
+/* If the partner claims to support USB4, but communication is only PD 2.0, the
+ * EC should disregard a request to enter USB4 from the host.
+ */
+ZTEST_F(usbc_usb4_mode, test_verify_usb4_pd2_no_entry)
+{
+	struct ec_response_typec_status status;
+
+	tcpci_partner_init(&fixture->partner, PD_REV20);
+	fixture->partner.cable = &passive_usb4;
+	connect_sink_to_port(&fixture->partner, fixture->tcpci_emul,
+			     fixture->charger_emul);
+
+	/* Instruct partner port to accept Enter_USB message */
+	fixture->partner.enter_usb_accept = true;
+
+	/* Verify that we properly identify a USB4 capable passive cable */
+	verify_cable_found(fixture->partner.cable);
+
+	status = host_cmd_typec_status(TEST_PORT);
+	zassert_equal((status.mux_state & USB_MUX_CHECK_MASK),
+		      USB_PD_MUX_USB_ENABLED, "Unexpected starting mux: 0x%02x",
+		      status.mux_state);
+
+	host_cmd_typec_control_enter_mode(TEST_PORT, TYPEC_MODE_USB4);
+	k_sleep(K_SECONDS(1));
+
+	/* PD 2.0 doesn't include Enter_USB, so it's not possible to enter USB4
+	 * mode. A Discover Identity ACK indicating support for USB4 isn't even
+	 * valid under PD 2.0. If the host nevertheless commands the EC to enter
+	 * USB4, the EC should not attempt to do so.
+	 */
+	status = host_cmd_typec_status(TEST_PORT);
+	zassert_equal((status.mux_state & USB_MUX_CHECK_MASK),
+		      USB_PD_MUX_USB_ENABLED, "Failed to see USB still set");
+	zassert_not_equal((status.mux_state & USB_MUX_CHECK_MASK),
+			  USB_PD_MUX_USB4_ENABLED, "Unexpected USB4 mode set");
+}
+
 /*
  * TODO(b/260095516): This test suite is only testing the default good case, and
  * one error case where the cable doesn't support USB4. This suite needs to be