WIP: stm32 flash rework + ch32 flash rework and implementation

src/Makefile

@@ -23,65 +23,73 @@ ifeq ($(ENABLE_DEBUG), 1)
 CFLAGS += -DENABLE_DEBUG
 endif
 
-SRC =              \
-	adiv5.c        \
-	adiv5_jtag.c   \
-	adiv5_swd.c    \
-	command.c      \
-	cortex.c       \
-	cortexa.c      \
-	cortexm.c      \
-	crc32.c        \
-	efm32.c        \
-	exception.c    \
-	gdb_if.c       \
-	gdb_main.c     \
-	gdb_hostio.c   \
-	gdb_packet.c   \
-	gdb_reg.c      \
-	hex_utils.c    \
-	hc32l110.c     \
-	imxrt.c        \
-	jtag_devs.c    \
-	jtag_scan.c    \
-	lmi.c          \
-	lpc_common.c   \
-	lpc11xx.c      \
-	lpc17xx.c      \
-	lpc15xx.c      \
-	lpc40xx.c      \
-	lpc43xx.c      \
-	lpc546xx.c     \
-	lpc55xx.c      \
-	kinetis.c      \
-	main.c         \
-	maths_utils.c  \
-	morse.c        \
-	msp432e4.c     \
-	msp432p4.c     \
-	nrf51.c        \
-	nrf91.c        \
-	nxpke04.c      \
-	remote.c       \
-	rp.c           \
-	sam3x.c        \
-	sam4l.c        \
-	samd.c         \
-	samx5x.c       \
-	sfdp.c         \
-	spi.c          \
-	stm32f1.c      \
-	ch32f1.c       \
-	stm32f4.c      \
-	stm32h5.c      \
-	stm32h7.c      \
-	stm32mp15.c    \
-	stm32l0.c      \
-	stm32l4.c      \
-	stm32g0.c      \
-	renesas.c      \
-	target.c       \
-	target_flash.c \
+SRC =                \
+	adiv5.c          \
+	adiv5_jtag.c     \
+	adiv5_swd.c      \
+	command.c        \
+	cortex.c         \
+	cortexa.c        \
+	cortexm.c        \
+	crc32.c          \
+	efm32.c          \
+	esp32c3.c        \
+	exception.c      \
+	gdb_if.c         \
+	gdb_main.c       \
+	gdb_hostio.c     \
+	gdb_packet.c     \
+	gdb_reg.c        \
+	hex_utils.c      \
+	hc32l110.c       \
+	imxrt.c          \
+	jtag_devs.c      \
+	jtag_scan.c      \
+	lmi.c            \
+	lpc_common.c     \
+	lpc11xx.c        \
+	lpc17xx.c        \
+	lpc15xx.c        \
+	lpc40xx.c        \
+	lpc43xx.c        \
+	lpc546xx.c       \
+	lpc55xx.c        \
+	kinetis.c        \
+	main.c           \
+	maths_utils.c    \
+	morse.c          \
+	msp432e4.c       \
+	msp432p4.c       \
+	nrf51.c          \
+	nrf91.c          \
+	nxpke04.c        \
+	remote.c         \
+	riscv32.c        \
+	riscv64.c        \
+	riscv_debug.c    \
+	riscv_jtag_dtm.c \
+	rp.c             \
+	sam3x.c          \
+	sam4l.c          \
+	samd.c           \
+	samx5x.c         \
+	sfdp.c           \
+	spi.c            \
+	stm32f1.c        \
+	ch32_flash.c	 \
+	stm32_flash.c	 \
+	ch32f1x.c        \
+	ch32v3x.c        \
+	stm32f4.c        \
+	stm32h5.c        \
+	stm32h7.c        \
+	stm32mp15.c      \
+	stm32l0.c        \
+	stm32l4.c        \
+	stm32g0.c        \
+	renesas.c        \
+	target.c         \
+	target_flash.c   \
 	target_probe.c
 
 ifeq (,$(filter all_platforms,$(MAKECMDGOALS)))

src/command.c

@@ -57,6 +57,7 @@ static bool cmd_help(target_s *t, int argc, const char **argv);
 
 static bool cmd_jtag_scan(target_s *target, int argc, const char **argv);
 static bool cmd_swd_scan(target_s *t, int argc, const char **argv);
+static bool cmd_rvswd_scan(target_s *target, int argc, const char **argv);
 static bool cmd_auto_scan(target_s *t, int argc, const char **argv);
 static bool cmd_frequency(target_s *t, int argc, const char **argv);
 static bool cmd_targets(target_s *t, int argc, const char **argv);
