mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-14 00:47:26 +00:00
93134e18e8
u_boot_console.exec_attach.get_spawn() performs two steps: 1) Spawn a process to communicate with the serial console. 2) Reset the board so that U-Boot starts running from scratch. Currently, if an exception happens in step (2), no cleanup is performed on the process created in step (1). That process stays running and may e.g. hold serial port locks, or simply continue to read data from the serial port, thus preventing it from reaching any other process that attempts to read from the same serial port later. While there is error cleanup code in u_boot_console_base.ensure_spawned(), this is not triggered since the exception prevents assignment to self.p there, and hence the exception handler has no object to operate upon in cleanup_spawn(). Solve this by enhancing u_boot_console.exec_attach.get_spawn() to clean up any objects it has created. In theory, u_boot_spawn.Spawn's constructor has a similar issue, so fix this too. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org>
71 lines
2.4 KiB
Python
71 lines
2.4 KiB
Python
# Copyright (c) 2015 Stephen Warren
|
|
# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved.
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
# Logic to interact with U-Boot running on real hardware, typically via a
|
|
# physical serial port.
|
|
|
|
import sys
|
|
from u_boot_spawn import Spawn
|
|
from u_boot_console_base import ConsoleBase
|
|
|
|
class ConsoleExecAttach(ConsoleBase):
|
|
"""Represents a physical connection to a U-Boot console, typically via a
|
|
serial port. This implementation executes a sub-process to attach to the
|
|
console, expecting that the stdin/out of the sub-process will be forwarded
|
|
to/from the physical hardware. This approach isolates the test infra-
|
|
structure from the user-/installation-specific details of how to
|
|
communicate with, and the identity of, serial ports etc."""
|
|
|
|
def __init__(self, log, config):
|
|
"""Initialize a U-Boot console connection.
|
|
|
|
Args:
|
|
log: A multiplexed_log.Logfile instance.
|
|
config: A "configuration" object as defined in conftest.py.
|
|
|
|
Returns:
|
|
Nothing.
|
|
"""
|
|
|
|
# The max_fifo_fill value might need tweaking per-board/-SoC?
|
|
# 1 would be safe anywhere, but is very slow (a pexpect issue?).
|
|
# 16 is a common FIFO size.
|
|
# HW flow control would mean this could be infinite.
|
|
super(ConsoleExecAttach, self).__init__(log, config, max_fifo_fill=16)
|
|
|
|
with self.log.section('flash'):
|
|
self.log.action('Flashing U-Boot')
|
|
cmd = ['u-boot-test-flash', config.board_type, config.board_identity]
|
|
runner = self.log.get_runner(cmd[0], sys.stdout)
|
|
runner.run(cmd)
|
|
runner.close()
|
|
self.log.status_pass('OK')
|
|
|
|
def get_spawn(self):
|
|
"""Connect to a fresh U-Boot instance.
|
|
|
|
The target board is reset, so that U-Boot begins running from scratch.
|
|
|
|
Args:
|
|
None.
|
|
|
|
Returns:
|
|
A u_boot_spawn.Spawn object that is attached to U-Boot.
|
|
"""
|
|
|
|
args = [self.config.board_type, self.config.board_identity]
|
|
s = Spawn(['u-boot-test-console'] + args)
|
|
|
|
try:
|
|
self.log.action('Resetting board')
|
|
cmd = ['u-boot-test-reset'] + args
|
|
runner = self.log.get_runner(cmd[0], sys.stdout)
|
|
runner.run(cmd)
|
|
runner.close()
|
|
except:
|
|
s.close()
|
|
raise
|
|
|
|
return s
|