Skip to content
This repository was archived by the owner on Mar 7, 2026. It is now read-only.

Fix: DPv2+ SWD regression#1360

Merged
esden merged 10 commits intomainfrom
fix/dpv2-swd-regression
Jan 10, 2023
Merged

Fix: DPv2+ SWD regression#1360
esden merged 10 commits intomainfrom
fix/dpv2-swd-regression

Conversation

@dragonmux
Copy link
Copy Markdown
Member

@dragonmux dragonmux commented Jan 10, 2023

Detailed description

In this PR we address the SWD regression identified in #1359 which was caused by the protocol recovery addition in https://github.com/blackmagic-debug/blackmagic/pulls/1331 exposing the DPv2+ protocol recovery being incorrect and scan not setting the DP version field so causing recovery to progress incorrectly (post-recovery the device had DP#0 reselected in the multi-drop chain making things work when they shouldn't).

After this change, discovery and recovery both work correctly and reliably for DPv0, DPv1 and DPv2 SWD devices.

Your checklist for this pull request

  • I've read the Code of Conduct
  • I've read the guidelines for contributing to this repository
  • It builds for hardware native (make PROBE_HOST=native)
  • It builds as BMDA (make PROBE_HOST=hosted)
  • I've tested it to the best of my ability
  • My commit messages provide a useful short description of what the commits do

Closing issues

Fixes #1359

@dragonmux dragonmux added Bug Confirmed bug BMP Firmware Black Magic Probe Firmware (not PC hosted software) Regression Bug caused by a regression labels Jan 10, 2023
@dragonmux dragonmux added this to the v1.9 release milestone Jan 10, 2023
@dragonmux dragonmux requested a review from esden January 10, 2023 19:15
Copy link
Copy Markdown
Member

@esden esden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@esden esden merged commit 302c8b5 into main Jan 10, 2023
Copy link
Copy Markdown
Contributor

@perigoso perigoso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dragonmux dragonmux deleted the fix/dpv2-swd-regression branch January 11, 2023 03:25
@dragonmux dragonmux linked an issue Jan 31, 2023 that may be closed by this pull request
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

BMP Firmware Black Magic Probe Firmware (not PC hosted software) Bug Confirmed bug Regression Bug caused by a regression

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Unable to swdp_scan since 1.9.0rc1 Scanning a device with an inaccessible MEM-AP fails (nRF9160)

3 participants