atomic: change atomic_t to long

Change the atomic_t type from int to long. For all chips used for EC,
this change shouldn't impact the generated code, except for the string
needed fot the print function. For the host build keep int, because EC
codebase assumes that the atomic_t type is 4-byte wide.

The change caused by a change in Zephyr upstream (atomic_t from int to
long).

BUG=b:207082842
Cq-Depend: chromium:3330355
TEST=make buildall && zmake testall
BRANCH=main
Signed-off-by: Dawid Niedzwiecki <dn@semihalf.com>
Change-Id: Id4b6f8b60e73bdef741a530e3ed614b67b48720f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3330201
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Commit-Queue: Dawid Niedzwiecki <dawidn@google.com>

13 files changed, 48 insertions, 42 deletions

diff --git a/chip/mchp/clock.c b/chip/mchp/clock.c
index 7a3914194b..0b579055d4 100644
--- a/chip/mchp/clock.c
+++ b/chip/mchp/clock.c
@@ -763,7 +763,7 @@ static int command_dsleep(int argc, char **argv)
 		}
 	}
 
-	ccprintf("Sleep mask: %08x\n", sleep_mask);
+	ccprintf("Sleep mask: %08lx\n", (long)sleep_mask);
 	ccprintf("Console in use timeout:   %d sec\n",
 			console_in_use_timeout_sec);
 
diff --git a/chip/npcx/clock.c b/chip/npcx/clock.c
index ab3bd7f119..6df7d4a8c2 100644
--- a/chip/npcx/clock.c
+++ b/chip/npcx/clock.c
@@ -499,7 +499,7 @@ static int command_dsleep(int argc, char **argv)
 		}
 	}
 
-	ccprintf("Sleep mask: %08x\n", sleep_mask);
+	ccprintf("Sleep mask: %08lx\n", (long)sleep_mask);
 	ccprintf("Console in use timeout:   %d sec\n",
 			console_in_use_timeout_sec);
 	ccprintf("PMCSR register:      0x%02x\n", NPCX_PMCSR);
diff --git a/chip/stm32/usart_info_command.c b/chip/stm32/usart_info_command.c
index 50d56aa2ba..28773768f5 100644
--- a/chip/stm32/usart_info_command.c
+++ b/chip/stm32/usart_info_command.c
@@ -20,13 +20,14 @@ static int command_usart_info(int argc, char **argv)
 		if (config == NULL)
 			continue;
 
-		ccprintf(
-			"USART%d\n"
-			"    dropped %d bytes\n"
-			"    overran %d times\n",
-			config->hw->index + 1,
-			atomic_clear((atomic_t *)&(config->state->rx_dropped)),
-			atomic_clear((atomic_t *)&(config->state->rx_overrun)));
+		ccprintf("USART%d\n"
+			 "    dropped %ld bytes\n"
+			 "    overran %ld times\n",
+			 config->hw->index + 1,
+			 (long)atomic_clear(
+				 (atomic_t *)&(config->state->rx_dropped)),
+			 (long)atomic_clear(
+				 (atomic_t *)&(config->state->rx_overrun)));
 
 		if (config->rx->info)
 			config->rx->info(config);
diff --git a/chip/stm32/usart_rx_dma.c b/chip/stm32/usart_rx_dma.c
index 13c63949dd..fed5b7ae17 100644
--- a/chip/stm32/usart_rx_dma.c
+++ b/chip/stm32/usart_rx_dma.c
@@ -114,6 +114,6 @@ void usart_rx_dma_info(struct usart_config const *config)
 	struct usart_rx_dma const *dma_config =
 		DOWNCAST(config->rx, struct usart_rx_dma const, usart_rx);
 
-	ccprintf("    DMA RX max_bytes %d\n",
-		 atomic_clear((atomic_t *)&dma_config->state->max_bytes));
+	ccprintf("    DMA RX max_bytes %ld\n",
+		 (long)atomic_clear((atomic_t *)&dma_config->state->max_bytes));
 }
diff --git a/common/dptf.c b/common/dptf.c
index 06937bf71d..d18f67f84d 100644
--- a/common/dptf.c
+++ b/common/dptf.c
@@ -198,7 +198,7 @@ static int command_dptftemp(int argc, char **argv)
 		ccprintf("    %s\n", temp_sensors[id].name);
 	}
 
