samples: drivers: ipm changes

reorganize overlays
move files here and there
Add shell and more stuff

Signed-off-by: Marek Matej <[email protected]>

samples/drivers/ipm/ipm_esp32/CMakeLists.txt

@@ -2,33 +2,11 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/ipm_esp32_appcpu-prefix/src/ipm_esp32_appcpu-build/zephyr)
-
-if("${BOARD}" STREQUAL "esp32_devkitc_wrover/esp32/procpu")
-  set(BOARD_REMOTE "esp32_devkitc_wrover/esp32/appcpu")
-elseif("${BOARD}" STREQUAL "esp32_devkitc_wroom/esp32/procpu")
-  set(BOARD_REMOTE "esp32_devkitc_wroom/esp32/appcpu")
-elseif("${BOARD}" STREQUAL "esp32s3_devkitm/esp32s3/procpu")
-  set(BOARD_REMOTE "esp32s3_devkitm/esp32s3/appcpu")
-else()
-  message(FATAL_ERROR "${BOARD} was not supported for this sample")
-endif()
+set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../ipm_esp32_remote/zephyr)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(ipm_esp32)
-
-set_source_files_properties(${REMOTE_ZEPHYR_DIR}/esp32_appcpu_firmware.c PROPERTIES GENERATED TRUE)
-target_sources(app PRIVATE src/main.c ${REMOTE_ZEPHYR_DIR}/esp32_appcpu_firmware.c)
 
-include(ExternalProject)
-
-ExternalProject_Add(
-	ipm_esp32_appcpu
-	SOURCE_DIR ${APPLICATION_SOURCE_DIR}/ipm_esp_appcpu
-	INSTALL_COMMAND ""
-	CMAKE_CACHE_ARGS -DBOARD:STRING=${BOARD_REMOTE}
-	BUILD_BYPRODUCTS "${REMOTE_ZEPHYR_DIR}/${KERNEL_BIN_NAME}"
-	BUILD_ALWAYS True
-)
+message(STATUS "${BOARD} compile as Master in this sample")
+project(ipm_esp32)
 
-add_dependencies(app ipm_esp32_appcpu)
+target_sources(app PRIVATE src/main.c src/shell.c)

samples/drivers/ipm/ipm_esp32/ipm_esp_appcpu/CMakeLists.txt → samples/drivers/ipm/ipm_esp32/remote/CMakeLists.txt

@@ -3,6 +3,8 @@
 cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(ipm_esp32_appcpu)
+
+message(STATUS "${BOARD} compiles as remote in this sample")
+project(ipm_esp32_remote)
 
 target_sources(app PRIVATE src/main.c)

samples/drivers/ipm/ipm_esp32/remote/prj.conf

@@ -0,0 +1,4 @@
+CONFIG_HEAP_MEM_POOL_SIZE=2048
+CONFIG_IPM=y
+CONFIG_GPIO=y
+CONFIG_MAIN_STACK_SIZE=4096

samples/drivers/ipm/ipm_esp32/ipm_esp_appcpu/src/main.c → samples/drivers/ipm/ipm_esp32/remote/src/main.c

@@ -4,13 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdio.h>
 #include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/ipm.h>
-#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 
 static const struct device *ipm_dev;
