atomic: fix printing atomic_t type

After changing the atomic_t type from long to int the print format was
changed to %l, but the CrosEC print function doesn't support the 'l'
format if long is 4 bytes wide.

Cast the atomic_t to int and print it as a normal int variable.

BUG=b:207082842
TEST=make buildall && zmake testall && make sure the 'taskinfo' work
BRANCH=main
Signed-off-by: Dawid Niedzwiecki <dn@semihalf.com>
Change-Id: I8643d8b843720e3583a29d83fc143d8e103e79c4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3359425
Tested-by: Patryk Duda <pdk@semihalf.com>
Reviewed-by: Patryk Duda <patrykd@google.com>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Commit-Queue: Patryk Duda <patrykd@google.com>

5 files changed, 25 insertions, 25 deletions

diff --git a/core/cortex-m/task.c b/core/cortex-m/task.c
index 6bff0b8d74..934de2b70c 100644
--- a/core/cortex-m/task.c
+++ b/core/cortex-m/task.c
@@ -962,8 +962,8 @@ void task_print_list(void)
 		     sp++)
 			stackused -= sizeof(uint32_t);
 
-		ccprintf("%4d %c %-16s %08lx %11.6lld  %3d/%3d\n", i, is_ready,
-			 task_names[i], (long)tasks[i].events, tasks[i].runtime,
+		ccprintf("%4d %c %-16s %08x %11.6lld  %3d/%3d\n", i, is_ready,
+			 task_names[i], (int)tasks[i].events, tasks[i].runtime,
 			 stackused, tasks_init[i].stack_size);
 		cflush();
 	}