-	ccprintf("AP seen mask: 0x%08x\n", dptf_seen);
+	ccprintf("AP seen mask: 0x%08lx\n", (long)dptf_seen);
 	return EC_SUCCESS;
 }
 DECLARE_CONSOLE_COMMAND(dptftemp, command_dptftemp,
diff --git a/common/fpsensor/fpsensor.c b/common/fpsensor/fpsensor.c
index 8d4f88c8eb..485cfe3ea7 100644
--- a/common/fpsensor/fpsensor.c
+++ b/common/fpsensor/fpsensor.c
@@ -754,7 +754,7 @@ static enum ec_error_list fp_console_action(uint32_t mode)
 
 	while (tries--) {
 		if (!(sensor_mode & FP_MODE_ANY_CAPTURE)) {
-			CPRINTS("done (events:%x)", fp_events);
+			CPRINTS("done (events:%lx)", (long)fp_events);
 			return 0;
 		}
 		usleep(100 * MSEC);
diff --git a/common/system.c b/common/system.c
index 621ed6a99d..0d499ff096 100644
--- a/common/system.c
+++ b/common/system.c
@@ -1491,7 +1491,7 @@ static int command_sleepmask(int argc, char **argv)
 		}
 	}
 #endif
-	ccprintf("sleep mask: %08x\n", sleep_mask);
+	ccprintf("sleep mask: %08lx\n", (long)sleep_mask);
 
 	return EC_SUCCESS;
 }
diff --git a/core/cortex-m/task.c b/core/cortex-m/task.c
index 61c180330f..6bff0b8d74 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 %08x %11.6lld  %3d/%3d\n", i, is_ready,
-			 task_names[i], tasks[i].events, tasks[i].runtime,
+		ccprintf("%4d %c %-16s %08lx %11.6lld  %3d/%3d\n", i, is_ready,
+			 task_names[i], (long)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%08x\n", tasks_ready);
+		ccprintf("tasks_ready: 0x%08lx\n", (long)tasks_ready);
 	} else {
 		tasks_ready = strtoi(argv[1], NULL, 16);
-		ccprintf("Setting tasks_ready to 0x%08x\n", tasks_ready);
+		ccprintf("Setting tasks_ready to 0x%08lx\n", (long)tasks_ready);
 		__schedule(0, 0);
 	}
 
diff --git a/core/cortex-m0/task.c b/core/cortex-m0/task.c
index 6996ad133c..64c5423a2b 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 %08x %11.6lld  %3d/%3d\n", i, is_ready,
-			 task_names[i], tasks[i].events, tasks[i].runtime,
+		ccprintf("%4d %c %-16s %08lx %11.6lld  %3d/%3d\n", i, is_ready,
+			 task_names[i], (long)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%08x\n", tasks_ready);
+		ccprintf("tasks_ready: 0x%08lx\n", (long)tasks_ready);
 	} else {
 		tasks_ready = strtoi(argv[1], NULL, 16);
-		ccprintf("Setting tasks_ready to 0x%08x\n", tasks_ready);
+		ccprintf("Setting tasks_ready to 0x%08lx\n", (long)tasks_ready);
 		__schedule(0, 0);
 	}
 
diff --git a/core/minute-ia/task.c b/core/minute-ia/task.c
index 6ad7e8046e..91f996a1c6 100644
--- a/core/minute-ia/task.c
+++ b/core/minute-ia/task.c
@@ -534,15 +534,15 @@ void task_print_list(void)
 		if (IS_ENABLED(CONFIG_FPU)) {
 			char use_fpu = tasks[i].use_fpu ? 'Y' : 'N';
 
-			ccprintf("%4d %c %-16s %08x %11.6lld  %3d/%3d %c\n",
-				 i, is_ready, task_get_name(i), tasks[i].events,
-				 tasks[i].runtime, stackused,
-				 tasks_init[i].stack_size, use_fpu);
+			ccprintf("%4d %c %-16s %08lx %11.6lld  %3d/%3d %c\n",
+				 i, is_ready, task_get_name(i),
+				 (long)tasks[i].events, tasks[i].runtime,
+				 stackused, tasks_init[i].stack_size, use_fpu);
 		} else {
-			ccprintf("%4d %c %-16s %08x %11.6lld  %3d/%3d\n",
-				 i, is_ready, task_get_name(i), tasks[i].events,
-				 tasks[i].runtime, stackused,
-				 tasks_init[i].stack_size);
+			ccprintf("%4d %c %-16s %08lx %11.6lld  %3d/%3d\n",
+				 i, is_ready, task_get_name(i),
+				 (long)tasks[i].events, tasks[i].runtime,
+				 stackused, tasks_init[i].stack_size);
 		}
 
 		cflush();
