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

diff --git a/test/mpu.c b/test/mpu.c
deleted file mode 100644
index 25b2c58903..0000000000
--- a/test/mpu.c
+++ /dev/null
@@ -1,222 +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 "mpu.h"
-#include "mpu_private.h"
-#include "string.h"
-#include "system.h"
-#include "test_util.h"
-
-struct mpu_info {
-	bool has_mpu;
-	int num_mpu_regions;
-	bool mpu_is_unified;
-};
-
-#if defined(CHIP_VARIANT_STM32F412)
-struct mpu_info mpu_info = {
-	.has_mpu = true,
-	.num_mpu_regions = 8,
-	.mpu_is_unified = true
-};
-
-struct mpu_rw_regions expected_rw_regions = { .num_regions = 2,
-					      .addr = { 0x08060000,
-							0x08080000 },
-					      .size = { 0x20000, 0x80000 } };
-#elif defined(CHIP_VARIANT_STM32H7X3)
-struct mpu_info mpu_info = {
-	.has_mpu = true,
-	.num_mpu_regions = 16,
-	.mpu_is_unified = true
-};
-
-struct mpu_rw_regions expected_rw_regions = { .num_regions = 1,
-					      .addr = { 0x08100000,
-							0x08200000 },
-					      .size = { 0x100000, 0 } };
-#else
-#error "MPU info not defined for this chip. Please add it."
-#endif
-
-test_static int test_mpu_info(void)
-{
-	TEST_EQ(mpu_num_regions(), mpu_info.num_mpu_regions, "%d");
-	TEST_EQ(has_mpu(), mpu_info.has_mpu, "%d");
-	TEST_EQ(mpu_is_unified(), mpu_info.mpu_is_unified, "%d");
-	return EC_SUCCESS;
-}
-
-test_static int reset_mpu(void)
-{
-	int i;
-
-	mpu_disable();
-
-	for (i = 0; i < mpu_info.num_mpu_regions; ++i) {
-		/*
-		 * Disable all regions.
-		 *
-		 * We use the smallest possible size (32 bytes), but it
-		 * doesn't really matter since the regions are disabled.
-		 */
-		TEST_EQ(mpu_config_region(i, 0, 32, 0, 0), EC_SUCCESS, "%d");
-	}
-
-	mpu_enable();
-
-	return EC_SUCCESS;
-}
-
-test_static int test_mpu_update_region_valid_region(void)
-{
-	volatile char data __maybe_unused;
-
-	char * const ram_base = (char * const)CONFIG_RAM_BASE;
-	const uint8_t size_bit = 5;
-	uint16_t mpu_attr = MPU_ATTR_NO_NO;
-
-	/*
-	 * Initial read should work. MPU is not protecting the given address.
-	 */
-	data = ram_base[0];
-
-	TEST_EQ(mpu_update_region(0, (uint32_t)ram_base, size_bit, mpu_attr, 1,
-				  0),
-		EC_SUCCESS, "%d");
-
-	/* This panics with a data violation at CONFIG_RAM_BASE:
-	 *
-	 * Data access violation, mfar = <CONFIG_RAM_BASE>
-	 */
-	data = ram_base[0];
-
-	return EC_SUCCESS;
-}
-
-test_static int test_mpu_update_region_invalid_region(void)
-{
-	/* Test invalid region */
-	TEST_EQ(mpu_update_region(mpu_info.num_mpu_regions, 0x8020000, 17,
-				  0x1000, 1, 0),
-		-EC_ERROR_INVAL, "%d");
-	return EC_SUCCESS;
-}
-
-test_static int test_mpu_update_region_invalid_alignment(void)
-{
-	/*
-	 * Test size that is not aligned to address.
-	 */
-	const uint32_t addr = 0x20000;
-	const uint32_t size = 0x40000;
-	const uint32_t size_bit = 18;
-
-	TEST_EQ(size, BIT(size_bit), "%d");
-	TEST_EQ(reset_mpu(), EC_SUCCESS, "%d");
-	TEST_EQ(mpu_update_region(0, addr, size_bit, 0, 1, 0), -EC_ERROR_INVAL,
-		"%d");
-
-	return EC_SUCCESS;
-}
-
-test_static int test_mpu_lock_ro_flash(void)
-{
-	int rv;
-
-	rv = mpu_lock_ro_flash();
-	TEST_EQ(rv, EC_SUCCESS, "%d");
-
-	return EC_SUCCESS;
-}
-
-test_static int test_mpu_lock_rw_flash(void)
-{
-	int rv;
-
-	rv = mpu_lock_rw_flash();
-	TEST_EQ(rv, EC_SUCCESS, "%d");
-
-	return EC_SUCCESS;
-}
-
-test_static int test_mpu_protect_data_ram(void)
-{
-	int rv;
-
-	rv = mpu_protect_data_ram();
-	TEST_EQ(rv, EC_SUCCESS, "%d");
-
-	return EC_SUCCESS;
-}
-
-test_static int test_mpu_protect_code_ram(void)
-{
-	if (IS_ENABLED(CONFIG_EXTERNAL_STORAGE) ||
-	    !IS_ENABLED(CONFIG_FLASH_PHYSICAL)) {
-		int rv;
-
-		rv = mpu_protect_code_ram();
-		TEST_EQ(rv, EC_SUCCESS, "%d");
-	}
-
-	return EC_SUCCESS;
-}
-
-test_static int test_mpu_get_rw_regions(void)
-{
-	struct mpu_rw_regions rw_regions = mpu_get_rw_regions();
-	int rv = memcmp(&rw_regions, &expected_rw_regions,
-			sizeof(expected_rw_regions));
-
-	TEST_EQ(rv, 0, "%d");
-	return EC_SUCCESS;
-}
-
-void run_test(int argc, char **argv)
-{
-	enum ec_image cur_image = system_get_image_copy();
-
-	ccprintf("Running MPU test\n");
-
-	RUN_TEST(reset_mpu);
-	RUN_TEST(test_mpu_info);
-
-	/*
-	 * TODO(b/151105339): For all locked regions, check that we cannot
-	 * read/write/execute (depending on the configuration).
-	 */
-
-	/*
-	 * Since locking prevents code execution, we can only lock the region
-	 * that is not running or the test will hang.
-	 */
-	if (cur_image == EC_IMAGE_RW) {
-		RUN_TEST(reset_mpu);
-		RUN_TEST(test_mpu_lock_ro_flash);
-	}
-
-	if (cur_image == EC_IMAGE_RO) {
-		RUN_TEST(reset_mpu);
-		RUN_TEST(test_mpu_lock_rw_flash);
-	}
-
-	RUN_TEST(reset_mpu);
-	RUN_TEST(test_mpu_update_region_invalid_region);
-	RUN_TEST(reset_mpu);
-	RUN_TEST(test_mpu_update_region_invalid_alignment);
-	RUN_TEST(reset_mpu);
-	RUN_TEST(test_mpu_protect_code_ram);
-	RUN_TEST(reset_mpu);
-	RUN_TEST(test_mpu_protect_data_ram);
-	RUN_TEST(reset_mpu);
-	RUN_TEST(test_mpu_get_rw_regions);
-	RUN_TEST(reset_mpu);
-	/* This test must be last because it generates a panic */
-	RUN_TEST(test_mpu_update_region_valid_region);
-	RUN_TEST(reset_mpu);
-	test_print_result();
-}