Revert "Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main"factory-brya-14909.124.B-main

This reverts commit 184d13e77614be3be5374d3fef9d1edf66ec8687.

Reason for revert: broken build due to ec-utils.

Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14909.124.B-main
>
> Relevant changes:
>
> git log --oneline 19d4d68ffa..aa40b859b3 -- baseboard/brya board/agah
> board/anahera board/banshee board/brya board/crota board/felwinter
> board/gimble board/kano board/mithrax board/osiris board/primus
> board/redrix board/taeko board/taniks board/vell board/volmar
> driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
> driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
> driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
> driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
> include/intel_x86.h power/alderlake* power/intel_x86.c
> util/getversion.sh
>
> e6da633c38 driver: Sort header files
> 234a87ae2d tcpci: Add FRS enable to driver structure
> a56be59ccd tcpm_header: add test for tcpm_dump_registers
> 57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
> e420c8ff9a marasov: Modify TypeC and TypeA configuration.
> 43b53e0045 Add default implementation of board_set_charge_limit
> b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
> f1b563c350 baseboard: Sort header files
> 7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
> ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
> 8f89f69a5b crota: disable lid angle sensor for clamshell
>
> BRANCH=None
> BUG=b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
> BUG=b:247100970 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: I0ecfa0e6af68631283c7a9e8f1afb9d827176c62
> Signed-off-by: YH Lin <yueherngl@google.com>

Bug: b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
Bug: b:247100970 b:254328661
Change-Id: Ia14942d1bd6a502062399d77cb59d1f4b549b2c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077247
Auto-Submit: YH Lin <yueherngl@chromium.org>
Tested-by: YH Lin <yueherngl@chromium.org>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Commit-Queue: YH Lin <yueherngl@chromium.org>

1 files changed, 22 insertions, 22 deletions

diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c
index 781a0cc06a..fdea74a691 100644
--- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c
+++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c
@@ -3,6 +3,10 @@
  * found in the LICENSE file.
  */
 
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/ztest.h>
+
 #include "battery.h"
 #include "battery_smart.h"
 #include "chipset.h"
@@ -17,10 +21,6 @@
 #include "usb_pd.h"
 #include "util.h"
 
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/sys/slist.h>
-#include <zephyr/ztest.h>
-
 struct usb_attach_5v_3a_pd_source_rev3_fixture {
 	struct tcpci_partner_data source_5v_3a;
 	struct tcpci_src_emul_data src_ext;
@@ -62,11 +62,11 @@ static void usb_attach_5v_3a_pd_source_before(void *data)
 	/* Clear Alert and Status receive checks */
 	tcpci_src_emul_clear_alert_received(&fixture->src_ext);
 	tcpci_src_emul_clear_status_received(&fixture->src_ext);
-	zassert_false(fixture->src_ext.alert_received);
-	zassert_false(fixture->src_ext.status_received);
+	zassume_false(fixture->src_ext.alert_received);
+	zassume_false(fixture->src_ext.status_received);
 
 	/* Initial check on power state */
-	zassert_true(chipset_in_state(CHIPSET_STATE_ON));
+	zassume_true(chipset_in_state(CHIPSET_STATE_ON));
 }
 
 static void usb_attach_5v_3a_pd_source_after(void *data)
@@ -112,8 +112,8 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, test_batt_cap)
 
 	/* See pe_give_battery_cap_entry() in common/usbc/usb_pe_drp_sm.c */
 