@@ -88,6 +89,7 @@ const command_s cmd_list[] = {
 	{"jtag_scan", cmd_jtag_scan, "Scan JTAG chain for devices"},
 	{"swd_scan", cmd_swd_scan, "Scan SWD interface for devices: [TARGET_ID]"},
 	{"swdp_scan", cmd_swd_scan, "Deprecated: use swd_scan instead"},
+	{"rvswd_scan", cmd_rvswd_scan, "Scan RVSWD for devices"},
 	{"auto_scan", cmd_auto_scan, "Automatically scan all chain types for devices"},
 	{"frequency", cmd_frequency, "set minimum high and low times: [FREQ]"},
 	{"targets", cmd_targets, "Display list of available targets"},
@@ -288,6 +290,49 @@ bool cmd_swd_scan(target_s *t, int argc, const char **argv)
 	return true;
 }
 
+bool cmd_rvswd_scan(target_s *target, int argc, const char **argv)
+{
+	(void)target;
+	(void)argc;
+	(void)argv;
+
+	if (platform_target_voltage())
+		gdb_outf("Target voltage: %s\n", platform_target_voltage());
+
+	if (connect_assert_nrst)
+		platform_nrst_set_val(true); /* will be deasserted after attach */
+
+	bool scan_result = false;
+	volatile exception_s e;
+	TRY_CATCH (e, EXCEPTION_ALL) {
+#if PC_HOSTED == 1
+		scan_result = bmda_rvswd_scan();
+#else
+		scan_result = false;
+#endif
+	}
+	switch (e.type) {
+	case EXCEPTION_TIMEOUT:
+		gdb_outf("Timeout during scan. Is target stuck in WFI?\n");
+		break;
+	case EXCEPTION_ERROR:
+		gdb_outf("Exception: %s\n", e.msg);
+		break;
+	}
+
+	if (!scan_result) {
+		platform_target_clk_output_enable(false);
+		platform_nrst_set_val(false);
+		gdb_out("RVSWD scan failed!\n");
+		return false;
+	}
+
+	cmd_targets(NULL, 0, NULL);
+	platform_target_clk_output_enable(false);
+	morse(NULL, false);
+	return true;
+}
+
 bool cmd_auto_scan(target_s *t, int argc, const char **argv)
 {
 	(void)t;

src/gdb_main.c

@@ -722,10 +722,13 @@ static void handle_z_packet(char *packet, const size_t plen)
 	else
 		ret = target_breakwatch_clear(cur_target, type, addr, len);
 
+	/* If the target handler was unable to set/clear the break/watch-point, return an error */
 	if (ret < 0)
 		gdb_putpacketz("E01");
+	/* If the handler does not support the kind requested, return empty string */
 	else if (ret > 0)
 		gdb_putpacketz("");
+	/* Otherwise let GDB know that everything went well */
 	else
 		gdb_putpacketz("OK");
 }

src/include/buffer_utils.h

@@ -51,6 +51,14 @@ static inline void write_le4(uint8_t *const buffer, const size_t offset, const u
 	buffer[offset + 3U] = (value >> 24U) & 0xffU;
 }
 