@@ -565,8 +565,9 @@ static int command_task_info(int argc, char **argv)
 				total += irq_dist[i];
 			}
 		}
-		ccprintf("Service calls:          %11d\n", svc_calls);
-		ccprintf("Total exceptions:       %11d\n", total + svc_calls);
+		ccprintf("Service calls:          %11ld\n", (long)svc_calls);
+		ccprintf("Total exceptions:       %11ld\n",
+			 total + (long)svc_calls);
 		ccprintf("Task switches:          %11d\n", task_switches);
 		ccprintf("Task switching started: %11.6lld s\n",
 			 task_start_time);
@@ -586,10 +587,10 @@ __maybe_unused
 static int command_task_ready(int argc, char **argv)
 {
 	if (argc < 2) {
-		ccprintf("tasks_ready: 0x%08x\n", tasks_ready);
+		ccprintf("tasks_ready: 0x%08lx\n", (long)tasks_ready);
 	} else {
 		tasks_ready = strtoi(argv[1], NULL, 16);
-		ccprintf("Setting tasks_ready to 0x%08x\n", tasks_ready);
+		ccprintf("Setting tasks_ready to 0x%08lx\n", (long)tasks_ready);
 		__schedule(0, 0);
 	}
 
diff --git a/core/nds32/task.c b/core/nds32/task.c
index 0503495f17..37d09c6d2c 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 %08x %11.6lld  %3d/%3d\n", i, is_ready,
-			 task_names[i], tasks[i].events, tasks[i].runtime,
+		ccprintf("%4d %c %-16s %08lx %11.6lld  %3d/%3d\n", i, is_ready,
+			 task_names[i], (long)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%08x\n", tasks_ready);
+		ccprintf("tasks_ready: 0x%08lx\n", (long)tasks_ready);
 	} else {
 		tasks_ready = strtoi(argv[1], NULL, 16);
-		ccprintf("Setting tasks_ready to 0x%08x\n", tasks_ready);
+		ccprintf("Setting tasks_ready to 0x%08lx\n", (long)tasks_ready);
 		__schedule(0, 0, 0);
 	}
 
diff --git a/core/riscv-rv32i/task.c b/core/riscv-rv32i/task.c
index b9b126c1fd..a7c8c7c56d 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 %08x %11.6lld  %3d/%3d\n", i, is_ready,
-			 task_names[i], tasks[i].events, tasks[i].runtime,
+		ccprintf("%4d %c %-16s %08lx %11.6lld  %3d/%3d\n", i, is_ready,
+			 task_names[i], (long)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%08x\n", tasks_ready);
+		ccprintf("tasks_ready: 0x%08lx\n", (long)tasks_ready);
 	} else {
 		tasks_ready = strtoi(argv[1], NULL, 16);
-		ccprintf("Setting tasks_ready to 0x%08x\n", tasks_ready);
+		ccprintf("Setting tasks_ready to 0x%08lx\n", (long)tasks_ready);
 		__schedule(0, 0, 0);
 	}
 
diff --git a/include/atomic_t.h b/include/atomic_t.h
index dddde95e5a..e35fc187bf 100644
--- a/include/atomic_t.h
+++ b/include/atomic_t.h
@@ -9,7 +9,11 @@
 #define __CROS_EC_ATOMIC_T_H
 
 #ifndef CONFIG_ZEPHYR
+#ifdef TEST_BUILD
 typedef int atomic_t;
+#else
+typedef long atomic_t;
+#endif
 typedef atomic_t atomic_val_t;
 #else
 #include <sys/atomic.h>