soc: arm: nordic_nrf: timing: Fix wrapping

nordic-krch · nashif · commit cd3dae7c2c95 · 2024-08-16T08:50:13.000-04:00
Fix wrapping case for SoC with 32 bit TIMER.

Signed-off-by: Krzysztof Chruściński &lt;krzysztof.chruscinski@nordicsemi.no&gt;
diff --git a/soc/nordic/timing.c b/soc/nordic/timing.c
@@ -47,14 +47,14 @@ uint64_t soc_timing_cycles_get(volatile timing_t *const start,
 {
 #if defined(CONFIG_SOC_SERIES_NRF51X)
 #define COUNTER_SPAN BIT(16)
+#else
+#define COUNTER_SPAN BIT64(32)
+#endif
 	if (*end >= *start) {
 		return (*end - *start);
 	} else {
 		return COUNTER_SPAN + *end - *start;
 	}
-#else
-	return (*end - *start);
-#endif
 }
 
 uint64_t soc_timing_freq_get(void)

Original file line number	Diff line number	Diff line change
`@@ -47,14 +47,14 @@ uint64_t soc_timing_cycles_get(volatile timing_t *const start,`
`47`	`47`	`{`
`48`	`48`	`#if defined(CONFIG_SOC_SERIES_NRF51X)`
`49`	`49`	`#define COUNTER_SPAN BIT(16)`
	`50`	`+#else`
	`51`	`+#define COUNTER_SPAN BIT64(32)`
	`52`	`+#endif`
`50`	`53`	`if (end >= start) {`
`51`	`54`	`return (end - start);`
`52`	`55`	`} else {`
`53`	`56`	`return COUNTER_SPAN + end - start;`
`54`	`57`	`}`
`55`		`-#else`
`56`		`- return (end - start);`
`57`		`-#endif`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`uint64_t soc_timing_freq_get(void)`