armv7m4: add stlink host reset

JIRA: CI-433

trunner/harness/base.py

@@ -73,9 +73,10 @@ class FlashError(ProcessError):
 class Rebooter:
     """Class that provides all necessary methods needed for rebooting target device."""
 
-    def __init__(self, host: Host, dut: Dut):
+    def __init__(self, host: Host, dut: Dut, openocd_rst: Optional[bool] = False):
         self.host = host
         self.dut = dut
+        self.openocd_rst = openocd_rst
 
     def _reboot_soft(self):
         self.host.set_reset(0)
@@ -101,6 +102,9 @@ def _reboot_dut_gpio(self, hard):
     def _reboot_dut_text(self, hard):
         pass
 
+    def _reboot_dut_command(self, hard):
+        pass
+
     def _set_flash_mode(self, flash):
         pass
 
@@ -110,10 +114,16 @@ def __call__(self, flash=False, hard=False):
         self._set_flash_mode(flash)
 
         if self.host.has_gpio():
-            self._reboot_dut_gpio(hard=hard)
+            if self.openocd_rst == True:
+                self._reboot_dut_command(hard=hard)
+            else:
+                self._reboot_dut_gpio(hard=hard)
         else:
             # Perform rebooting with user interaction
-            self._reboot_dut_text(hard=hard)
+            if self.openocd_rst == True:
+                self._reboot_dut_command(hard=hard)
+            else:
+                self._reboot_dut_text(hard=hard)
 
 
 class HarnessBase(ABC):

trunner/target/armv7m4.py

@@ -1,5 +1,6 @@
 import subprocess
 import time
+import os
 from pathlib import Path
 from typing import Callable, Optional, Sequence
 
@@ -24,9 +25,28 @@
 
 
 class ARMv7M4Rebooter(Rebooter):
-    # TODO add text mode
-    # NOTE: changing boot modes not needed/supported for this target
-    pass
+
+    def _reboot_dut_text(self, hard):
+        self.dut.send(" reboot\r\n")
+
+    def _reboot_dut_command(self, hard):
+        subprocess.run(
+            [
+                "openocd",
+                "-f",
+                "interface/stlink.cfg",
+                "-f",
+                "target/stm32l4x.cfg",
+                "-c",
+                "reset_config srst_only srst_nogate connect_assert_srst",
+                "-c",
+                "init;reset;exit",
+            ],
+            encoding="ascii",
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            timeout=20,
+        )
 
 
 class STM32L4x6OpenocdGdbServerHarness(IntermediateHarness):
@@ -46,9 +66,16 @@ def __init__(self, harness: Callable[[TestResult], TestResult]):
 
     def __call__(self, result: TestResult) -> TestResult:
         # Set of config parameters used in Openocd to flash up stm32l4a6
-        openocd_args = ["-c", "reset_config srst_only srst_nogate connect_assert_srst", "-c", "init;reset"]
-
-        with OpenocdGdbServer(interface="stlink", target="stm32l4x", extra_args=openocd_args).run():
+        openocd_args = [
+            "-c",
+            "reset_config srst_only srst_nogate connect_assert_srst",
+            "-c",
+            "init;reset",
+        ]
+
+        with OpenocdGdbServer(
+            interface="stlink", target="stm32l4x", extra_args=openocd_args
+        ).run():
             self.harness(result)
 
         return self.next_harness(result)
@@ -94,7 +121,6 @@ def __call__(self):
         for app in self.apps:
             path = self.gdb.cwd / Path(app.file)
             sz = path.stat().st_size
-
             self.alias(app.file, offset=offset, size=sz)
             self.app("ramdev", app.file, "ram", "ram")
 
@@ -107,14 +133,15 @@ class STM32L4x6Target(TargetBase):
     experimental = False
     image_file = "phoenix.disk"
     image_addr = 0x08000000
+    openocd_utility = True
 
     def __init__(self, host: Host, port: Optional[str] = None, baudrate: int = 115200):
         if port is None:
             # Try to find USB-Serial controller
             port = find_port("USB-Serial|UART")
 
         self.dut = SerialDut(port, baudrate, encoding="utf-8", codec_errors="ignore")
-        self.rebooter = ARMv7M4Rebooter(host, self.dut)
+        self.rebooter = ARMv7M4Rebooter(host, self.dut, openocd_rst=True)
         super().__init__()
 
     @classmethod
@@ -147,7 +174,9 @@ def flash_dut(self):
         except subprocess.CalledProcessError as e:
             raise FlashError(msg=str(e), output=e.stdout) from e
         except subprocess.TimeoutExpired as e:
-            raise FlashError(msg=str(e), output=e.stdout.decode("ascii") if e.stdout else None) from e
+            raise FlashError(
+                msg=str(e), output=e.stdout.decode("ascii") if e.stdout else None
+            ) from e
 
     def build_test(self, test: TestOptions):
         builder = HarnessBuilder()
@@ -162,7 +191,9 @@ def build_test(self, test: TestOptions):
                 app_loader = STM32L4x6PloAppLoader(
                     dut=self.dut,
                     apps=test.bootloader.apps,
-                    gdb=GdbInteractive(port=3333, cwd=self.root_dir() / test.shell.path),
+                    gdb=GdbInteractive(
+                        port=3333, cwd=self.root_dir() / test.shell.path
+                    ),
                 )
 
             builder.add(PloHarness(self.dut, app_loader=app_loader))