Always use DP to perform reset.

All calls to reset() and assert_reset() are made to the DP so they
are funneled through a single point that is above the probe level.

Author: flit

pyocd/commands/values.py

@@ -243,7 +243,13 @@ def modify(self, args):
             raise exceptions.CommandError("missing reset state")
         state = int(args[0], base=0)
         self.context.writef("nRESET = {}", state)
-        self.context.probe.assert_reset((state == 0))
+        
+        # Use the probe to assert reset if the DP doesn't exist for some reason, otherwise
+        # use the DP so reset notifications are sent.
+        if self.context.target.dp is None:
+            self.context.probe.assert_reset((state == 0))
+        else:
+            self.context.target.dp.assert_reset((state == 0))
 
 class SessionOptionValue(ValueBase):
     INFO = {

pyocd/core/soc_target.py

@@ -211,7 +211,11 @@ def remove_watchpoint(self, addr, size, type):
     def reset(self, reset_type=None):
         # Perform a hardware reset if there is not a core.
         if self.selected_core is None:
-            self.session.probe.reset()
+            # Use the probe to reset if the DP doesn't exist yet.
+            if self.dp is None:
+                self.session.probe.reset()
+            else:
+                self.dp.reset()
             return
         self.selected_core.reset(reset_type)
 

pyocd/coresight/coresight_target.py

@@ -105,10 +105,10 @@ def pre_connect(self):
         mode = self.session.options.get('connect_mode')
         if mode == 'pre-reset':
             LOG.info("Performing connect pre-reset")
-            self.session.probe.reset()
+            self.dp.reset()
         elif mode == 'under-reset':
             LOG.info("Asserting reset prior to connect")
-            self.session.probe.assert_reset(True)
+            self.dp.assert_reset(True)
 
     def perform_halt_on_connect(self):
         """! @brief Halt cores.
@@ -139,7 +139,7 @@ def post_connect(self):
         mode = self.session.options.get('connect_mode')
         if mode == 'under-reset':
             LOG.info("Deasserting reset post connect")
-            self.session.probe.assert_reset(False)
+            self.dp.assert_reset(False)
 
             LOG.debug("Clearing reset catch")
             # Apply to all cores.

pyocd/coresight/cortex_m.py

@@ -706,7 +706,7 @@ def _perform_reset(self, reset_type):
         """! @brief Perform a reset of the specified type."""
         assert isinstance(reset_type, Target.ResetType)
         if reset_type is Target.ResetType.HW:
-            self.session.probe.reset()
+            self.session.target.dp.reset()
         elif reset_type is Target.ResetType.SW_EMULATED:
             self._perform_emulated_reset()
         else:

pyocd/target/builtin/target_STM32F767xx.py

@@ -124,7 +124,7 @@ def __init__(self, session):
         super(STM32F767xx, self).__init__(session, self.MEMORY_MAP)
 
     def assert_reset_for_connect(self):
-        self.dp.probe.assert_reset(1)
+        self.dp.assert_reset(1)
 
     def safe_reset_and_halt(self):
         assert self.dp.is_reset_asserted()
@@ -143,7 +143,7 @@ def safe_reset_and_halt(self):
         # Prevent disabling bus clock/power in low power modes.
         ap.write32(DBGMCU.CR, DBGMCU.CR_VALUE)
 
-        self.dp.probe.assert_reset(0)
+        self.dp.assert_reset(0)
         time.sleep(0.01)
 
         # Restore DEMCR original value.

pyocd/target/family/target_psoc6.py

@@ -36,7 +36,7 @@ def reset(self, reset_type=None):
         self.session.notify(Target.Event.PRE_RESET, self)
         self._run_token += 1
         if reset_type is Target.ResetType.HW:
-            self.session.probe.reset()
+            self._ap.dp.reset()
             sleep(0.5)
             self._ap.dp.init()
             self._ap.dp.power_up_debug()
@@ -191,7 +191,7 @@ def reset(self, reset_type=None):
         self._run_token += 1
 
         if reset_type is Target.ResetType.HW:
-            self.session.probe.reset()
+            self._ap.dp.reset()
             self.reinit_dap()
             self.fpb.enable()