From: Kane Chen <[email protected]> The current AST2700 functional test forces PCIe2 enablement by manually manipulating U-Boot env and FDT via the console. This sequence interferes with test cases that rely on the default boot flow of the image.
Introduce a 'enable_pcie' parameter (defaulting to True) to both 'verify_openbmc_boot_start' and 'verify_openbmc_boot_and_login' methods. This allow test cases to toggle the PCIe2 initialization sequence based on their specific requirements without breaking standard boot tests. Signed-off-by: Kane-Chen-AS <[email protected]> Reviewed-by: Cédric Le Goater <[email protected]> Link: https://lore.kernel.org/qemu-devel/[email protected] Signed-off-by: Cédric Le Goater <[email protected]> --- tests/functional/aarch64/test_aspeed_ast2700.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/functional/aarch64/test_aspeed_ast2700.py b/tests/functional/aarch64/test_aspeed_ast2700.py index d7eeab9c23fd..cb1aafeb99fa 100755 --- a/tests/functional/aarch64/test_aspeed_ast2700.py +++ b/tests/functional/aarch64/test_aspeed_ast2700.py @@ -65,13 +65,14 @@ def enable_ast2700_pcie2(self): 'fdt set /soc@14000000/pcie@140d0000 status "okay"', '=>') exec_command(self, 'bootm go') - def verify_openbmc_boot_start(self): + def verify_openbmc_boot_start(self, enable_pcie=True): wait_for_console_pattern(self, 'U-Boot 2023.10') - self.enable_ast2700_pcie2() + if enable_pcie: + self.enable_ast2700_pcie2() wait_for_console_pattern(self, 'Linux version ') - def verify_openbmc_boot_and_login(self, name): - self.verify_openbmc_boot_start() + def verify_openbmc_boot_and_login(self, name, enable_pcie=True): + self.verify_openbmc_boot_start(enable_pcie) wait_for_console_pattern(self, f'{name} login:') exec_command_and_wait_for_pattern(self, 'root', 'Password:') -- 2.52.0
