Merge pull request #194 from smartobjectoriented/193-add-logs-support-in-soo-environment

jmi-reds · web-flow · commit 27ffea866710 · 2025-09-26T11:10:27.000+02:00
Add support for `logs` - used in soo env.
diff --git a/so3/arch/arm32/mmu.c b/so3/arch/arm32/mmu.c
@@ -21,6 +21,7 @@
 #include <heap.h>
 #include <sizes.h>
 #include <string.h>
+#include <log.h>
 
 #include <device/ramdev.h>
 
diff --git a/so3/arch/arm64/mmu.c b/so3/arch/arm64/mmu.c
@@ -22,6 +22,7 @@
 #include <sizes.h>
 #include <string.h>
 #include <process.h>
+#include <log.h>
 
 #include <device/ramdev.h>
 #include <device/fdt.h>
diff --git a/so3/avz/kernel/domain.c b/so3/avz/kernel/domain.c
@@ -24,6 +24,7 @@
 #include <softirq.h>
 #include <memory.h>
 #include <heap.h>
+#include <log.h>
 
 #include <asm/processor.h>
 #include <asm/vfp.h>
diff --git a/so3/avz/kernel/injector.c b/so3/avz/kernel/injector.c
@@ -22,6 +22,7 @@
 #include <crc.h>
 #include <softirq.h>
 #include <ptrace.h>
+#include <log.h>
 
 #include <avz/memslot.h>
 #include <avz/domain.h>
diff --git a/so3/configs/virt64_capsule_defconfig b/so3/configs/virt64_capsule_defconfig
@@ -103,3 +103,4 @@ CONFIG_VUART_FRONTEND=y
 # CONFIG_VUIHANDLER_FRONTEND is not set
 # CONFIG_VSENSELED_FRONTEND is not set
 # CONFIG_VSENSEJ_FRONTEND is not set
+CONFIG_VLOGS_FRONTEND=y
diff --git a/so3/devices/device.c b/so3/devices/device.c
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <vfs.h>
+#include <log.h>
 
 #include <asm/setup.h>
 
diff --git a/so3/devices/fdt.c b/so3/devices/fdt.c
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <common.h>
 #include <memory.h>
+#include <log.h>
 
 #include <device/device.h>
 #include <device/driver.h>
diff --git a/so3/devices/input/kmi0.c b/so3/devices/input/kmi0.c
@@ -27,6 +27,7 @@
 #include <vfs.h>
 #include <common.h>
 #include <memory.h>
+#include <log.h>
 
 #include <asm/io.h>
 #include <device/driver.h>
diff --git a/so3/devices/input/ps2.c b/so3/devices/input/ps2.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <common.h>
+#include <log.h>
 #include <device/input/ps2.h>
 
 #define GET_DX(state, x) ((x) - (((state) << 4) & 0x100))
diff --git a/so3/devices/irq.c b/so3/devices/irq.c
@@ -22,6 +22,7 @@
 #include <heap.h>
 #include <string.h>
 #include <thread.h>
+#include <log.h>
 
 #include <device/irq.h>
 
diff --git a/so3/devices/irq/gic.c b/so3/devices/irq/gic.c
@@ -46,6 +46,7 @@
 #include <percpu.h>
 #include <smp.h>
 #include <spinlock.h>
+#include <log.h>
 
 #include <device/device.h>
 #include <device/driver.h>
diff --git a/so3/devices/ramdev/ramdev.c b/so3/devices/ramdev/ramdev.c
@@ -17,9 +17,9 @@
  */
 
 #include <common.h>
-#include <log.h>
 #include <memory.h>
 #include <part.h>
+#include <log.h>
 
 #include <device/fdt.h>
 #include <device/ramdev.h>
diff --git a/so3/devices/timer.c b/so3/devices/timer.c
@@ -19,6 +19,7 @@
 #include <spinlock.h>
 #include <timer.h>
 #include <softirq.h>
+#include <log.h>
 
 #include <device/timer.h>
 #include <device/irq.h>
diff --git a/so3/dts/virt64_capsule.dts b/so3/dts/virt64_capsule.dts
@@ -95,22 +95,26 @@
 		perform various tests. This variant includes a rootfs with some user space \n \
 		applications.";
 