-	zassert_true(battery_is_present(), "Battery must be present");
-	zassert_true(IS_ENABLED(HAS_TASK_HOSTCMD) &&
+	zassume_true(battery_is_present(), "Battery must be present");
+	zassume_true(IS_ENABLED(HAS_TASK_HOSTCMD) &&
 			     *host_get_memmap(EC_MEMMAP_BATTERY_VERSION) != 0,
 		     "Cannot access battery data");
 
@@ -171,7 +171,7 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, test_batt_cap_invalid)
 
 ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_alert_msg)
 {
-	zassert_equal(pd_broadcast_alert_msg(ADO_OTP_EVENT), EC_SUCCESS);
+	zassume_equal(pd_broadcast_alert_msg(ADO_OTP_EVENT), EC_SUCCESS);
 
 	k_sleep(K_SECONDS(2));
 	zassert_true(fixture->src_ext.alert_received);
@@ -186,8 +186,8 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_alert_on_power_state_change)
 	zassert_true(fixture->src_ext.status_received);
 	tcpci_src_emul_clear_alert_received(&fixture->src_ext);
 	tcpci_src_emul_clear_status_received(&fixture->src_ext);
-	zassert_false(fixture->src_ext.alert_received);
-	zassert_false(fixture->src_ext.status_received);
+	zassume_false(fixture->src_ext.alert_received);
+	zassume_false(fixture->src_ext.status_received);
 
 	/* Shutdown and check partner received Alert and Status messages */
 	hook_notify(HOOK_CHIPSET_SHUTDOWN);
@@ -196,8 +196,8 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_alert_on_power_state_change)
 	zassert_true(fixture->src_ext.status_received);
 	tcpci_src_emul_clear_alert_received(&fixture->src_ext);
 	tcpci_src_emul_clear_status_received(&fixture->src_ext);
-	zassert_false(fixture->src_ext.alert_received);
-	zassert_false(fixture->src_ext.status_received);
+	zassume_false(fixture->src_ext.alert_received);
+	zassume_false(fixture->src_ext.status_received);
 
 	/* Startup and check partner received Alert and Status messages */
 	hook_notify(HOOK_CHIPSET_STARTUP);
@@ -206,8 +206,8 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_alert_on_power_state_change)
 	zassert_true(fixture->src_ext.status_received);
 	tcpci_src_emul_clear_alert_received(&fixture->src_ext);
 	tcpci_src_emul_clear_status_received(&fixture->src_ext);
-	zassert_false(fixture->src_ext.alert_received);
-	zassert_false(fixture->src_ext.status_received);
+	zassume_false(fixture->src_ext.alert_received);
+	zassume_false(fixture->src_ext.status_received);
 
 	/* Resume and check partner received Alert and Status messages */
 	hook_notify(HOOK_CHIPSET_RESUME);
@@ -247,9 +247,9 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3,
 	/* Clear alert and status flags set during shutdown */
 	tcpci_src_emul_clear_alert_received(&fixture->src_ext);
 	tcpci_src_emul_clear_status_received(&fixture->src_ext);
-	zassert_false(fixture->src_ext.alert_received);
-	zassert_false(fixture->src_ext.status_received);
-	zassert_true(chipset_in_state(CHIPSET_STATE_ANY_OFF));
+	zassume_false(fixture->src_ext.alert_received);
+	zassume_false(fixture->src_ext.status_received);
+	zassume_true(chipset_in_state(CHIPSET_STATE_ANY_OFF));
 
 	/* While in S5/G3 expect nothing on invalid (too long) press */
 	ado = ADO_EXTENDED_ALERT_EVENT | ADO_POWER_BUTTON_PRESS;
@@ -283,9 +283,9 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_startup_on_pd_button_press)
 	/* Clear alert and status flags set during shutdown */
 	tcpci_src_emul_clear_alert_received(&fixture->src_ext);
 	tcpci_src_emul_clear_status_received(&fixture->src_ext);
-	zassert_false(fixture->src_ext.alert_received);
-	zassert_false(fixture->src_ext.status_received);
-	zassert_true(chipset_in_state(CHIPSET_STATE_ANY_OFF));
+	zassume_false(fixture->src_ext.alert_received);
+	zassume_false(fixture->src_ext.status_received);
+	zassume_true(chipset_in_state(CHIPSET_STATE_ANY_OFF));
 
 	/* While in S5/G3 expect Alert->Get_Status->Status on valid press */
 	ado = ADO_EXTENDED_ALERT_EVENT | ADO_POWER_BUTTON_PRESS;