From f203a712ce773f08fa2ea70f17285b3a1e2f877d Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 8 Feb 2021 10:59:38 -0800 Subject: test/run_device_tests.py: Add icetower MPU address We expect a data access violation at CONFIG_RAM_BASE, which is 0x24000000 on icetower. BRANCH=none BUG=b:170432597 TEST=On icetower v0.1 with servo micro and jlink attached ./test/run_device_tests.py --board dartmonkey -t mpu_ro mpu_rw Signed-off-by: Tom Hughes Change-Id: I2162f8b77f6bbf3606762c3de73c6c1b32a8ec92 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2682780 Reviewed-by: Yicheng Li --- test/run_device_tests.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/run_device_tests.py b/test/run_device_tests.py index a2b34d244e..261cb476db 100755 --- a/test/run_device_tests.py +++ b/test/run_device_tests.py @@ -48,6 +48,8 @@ DATA_ACCESS_VIOLATION_80E0000_REGEX = re.compile( r'Data access violation, mfar = 80e0000\r\n') DATA_ACCESS_VIOLATION_20000000_REGEX = re.compile( r'Data access violation, mfar = 20000000\r\n') +DATA_ACCESS_VIOLATION_24000000_REGEX = re.compile( + r'Data access violation, mfar = 24000000\r\n') BLOONCHIPPER = 'bloonchipper' DARTMONKEY = 'dartmonkey' @@ -63,12 +65,13 @@ class BoardConfig: """Board-specific configuration.""" def __init__(self, name, servo_uart_name, servo_power_enable, - rollback_region0_regex, rollback_region1_regex): + rollback_region0_regex, rollback_region1_regex, mpu_regex): self.name = name self.servo_uart_name = servo_uart_name self.servo_power_enable = servo_power_enable self.rollback_region0_regex = rollback_region0_regex self.rollback_region1_regex = rollback_region1_regex + self.mpu_regex = mpu_regex class TestConfig: @@ -127,12 +130,10 @@ class AllTests: 'mpu_ro': TestConfig(name='mpu', image_to_use=ImageType.RO, - finish_regexes=[ - DATA_ACCESS_VIOLATION_20000000_REGEX]), + finish_regexes=[board_config.mpu_regex]), 'mpu_rw': TestConfig(name='mpu', - finish_regexes=[ - DATA_ACCESS_VIOLATION_20000000_REGEX]), + finish_regexes=[board_config.mpu_regex]), 'mutex': TestConfig(name='mutex'), 'pingpong': @@ -169,6 +170,7 @@ BLOONCHIPPER_CONFIG = BoardConfig( servo_power_enable='fpmcu_pp3300', rollback_region0_regex=DATA_ACCESS_VIOLATION_8020000_REGEX, rollback_region1_regex=DATA_ACCESS_VIOLATION_8040000_REGEX, + mpu_regex=DATA_ACCESS_VIOLATION_20000000_REGEX, ) DARTMONKEY_CONFIG = BoardConfig( @@ -177,6 +179,7 @@ DARTMONKEY_CONFIG = BoardConfig( servo_power_enable='fpmcu_pp3300', rollback_region0_regex=DATA_ACCESS_VIOLATION_80C0000_REGEX, rollback_region1_regex=DATA_ACCESS_VIOLATION_80E0000_REGEX, + mpu_regex=DATA_ACCESS_VIOLATION_24000000_REGEX, ) BOARD_CONFIGS = { -- cgit v1.2.1