---
tests/functional/aarch64/test_aspeed_ast2700a1.py | 11 +++++++++--
tests/functional/aarch64/test_aspeed_ast2700a2.py | 11 +++++++++--
tests/functional/aarch64/test_aspeed_ast2700fc.py | 9 +++++++--
3 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/tests/functional/aarch64/test_aspeed_ast2700a1.py
b/tests/functional/aarch64/test_aspeed_ast2700a1.py
index 5c0c4b0ed5..b0c08854da 100755
--- a/tests/functional/aarch64/test_aspeed_ast2700a1.py
+++ b/tests/functional/aarch64/test_aspeed_ast2700a1.py
@@ -51,9 +51,11 @@ def verify_vbootrom_firmware_flow(self):
wait_for_console_pattern(self, 'pass')
wait_for_console_pattern(self, 'Jumping to BL31 (Trusted Firmware-A)')
+ def disable_kernel_crypto_selftest(self):
+ exec_command_and_wait_for_pattern(self,
+ 'setenv bootargs "${bootargs} cryptomgr.notests=1"', '=>')
+
def enable_ast2700_pcie2(self):
- wait_for_console_pattern(self, 'Hit any key to stop autoboot')
- exec_command_and_wait_for_pattern(self, '\012', '=>')
exec_command_and_wait_for_pattern(self,
'cp 100420000 403000000 900000', '=>')
exec_command_and_wait_for_pattern(self,
@@ -67,8 +69,13 @@ def enable_ast2700_pcie2(self):
def verify_openbmc_boot_start(self, enable_pcie=True):
wait_for_console_pattern(self, 'U-Boot 2023.10')
+ wait_for_console_pattern(self, 'Hit any key to stop autoboot')
+ exec_command_and_wait_for_pattern(self, '\012', '=>')
+ self.disable_kernel_crypto_selftest()
if enable_pcie:
self.enable_ast2700_pcie2()
+ else:
+ exec_command(self, 'boot')
wait_for_console_pattern(self, 'Linux version ')
def verify_openbmc_boot_and_login(self, name, enable_pcie=True):
diff --git a/tests/functional/aarch64/test_aspeed_ast2700a2.py
b/tests/functional/aarch64/test_aspeed_ast2700a2.py
index cc62a915b5..ed414999f4 100755
--- a/tests/functional/aarch64/test_aspeed_ast2700a2.py
+++ b/tests/functional/aarch64/test_aspeed_ast2700a2.py
@@ -51,9 +51,11 @@ def verify_vbootrom_firmware_flow(self):
wait_for_console_pattern(self, 'pass')
wait_for_console_pattern(self, 'Jumping to BL31 (Trusted Firmware-A)')
+ def disable_kernel_crypto_selftest(self):
+ exec_command_and_wait_for_pattern(self,
+ 'setenv bootargs "${bootargs} cryptomgr.notests=1"', '=>')
+
def enable_ast2700_pcie2(self):
- wait_for_console_pattern(self, 'Hit any key to stop autoboot')
- exec_command_and_wait_for_pattern(self, '\012', '=>')
exec_command_and_wait_for_pattern(self,
'cp 100420000 403000000 900000', '=>')
exec_command_and_wait_for_pattern(self,
@@ -67,8 +69,13 @@ def enable_ast2700_pcie2(self):
def verify_openbmc_boot_start(self, enable_pcie=True):
wait_for_console_pattern(self, 'U-Boot 2023.10')
+ wait_for_console_pattern(self, 'Hit any key to stop autoboot')
+ exec_command_and_wait_for_pattern(self, '\012', '=>')
+ self.disable_kernel_crypto_selftest()
if enable_pcie:
self.enable_ast2700_pcie2()
+ else:
+ exec_command(self, 'boot')
wait_for_console_pattern(self, 'Linux version ')
def verify_openbmc_boot_and_login(self, name, enable_pcie=True):
diff --git a/tests/functional/aarch64/test_aspeed_ast2700fc.py
b/tests/functional/aarch64/test_aspeed_ast2700fc.py
index f68f40a1bf..df889134ed 100755
--- a/tests/functional/aarch64/test_aspeed_ast2700fc.py
+++ b/tests/functional/aarch64/test_aspeed_ast2700fc.py
@@ -27,9 +27,11 @@ def do_test_aarch64_aspeed_sdk_start(self, image):
self.vm.launch()
+ def disable_kernel_crypto_selftest(self):
+ exec_command_and_wait_for_pattern(self,
+ 'setenv bootargs "${bootargs} cryptomgr.notests=1"', '=>')
+
def enable_ast2700_pcie2(self):
- wait_for_console_pattern(self, 'Hit any key to stop autoboot')
- exec_command_and_wait_for_pattern(self, '\012', '=>')
exec_command_and_wait_for_pattern(self,
'cp 100420000 403000000 900000', '=>')
exec_command_and_wait_for_pattern(self,
@@ -43,6 +45,9 @@ def enable_ast2700_pcie2(self):
def verify_openbmc_boot_and_login(self, name):
wait_for_console_pattern(self, 'U-Boot 2023.10')
+ wait_for_console_pattern(self, 'Hit any key to stop autoboot')
+ exec_command_and_wait_for_pattern(self, '\012', '=>')
+ self.disable_kernel_crypto_selftest()
self.enable_ast2700_pcie2()
wait_for_console_pattern(self, 'Starting kernel ...')