@@ -1006,10 +1006,10 @@ DECLARE_SAFE_CONSOLE_COMMAND(taskinfo, command_task_info,
 static int command_task_ready(int argc, char **argv)
 {
 	if (argc < 2) {
-		ccprintf("tasks_ready: 0x%08lx\n", (long)tasks_ready);
+		ccprintf("tasks_ready: 0x%08x\n", (int)tasks_ready);
 	} else {
 		tasks_ready = strtoi(argv[1], NULL, 16);
-		ccprintf("Setting tasks_ready to 0x%08lx\n", (long)tasks_ready);
+		ccprintf("Setting tasks_ready to 0x%08x\n", (int)tasks_ready);
 		__schedule(0, 0);
 	}
 
diff --git a/core/cortex-m0/task.c b/core/cortex-m0/task.c
index 64c5423a2b..e8aec0926e 100644
--- a/core/cortex-m0/task.c
+++ b/core/cortex-m0/task.c
@@ -579,8 +579,8 @@ void task_print_list(void)
 		     sp++)
 			stackused -= sizeof(uint32_t);
 
-		ccprintf("%4d %c %-16s %08lx %11.6lld  %3d/%3d\n", i, is_ready,
-			 task_names[i], (long)tasks[i].events, tasks[i].runtime,
+		ccprintf("%4d %c %-16s %08x %11.6lld  %3d/%3d\n", i, is_ready,
+			 task_names[i], (int)tasks[i].events, tasks[i].runtime,
 			 stackused, tasks_init[i].stack_size);
 		cflush();
 	}
@@ -623,10 +623,10 @@ DECLARE_CONSOLE_COMMAND(taskinfo, command_task_info,
 static int command_task_ready(int argc, char **argv)
 {
 	if (argc < 2) {
-		ccprintf("tasks_ready: 0x%08lx\n", (long)tasks_ready);
+		ccprintf("tasks_ready: 0x%08x\n", (int)tasks_ready);
 	} else {
 		tasks_ready = strtoi(argv[1], NULL, 16);
-		ccprintf("Setting tasks_ready to 0x%08lx\n", (long)tasks_ready);
+		ccprintf("Setting tasks_ready to 0x%08x\n", (int)tasks_ready);
 		__schedule(0, 0);
 	}
 
diff --git a/core/minute-ia/task.c b/core/minute-ia/task.c
index 91f996a1c6..3526b93dd0 100644
--- a/core/minute-ia/task.c
+++ b/core/minute-ia/task.c
@@ -534,14 +534,14 @@ void task_print_list(void)
 		if (IS_ENABLED(CONFIG_FPU)) {
 			char use_fpu = tasks[i].use_fpu ? 'Y' : 'N';
 
-			ccprintf("%4d %c %-16s %08lx %11.6lld  %3d/%3d %c\n",
+			ccprintf("%4d %c %-16s %08x %11.6lld  %3d/%3d %c\n",
 				 i, is_ready, task_get_name(i),
-				 (long)tasks[i].events, tasks[i].runtime,
+				 (int)tasks[i].events, tasks[i].runtime,
 				 stackused, tasks_init[i].stack_size, use_fpu);
 		} else {
-			ccprintf("%4d %c %-16s %08lx %11.6lld  %3d/%3d\n",
+			ccprintf("%4d %c %-16s %08x %11.6lld  %3d/%3d\n",
 				 i, is_ready, task_get_name(i),
-				 (long)tasks[i].events, tasks[i].runtime,
+				 (int)tasks[i].events, tasks[i].runtime,
 				 stackused, tasks_init[i].stack_size);
 		}
 
@@ -565,9 +565,9 @@ static int command_task_info(int argc, char **argv)
 				total += irq_dist[i];
 			}
 		}
-		ccprintf("Service calls:          %11ld\n", (long)svc_calls);
-		ccprintf("Total exceptions:       %11ld\n",
-			 total + (long)svc_calls);
+		ccprintf("Service calls:          %11d\n", (int)svc_calls);
+		ccprintf("Total exceptions:       %11d\n",
+			 total + (int)svc_calls);
 		ccprintf("Task switches:          %11d\n", task_switches);
 		ccprintf("Task switching started: %11.6lld s\n",
 			 task_start_time);
@@ -587,10 +587,10 @@ __maybe_unused
 static int command_task_ready(int argc, char **argv)
 {
 	if (argc < 2) {
-		ccprintf("tasks_ready: 0x%08lx\n", (long)tasks_ready);
+		ccprintf("tasks_ready: 0x%08x\n", (int)tasks_ready);
 	} else {
 		tasks_ready = strtoi(argv[1], NULL, 16);
-		ccprintf("Setting tasks_ready to 0x%08lx\n", (long)tasks_ready);
+		ccprintf("Setting tasks_ready to 0x%08x\n", (int)tasks_ready);
 		__schedule(0, 0);
 	}
 
diff --git a/core/nds32/task.c b/core/nds32/task.c
index 37d09c6d2c..aa88193d91 100644
--- a/core/nds32/task.c
+++ b/core/nds32/task.c
@@ -680,8 +680,8 @@ void task_print_list(void)
 		     sp++)
 			stackused -= sizeof(uint32_t);
 
-		ccprintf("%4d %c %-16s %08lx %11.6lld  %3d/%3d\n", i, is_ready,
-			 task_names[i], (long)tasks[i].events, tasks[i].runtime,
+		ccprintf("%4d %c %-16s %08x %11.6lld  %3d/%3d\n", i, is_ready,
+			 task_names[i], (int)tasks[i].events, tasks[i].runtime,
 			 stackused, tasks_init[i].stack_size);
 		cflush();
 	}
@@ -724,10 +724,10 @@ DECLARE_CONSOLE_COMMAND(taskinfo, command_task_info,
 static int command_task_ready(int argc, char **argv)
 {
 	if (argc < 2) {
-		ccprintf("tasks_ready: 0x%08lx\n", (long)tasks_ready);
+		ccprintf("tasks_ready: 0x%08x\n", (int)tasks_ready);
 	} else {
 		tasks_ready = strtoi(argv[1], NULL, 16);
-		ccprintf("Setting tasks_ready to 0x%08lx\n", (long)tasks_ready);
+		ccprintf("Setting tasks_ready to 0x%08x\n", (int)tasks_ready);
 		__schedule(0, 0, 0);
 	}
 
diff --git a/core/riscv-rv32i/task.c b/core/riscv-rv32i/task.c
index a7c8c7c56d..204e58432d 100644
--- a/core/riscv-rv32i/task.c
+++ b/core/riscv-rv32i/task.c
@@ -613,8 +613,8 @@ void task_print_list(void)
 		     sp++)
 			stackused -= sizeof(uint32_t);
 
-		ccprintf("%4d %c %-16s %08lx %11.6lld  %3d/%3d\n", i, is_ready,
-			 task_names[i], (long)tasks[i].events, tasks[i].runtime,
+		ccprintf("%4d %c %-16s %08x %11.6lld  %3d/%3d\n", i, is_ready,
+			 task_names[i], (int)tasks[i].events, tasks[i].runtime,
 			 stackused, tasks_init[i].stack_size);
 		cflush();
 	}
@@ -657,10 +657,10 @@ DECLARE_CONSOLE_COMMAND(taskinfo, command_task_info,
 static int command_task_ready(int argc, char **argv)
 {
 	if (argc < 2) {
-		ccprintf("tasks_ready: 0x%08lx\n", (long)tasks_ready);
+		ccprintf("tasks_ready: 0x%08x\n", (int)tasks_ready);
 	} else {
 		tasks_ready = strtoi(argv[1], NULL, 16);
-		ccprintf("Setting tasks_ready to 0x%08lx\n", (long)tasks_ready);
+		ccprintf("Setting tasks_ready to 0x%08x\n", (int)tasks_ready);
 		__schedule(0, 0, 0);
 	}