Increase test coverage of charge_state_v2.c

This improves some of the smart battery mocks, and adds some more tests for
the new change state machine.

BUG=chrome-os-partner:20881
BRANCH=ToT
TEST=make coverage

Line coverage of this file jumps from 53% to 93%.

Change-Id: I4a9b8818cefaffd3022cebe08a36d592b0611295
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/193690

5 files changed, 474 insertions, 34 deletions

diff --git a/board/host/battery.c b/board/host/battery.c
index 85173f8378..a5c447f5d7 100644
--- a/board/host/battery.c
+++ b/board/host/battery.c
@@ -45,6 +45,7 @@ int sb_i2c_read_string(int port, int slave_addr, int offset, uint8_t *data,
 {
 	return EC_SUCCESS;
 }
+DECLARE_TEST_I2C_READ_STRING(sb_i2c_read_string);
 
 int battery_time_at_rate(int rate, int *minutes)
 {
diff --git a/board/host/charger.c b/board/host/charger.c
index 0e72fe8fb4..0ec8ab605c 100644
--- a/board/host/charger.c
+++ b/board/host/charger.c
@@ -27,8 +27,10 @@ static const struct charger_info mock_charger_info = {
 #define OPTION_CHARGE_INHIBIT (1 << 0)
 
 static uint32_t mock_option;
+static uint32_t mock_mode;
 static uint32_t mock_current;
 static uint32_t mock_voltage;
+static uint32_t mock_input_current;
 
 const struct charger_info *charger_get_info(void)
 {
@@ -39,7 +41,7 @@ const struct charger_info *charger_get_info(void)
 int charger_get_status(int *status)
 {
 	*status = CHARGER_LEVEL_2;
-	if (mock_option & CHARGE_FLAG_INHIBIT_CHARGE)
+	if (mock_mode & CHARGE_FLAG_INHIBIT_CHARGE)
 		*status |= CHARGER_CHARGE_INHIBITED;
 
 	return EC_SUCCESS;
@@ -49,9 +51,9 @@ int charger_get_status(int *status)
 int charger_set_mode(int mode)
 {
 	if (mode & CHARGE_FLAG_INHIBIT_CHARGE)
-		mock_option |= OPTION_CHARGE_INHIBIT;
+		mock_mode |= OPTION_CHARGE_INHIBIT;
 	else
-		mock_option &= ~OPTION_CHARGE_INHIBIT;
+		mock_mode &= ~OPTION_CHARGE_INHIBIT;
 	return EC_SUCCESS;
 }
 
@@ -95,12 +97,14 @@ int charger_set_voltage(int voltage)
 
 int charger_get_option(int *option)
 {
+	*option = mock_option;
 	return EC_SUCCESS;
 }
 
 
 int charger_set_option(int option)
 {
+	mock_option = option;
 	return EC_SUCCESS;
 }
 
@@ -119,18 +123,30 @@ int charger_device_id(int *id)
 
 int charger_get_input_current(int *input_current)
 {
+	*input_current = mock_input_current;
 	return EC_SUCCESS;
 }
 
 
-int charger_set_input_current(int input_current)
+int charger_set_input_current(int current)
 {
+	const struct charger_info *info = charger_get_info();
+
+	if (current < info->input_current_min)
+		current = info->input_current_min;
+	if (current > info->input_current_max)
+		current = info->input_current_max;
+
+	if (mock_input_current != current)
+		ccprintf("Charger set input current: %d\n", current);
+
+	mock_input_current = current;
 	return EC_SUCCESS;
 }
 
 
 int charger_post_init(void)
 {
-	mock_current = CONFIG_CHARGER_INPUT_CURRENT;
+	mock_current = mock_input_current = CONFIG_CHARGER_INPUT_CURRENT;
 	return EC_SUCCESS;
 }
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c
index f5adc45b17..a528ba63ff 100644
--- a/common/charge_state_v2.c
+++ b/common/charge_state_v2.c
@@ -38,7 +38,8 @@ static struct charge_state_data curr;
 static int prev_ac, prev_volt, prev_curr, prev_charge;
 static int state_machine_force_idle;
 static unsigned int user_current_limit = -1U;
-static timestamp_t shutdown_warning_time, precharge_start_time;
+test_export_static timestamp_t shutdown_warning_time;
+static timestamp_t precharge_start_time;
 static int battery_seems_to_be_dead;
 static int problems_exist;
 
@@ -802,10 +803,12 @@ static int charge_command_charge_state(struct host_cmd_handler_args *args)
 #endif
 			switch (in->set_param.param) {
 			case CS_PARAM_CHG_VOLTAGE:
+				val = charger_closest_voltage(val);
 				if (charge_request(val, -1))
 					rv = EC_RES_ERROR;
 				break;
 			case CS_PARAM_CHG_CURRENT:
+				val = charger_closest_current(val);
 				if (charge_request(-1, val))
 					rv = EC_RES_ERROR;
 				break;
diff --git a/test/sbs_charging_v2.c b/test/sbs_charging_v2.c
index 69777042a3..095405b3bb 100644
--- a/test/sbs_charging_v2.c
+++ b/test/sbs_charging_v2.c
@@ -16,17 +16,30 @@
 #include "test_util.h"
 #include "util.h"
 
-#define WAIT_CHARGER_TASK 500
+#define WAIT_CHARGER_TASK 600
 #define BATTERY_DETACH_DELAY 35000
 
 static int mock_chipset_state = CHIPSET_STATE_ON;
 static int is_shutdown;
 static int is_force_discharge;
 static int is_hibernated;
+static int override_voltage, override_current, override_usec;
+
+/* The simulation doesn't really hibernate, so we must reset this ourselves */
+extern timestamp_t shutdown_warning_time;
+
+static void reset_mocks(void)
+{
+	mock_chipset_state = CHIPSET_STATE_ON;
+	is_shutdown = is_force_discharge = is_hibernated = 0;
+	override_voltage = override_current = override_usec = 0;
+	shutdown_warning_time.val = 0ULL;
+}
 
 void chipset_force_shutdown(void)
 {
 	is_shutdown = 1;
+	mock_chipset_state = CHIPSET_STATE_HARD_OFF;
 }
 
 int chipset_in_state(int state_mask)
@@ -45,24 +58,41 @@ void system_hibernate(int sec, int usec)
 	is_hibernated = 1;
 }
 
-/* Setup init condition */
-static void test_setup(void)
+int charger_profile_override(struct charge_state_data *curr)
 {
-	const struct battery_info *bat_info = battery_get_info();
+	if (override_voltage)
+		curr->requested_voltage = override_voltage;
+	if (override_current)
+		curr->requested_current = override_current;
 
-	/* 50% of charge */
-	sb_write(SB_RELATIVE_STATE_OF_CHARGE, 50);
-	sb_write(SB_ABSOLUTE_STATE_OF_CHARGE, 50);
-	/* 25 degree Celsius */
-	sb_write(SB_TEMPERATURE, 250 + 2731);
-	/* Normal voltage */
-	sb_write(SB_VOLTAGE, bat_info->voltage_normal);
-	sb_write(SB_CHARGING_VOLTAGE, bat_info->voltage_max);
-	sb_write(SB_CHARGING_CURRENT, 4000);
-	/* Discharging at 100mAh */
-	sb_write(SB_CURRENT, -100);
-	/* Unplug AC */
-	gpio_set_level(GPIO_AC_PRESENT, 0);
+	if (override_usec)
+		return override_usec;
+
+	/* Don't let it sleep a whole minute when the AP is off */
+	if (chipset_in_state(CHIPSET_STATE_ANY_OFF))
+		return CHARGE_POLL_PERIOD_LONG;
+
+	return 0;
+}
+
+static uint32_t meh;
+enum ec_status charger_profile_override_get_param(uint32_t param,
+						  uint32_t *value)
+{
+	if (param == CS_PARAM_CUSTOM_PROFILE_MIN) {
+		*value = meh;
+		return EC_RES_SUCCESS;
+	}
+	return EC_RES_INVALID_PARAM;
+}
+enum ec_status charger_profile_override_set_param(uint32_t param,
+						  uint32_t value)
+{
+	if (param == CS_PARAM_CUSTOM_PROFILE_MIN) {
+		meh = value;
+		return EC_RES_SUCCESS;
+	}
+	return EC_RES_INVALID_PARAM;
 }
 
 static int wait_charging_state(void)
@@ -75,6 +105,39 @@ static int wait_charging_state(void)
 	return state;
 }
 
+/* Setup init condition */
+static void test_setup(int on_ac)
+{
+	const struct battery_info *bat_info = battery_get_info();
+
+	reset_mocks();
+
+	/* 50% of charge */
+	sb_write(SB_RELATIVE_STATE_OF_CHARGE, 50);
+	sb_write(SB_ABSOLUTE_STATE_OF_CHARGE, 50);
+	/* full charge capacity in mAh */
+	sb_write(SB_FULL_CHARGE_CAPACITY, 0xf000);
+	/* 25 degree Celsius */
+	sb_write(SB_TEMPERATURE, CELSIUS_TO_DECI_KELVIN(25));
+	/* battery pack voltage */
+	sb_write(SB_VOLTAGE, bat_info->voltage_normal);
+	/* desired charging voltage/current */
+	sb_write(SB_CHARGING_VOLTAGE, bat_info->voltage_max);
+	sb_write(SB_CHARGING_CURRENT, 4000);
+
+	/* battery pack current is positive when charging */
+	if (on_ac) {
+		sb_write(SB_CURRENT, 1000);
+		gpio_set_level(GPIO_AC_PRESENT, 1);
+	} else {
+		sb_write(SB_CURRENT, -100);
+		gpio_set_level(GPIO_AC_PRESENT, 0);
+	}
+
+	/* Let things stabilize */
+	wait_charging_state();
+}
+
 static int charge_control(enum ec_charge_control_mode mode)
 {
 	struct ec_params_charge_control params;
@@ -83,17 +146,29 @@ static int charge_control(enum ec_charge_control_mode mode)
 				      sizeof(params), NULL, 0);
 }
 
+/* Host Event helpers */
+static int ev_is_set(int event)
+{
+	return host_get_events() & EC_HOST_EVENT_MASK(event);
+}
+static int ev_is_clear(int event)
+{
+	return !ev_is_set(event);
+}
+static void ev_clear(int event)
+{
+	host_clear_events(EC_HOST_EVENT_MASK(event));
+}
+
 static int test_charge_state(void)
 {
 	enum charge_state state;
+	uint32_t flags;
+
+	/* On AC */
+	test_setup(1);
 
-	state = wait_charging_state();
-	/* Plug AC, charging at 1000mAh */
 	ccprintf("[CHARGING TEST] AC on\n");
-	gpio_set_level(GPIO_AC_PRESENT, 1);
-	sb_write(SB_CURRENT, 1000);
-	state = wait_charging_state();
-	TEST_ASSERT(state == PWR_STATE_CHARGE);
 
 	/* Detach battery, charging error */
 	ccprintf("[CHARGING TEST] Detach battery\n");
@@ -106,8 +181,12 @@ static int test_charge_state(void)
 	/* Attach battery again, charging */
 	ccprintf("[CHARGING TEST] Attach battery\n");
 	test_attach_i2c(I2C_PORT_BATTERY, BATTERY_ADDR);
+	/* And changing full capacity should trigger a host event */
+	ev_clear(EC_HOST_EVENT_BATTERY);
+	sb_write(SB_FULL_CHARGE_CAPACITY, 0xeff0);
 	state = wait_charging_state();
 	TEST_ASSERT(state == PWR_STATE_CHARGE);
+	TEST_ASSERT(ev_is_set(EC_HOST_EVENT_BATTERY));
 
 	/* Unplug AC, discharging at 1000mAh */
 	ccprintf("[CHARGING TEST] AC off\n");
@@ -115,6 +194,9 @@ static int test_charge_state(void)
 	sb_write(SB_CURRENT, -1000);
 	state = wait_charging_state();
 	TEST_ASSERT(state == PWR_STATE_DISCHARGE);
+	flags = charge_get_flags();
+	TEST_ASSERT(!(flags & CHARGE_FLAG_EXTERNAL_POWER));
+	TEST_ASSERT(!(flags & CHARGE_FLAG_FORCE_IDLE));
 
 	/* Discharging waaaay overtemp is ignored */
 	ccprintf("[CHARGING TEST] AC off, batt temp = 0xffff\n");
@@ -147,9 +229,15 @@ static int test_charge_state(void)
 	sb_write(SB_CURRENT, 1000);
 	state = wait_charging_state();
 	TEST_ASSERT(state == PWR_STATE_CHARGE);
+	flags = charge_get_flags();
+	TEST_ASSERT(flags & CHARGE_FLAG_EXTERNAL_POWER);
+	TEST_ASSERT(!(flags & CHARGE_FLAG_FORCE_IDLE));
 	charge_control(CHARGE_CONTROL_IDLE);
 	state = wait_charging_state();
 	TEST_ASSERT(state == PWR_STATE_IDLE);
+	flags = charge_get_flags();
+	TEST_ASSERT(flags & CHARGE_FLAG_EXTERNAL_POWER);
+	TEST_ASSERT(flags & CHARGE_FLAG_FORCE_IDLE);
 	charge_control(CHARGE_CONTROL_NORMAL);
 	state = wait_charging_state();
 	TEST_ASSERT(state == PWR_STATE_CHARGE);
@@ -172,10 +260,10 @@ static int test_charge_state(void)
 
 static int test_low_battery(void)
 {
+	test_setup(1);
+
 	ccprintf("[CHARGING TEST] Low battery with AC\n");
-	gpio_set_level(GPIO_AC_PRESENT, 1);
-	is_hibernated = 0;
-	sb_write(SB_CURRENT, 1000);
+
 	sb_write(SB_RELATIVE_STATE_OF_CHARGE, 2);
 	wait_charging_state();
 	mock_chipset_state = CHIPSET_STATE_SOFT_OFF;
@@ -222,12 +310,343 @@ static int test_low_battery(void)
 	return EC_SUCCESS;
 }
 
-void run_test(void)
+static int test_external_funcs(void)
 {
-	test_setup();
+	int rv, temp;
+	uint32_t flags;
+	int state;
+
+	/* Connect the AC */
+	test_setup(1);
+
+	flags = charge_get_flags();
+	TEST_ASSERT(flags & CHARGE_FLAG_EXTERNAL_POWER);
+	TEST_ASSERT(!(flags & CHARGE_FLAG_FORCE_IDLE));
+
+	/* Invalid or do-nothing commands first */
+	UART_INJECT("chg\n");
+	state = wait_charging_state();
+	TEST_ASSERT(state == PWR_STATE_CHARGE);
+	flags = charge_get_flags();
+	TEST_ASSERT(flags & CHARGE_FLAG_EXTERNAL_POWER);
+	TEST_ASSERT(!(flags & CHARGE_FLAG_FORCE_IDLE));
+
+	UART_INJECT("chg blahblah\n");
+	state = wait_charging_state();
+	TEST_ASSERT(state == PWR_STATE_CHARGE);
+	flags = charge_get_flags();
+	TEST_ASSERT(flags & CHARGE_FLAG_EXTERNAL_POWER);
+	TEST_ASSERT(!(flags & CHARGE_FLAG_FORCE_IDLE));
+
+	UART_INJECT("chg idle\n");
+	state = wait_charging_state();
+	TEST_ASSERT(state == PWR_STATE_CHARGE);
+	flags = charge_get_flags();
+	TEST_ASSERT(flags & CHARGE_FLAG_EXTERNAL_POWER);
+	TEST_ASSERT(!(flags & CHARGE_FLAG_FORCE_IDLE));
+
+	UART_INJECT("chg idle blargh\n");
+	state = wait_charging_state();
+	TEST_ASSERT(state == PWR_STATE_CHARGE);
+	flags = charge_get_flags();
+	TEST_ASSERT(flags & CHARGE_FLAG_EXTERNAL_POWER);
+	TEST_ASSERT(!(flags & CHARGE_FLAG_FORCE_IDLE));
+
+	/* Now let's force idle on and off */
+	UART_INJECT("chg idle on\n");
+	state = wait_charging_state();
+	TEST_ASSERT(state == PWR_STATE_IDLE);
+	flags = charge_get_flags();
+	TEST_ASSERT(flags & CHARGE_FLAG_EXTERNAL_POWER);
+	TEST_ASSERT(flags & CHARGE_FLAG_FORCE_IDLE);
 
+	UART_INJECT("chg idle off\n");
+	wait_charging_state();
+	state = wait_charging_state();
+	TEST_ASSERT(state == PWR_STATE_CHARGE);
+	flags = charge_get_flags();
+	TEST_ASSERT(flags & CHARGE_FLAG_EXTERNAL_POWER);
+	TEST_ASSERT(!(flags & CHARGE_FLAG_FORCE_IDLE));
+
+	/* and the rest */
+	TEST_ASSERT(charge_get_state() == PWR_STATE_CHARGE);
+	TEST_ASSERT(!charge_want_shutdown());
+	TEST_ASSERT(charge_get_percent() == 50);
+	temp = 0;
+	rv = charge_temp_sensor_get_val(0, &temp);
+	TEST_ASSERT(rv == EC_SUCCESS);
+	TEST_ASSERT(K_TO_C(temp) == 25);
+
+	return EC_SUCCESS;
+}
+
+#define CHG_OPT1 0x2000
+#define CHG_OPT2 0x4000
+static int test_hc_charge_state(void)
+{
+	enum charge_state state;
+	int i, rv, tmp;
+	struct ec_params_charge_state params;
+	struct ec_response_charge_state resp;
+
+	/* Let's connect the AC again. */
+	test_setup(1);
+
+	/* Initialize the charger options with some nonzero value */
+	TEST_ASSERT(charger_set_option(CHG_OPT1) == EC_SUCCESS);
+
+	/* Get the state */
+	memset(&resp, 0, sizeof(resp));
+	params.cmd = CHARGE_STATE_CMD_GET_STATE;
+	rv = test_send_host_command(EC_CMD_CHARGE_STATE, 0,
+				    &params, sizeof(params),
+				    &resp, sizeof(resp));
+	TEST_ASSERT(rv == EC_RES_SUCCESS);
+	TEST_ASSERT(resp.get_state.ac);
+	TEST_ASSERT(resp.get_state.chg_voltage);
+	TEST_ASSERT(resp.get_state.chg_current);
+	TEST_ASSERT(resp.get_state.chg_input_current);
+	TEST_ASSERT(resp.get_state.batt_state_of_charge);
+
+	/* Check all the params */
+	for (i = 0; i < CS_NUM_BASE_PARAMS; i++) {
+
+		/* Read it */
+		memset(&resp, 0, sizeof(resp));
+		params.cmd = CHARGE_STATE_CMD_GET_PARAM;
+		params.get_param.param = i;
+		rv = test_send_host_command(EC_CMD_CHARGE_STATE, 0,
+					    &params, sizeof(params),
+					    &resp, sizeof(resp));
+		TEST_ASSERT(rv == EC_RES_SUCCESS);
+		TEST_ASSERT(resp.get_param.value);
+
+		/* Bump it up a bit */
+		tmp = resp.get_param.value;
+		switch (i) {
+		case CS_PARAM_CHG_VOLTAGE:
+		case CS_PARAM_CHG_CURRENT:
+		case CS_PARAM_CHG_INPUT_CURRENT:
+			tmp -= 128;		/* Should be valid delta */
+			break;
+		case CS_PARAM_CHG_STATUS:
+			/* This one can't be set */
+			break;
+		case CS_PARAM_CHG_OPTION:
+			tmp = CHG_OPT2;
+			break;
+		}
+		params.cmd = CHARGE_STATE_CMD_SET_PARAM;
+		params.set_param.param = i;
+		params.set_param.value = tmp;
+		rv = test_send_host_command(EC_CMD_CHARGE_STATE, 0,
+					    &params, sizeof(params),
+					    &resp, sizeof(resp));
+		if (i == CS_PARAM_CHG_STATUS)
+			TEST_ASSERT(rv == EC_RES_ACCESS_DENIED);
+		else
+			TEST_ASSERT(rv == EC_RES_SUCCESS);
+		/* Allow the change to take effect */
+		state = wait_charging_state();
+		TEST_ASSERT(state == PWR_STATE_CHARGE);
+
+		/* Read it back again*/
+		memset(&resp, 0, sizeof(resp));
+		params.cmd = CHARGE_STATE_CMD_GET_PARAM;
+		params.get_param.param = i;
+		rv = test_send_host_command(EC_CMD_CHARGE_STATE, 0,
+					    &params, sizeof(params),
+					    &resp, sizeof(resp));
+		TEST_ASSERT(rv == EC_RES_SUCCESS);
+		TEST_ASSERT(resp.get_param.value == tmp);
+	}
+
+	/* And a custom profile param */
+	meh = 0xdeadbeef;
+	memset(&resp, 0, sizeof(resp));
+	params.cmd = CHARGE_STATE_CMD_GET_PARAM;
+	params.get_param.param = CS_PARAM_CUSTOM_PROFILE_MIN;
+	rv = test_send_host_command(EC_CMD_CHARGE_STATE, 0,
+				    &params, sizeof(params),
+				    &resp, sizeof(resp));
+	TEST_ASSERT(rv == EC_RES_SUCCESS);
+	TEST_ASSERT(resp.get_param.value == meh);
+	params.cmd = CHARGE_STATE_CMD_SET_PARAM;
+	params.set_param.param = CS_PARAM_CUSTOM_PROFILE_MIN;
+	params.set_param.value = 0xc0def00d;
+	rv = test_send_host_command(EC_CMD_CHARGE_STATE, 0,
+				    &params, sizeof(params),
+				    &resp, sizeof(resp));
+	TEST_ASSERT(rv == EC_RES_SUCCESS);
+	/* Allow the change to take effect */
+	state = wait_charging_state();
+	TEST_ASSERT(meh == params.set_param.value);
+
+	/* param out of range */
+	params.cmd = CHARGE_STATE_CMD_GET_PARAM;
+	params.get_param.param = CS_NUM_BASE_PARAMS;
+	rv = test_send_host_command(EC_CMD_CHARGE_STATE, 0,
+				    &params, sizeof(params),
+				    &resp, sizeof(resp));
+	TEST_ASSERT(rv == EC_RES_INVALID_PARAM);
+	params.cmd = CHARGE_STATE_CMD_SET_PARAM;
+	params.set_param.param = CS_NUM_BASE_PARAMS;
+	params.set_param.value = 0x1000;	/* random value */
+	rv = test_send_host_command(EC_CMD_CHARGE_STATE, 0,
+				    &params, sizeof(params),
+				    &resp, sizeof(resp));
+	TEST_ASSERT(rv == EC_RES_INVALID_PARAM);
+
+	/* command out of range */
+	params.cmd = CHARGE_STATE_NUM_CMDS;
+	rv = test_send_host_command(EC_CMD_CHARGE_STATE, 0,
+				    &params, sizeof(params),
+				    &resp, sizeof(resp));
+	TEST_ASSERT(rv == EC_RES_INVALID_PARAM);
+
+	/*
+	 * We've screwed with the charger settings, so let the state machine
+	 * reset itself before we stop.
+	 */
+	test_setup(0);
+	test_setup(1);
+
+	return EC_SUCCESS;
+}
+
+static int test_hc_current_limit(void)
+{
+	int rv, norm_current, lower_current;
+	struct ec_params_charge_state cs_params;
+	struct ec_response_charge_state cs_resp;
+	struct ec_params_current_limit cl_params;
+
+	/* On AC */
+	test_setup(1);
+
+	/* See what current the charger is delivering */
+	cs_params.cmd = CHARGE_STATE_CMD_GET_STATE;
+	rv = test_send_host_command(EC_CMD_CHARGE_STATE, 0,
+				    &cs_params, sizeof(cs_params),
+				    &cs_resp, sizeof(cs_resp));
+	TEST_ASSERT(rv == EC_RES_SUCCESS);
+	norm_current = cs_resp.get_state.chg_current;
+
+	/* Lower it a bit */
+	lower_current = norm_current - 256;
+	cl_params.limit = lower_current;
+	rv = test_send_host_command(EC_CMD_CHARGE_CURRENT_LIMIT, 0,
+				    &cl_params, sizeof(cl_params),
+				    0, 0);
+	TEST_ASSERT(rv == EC_RES_SUCCESS);
+	wait_charging_state();
+
+	/* See that it's changed */
+	rv = test_send_host_command(EC_CMD_CHARGE_STATE, 0,
+				    &cs_params, sizeof(cs_params),
+				    &cs_resp, sizeof(cs_resp));
+	TEST_ASSERT(rv == EC_RES_SUCCESS);
+	TEST_ASSERT(lower_current == cs_resp.get_state.chg_current);
+
+	/* Remove the limit */
+	cl_params.limit = -1U;
+	rv = test_send_host_command(EC_CMD_CHARGE_CURRENT_LIMIT, 0,
+				    &cl_params, sizeof(cl_params),
+				    0, 0);
+	TEST_ASSERT(rv == EC_RES_SUCCESS);
+	wait_charging_state();
+
+	/* See that it's back */
+	rv = test_send_host_command(EC_CMD_CHARGE_STATE, 0,
+				    &cs_params, sizeof(cs_params),
+				    &cs_resp, sizeof(cs_resp));
+	TEST_ASSERT(rv == EC_RES_SUCCESS);
+	TEST_ASSERT(norm_current == cs_resp.get_state.chg_current);
+
+	return EC_SUCCESS;
+}
+
+static int test_low_battery_hostevents(void)
+{
+	int state;
+
+	test_setup(0);
+
+	ccprintf("[CHARGING TEST] Low battery host events\n");
+
+	/* You know you make me wanna */
+	sb_write(SB_RELATIVE_STATE_OF_CHARGE, BATTERY_LEVEL_LOW + 1);
+	ev_clear(EC_HOST_EVENT_BATTERY_LOW);
+	ev_clear(EC_HOST_EVENT_BATTERY_CRITICAL);
+	ev_clear(EC_HOST_EVENT_BATTERY_SHUTDOWN);
+	state = wait_charging_state();
+	TEST_ASSERT(state == PWR_STATE_DISCHARGE);
+	TEST_ASSERT(ev_is_clear(EC_HOST_EVENT_BATTERY_LOW));
+	TEST_ASSERT(ev_is_clear(EC_HOST_EVENT_BATTERY_CRITICAL));
+	TEST_ASSERT(ev_is_clear(EC_HOST_EVENT_BATTERY_SHUTDOWN));
+
+	/* (Shout) a little bit louder now */
+	sb_write(SB_RELATIVE_STATE_OF_CHARGE, BATTERY_LEVEL_LOW - 1);
+	state = wait_charging_state();
+	TEST_ASSERT(state == PWR_STATE_DISCHARGE);
+	TEST_ASSERT(ev_is_set(EC_HOST_EVENT_BATTERY_LOW));
+	TEST_ASSERT(ev_is_clear(EC_HOST_EVENT_BATTERY_CRITICAL));
+	TEST_ASSERT(ev_is_clear(EC_HOST_EVENT_BATTERY_SHUTDOWN));
+	TEST_ASSERT(!is_shutdown);
+
+	/* (Shout) a little bit louder now */
+	sb_write(SB_RELATIVE_STATE_OF_CHARGE, BATTERY_LEVEL_CRITICAL + 1);
+	state = wait_charging_state();
+	TEST_ASSERT(state == PWR_STATE_DISCHARGE);
+	TEST_ASSERT(ev_is_set(EC_HOST_EVENT_BATTERY_LOW));
+	TEST_ASSERT(ev_is_clear(EC_HOST_EVENT_BATTERY_CRITICAL));
+	TEST_ASSERT(ev_is_clear(EC_HOST_EVENT_BATTERY_SHUTDOWN));
+	TEST_ASSERT(!is_shutdown);
+
+	/* (Shout) a little bit louder now */
+	sb_write(SB_RELATIVE_STATE_OF_CHARGE, BATTERY_LEVEL_CRITICAL - 1);
+	state = wait_charging_state();
+	TEST_ASSERT(state == PWR_STATE_DISCHARGE);
+	TEST_ASSERT(ev_is_set(EC_HOST_EVENT_BATTERY_LOW));
+	TEST_ASSERT(ev_is_set(EC_HOST_EVENT_BATTERY_CRITICAL));
+	TEST_ASSERT(ev_is_clear(EC_HOST_EVENT_BATTERY_SHUTDOWN));
+	TEST_ASSERT(!is_shutdown);
+
+	/* (Shout) a little bit louder now */
+	sb_write(SB_RELATIVE_STATE_OF_CHARGE, BATTERY_LEVEL_SHUTDOWN + 1);
+	state = wait_charging_state();
+	TEST_ASSERT(state == PWR_STATE_DISCHARGE);
+	TEST_ASSERT(ev_is_set(EC_HOST_EVENT_BATTERY_LOW));
+	TEST_ASSERT(ev_is_set(EC_HOST_EVENT_BATTERY_CRITICAL));
+	TEST_ASSERT(ev_is_clear(EC_HOST_EVENT_BATTERY_SHUTDOWN));
+	TEST_ASSERT(!is_shutdown);
+
+	/* (Shout) a little bit louder now */
+	sb_write(SB_RELATIVE_STATE_OF_CHARGE, BATTERY_LEVEL_SHUTDOWN - 1);
+	state = wait_charging_state();
+	TEST_ASSERT(state == PWR_STATE_DISCHARGE);
+	TEST_ASSERT(ev_is_set(EC_HOST_EVENT_BATTERY_LOW));
+	TEST_ASSERT(ev_is_set(EC_HOST_EVENT_BATTERY_CRITICAL));
+	/* hey-hey-HEY-hey. Doesn't immediately shut down */
+	TEST_ASSERT(ev_is_set(EC_HOST_EVENT_BATTERY_SHUTDOWN));
+	TEST_ASSERT(!is_shutdown);
+	/* after a while, the AP should shut down */
+	sleep(LOW_BATTERY_SHUTDOWN_TIMEOUT);
+	TEST_ASSERT(is_shutdown);
+
+	return EC_SUCCESS;
+}
+
+
+
+void run_test(void)
+{
 	RUN_TEST(test_charge_state);
 	RUN_TEST(test_low_battery);
+	RUN_TEST(test_external_funcs);
+	RUN_TEST(test_hc_charge_state);
+	RUN_TEST(test_hc_current_limit);
+	RUN_TEST(test_low_battery_hostevents);
 
 	test_print_result();
 }
diff --git a/test/test_config.h b/test/test_config.h
index 1ac42ae9d9..adcda73578 100644
--- a/test/test_config.h
+++ b/test/test_config.h
@@ -68,6 +68,7 @@ int board_discharge_on_ac(int enabled);
 #define CONFIG_BATTERY_SMART
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_V2
+#define CONFIG_CHARGER_PROFILE_OVERRIDE
 #define CONFIG_CHARGER_INPUT_CURRENT 4032
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 int board_discharge_on_ac(int enabled);