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, 353 deletions

diff --git a/zephyr/shim/src/tasks.c b/zephyr/shim/src/tasks.c
deleted file mode 100644
index 2f1fec16d6..0000000000
--- a/zephyr/shim/src/tasks.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/* Copyright 2020 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.
- */
-
-#include <kernel.h>
-#include <init.h>
-#include <sys/atomic.h>
-#include <shell/shell.h>
-
-#include "common.h"
-#include "timer.h"
-#include "task.h"
-
-/* We need to ensure that is one lower priority for the deferred task */
-BUILD_ASSERT(CONFIG_NUM_PREEMPT_PRIORITIES + 1 >= TASK_ID_COUNT,
-	     "Must increase number of available preempt priorities");
-
-/* Declare all task stacks here */
-#define CROS_EC_TASK(name, e, p, size) \
-	K_THREAD_STACK_DEFINE(name##_STACK, size);
-#define TASK_TEST(name, e, p, size) CROS_EC_TASK(name, e, p, size)
-CROS_EC_TASK_LIST
-#undef CROS_EC_TASK
-#undef TASK_TEST
-
-/* Forward declare all task entry point functions */
-#define CROS_EC_TASK(name, entry, ...) void entry(void *p);
-#define TASK_TEST(name, entry, ...) CROS_EC_TASK(name, entry)
-CROS_EC_TASK_LIST
-#undef CROS_EC_TASK
-#undef TASK_TEST
-
-/** Context for each CROS EC task that is run in its own zephyr thread */
-struct task_ctx {
-#ifdef CONFIG_THREAD_NAME
-	/** Name of thread (for debugging) */
-	const char *name;
-#endif
-	/** Zephyr thread structure that hosts EC tasks */
-	struct k_thread zephyr_thread;
-	/** Zephyr thread id for above thread */
-	k_tid_t zephyr_tid;
-	/** Address of Zephyr thread's stack */
-	k_thread_stack_t *stack;
-	/** Usabled size in bytes of above thread stack */
-	size_t stack_size;
-	/** Task (platform/ec) entry point */
-	void (*entry)(void *p);
-	/** The parameter that is passed into the task entry point */
-	intptr_t parameter;
-	/** A wait-able event that is raised when a new task event is posted */
-	struct k_poll_signal new_event;
-	/** The current platform/ec events set for this task/thread */
-	uint32_t event_mask;
-	/**
-	 * The timer associated with this task, which can be set using
-	 * timer_arm().
-	 */
-	struct k_timer timer;
-};
-
-#ifdef CONFIG_THREAD_NAME
-#define CROS_EC_TASK(_name, _entry, _parameter, _size) \
-	{                                              \
-		.entry = _entry,                       \
-		.parameter = _parameter,               \
-		.stack = _name##_STACK,                \
-		.stack_size = _size,                   \
-		.name = #_name,                        \
-	},
-#else
-#define CROS_EC_TASK(_name, _entry, _parameter, _size) \
-	{                                              \
-		.entry = _entry,                       \
-		.parameter = _parameter,               \
-		.stack = _name##_STACK,                \
-		.stack_size = _size,                   \
-	},
-#endif /* CONFIG_THREAD_NAME */
-#define TASK_TEST(_name, _entry, _parameter, _size) \
-	CROS_EC_TASK(_name, _entry, _parameter, _size)
-static struct task_ctx shimmed_tasks[] = {
-	CROS_EC_TASK_LIST
-#ifdef TEST_BUILD
-	[TASK_ID_TEST_RUNNER] = {},
-#endif
-};
-static int tasks_started;
-#undef CROS_EC_TASK
-#undef TASK_TEST
-
-task_id_t task_get_current(void)
-{
-	for (size_t i = 0; i < ARRAY_SIZE(shimmed_tasks); ++i) {
-		if (shimmed_tasks[i].zephyr_tid == k_current_get()) {
-			return i;
-		}
-	}
-
-#if defined(HAS_TASK_HOOKS)
-	/* Hooks ID should be returned for deferred calls */
-	if (k_current_get() == &k_sys_work_q.thread) {
-		return TASK_ID_HOOKS;
-	}
-#endif /* HAS_TASK_HOOKS */
-
-	__ASSERT(false, "Task index out of bound");
-	return 0;
-}
-
-uint32_t *task_get_event_bitmap(task_id_t cros_task_id)
-{
-	struct task_ctx *const ctx = &shimmed_tasks[cros_task_id];
-
-	return &ctx->event_mask;
-}
-
-uint32_t task_set_event(task_id_t cros_task_id, uint32_t event)
-{
-	struct task_ctx *const ctx = &shimmed_tasks[cros_task_id];
-
-	atomic_or(&ctx->event_mask, event);
-	k_poll_signal_raise(&ctx->new_event, 0);
-
-	return 0;
-}
-
-uint32_t task_wait_event(int timeout_us)
-{
-	struct task_ctx *const ctx = &shimmed_tasks[task_get_current()];
-	const k_timeout_t timeout = (timeout_us == -1) ? K_FOREVER :
-							 K_USEC(timeout_us);
-	const int64_t tick_deadline =
-		k_uptime_ticks() + k_us_to_ticks_near64(timeout_us);
-
-	struct k_poll_event poll_events[1] = {
-		K_POLL_EVENT_INITIALIZER(K_POLL_TYPE_SIGNAL,
-					 K_POLL_MODE_NOTIFY_ONLY,
-					 &ctx->new_event),
-	};
-
-	/* Wait for signal, then clear it before reading events */
-	const int rv = k_poll(poll_events, ARRAY_SIZE(poll_events), timeout);
-
-	k_poll_signal_reset(&ctx->new_event);
-	uint32_t events = atomic_set(&ctx->event_mask, 0);
-
-	if (rv == -EAGAIN) {
-		events |= TASK_EVENT_TIMER;
-	}
-
-	/* If we didn't get an event, we need to wait again. There is a very
-	 * small change of us reading the event_mask one signaled event too
-	 * early. In that case, just wait again for the remaining timeout
-	 */
-	if (events == 0) {
-		const int64_t ticks_left = tick_deadline - k_uptime_ticks();
-
-		if (ticks_left > 0) {
-			return task_wait_event(
-				k_ticks_to_us_near64(ticks_left));
-		}
-
-		events |= TASK_EVENT_TIMER;
-	}
-
-	return events;
-}
-
-uint32_t task_wait_event_mask(uint32_t event_mask, int timeout_us)
-{
-	struct task_ctx *const ctx = &shimmed_tasks[task_get_current()];
-	uint32_t events = 0;
-	const int64_t tick_deadline =
-		k_uptime_ticks() + k_us_to_ticks_near64(timeout_us);
-
-	/*  Need to return timeout flags if it occurs as well */
-	event_mask |= TASK_EVENT_TIMER;
-
-	while (!(event_mask & events)) {
-		const int64_t ticks_left = tick_deadline - k_uptime_ticks();
-
-		if (timeout_us != -1 && ticks_left <= 0) {
-			events |= TASK_EVENT_TIMER;
-			break;
-		}
-
-		struct k_poll_event poll_events[1] = {
-			K_POLL_EVENT_INITIALIZER(K_POLL_TYPE_SIGNAL,
-						 K_POLL_MODE_NOTIFY_ONLY,
-						 &ctx->new_event),
-		};
-
-		/* Ensure to honor the -1 timeout as FOREVER */
-		k_poll(poll_events, ARRAY_SIZE(poll_events),
-		       timeout_us == -1 ? K_FOREVER : K_TICKS(ticks_left));
-		k_poll_signal_reset(&ctx->new_event);
-		events |= atomic_set(&ctx->event_mask, 0);
-	}
-
-	/* Replace any events that weren't in the mask */
-	if (events & ~event_mask) {
-		atomic_or(&ctx->event_mask, events & ~event_mask);
-		k_poll_signal_raise(&ctx->new_event, 0);
-	}
-
-	return events & event_mask;
-}
-
-static void task_entry(void *task_contex, void *unused1, void *unused2)
-{
-	ARG_UNUSED(unused1);
-	ARG_UNUSED(unused2);
-
-	struct task_ctx *const ctx = (struct task_ctx *)task_contex;
-
-#ifdef CONFIG_THREAD_NAME
-	/* Name thread for debugging */
-	k_thread_name_set(ctx->zephyr_tid, ctx->name);
-#endif
-
-	/* Call into task entry point */
-	ctx->entry((void *)ctx->parameter);
-}
-
-/*
- * Callback function to use with k_timer_start to set the
- * TASK_EVENT_TIMER event on a task.
- */
-static void timer_expire(struct k_timer *timer_id)
-{
-	struct task_ctx *const ctx =
-		CONTAINER_OF(timer_id, struct task_ctx, timer);
-	task_id_t cros_ec_task_id = ctx - shimmed_tasks;
-
-	task_set_event(cros_ec_task_id, TASK_EVENT_TIMER);
-}
-
-int timer_arm(timestamp_t event, task_id_t cros_ec_task_id)
-{
-	timestamp_t now = get_time();
-	struct task_ctx *const ctx = &shimmed_tasks[cros_ec_task_id];
-
-	if (event.val <= now.val) {
-		/* Timer requested for now or in the past, fire right away */
-		task_set_event(cros_ec_task_id, TASK_EVENT_TIMER);
-		return EC_SUCCESS;
-	}
-
-	/* Check for a running timer */
-	if (k_timer_remaining_get(&ctx->timer))
-		return EC_ERROR_BUSY;
-
-	k_timer_start(&ctx->timer, K_USEC(event.val - now.val), K_NO_WAIT);
-	return EC_SUCCESS;
-}
-
-void timer_cancel(task_id_t cros_ec_task_id)
-{
-	struct task_ctx *const ctx = &shimmed_tasks[cros_ec_task_id];
-
-	k_timer_stop(&ctx->timer);
-}
-
-#ifdef TEST_BUILD
-void set_test_runner_tid(void)
-{
-	shimmed_tasks[TASK_ID_TEST_RUNNER].zephyr_tid = k_current_get();
-}
-#endif
-
-void start_ec_tasks(void)
-{
-	for (size_t i = 0; i < ARRAY_SIZE(shimmed_tasks); ++i) {
-		struct task_ctx *const ctx = &shimmed_tasks[i];
-
-		k_timer_init(&ctx->timer, timer_expire, NULL);
-
-#ifdef TEST_BUILD
-		/* Do not create thread for test runner; it will be set later */
-		if (i == TASK_ID_TEST_RUNNER) {
-			ctx->zephyr_tid = NULL;
-			continue;
-		}
-#endif
-		/*
-		 * TODO(b/172361873): Add K_FP_REGS for FPU tasks. See
-		 * comment in config.h for CONFIG_TASK_LIST for existing flags
-		 * implementation.
-		 */
-		ctx->zephyr_tid = k_thread_create(
-			&ctx->zephyr_thread, ctx->stack, ctx->stack_size,
-			task_entry, ctx, NULL, NULL,
-			K_PRIO_PREEMPT(TASK_ID_COUNT - i - 1), 0, K_NO_WAIT);
-	}
-	tasks_started = 1;
-}
-
-/*
- * Initialize all of the kernel objects before application code starts.
- * This allows us to set events on tasks before they even start, e.g. in
- * INIT_HOOKS.
- */
-int init_signals(const struct device *unused)
-{
-	ARG_UNUSED(unused);
-
-	for (size_t i = 0; i < ARRAY_SIZE(shimmed_tasks); ++i) {
-		struct task_ctx *const ctx = &shimmed_tasks[i];
-
-		/* Initialize the new_event structure */
-		k_poll_signal_init(&ctx->new_event);
-	}
-
-	return 0;
-}
-SYS_INIT(init_signals, POST_KERNEL, 50);
-
-int task_start_called(void)
-{
-	return tasks_started;
-}
-
-void task_disable_task(task_id_t tskid)
-{
-	/* TODO(b/190203712): Implement this */
-}
-
-void task_clear_pending_irq(int irq)
-{
-#if CONFIG_ITE_IT8XXX2_INTC
-	ite_intc_isr_clear(irq);
-#endif
-}
-
-void task_enable_irq(int irq)
-{
-	arch_irq_enable(irq);
-}
-
-inline int in_interrupt_context(void)
-{
-	return k_is_in_isr();
-}
-
-#if IS_ENABLED(CONFIG_KERNEL_SHELL) && IS_ENABLED(CONFIG_THREAD_MONITOR)
-static int taskinfo(const struct shell *shell, size_t argc, char **argv)
-{
-	return shell_execute_cmd(shell, "kernel threads");
-}
-SHELL_CMD_REGISTER(taskinfo, NULL, "Threads statistics", taskinfo);
-#endif