B91 BLE, DFU and west debug support

Author: Yuriy Vynnychek

boards/common/spi_burn.board.cmake

@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_set_flasher_ifnset(spi_burn)
+board_set_debugger_ifnset(spi_burn)
 board_finalize_runner_args(spi_burn)

boards/riscv/tlsr9518adk80d/Kconfig.defconfig

@@ -36,6 +36,12 @@ config I2C_TELINK_B91
 config ADC_TELINK_B91
 	default y if ADC
 
+# Workaround for not being able to have commas in macro arguments
+DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
+
+config FLASH_LOAD_OFFSET
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) if USE_DT_CODE_PARTITION
+
 if BT
 
 # BLE Controller SDK from hal_telink requires

boards/riscv/tlsr9518adk80d/board.cmake

@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
-board_runner_args(spi_burn --addr 0x0)
+board_runner_args(spi_burn)
 include(${ZEPHYR_BASE}/boards/common/spi_burn.board.cmake)

boards/riscv/tlsr9518adk80d/doc/index.rst

@@ -279,7 +279,21 @@ It is also possible to use the west flash command, but additional steps are requ
 Debugging
 =========
 
-Supporting UART debug and OpenOCD+GDB.
+Supporting UART debug and OpenOCD+GDB. west debug command also supported. You may run it in a simle way, like:
+
+.. code-block:: console
+
+   west debug
+
+Or with additional arguments, like:
+
+.. code-block:: console
+
+   west debug --gdb-port=<port_number> --gdb-ex=<additional_ex_arguments>
+
+Example:
+   west debug --gdb-port=1111 --gdb-ex="-ex monitor reset halt -ex b main -ex continue"
+
 
 References
 **********

boards/riscv/tlsr9518adk80d/tlsr9518adk80d.dts

@@ -16,6 +16,8 @@
 	aliases {
 		led0 = &led_blue;
 		led1 = &led_green;
+		led2 = &led_white;
+		led3 = &led_red;
 		sw0 = &key_1;
 		pwm-led0 = &pwm_led_blue;
 		pwm-0 = &pwm0;
@@ -69,6 +71,7 @@
 		zephyr,flash = &flash;
 		zephyr,flash-controller = &flash_mspi;
 		zephyr,entropy = &trng0;
+		zephyr,code-partition = &slot0_partition;
 	};
 };
 
@@ -86,6 +89,36 @@
 
 &flash {
 	reg = <0x20000000 0x100000>;
+
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x00000000 0x10000>;
+		};
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x10000 0x70000>;
+		};
+		slot1_partition: partition@80000 {
+			label = "image-1";
+			reg = <0x80000 0x70000>;
+		};
+		scratch_partition: partition@f0000 {
+			label = "image-scratch";
+			reg = <0xf0000 0x4000>;
+		};
+		storage_partition: partition@f4000 {
+			label = "storage";
+			reg = <0xf4000 0x0000b000>;
+		/* region <0xff000 0x1000> is reserved for 
+		 * Telink B91 SDK's data (BLE MAC address etc.)
+		 */
+		};
+	};
 };
 
 &gpiob {
@@ -144,35 +177,3 @@
 	status = "okay";
 	vref = "ADC_VREF_1P2V";
 };
-
-&flash_mspi {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		boot_partition: partition@0 {
-			label = "mcuboot";
-			reg = <0x00000000 0x8000>;
-		};
-		slot0_partition: partition@8000 {
-			label = "image-0";
-			reg = <0x00008000 0x1a000>;
-		};
-		slot1_partition: partition@22000 {
-			label = "image-1";
-			reg = <0x00022000 0x1a000>;
-		};
-		scratch_partition: partition@3c000 {
-			label = "image-scratch";
-			reg = <0x0003c000 0x2000>;
-		};
-		storage_partition: partition@f0000 {
-			label = "storage";
-			reg = <0x000f0000 0x00008000>;
-			/* region 0x000f8000 .. 0x000FFFFF
-			 * is reserved for factory calibration
-			 */
-		};
-	};
-};

drivers/serial/uart_b91.c

@@ -35,6 +35,10 @@
 #define UART_STOP_BIT_1P5  BIT(4)
 #define UART_STOP_BIT_2    BIT(5)
 
+/* TX RX reset bits */
+#define UART_RX_RESET_BIT BIT(6)
+#define UART_TX_RESET_BIT BIT(7)
+
 
 /* B91 UART registers structure */
 struct uart_b91_t {
@@ -304,6 +308,12 @@ static int uart_b91_driver_init(const struct device *dev)
 	uint8_t bwpc = 0u;
 	volatile struct uart_b91_t *uart = GET_UART(dev);
 	const struct uart_b91_config *cfg = dev->config;
+	struct uart_b91_data *data = dev->data;
+
+	/* Reset Tx, Rx status before usage */
+	uart->status |= UART_RX_RESET_BIT | UART_TX_RESET_BIT;
+	data->rx_byte_index = 0;
+	data->tx_byte_index = 0;
 
 	/* configure pins */
 	status = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);

samples/subsys/mgmt/mcumgr/smp_svr/boards/tlsr9518adk80d.conf

@@ -0,0 +1,4 @@
+CONFIG_LOG_BACKEND_UART=y
+CONFIG_IMG_BLOCK_BUF_SIZE=256
+CONFIG_GPIO=y
+CONFIG_ASSERT=y

samples/subsys/mgmt/mcumgr/smp_svr/boards/tlsr9518adk80d.overlay

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2022 Telink Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	chosen {
+		zephyr,uart-mcumgr = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,console = &uart1;
+	};
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_tx_pb2_default &uart0_rx_pb3_default>;
+	pinctrl-names = "default";
+};
+
+&uart1 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart1_tx_pc6_default &uart1_rx_pc7_default>;
+	pinctrl-names = "default";
+};

samples/subsys/mgmt/mcumgr/smp_svr/src/main.c

@@ -8,6 +8,16 @@
 #include <zephyr/zephyr.h>
 #include <zephyr/stats/stats.h>
 #include <zephyr/usb/usb_device.h>
+#include <drivers/gpio.h>
+
+/* The devicetree node identifier for the "led0" alias. */
+#define LED_NODE DT_ALIAS(led0)
+
+/*
+ * A build error on this line means your board is unsupported.
+ * See the sample documentation for information on how to fix this.
+ */
+static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(LED_NODE, gpios);
 
 #ifdef CONFIG_MCUMGR_CMD_FS_MGMT
 #include <zephyr/device.h>
@@ -60,6 +70,12 @@ static struct fs_mount_t littlefs_mnt = {
 };
 #endif
 
+static void gpio_init(void)
+{
+	__ASSERT(device_is_ready(led.port), "Device is not ready");
+	__ASSERT(gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE) == 0, "Fail to config gpio");
+}
+
 void main(void)
 {
 	int rc = STATS_INIT_AND_REG(smp_svr_stats, STATS_SIZE_32,
@@ -109,10 +125,14 @@ void main(void)
 	 */
 	LOG_INF("build time: " __DATE__ " " __TIME__);
 
+	/* Enable LED */
+	gpio_init();
+
 	/* The system work queue handles all incoming mcumgr requests.  Let the
 	 * main thread idle while the mcumgr server runs.
 	 */
 	while (1) {
+		__ASSERT(gpio_pin_toggle_dt(&led) == 0, "Fail to toggle LED");
 		k_sleep(K_MSEC(1000));
 		STATS_INC(smp_svr_stats, ticks);
 	}