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

diff --git a/test/rollback.c b/test/rollback.c
deleted file mode 100644
index 2038333311..0000000000
--- a/test/rollback.c
+++ /dev/null
@@ -1,127 +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 <stdbool.h>
-#include "flash.h"
-#include "mpu.h"
-#include "string.h"
-#include "test_util.h"
-
-struct rollback_info {
-	int region_0_offset;
-	int region_1_offset;
-	uint32_t region_size_bytes;
-};
-
-/* These values are intentionally hardcoded here instead of using the chip
- * config headers, so that if the headers are accidentally changed we can catch
- * it.
- */
-#if defined(CHIP_VARIANT_STM32F412)
-struct rollback_info rollback_info = {
-	.region_0_offset = 0x20000,
-	.region_1_offset = 0x40000,
-	.region_size_bytes = 128 * 1024,
-};
-#elif defined(CHIP_VARIANT_STM32H7X3)
-struct rollback_info rollback_info = {
-	.region_0_offset = 0xC0000,
-	.region_1_offset = 0xE0000,
-	.region_size_bytes = 128 * 1024,
-};
-#else
-#error "Rollback info not defined for this chip. Please add it."
-#endif
-
-test_static int read_rollback_region(const struct rollback_info *info,
-				     int region)
-{
-	int i;
-	char data;
-	uint32_t bytes_read = 0;
-
-	int offset = region == 0 ? info->region_0_offset :
-				   info->region_1_offset;
-
-	for (i = 0; i < info->region_size_bytes; i++) {
-		if (crec_flash_read(offset + i, sizeof(data), &data) ==
-			EC_SUCCESS)
-			bytes_read++;
-	}
-
-	return bytes_read;
-}
-
-test_static int _test_lock_rollback(const struct rollback_info *info,
-				    int region)
-{
-	int rv;
-
-	/*
-	 * We expect the MPU to have already been enabled during the
-	 * initialization process (mpu_pre_init).
-	 */
-
-	rv = mpu_lock_rollback(0);
-	TEST_EQ(rv, EC_SUCCESS, "%d");
-
-	/* unlocked we should be able to read both regions */
-	rv = read_rollback_region(info, 0);
-	TEST_EQ(rv, rollback_info.region_size_bytes, "%d");
-
-	rv = read_rollback_region(info, 1);
-	TEST_EQ(rv, rollback_info.region_size_bytes, "%d");
-
-	rv = mpu_lock_rollback(1);
-	TEST_EQ(rv, EC_SUCCESS, "%d");
-
-	/* TODO(b/156112448): Validate that it actually reboots with the correct
-	 * data access violation.
-	 */
-	read_rollback_region(info, region);
-
-	/* Should not get here. Should reboot with:
-	 *
-	 * Data access violation, mfar = XXX
-	 *
-	 * where XXX = start of rollback
-	 */
-	TEST_ASSERT(false);
-
-	return EC_ERROR_UNKNOWN;
-}
-
-test_static int test_lock_rollback_region_0(void)
-{
-	/* This call should never return due to panic. */
-	return _test_lock_rollback(&rollback_info, 0);
-}
-
-test_static int test_lock_rollback_region_1(void)
-{
-	/* This call should never return due to panic. */
-	return _test_lock_rollback(&rollback_info, 1);
-}
-
-void run_test(int argc, char **argv)
-{
-	if (argc < 2) {
-		ccprintf("usage: runtest [region0|region1]\n");
-		return;
-	}
-
-	ccprintf("Running rollback test\n");
-
-	/*
-	 * TODO(b/156112448): For now you have to run the test separately for
-	 * each region.
-	 */
-	if (strncmp(argv[1], "region0", 7) == 0)
-		RUN_TEST(test_lock_rollback_region_0);
-	else if (strncmp(argv[1], "region1", 7) == 0)
-		RUN_TEST(test_lock_rollback_region_1);
-
-	test_print_result();
-}