Merge remote-tracking branch cros/main into factory-brya-14517.B-main

Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
baseboard/brya/relevant-paths.txt factory-brya-14517.B-main

Relevant changes:

git log --oneline 54462f034b..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:259002141 b:255184961 b:247100970 b:259354679 b:260630630
BUG=b:163093572 b:254328661
TEST=`emerge-brya chromeos-ec`

Force-Relevant-Builds: all
Change-Id: Ia85a701fbf6b8e67ec214b9e25e0e55e980a6f47
Signed-off-by: YH Lin <yueherngl@google.com>

1 files changed, 91 insertions, 0 deletions

diff --git a/zephyr/test/drivers/default/src/charge_state_prevent_power_on.c b/zephyr/test/drivers/default/src/charge_state_prevent_power_on.c
new file mode 100644
index 0000000000..ce47ff8042
--- /dev/null
+++ b/zephyr/test/drivers/default/src/charge_state_prevent_power_on.c
@@ -0,0 +1,91 @@
+/* Copyright 2022 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "charge_state.h"
+#include "charge_state_v2.h"
+#include "test/drivers/test_state.h"
+
+#include <zephyr/ztest.h>
+
+/* Test external variable defined in charge_state_v2 */
+extern int charge_prevent_power_on_automatic_power_on;
+
+struct charge_state_prevent_power_on_fixture {
+	struct charge_state_data charge_state_backup;
+	int automatic_power_on;
+};
+
+static void *setup(void)
+{
+	static struct charge_state_prevent_power_on_fixture fixture;
+
+	return &fixture;
+}
+
+static void before(void *f)
+{
+	struct charge_state_prevent_power_on_fixture *fixture = f;
+
+	/* Backup the current state */
+	fixture->charge_state_backup = *charge_get_status();
+	fixture->automatic_power_on =
+		charge_prevent_power_on_automatic_power_on;
+
+	/* Reset the automatic_power_on global */
+	charge_prevent_power_on_automatic_power_on = 1;
+}
+
+static void after(void *f)
+{
+	struct charge_state_prevent_power_on_fixture *fixture = f;
+
+	/* Restore the state from 'before' */
+	*charge_get_status() = fixture->charge_state_backup;
+	charge_prevent_power_on_automatic_power_on =
+		fixture->automatic_power_on;
+}
+
+ZTEST_SUITE(charge_state_prevent_power_on, drivers_predicate_post_main, setup,
+	    before, after, NULL);
+
+ZTEST(charge_state_prevent_power_on, test_allow_power_on)
+{
+	struct batt_params *params = &charge_get_status()->batt;
+
+	/* Force a call to refresh the battery parameters */
+	params->is_present = BP_NOT_SURE;
+	/* Set the charge state to be high enough */
+	params->state_of_charge =
+		CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_FOR_POWER_ON;
+
+	/* Verify that we can power on when the power button was pressed */
+	zassert_false(charge_prevent_power_on(true));
+}
+
+ZTEST(charge_state_prevent_power_on, test_low_charge)
+{
+	struct batt_params *params = &charge_get_status()->batt;
+
+	/* Force a low charge state */
+	params->state_of_charge =
+		CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_FOR_POWER_ON - 1;
+
+	/* Verify that we cannot power on during an automatic power-on */
+	zassert_true(charge_prevent_power_on(false));
+}
+
+ZTEST(charge_state_prevent_power_on, test_consuming_full_input_current)
+{
+	struct batt_params *params = &charge_get_status()->batt;
+
+	params->state_of_charge = 50;
+	zassert_true(charge_is_consuming_full_input_current());
+
+	params->state_of_charge = 0;
+	zassert_false(charge_is_consuming_full_input_current());
+
+	params->state_of_charge = 100;
+	zassert_false(charge_is_consuming_full_input_current());
+}