-        frontends {
+		frontends {
 
 			/* Enabling vdummy for testing purposes */
-            vdummy {
+			vdummy {
 				compatible = "vdummy,frontend";
 				status = "disabled";
 			};
 
-            /* Enabling the console */
-            vuart {
+			/* Enabling the console */
+			vuart {
 				compatible = "vuart,frontend";
 				status = "ok";
 			};
 
-
-        };
+			/* Enabling vlogs - logging supports */
+			vlogs {
+				compatible = "vlogs,frontend";
+				status = "ok";
+			};
+		};
 	};
 
 
diff --git a/so3/fs/elf.c b/so3/fs/elf.c
@@ -25,6 +25,7 @@
 #include <sizes.h>
 #include <types.h>
 #include <string.h>
+#include <log.h>
 
 /* Load the file in a buffer allocated in the kernel heap */
 uint8_t *elf_load_buffer(const char *filename)
diff --git a/so3/fs/fat/diskio.c b/so3/fs/fat/diskio.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <part.h>
+#include <log.h>
 
 #include <fat/diskio.h> /* FatFs lower layer API */
 
diff --git a/so3/fs/fat/fat.c b/so3/fs/fat/fat.c
@@ -19,6 +19,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <log.h>
 
 #include <fat/fat.h>
 #include <fat/ff.h>
diff --git a/so3/fs/vfs.c b/so3/fs/vfs.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <dirent.h>
 #include <console.h>
+#include <log.h>
 
 #include <fat/fat.h>
 #include <devfs/devfs.h>
diff --git a/so3/include/common.h b/so3/include/common.h
@@ -26,7 +26,6 @@
 #include <types.h>
 #include <printk.h>
 #include <string.h>
-#include <log.h>
 
 #endif /* __ASSEMBLY__ */
 
diff --git a/so3/include/log.h b/so3/include/log.h
@@ -20,6 +20,11 @@
 
 #include <printk.h>
 
+#ifdef CONFIG_SOO
+#include <soo/soo.h>
+#include <soo/dev/vlogs.h>
+#endif
+
 #define LOG_LEVEL_CRITICAL 1
 #define LOG_LEVEL_ERROR 2
 #define LOG_LEVEL_WARNING 3
@@ -31,13 +36,24 @@
 #define CONFIG_LOG_LEVEL LOG_LEVEL_INFO
 #endif
 
-#ifdef CONFIG_AVZ
+#if defined(CONFIG_AVZ)
 
 #define LOG(level, fmt, ...)                                                                     \
 	do {                                                                                     \
 		lprintk("[SO3:AVZ " #level "] <%s:%d> " fmt, __func__, __LINE__, ##__VA_ARGS__); \
 	} while (0)
 
+#elif defined(CONFIG_VLOGS_FRONTEND)
+
+#define LOG(level, fmt, ...)                                                                                                   \
+	do {                                                                                                                   \
+		if (vlogs_ready())                                                                                             \
+			vlogs_write("[ME:%d][" #level "] <%s:%d> " fmt, get_ME_desc()->slotID, __func__, __LINE__,             \
+				    ##__VA_ARGS__);                                                                            \
+		else                                                                                                           \
+			lprintk("[ME:%d][" #level "] <%s:%d> " fmt, get_ME_desc()->slotID, __func__, __LINE__, ##__VA_ARGS__); \
+	} while (0)
+
 #else
 
 #define LOG(level, fmt, ...)                                                                 \
diff --git a/so3/include/net/netif/ppp/ppp_impl.h b/so3/include/net/netif/ppp/ppp_impl.h
@@ -45,6 +45,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h> /* strtol() */
+#include <log.h>
 
 #include "lwip/netif.h"
 #include "lwip/def.h"
diff --git a/so3/ipc/signal.c b/so3/ipc/signal.c
@@ -23,6 +23,7 @@
 #include <thread.h>
 #include <types.h>
 #include <softirq.h>
+#include <log.h>
 
 #include <asm/processor.h>
 
diff --git a/so3/kernel/process.c b/so3/kernel/process.c
@@ -32,6 +32,7 @@
 #include <types.h>
 #include <vfs.h>
 #include <wait.h>
+#include <log.h>
 
 #include <device/serial.h>
 
diff --git a/so3/kernel/schedule.c b/so3/kernel/schedule.c
@@ -28,6 +28,7 @@
 #include <softirq.h>
 #include <mutex.h>
 #include <timer.h>
+#include <log.h>
 
 #include <device/irq.h>
 
diff --git a/so3/kernel/timer.c b/so3/kernel/timer.c
@@ -31,6 +31,7 @@
 #include <timer.h>
 #include <percpu.h>
 #include <heap.h>
+#include <log.h>
 
 #include <avz/keyhandler.h>
 
diff --git a/so3/lib/Makefile b/so3/lib/Makefile
@@ -8,4 +8,3 @@ lib-y += vsprintf.o printk.o
 lib-y += strtod.o
 lib-y += list_sort.o
 
- 
diff --git a/so3/soo/drivers/Kconfig b/so3/soo/drivers/Kconfig
@@ -19,5 +19,8 @@ config VSENSELED_FRONTEND
 config VSENSEJ_FRONTEND
     bool "vsensej joystick Sense HAT frontend"
 
+config VLOGS_FRONTEND
+    bool "vlogs serial driver"
+
 endmenu
 
diff --git a/so3/soo/drivers/Makefile b/so3/soo/drivers/Makefile
@@ -5,3 +5,4 @@ obj-$(CONFIG_VUART_FRONTEND) += vuartfront/
 obj-$(CONFIG_VUIHANDLER_FRONTEND) += vuihandlerfront/
 obj-$(CONFIG_VSENSELED_FRONTEND) += vsenseledfront/
 obj-$(CONFIG_VSENSEJ_FRONTEND) += vsensejfront/
+obj-$(CONFIG_VLOGS_FRONTEND) += vlogsfront/
diff --git a/so3/soo/drivers/vlogsfront/Makefile b/so3/soo/drivers/vlogsfront/Makefile
@@ -0,0 +1 @@
+obj-y := vlogs.o
diff --git a/so3/soo/drivers/vlogsfront/vlogs.c b/so3/soo/drivers/vlogsfront/vlogs.c
diff --git a/so3/soo/include/soo/dev/vlogs.h b/so3/soo/include/soo/dev/vlogs.h
diff --git a/so3/soo/kernel/setup.c b/so3/soo/kernel/setup.c
diff --git a/so3/soo/kernel/vbstore/vbstore_me.c b/so3/soo/kernel/vbstore/vbstore_me.c
diff --git a/usr/CMakeLists.txt b/usr/CMakeLists.txt
diff --git a/usr/lib/CMakeLists.txt b/usr/lib/CMakeLists.txt
diff --git a/usr/lib/logs/CMakeLists.txt b/usr/lib/logs/CMakeLists.txt
diff --git a/usr/lib/logs/capsule_log.c b/usr/lib/logs/capsule_log.c
diff --git a/usr/lib/logs/include/capsule_log.h b/usr/lib/logs/include/capsule_log.h
diff --git a/usr/src/CMakeLists.txt b/usr/src/CMakeLists.txt
diff --git a/usr/src/logs_example.c b/usr/src/logs_example.c
