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, 10 insertions, 111 deletions

diff --git a/zephyr/test/drivers/keyboard_scan/src/mkbp_event.c b/zephyr/test/drivers/keyboard_scan/src/mkbp_event.c
index 2d6560fd1e..dee2ba2d1b 100644
--- a/zephyr/test/drivers/keyboard_scan/src/mkbp_event.c
+++ b/zephyr/test/drivers/keyboard_scan/src/mkbp_event.c
@@ -2,23 +2,19 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include <zephyr/ztest.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
+#include <zephyr/fff.h>
+#include <emul/emul_kb_raw.h>
 
-#include "chipset.h"
 #include "console.h"
 #include "host_command.h"
 #include "mkbp_event.h"
 #include "mkbp_fifo.h"
 #include "test/drivers/test_mocks.h"
 #include "test/drivers/test_state.h"
-#include "test/drivers/utils.h"
-
-#include <zephyr/drivers/emul.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/gpio/gpio_emul.h>
-#include <zephyr/fff.h>
-#include <zephyr/ztest.h>
-
-#include <emul/emul_kb_raw.h>
 
 /**
  * @brief FFF fake that will be registered as a callback to monitor the EC->AP
@@ -37,7 +33,7 @@ struct event_fixture {
 
 static struct event_fixture fixture;
 
-ZTEST(mkbp_event, test_host_command_get_events__empty)
+ZTEST(mkbp_event, host_command_get_events__empty)
 {
 	/* Issue a host command to get the next event (from any source) */
 	uint16_t ret;
@@ -50,102 +46,7 @@ ZTEST(mkbp_event, test_host_command_get_events__empty)
 		      "Expected EC_RES_UNAVAILABLE but got %d", ret);
 }
 
-ZTEST(mkbp_event, test_activate_with_events)
-{
-	const struct device *gpio_dev = DEVICE_DT_GET(
-		DT_GPIO_CTLR(DT_NODELABEL(gpio_ap_ec_int_l), gpios));
-	const int gpio_pin = DT_GPIO_PIN(DT_NODELABEL(gpio_ap_ec_int_l), gpios);
-
-	/* Put the chipset to sleep */
-	chipset_force_shutdown(CHIPSET_SHUTDOWN_BUTTON);
-	k_sleep(K_SECONDS(15));
-
-	/* Activate with no events, should not trigger an interrupt */
-	activate_mkbp_with_events(0);
-
-	/* Check that GPIO is still 1 */
-	zassert_equal(1, gpio_emul_output_get(gpio_dev, gpio_pin));
-}
-
-ZTEST(mkbp_event, test_host_command_host_event_wake_mask)
-{
-	struct ec_response_mkbp_event_wake_mask response = { 0 };
-	struct ec_params_mkbp_event_wake_mask params = { 0 };
-	struct host_cmd_handler_args args =
-		BUILD_HOST_COMMAND(EC_CMD_MKBP_WAKE_MASK, 0, response, params);
-
-	/* Set the wake mask to 0x12345678 */
-	params.action = SET_WAKE_MASK;
-	params.mask_type = EC_MKBP_HOST_EVENT_WAKE_MASK;
-	params.new_wake_mask = 0x12345678;
-
-	zassert_ok(host_command_process(&args));
-
-	/* Get the wake mask */
-	params.action = GET_WAKE_MASK;
-
-	zassert_ok(host_command_process(&args));
-	zassert_equal(0x12345678, response.wake_mask);
-}
-
-ZTEST(mkbp_event, test_host_command_event_wake_mask)
-{
-	struct ec_response_mkbp_event_wake_mask response = { 0 };
-	struct ec_params_mkbp_event_wake_mask params = { 0 };
-	struct host_cmd_handler_args args =
-		BUILD_HOST_COMMAND(EC_CMD_MKBP_WAKE_MASK, 0, response, params);
-
-	/* Set the wake mask to 0x87654321 */
-	params.action = SET_WAKE_MASK;
-	params.mask_type = EC_MKBP_EVENT_WAKE_MASK;
-	params.new_wake_mask = 0x87654321;
-
-	zassert_ok(host_command_process(&args));
-
-	/* Get the wake mask */
-	params.action = GET_WAKE_MASK;
-
-	zassert_ok(host_command_process(&args));
-	zassert_equal(0x87654321, response.wake_mask);
-}
-
-ZTEST(mkbp_event, test_host_command_wake_mask__invalid_args)
-{
-	struct ec_response_mkbp_event_wake_mask response = { 0 };
-	struct ec_params_mkbp_event_wake_mask params = {
-		.action = -1,
-		.mask_type = -1,
-	};
-	struct host_cmd_handler_args args =
-		BUILD_HOST_COMMAND(EC_CMD_MKBP_WAKE_MASK, 0, response, params);
-
-	/* Check invalid action */
-	zassert_equal(EC_RES_INVALID_PARAM, host_command_process(&args));
-
-	/* Check invalid mask type in getter */
-	params.action = GET_WAKE_MASK;
-	zassert_equal(EC_RES_INVALID_PARAM, host_command_process(&args));
-
-	/* Check invalid mask type in setter */
-	params.action = SET_WAKE_MASK;
-	zassert_equal(EC_RES_INVALID_PARAM, host_command_process(&args));
-}
-
-ZTEST(mkbp_event, test_console_command_wake_mask_event)
-{
-	check_console_cmd("mkbpwakemask event 500",
-			  "MKBP event wake mask: 0x000001f4", 0, __FILE__,
-			  __LINE__);
-	check_console_cmd("mkbpwakemask hostevent 7934",
-			  "MKBP host event wake mask: 0x00001efe", 0, __FILE__,
-			  __LINE__);
-	check_console_cmd("mkbpwakemask event f", NULL, EC_ERROR_PARAM2,
-			  __FILE__, __LINE__);
-	check_console_cmd("mkbpwakemask event", NULL, EC_ERROR_PARAM_COUNT,
-			  __FILE__, __LINE__);
-}
-
-ZTEST(mkbp_event, test_host_command_get_events__get_event)
+ZTEST(mkbp_event, host_command_get_events__get_event)
 {
 	/* Dispatch a fake keyboard event and ensure it gets returned by the
 	 * host command.
@@ -197,7 +98,7 @@ ZTEST(mkbp_event, test_host_command_get_events__get_event)
 		      interrupt_gpio_monitor_fake.call_count);
 }
 
-ZTEST(mkbp_event, test_no_ap_response)
+ZTEST(mkbp_event, no_ap_response)
 {
 	/* Cause an event but do not send any host commands. This should cause
 	 * the EC to send the interrupt to the AP 3 times before giving up.
@@ -252,7 +153,7 @@ static void *setup(void)
 		.handler = interrupt_gpio_monitor,
 	};
 
-	zassert_ok(gpio_add_callback(interrupt_pin->port,
+	zassume_ok(gpio_add_callback(interrupt_pin->port,
 				     &fixture.callback_config),
 		   "Could not configure GPIO callback.");
 
@@ -282,8 +183,6 @@ static void reset_events(void *data)
 	RESET_FAKE(interrupt_gpio_monitor);
 	RESET_FAKE(mkbp_send_event);
 	mkbp_send_event_fake.return_val = 1;
-
-	test_set_chipset_to_s0();
 }
 
 ZTEST_SUITE(mkbp_event, drivers_predicate_post_main, setup, reset_events,