-static const char fake_resp[] = {"APP_CPU: This is a response"};
+static char resp[64];
+static uint32_t msg_cnt;
 struct k_sem sync;
 
 static void ipm_receive_callback(const struct device *ipmdev, void *user_data,
@@ -21,6 +24,8 @@ static void ipm_receive_callback(const struct device *ipmdev, void *user_data,
 
 int main(void)
 {
+	int ret;
+
 	k_sem_init(&sync, 0, 1);
 
 	ipm_dev = DEVICE_DT_GET(DT_NODELABEL(ipm0));
@@ -32,8 +37,14 @@ int main(void)
 	ipm_register_callback(ipm_dev, ipm_receive_callback, NULL);
 
 	while (1) {
-		k_sem_take(&sync, K_FOREVER);
-		ipm_send(ipm_dev, -1, sizeof(fake_resp), &fake_resp, sizeof(fake_resp));
+		ret = snprintf(resp, sizeof(resp), "Response id %i\n", ++msg_cnt);
+		if (ret < 0) {
+			continue;
+		} else {
+			k_sem_take(&sync, K_FOREVER);
+			ipm_send(ipm_dev, -1, sizeof(resp), &resp, sizeof(resp));
+		}
 	}
+
 	return 0;
 }

samples/drivers/ipm/ipm_esp32/src/main.c

@@ -10,7 +10,7 @@
 #include <zephyr/device.h>
 #include <string.h>
 
-static const char fake_request[] = {"PRO_CPU: Fake request to APP_CPU"};
+static const char request[] = {"PRO_CPU: request to APP_CPU"};
 
 static const struct device *ipm_dev;
 static char received_string[64];
@@ -22,12 +22,15 @@ static void ipm_receive_callback(const struct device *ipmdev, void *user_data,
 	ARG_UNUSED(ipmdev);
 	ARG_UNUSED(user_data);
 
-	strcpy(received_string, (const char *)data);
+	strncpy(received_string, (const char *)data, sizeof(received_string));
 	k_sem_give(&sync);
+
 }
 
 int main(void)
 {
+	int ret;
+
 	k_sem_init(&sync, 0, 1);
 
 	ipm_dev = DEVICE_DT_GET(DT_NODELABEL(ipm0));
@@ -38,15 +41,23 @@ int main(void)
 
 	ipm_register_callback(ipm_dev, ipm_receive_callback, NULL);
 
+	/* TODO: workaround to catch up with APPCPU */
+	k_msleep(1000);
+
 	while (1) {
-		printk("PRO_CPU is sending a fake request, waiting remote response...\n\r");
+		printk("PRO_CPU is sending a request, waiting remote response...\n\r");
+
+		ipm_send(ipm_dev, -1, sizeof(request), &request, sizeof(request));
 
-		ipm_send(ipm_dev, -1, sizeof(fake_request), &fake_request, sizeof(fake_request));
-		k_sem_take(&sync, K_FOREVER);
+		ret = k_sem_take(&sync, K_MSEC(5000));
 
-		printk("PRO_CPU received a message from APP_CPU : %s\n\r", received_string);
+		if (ret) {
+			printk("No response from APP_CPU - trying again.\r\n");
+		} else {
+			printk("PRO_CPU received a message from APP_CPU : %s\n\r", received_string);
+		}
 
-		k_sleep(K_MSEC(200));
+		k_sleep(K_MSEC(1000));
 	}
 	return 0;
 }

samples/drivers/ipm/ipm_esp32/src/shell.c

@@ -0,0 +1,64 @@
+/* Helper shell
+ */
+
+#include <stdlib.h>
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/regulator.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/dt-bindings/gpio/nordic-npm6001-gpio.h>
+#include <zephyr/dt-bindings/regulator/npm6001.h>
+#include <zephyr/posix/unistd.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/printk.h>
+
+#include <getopt.h>
+
+#define PR_SHELL(shell, fmt, ...)				\
+	shell_fprintf(shell, SHELL_NORMAL, fmt, ##__VA_ARGS__)
+#define PR_ERROR(shell, fmt, ...)				\
+	shell_fprintf(shell, SHELL_ERROR, fmt, ##__VA_ARGS__)
+#define PR_INFO(shell, fmt, ...)				\
+	shell_fprintf(shell, SHELL_INFO, fmt, ##__VA_ARGS__)
+#define PR_WARNING(shell, fmt, ...)				\
+	shell_fprintf(shell, SHELL_WARNING, fmt, ##__VA_ARGS__)
+
+/* Command usage info. */
+#define START_HELP \
+	("<cmd>\n\n" \
+	 "Start the APPCPU")
+
+#define STOP_HELP \
+	("<cmd>\n\n" \
+	 "Stop the APPCPU")
+
+void esp_appcpu_image_start(unsigned int hdr_offset);
+void esp_appcpu_image_stop(void);
+
+static int cmd_appcpu_start(const struct shell *shell, size_t argc, char **argv)
+{
+	printk("start appcpu\n");
+
+	esp_appcpu_image_start(0x20);
+
+	return 0;
+}
+
+static int cmd_appcpu_stop(const struct shell *shell, size_t argc, char **argv)
+{
+	printk("stop appcpu\n");
+
+	esp_appcpu_image_stop();
+
+	return 0;
+}
+
+SHELL_STATIC_SUBCMD_SET_CREATE(sub_amp,
+	/* Alphabetically sorted to ensure correct Tab autocompletion. */
+	SHELL_CMD_ARG(appstart,	NULL,	START_HELP,	cmd_appcpu_start, 1, 0),
+	SHELL_CMD_ARG(appstop,	NULL,	STOP_HELP,	cmd_appcpu_stop, 1, 0),
+	SHELL_SUBCMD_SET_END /* Array terminated. */
+);
+
+SHELL_CMD_REGISTER(amp, &sub_amp, "AMP debug commands.", NULL);