ish: Trim down the release branchstabilize-wristpin-14469.59.B-ishstabilize-voshyr-14637.B-ishstabilize-quickfix-14695.187.B-ishstabilize-quickfix-14695.124.B-ishstabilize-quickfix-14526.91.B-ishstabilize-14695.85.B-ishstabilize-14695.107.B-ishstabilize-14682.B-ishstabilize-14633.B-ishstabilize-14616.B-ishstabilize-14589.B-ishstabilize-14588.98.B-ishstabilize-14588.14.B-ishstabilize-14588.123.B-ishstabilize-14536.B-ishstabilize-14532.B-ishstabilize-14528.B-ishstabilize-14526.89.B-ishstabilize-14526.84.B-ishstabilize-14526.73.B-ishstabilize-14526.67.B-ishstabilize-14526.57.B-ishstabilize-14498.B-ishstabilize-14496.B-ishstabilize-14477.B-ishstabilize-14469.9.B-ishstabilize-14469.8.B-ishstabilize-14469.58.B-ishstabilize-14469.41.B-ishstabilize-14442.B-ishstabilize-14438.B-ishstabilize-14411.B-ishstabilize-14396.B-ishstabilize-14395.B-ishstabilize-14388.62.B-ishstabilize-14388.61.B-ishstabilize-14388.52.B-ishstabilize-14385.B-ishstabilize-14345.B-ishstabilize-14336.B-ishstabilize-14333.B-ishrelease-R99-14469.B-ishrelease-R98-14388.B-ishrelease-R102-14695.B-ishrelease-R101-14588.B-ishrelease-R100-14526.B-ishfirmware-cherry-14454.B-ishfirmware-brya-14505.B-ishfirmware-brya-14505.71.B-ishfactory-kukui-14374.B-ishfactory-guybrush-14600.B-ishfactory-cherry-14455.B-ishfactory-brya-14517.B-ish

In the interest of making long-term branch maintenance incur as little
technical debt on us as possible, we should not maintain any files on
the branch we are not actually using.

This has the added effect of making it extremely clear when merging CLs
from the main branch when changes have the possibility to affect us.

The follow-on CL adds a convenience script to actually pull updates from
the main branch and generate a CL for the update.

BUG=b:204206272
BRANCH=ish
TEST=make BOARD=arcada_ish && make BOARD=drallion_ish

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

1 files changed, 0 insertions, 229 deletions