+static inline void write_be4(uint8_t *const buffer, const size_t offset, const uint32_t value)
+{
+	buffer[offset + 0U] = (value >> 24U) & 0xffU;
+	buffer[offset + 1U] = (value >> 16U) & 0xffU;
+	buffer[offset + 2U] = (value >> 8U) & 0xffU;
+	buffer[offset + 3U] = value & 0xffU;
+}
+
 static inline uint16_t read_le2(const uint8_t *const buffer, const size_t offset)
 {
 	return buffer[offset + 0U] | ((uint16_t)buffer[offset + 1U] << 8U);

src/include/target.h

@@ -37,6 +37,7 @@ typedef struct target_controller target_controller_s;
 #if PC_HOSTED == 1
 bool bmda_swd_scan(uint32_t targetid);
 bool bmda_jtag_scan(void);
+bool bmda_rvswd_scan(void);
 #endif
 bool adiv5_swd_scan(uint32_t targetid);
 bool jtag_scan(void);
@@ -63,6 +64,7 @@ bool target_mem_access_needs_halt(target_s *target);
 bool target_flash_erase(target_s *target, target_addr_t addr, size_t len);
 bool target_flash_write(target_s *target, target_addr_t dest, const void *src, size_t len);
 bool target_flash_complete(target_s *target);
+bool target_flash_mass_erase(target_s *target);
 
 /* Register access functions */
 size_t target_regs_size(target_s *target);

src/platforms/hosted/Makefile.inc

@@ -126,6 +126,7 @@ ifneq ($(HOSTED_BMP_ONLY), 1)
     SRC += bmp_libusb.c stlinkv2.c stlinkv2_jtag.c stlinkv2_swd.c
     SRC += ftdi_bmp.c ftdi_jtag.c ftdi_swd.c
     SRC += jlink.c jlink_jtag.c jlink_swd.c
+    SRC += wchlink.c wchlink_rvswd.c wchlink_riscv_dtm.c
 else
     SRC += bmp_serial.c
 endif

src/platforms/hosted/bmp_libusb.c

@@ -74,6 +74,7 @@ static const debugger_device_s debugger_devices[] = {
 	{VENDOR_ID_STLINK, PRODUCT_ID_STLINKV3, PROBE_TYPE_STLINK_V2, NULL, "ST-Link v3"},
 	{VENDOR_ID_STLINK, PRODUCT_ID_STLINKV3E, PROBE_TYPE_STLINK_V2, NULL, "ST-Link v3E"},
 	{VENDOR_ID_SEGGER, PRODUCT_ID_ANY, PROBE_TYPE_JLINK, NULL, "Segger JLink"},
+	{VENDOR_ID_WCH, PRODUCT_ID_WCHLINK_RV, PROBE_TYPE_WCHLINK, NULL, "WCH-Link"},
 	{VENDOR_ID_FTDI, PRODUCT_ID_FTDI_FT2232, PROBE_TYPE_FTDI, NULL, "FTDI FT2232"},
 	{VENDOR_ID_FTDI, PRODUCT_ID_FTDI_FT4232, PROBE_TYPE_FTDI, NULL, "FTDI FT4232"},
 	{VENDOR_ID_FTDI, PRODUCT_ID_FTDI_FT232, PROBE_TYPE_FTDI, NULL, "FTDI FT232"},
@@ -99,7 +100,7 @@ const debugger_device_s *get_debugger_device_from_vid_pid(const uint16_t probe_v
 void bmp_ident(bmda_probe_s *info)
 {
 	DEBUG_INFO("Black Magic Debug App " FIRMWARE_VERSION "\n for Black Magic Probe, ST-Link v2 and v3, CMSIS-DAP, "
-			   "J-Link and FTDI (MPSSE)\n");
+			   "J-Link, FTDI (MPSSE) and WCH-Link\n");
 	if (info && info->vid && info->pid) {
 		DEBUG_INFO("Using %04x:%04x %s %s\n %s %s\n", info->vid, info->pid,
 			(info->serial[0]) ? info->serial : NO_SERIAL_NUMBER, info->manufacturer, info->product, info->version);

src/platforms/hosted/platform.c

@@ -50,6 +50,7 @@
 #include "stlinkv2.h"
 #include "ftdi_bmp.h"
 #include "jlink.h"
+#include "wchlink.h"
 #include "cmsis_dap.h"
 #endif
 
@@ -148,6 +149,11 @@ void platform_init(int argc, char **argv)
 		if (!jlink_init())
 			exit(1);
 		break;
+
+	case PROBE_TYPE_WCHLINK:
+		if (!wchlink_init())
+			exit(-1);
+		break;
 #endif
 
 	default:
@@ -269,6 +275,21 @@ bool bmda_jtag_init(void)
 	}
 }
 
+bool bmda_rvswd_scan()
+{
+	bmda_probe_info.is_jtag = false;
+
+	switch (bmda_probe_info.type) {
+#if HOSTED_BMP_ONLY == 0
+	case PROBE_TYPE_WCHLINK:
+		return wchlink_rvswd_scan();
+#endif
+
+	default:
+		return false;
+	}
+}
+
 void bmda_adiv5_dp_init(adiv5_debug_port_s *const dp)
 {
 	switch (bmda_probe_info.type) {
@@ -334,6 +355,9 @@ char *bmda_adaptor_ident(void)
 	case PROBE_TYPE_JLINK:
 		return "J-Link";
 
+	case PROBE_TYPE_WCHLINK:
+		return "WCH-Link";
+
 	default:
 		return NULL;
 	}

src/platforms/hosted/platform.h

@@ -77,13 +77,19 @@ void platform_buffer_flush(void);
 #define VENDOR_ID_ORBCODE   0x1209U
 #define PRODUCT_ID_ORBTRACE 0x3443U
 
+#define VENDOR_ID_WCH           0x1a86U
+#define PRODUCT_ID_WCHLINK_RV   0x8010U /* WCH-Link and WCH-LinkE in mode RV */
+#define PRODUCT_ID_WCHLINK_DAP  0x8011U /* WCH-Link in mode DAP */
+#define PRODUCT_ID_WCHLINKE_DAP 0x8012U /* WCH-LinkE in mode DAP */
+
 typedef enum probe_type {
 	PROBE_TYPE_NONE = 0,
 	PROBE_TYPE_BMP,
 	PROBE_TYPE_STLINK_V2,
 	PROBE_TYPE_FTDI,
 	PROBE_TYPE_CMSIS_DAP,
-	PROBE_TYPE_JLINK
+	PROBE_TYPE_JLINK,
+	PROBE_TYPE_WCHLINK,
 } probe_type_e;
 
 void gdb_ident(char *p, int count);