[nrf noup] Align with IronSide APIs

tomchy · tomchy · commit 7065b7922c8e · 2025-11-26T14:43:09.000+01:00
Use APIs defined in the following upstream commit:
f324a1540f57c7ea229fb047c542de80c4149aea

Ref: NCSDK-36359

Signed-off-by: Tomasz Chyrowicz &lt;tomasz.chyrowicz@nordicsemi.no&gt;
diff --git a/boot/zephyr/ironside_counters/ironside_counters.c b/boot/zephyr/ironside_counters/ironside_counters.c
@@ -30,7 +30,7 @@ fih_int boot_nv_security_counter_get(uint32_t image_id, fih_int *security_cnt)
 		FIH_RET(FIH_FAILURE);
 	}
 
-	if (image_id > IRONSIDE_COUNTER_MAX) {
+	if (image_id > IRONSIDE_COUNTER_NUM) {
 		FIH_RET(FIH_FAILURE);
 	}
 
@@ -59,7 +59,7 @@ fih_int boot_nv_security_counter_get(uint32_t image_id, fih_int *security_cnt)
 
 int32_t boot_nv_security_counter_update(uint32_t image_id, uint32_t img_security_cnt)
 {
-	if ((img_security_cnt > IRONSIDE_COUNTER_MAX_VALUE) || (image_id > IRONSIDE_COUNTER_MAX)) {
+	if ((img_security_cnt > IRONSIDE_COUNTER_MAX_VALUE) || (image_id > IRONSIDE_COUNTER_NUM)) {
 		return -BOOT_EBADARGS;
 	}
 
@@ -89,7 +89,7 @@ fih_int boot_nv_security_counter_is_update_possible(uint32_t image_id, uint32_t
 
 int32_t boot_nv_security_counter_lock(uint32_t image_id)
 {
-	if (image_id > IRONSIDE_COUNTER_MAX) {
+	if (image_id > IRONSIDE_COUNTER_NUM) {
 		return -BOOT_EBADARGS;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ fih_int boot_nv_security_counter_get(uint32_t image_id, fih_int *security_cnt)`
`30`	`30`	`FIH_RET(FIH_FAILURE);`
`31`	`31`	`}`
`32`	`32`
`33`		`- if (image_id > IRONSIDE_COUNTER_MAX) {`
	`33`	`+ if (image_id > IRONSIDE_COUNTER_NUM) {`
`34`	`34`	`FIH_RET(FIH_FAILURE);`
`35`	`35`	`}`
`36`	`36`
`@@ -59,7 +59,7 @@ fih_int boot_nv_security_counter_get(uint32_t image_id, fih_int *security_cnt)`
`59`	`59`
`60`	`60`	`int32_t boot_nv_security_counter_update(uint32_t image_id, uint32_t img_security_cnt)`
`61`	`61`	`{`
`62`		`- if ((img_security_cnt > IRONSIDE_COUNTER_MAX_VALUE) \|\| (image_id > IRONSIDE_COUNTER_MAX)) {`
	`62`	`+ if ((img_security_cnt > IRONSIDE_COUNTER_MAX_VALUE) \|\| (image_id > IRONSIDE_COUNTER_NUM)) {`
`63`	`63`	`return -BOOT_EBADARGS;`
`64`	`64`	`}`
`65`	`65`
`@@ -89,7 +89,7 @@ fih_int boot_nv_security_counter_is_update_possible(uint32_t image_id, uint32_t`
`89`	`89`
`90`	`90`	`int32_t boot_nv_security_counter_lock(uint32_t image_id)`
`91`	`91`	`{`
`92`		`- if (image_id > IRONSIDE_COUNTER_MAX) {`
	`92`	`+ if (image_id > IRONSIDE_COUNTER_NUM) {`
`93`	`93`	`return -BOOT_EBADARGS;`
`94`	`94`	`}`
`95`	`95`