Pr cmsis dap rebase #2

maxd-nordic · 2023-07-04T11:45:50Z

No description provided.

Add Serial Wire Debug Port interface driver API and bit-bang driver. The driver requires a simple Hardware Interface Circuits (HICs), where signals CLK, DOUT, DIN, ENn, OE_ENn, RESETn are connected to board GPIOs and buffered signals SWD_CLK and SWD_DIO to the target. Signal OE_ENn controls the direction of the Serial Wire (SWD_DIO), ENn the buffers SWD_CLK possibly others and enables/disables HIC. Signed-off-by: Johann Fischer <[email protected]> Signed-off-by: Johann Fischer <[email protected]>

Add CMSIS-DAP compatible controller which is a handler between the host interface and SWD driver. The controller follows CMSIS-DAP reference implementation. It expects a request buffer from the host interface, splits it to simple transfers and forwards to the DP driver, and finally returns a response buffer to the host. Interface to the host can be implemented with USB HID device support. Controller implements only SW-DP support and is tested with pyOCD and ADIv5.x. Signed-off-by: Johann Fischer <[email protected]>

Add cmsis dap sample using USB HID as interface. Signed-off-by: Johann Fischer <[email protected]>

this also fixes a bug where the packet size returned was only 17 byte. Signed-off-by: Johan Carlsson <[email protected]>

if a host client crashes or does not disconnect probe would otherwise hang. allow a new connection without raising errors. Signed-off-by: Johan Carlsson <[email protected]>

removed const from callback to make it easier to handle request and respose like the other code would. Signed-off-by: Johan Carlsson <[email protected]>

Signed-off-by: Johan Carlsson <[email protected]>

tmon-nordic · 2023-07-05T04:57:36Z

subsys/dap/Kconfig

@@ -17,6 +17,13 @@ config CMSIS_DAP_PACKET_COUNT
 	help
 	  Maximum packet buffers for request and response data.

+config CMSIS_DAP_PACKET_SIZE
+	int "Maximum packet size for request and response data."


This Kconfig has to be removed because this value is used to set wMaxPacketSize field in CONFIGURATION descriptor.

The endpoints are bulk, therefore the only valid options (Universal Serial Bus Specification Revision 2.0 5.8.3 Bulk Transfer Packet Size Constraints) are:

8, 16, 32 or 64 on Full-Speed device (or High-Speed capable device operating at Full-Speed)

512 on High-Speed device operating at High-Speed

Legacy USB stack (i.e. not device-next) is not really suitable for properly handling High-Speed (the problem is with High-Speed device operating at Full-Speed). The next stack is better on this.

While the 8/16/32/64 max packet size choice can seem arbitrary to the application software, there are cases where the USB device controller does not support all of the options. Due to this is better for the USB stack to handle the endpoint sizes.

For the old stack probably the best that can be done is probably just use 64 for Full-Speed and 512 when CONFIG_USB_DC_HAS_HS_SUPPORT is defined. This will exhibit the problem with High-Speed operating at Full-Speed, but fixing that in legacy stack seems infeasible.

Would it be enough to set the default based USB_DC_HAS_HS_SUPPORT and add a help text?
Or do you think the risk of misconfiguration is too high?

I don't think it should be Kconfig at all. There are already way too many Kconfigs that can give you essentially-broken-but-compiling code and this is going to be just another one.

This Kconfig option is not exclusive for USB transport. You have to adapt it according to your transport layer needs.

Right, the idea was to potentially have DAP over BLE at some point.

maxd-nordic · 2023-07-05T07:49:14Z

@jfischer-no We talked about the speed of probes that use zephyr_gpio instead of writing to registers directly.
I just compared erasing+flashing an nRF9160 with both configs and the results are good enough in my opinion: 49,342s (zephyr_gpio), 33,116s (direct register write).

maxd-nordic · 2023-07-05T07:58:22Z

Just tested on the Raspberry Pi Pico (rp_2040), which needs the new DAP command I implemented and it works fine!

jfischer-no · 2023-07-05T08:07:08Z

subsys/dap/Kconfig

+config CMSIS_DAP_PROBE_VENDOR
+	string "Probe vendor"
+	default "Zephyr"
+
+config CMSIS_DAP_PROBE_NAME
+	string "Probe name"
+	default "CMSIS-DAP"
+
+config CMSIS_DAP_BOARD_VENDOR
+	string "Target board vendor"
+	default ""
+
+config CMSIS_DAP_BOARD_NAME
+	string "Target board name"
+	default ""
+
+config CMSIS_DAP_DEVICE_VENDOR
+	string "Target device vendor"
+	default ""
+
+config CMSIS_DAP_DEVICE_NAME
+	string "Target device name"
+	default ""
+


These options are more problematic than others in terms of multi-instance support.

AFAICT, the cmsis_dap.c part only supports one instance. Maybe we can defer that multi-instance support to a later PR entirely.

subsys/dap/cmsis_dap.c

drivers/dp/fast_bitbang.h

drivers/dp/swdp_bitbang.c

drivers/dp/fast_bitbang.h

drivers/dp/swdp_bitbang.c

maxd-nordic · 2023-07-05T11:10:25Z

@jfischer-no thanks for the review! I'll try to fulfill the requests, but it might take a while to separate the commits.

Signed-off-by: Maximilian Deubel <[email protected]>

This is a requirement for CMSIS-DAPv2 Signed-off-by: Maximilian Deubel <[email protected]>

maxd-nordic · 2023-07-07T13:45:43Z

@jfischer-no @tmon-nordic please have another look. I tended to the request where I had an idea to fix. Might need more input if more things need to be fixed.