diff --git a/common/host_command_pd.c b/common/host_command_pd.c
deleted file mode 100644
index f9b67c8b8d..0000000000
--- a/common/host_command_pd.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/* Copyright 2014 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* Host command module for PD MCU */
-
-#include "charge_state.h"
-#include "common.h"
-#include "console.h"
-#include "gpio.h"
-#include "host_command.h"
-#include "lightbar.h"
-#include "panic.h"
-#include "system.h"
-#include "task.h"
-#include "tcpm/tcpm.h"
-#include "timer.h"
-#include "usb_pd.h"
-#include "usb_pd_tcpm.h"
-#include "util.h"
-
-#define CPRINTS(format, args...) cprints(CC_PD_HOST_CMD, format, ## args)
-
-#define TASK_EVENT_EXCHANGE_PD_STATUS  TASK_EVENT_CUSTOM_BIT(0)
-#define TASK_EVENT_HIBERNATING         TASK_EVENT_CUSTOM_BIT(1)
-
-/* Define local option for if we are a TCPM with an off chip TCPC */
-#if defined(CONFIG_USB_POWER_DELIVERY) && !defined(CONFIG_USB_PD_TCPM_STUB)
-#define USB_TCPM_WITH_OFF_CHIP_TCPC
-#endif
-
-#ifdef CONFIG_HOSTCMD_PD_CHG_CTRL
-/* By default allow 5V charging only for the dead battery case */
-static enum pd_charge_state charge_state = PD_CHARGE_5V;
-
-#define CHARGE_PORT_UNINITIALIZED -2
-static int charge_port = CHARGE_PORT_UNINITIALIZED;
-
-int pd_get_active_charge_port(void)
-{
-	return charge_port;
-}
-#endif /* CONFIG_HOSTCMD_PD_CHG_CTRL */
-
-void host_command_pd_send_status(enum pd_charge_state new_chg_state)
-{
-#ifdef CONFIG_HOSTCMD_PD_CHG_CTRL
-	/* Update PD MCU charge state if necessary */
-	if (new_chg_state != PD_CHARGE_NO_CHANGE)
-		charge_state = new_chg_state;
-#endif
-	/* Wake PD HC task to send status */
-	task_set_event(TASK_ID_PDCMD, TASK_EVENT_EXCHANGE_PD_STATUS);
-}
-
-void host_command_pd_request_hibernate(void)
-{
-	task_set_event(TASK_ID_PDCMD, TASK_EVENT_HIBERNATING);
-}
-
-#ifdef CONFIG_HOSTCMD_PD
-static int pd_send_host_command(struct ec_params_pd_status *ec_status,
-	struct ec_response_pd_status *pd_status)
-{
-	return pd_host_command(EC_CMD_PD_EXCHANGE_STATUS,
-			       EC_VER_PD_EXCHANGE_STATUS, ec_status,
-			       sizeof(struct ec_params_pd_status), pd_status,
-			       sizeof(struct ec_response_pd_status));
-}
-
-static void pd_exchange_update_ec_status(struct ec_params_pd_status *ec_status,
-					 uint32_t ec_state)
-{
-	/* Send PD charge state and battery state of charge */
-#ifdef CONFIG_HOSTCMD_PD_CHG_CTRL
-	ec_status->charge_state = charge_state;
-#endif
-	if (charge_get_flags() & CHARGE_FLAG_BATT_RESPONSIVE)
-		ec_status->batt_soc = charge_get_percent();
-	else
-		ec_status->batt_soc = -1;
-	ec_status->status = ec_state;
-}
-
-#ifdef CONFIG_HOSTCMD_PD_PANIC
-static void pd_check_panic(struct ec_response_pd_status *pd_status)
-{
-	static int pd_in_rw;
-
-	/*
-	 * Check if PD MCU is in RW. If PD MCU was in RW, is now in RO,
-	 * AND it did not sysjump to RO, then it must have crashed, and
-	 * therefore we should panic as well.
-	 */
-	if (pd_status->status & PD_STATUS_IN_RW) {
-		pd_in_rw = 1;
-	} else if (pd_in_rw &&
-		   !(pd_status->status & PD_STATUS_JUMPED_TO_IMAGE)) {
-		panic_printf("PD crash");
-		software_panic(PANIC_SW_PD_CRASH, 0);
-	}
-}
-#endif /* CONFIG_HOSTCMD_PD_PANIC */
-
-#ifdef CONFIG_HOSTCMD_PD_CHG_CTRL
-static void pd_check_chg_status(struct ec_response_pd_status *pd_status)
-{
-	int rv;
-#ifdef HAS_TASK_LIGHTBAR
-	/*
-	 * If charge port has changed, and it was initialized, then show
-	 * battery status on lightbar.
-	 */
-	if (pd_status->active_charge_port != charge_port) {
-		if (charge_port != CHARGE_PORT_UNINITIALIZED) {
-			charge_port = pd_status->active_charge_port;
-			lightbar_sequence(LIGHTBAR_TAP);
-		} else {
-			charge_port = pd_status->active_charge_port;
-		}
-	}
-#else
-	/* Store the active charge port */
-	charge_port = pd_status->active_charge_port;
-#endif
-
-	/* Set input current limit */
-	rv = charge_set_input_current_limit(MAX(pd_status->curr_lim_ma,
-					CONFIG_CHARGER_INPUT_CURRENT), 0);
-	if (rv < 0)
-		CPRINTS("Failed to set input curr limit from PD MCU");
-}
-#endif /* CONFIG_HOSTCMD_PD_CHG_CTRL */
-#endif /* CONFIG_HOSTCMD_PD */
-
-#ifdef USB_TCPM_WITH_OFF_CHIP_TCPC
-static void pd_service_tcpc_ports(uint16_t port_status)
-{
-	int i;
-
-	for (i = 0; i < board_get_usb_pd_port_count(); i++) {
-		if ((port_status & (PD_STATUS_TCPC_ALERT_0 << i)) &&
-		    pd_is_port_enabled(i))
-			tcpc_alert(i);
-	}
-}
-
-static int pd_get_alert(void)
-{
-#ifdef CONFIG_HOSTCMD_PD
-	return !gpio_get_level(GPIO_PD_MCU_INT);
-#else
-	return !!tcpc_get_alert_status();
-#endif
-}
-
-#endif /* USB_TCPM_WITH_OFF_CHIP_TCPC */
-
-static void pd_exchange_status(uint32_t ec_state)
-{
-#ifdef USB_TCPM_WITH_OFF_CHIP_TCPC
-	int first_exchange = 1;
-#endif
-
-#ifdef CONFIG_HOSTCMD_PD
-	struct ec_params_pd_status ec_status;
-	struct ec_response_pd_status pd_status;
-	int rv;
-
-	pd_exchange_update_ec_status(&ec_status, ec_state);
-#endif
-
-#ifdef USB_TCPM_WITH_OFF_CHIP_TCPC
-	/* Loop until the alert gpio is not active */
-	do {
-#endif
-
-#ifdef CONFIG_HOSTCMD_PD
-		rv = pd_send_host_command(&ec_status, &pd_status);
-		if (rv < 0) {
-			CPRINTS("Host command to PD MCU failed: %d", rv);
-			return;
-		}
-
-#ifdef CONFIG_HOSTCMD_PD_PANIC
-		pd_check_panic(&pd_status);
-#endif
-
-#ifdef CONFIG_HOSTCMD_PD_CHG_CTRL
-		pd_check_chg_status(&pd_status);
-#endif
-#endif /* CONFIG_HOSTCMD_PD */
-
-#ifdef USB_TCPM_WITH_OFF_CHIP_TCPC
-#ifdef CONFIG_HOSTCMD_PD
-		pd_service_tcpc_ports(pd_status.status);
-#else
-		pd_service_tcpc_ports(tcpc_get_alert_status());
-#endif
-
-		if (!first_exchange)
-			/* Delay to prevent task starvation */
-			usleep(5*MSEC);
-		first_exchange = 0;
-	} while (pd_get_alert());
-#endif /* USB_TCPM_WITH_OFF_CHIP_TCPC */
-}
-
-void pd_command_task(void *u)
-{
-	/* On startup exchange status with the PD */
-	pd_exchange_status(0);
-
-	while (1) {
-		/* Wait for the next command event */
-		int evt = task_wait_event(-1);
-		uint32_t ec_state = 0;
-
-		if (evt & TASK_EVENT_HIBERNATING)
-			ec_state = EC_STATUS_HIBERNATING;
-
-		/* Process event to send status to PD */
-		if ((evt & TASK_EVENT_EXCHANGE_PD_STATUS) ||
-		    (evt & TASK_EVENT_HIBERNATING))
-			pd_exchange_status(ec_state);
-	}
-}
-