This patch refactors the usage of MS OS 2.0 descriptors in the WebUSB sample. The function subset header was removed since it is not allowed for non-composite devices. Also, a new random GUID was added for automatic driver installation. Signed-off-by: Maximilian Deubel <[email protected]>

Signed-off-by: Maximilian Deubel <[email protected]>

jfischer-no · 2023-08-31T22:28:37Z

Applied to upstream PR with significant changes.

jfischer-no and others added 7 commits April 19, 2023 00:05

samples: debug: add CMSIS DAP sample using USB HID as interface

36daa53

Add cmsis dap sample using USB HID as interface. Signed-off-by: Johann Fischer <[email protected]>

dap: add konfig for maximum packet size.

07626bc

this also fixes a bug where the packet size returned was only 17 byte. Signed-off-by: Johan Carlsson <[email protected]>

dap: remove error check in connect command.

52969ac

if a host client crashes or does not disconnect probe would otherwise hang. allow a new connection without raising errors. Signed-off-by: Johan Carlsson <[email protected]>

dap: add support for vendor commands callback.

701b3df

removed const from callback to make it easier to handle request and respose like the other code would. Signed-off-by: Johan Carlsson <[email protected]>

driver: dp: bitbang: add support for nxp lpc.

5548f5b

Signed-off-by: Johan Carlsson <[email protected]>

maxd-nordic mentioned this pull request Jul 4, 2023

Add SWDP driver interface API and bit-bang driver, add CMSIS-DAP compatible controller zephyrproject-rtos/zephyr#53798

Merged

tmon-nordic suggested changes Jul 5, 2023

View reviewed changes

maxd-nordic force-pushed the pr-cmsis-dap-rebase branch from 730e783 to 1022090 Compare July 5, 2023 07:43

jfischer-no requested changes Jul 5, 2023

View reviewed changes

maxd-nordic force-pushed the pr-cmsis-dap-rebase branch 8 times, most recently from b079234 to a922397 Compare July 7, 2023 11:53

maxd-nordic added 6 commits July 7, 2023 15:22

driver: dp: bitbang: enable simpler pin configurations

848d48e

Signed-off-by: Maximilian Deubel <[email protected]>

dap: dap_swj_pins: implement wait

0227244

Signed-off-by: Maximilian Deubel <[email protected]>

dap: add definitions for v2.1.0

cc7765f

Signed-off-by: Maximilian Deubel <[email protected]>

dap: support DAP_INFO string elements

56ebbbc

Signed-off-by: Maximilian Deubel <[email protected]>

dap: react properly to unsupported UART commands

85c0de0

Signed-off-by: Maximilian Deubel <[email protected]>

dap: implement DAP_SWD_Sequence command

5514d8b

This is a requirement for CMSIS-DAPv2 Signed-off-by: Maximilian Deubel <[email protected]>

maxd-nordic force-pushed the pr-cmsis-dap-rebase branch from 79ded34 to bb8ab24 Compare July 7, 2023 13:43

maxd-nordic requested a review from jfischer-no July 7, 2023 13:44

maxd-nordic requested a review from tmon-nordic July 7, 2023 13:44

maxd-nordic force-pushed the pr-cmsis-dap-rebase branch from bb8ab24 to 418876d Compare August 24, 2023 13:10

maxd-nordic added 2 commits August 30, 2023 13:41

samples: subsys: usb: refactor dap usb sample for bulk interface

338a308

Signed-off-by: Maximilian Deubel <[email protected]>

maxd-nordic force-pushed the pr-cmsis-dap-rebase branch 2 times, most recently from 00f8c5b to 7b4e00d Compare August 30, 2023 11:52

review changes

c22584c

maxd-nordic force-pushed the pr-cmsis-dap-rebase branch from 7b4e00d to c22584c Compare August 30, 2023 12:02

jfischer-no force-pushed the pr-cmsis-dap-rebase branch from 36daa53 to 15569a2 Compare August 31, 2023 22:15

jfischer-no closed this Aug 31, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pr cmsis dap rebase #2

Pr cmsis dap rebase #2

maxd-nordic commented Jul 4, 2023

tmon-nordic Jul 5, 2023 •

edited

Loading

maxd-nordic Jul 5, 2023

tmon-nordic Jul 5, 2023

jfischer-no Jul 5, 2023 •

edited

Loading

maxd-nordic Jul 5, 2023

maxd-nordic commented Jul 5, 2023

maxd-nordic commented Jul 5, 2023

jfischer-no Jul 5, 2023

maxd-nordic Jul 7, 2023

maxd-nordic commented Jul 5, 2023

maxd-nordic commented Jul 7, 2023

jfischer-no commented Aug 31, 2023

Pr cmsis dap rebase #2

Pr cmsis dap rebase #2

Conversation

maxd-nordic commented Jul 4, 2023

tmon-nordic Jul 5, 2023 • edited Loading

Choose a reason for hiding this comment

maxd-nordic Jul 5, 2023

Choose a reason for hiding this comment

tmon-nordic Jul 5, 2023

Choose a reason for hiding this comment

jfischer-no Jul 5, 2023 • edited Loading

Choose a reason for hiding this comment

maxd-nordic Jul 5, 2023

Choose a reason for hiding this comment

maxd-nordic commented Jul 5, 2023

maxd-nordic commented Jul 5, 2023

jfischer-no Jul 5, 2023

Choose a reason for hiding this comment

maxd-nordic Jul 7, 2023

Choose a reason for hiding this comment

maxd-nordic commented Jul 5, 2023

maxd-nordic commented Jul 7, 2023

jfischer-no commented Aug 31, 2023

tmon-nordic Jul 5, 2023 •

edited

Loading

jfischer-no Jul 5, 2023 •

edited

Loading