nrf_security: drivers: cracen: small improvements

tomi-font · endre-nordic · commit e45b80283eb6 · 2025-02-28T12:02:18.000+01:00
- Improve CRACEN memory read/write logging. Now the macro that enables
  the logging is prefixed with SX_ and some
  non-word-aligned reads/writes are logged.
- Some minor cleanups.

Signed-off-by: Tomi Fontanilles &lt;tomi.fontanilles@nordicsemi.no&gt;
diff --git a/subsys/nrf_security/src/drivers/cracen/sicrypto/src/sicrypto.c b/subsys/nrf_security/src/drivers/cracen/sicrypto/src/sicrypto.c
@@ -10,8 +10,6 @@
 #include <cracen/statuscodes.h>
 #include "waitqueue.h"
 
-extern struct sx_pk_cnx silex_pk_engine;
-
 void si_task_init(struct sitask *t, char *workmem, size_t workmemsz)
 {
 	assert(t);
diff --git a/subsys/nrf_security/src/drivers/cracen/silexpk/include/silexpk/iomem.h b/subsys/nrf_security/src/drivers/cracen/silexpk/include/silexpk/iomem.h
@@ -7,6 +7,12 @@
 #ifndef IOMEM_HEADER_FILE
 #define IOMEM_HEADER_FILE
 
+#ifdef SX_INSTRUMENT_MMIO_WITH_PRINTFS
+#define SX_WARN_UNALIGNED_ADDR(addr) printk("%s: WARNING: unaligned address %p\r\n", __func__, addr)
+#else
+#define SX_WARN_UNALIGNED_ADDR(addr)
+#endif
+
 /** Clear device memory
  *
  * @param[in] dst Memory to clear.
diff --git a/subsys/nrf_security/src/drivers/cracen/silexpk/target/baremetal_ba414e_with_ik/pk_baremetal.c b/subsys/nrf_security/src/drivers/cracen/silexpk/target/baremetal_ba414e_with_ik/pk_baremetal.c
@@ -8,14 +8,15 @@
 
 #include <zephyr/kernel.h>
 
+#include "../hw/ba414/ba414_status.h"
+#include "../hw/ba414/pkhardware_ba414e.h"
 #include "../hw/ba414/regs_addr.h"
+#include "../hw/ik/ikhardware.h"
+#include "../hw/ik/regs_addr.h"
 #include <silexpk/core.h>
-#include "../hw/ba414/pkhardware_ba414e.h"
+#include <silexpk/iomem.h>
 #include <cracen/interrupts.h>
 #include <cracen/statuscodes.h>
-#include "../hw/ba414/ba414_status.h"
-#include "../hw/ik/ikhardware.h"
-#include "../hw/ik/regs_addr.h"
 #include "internal.h"
 
 #include <hal/nrf_cracen.h>
@@ -29,10 +30,6 @@
 #define ADDR_BA414EP_CRYPTORAM_BASE CRACEN_ADDR_BA414EP_CRYPTORAM_BASE
 #endif
 
-#ifndef SX_PK_MICROCODE_ADDRESS
-#define SX_PK_MICROCODE_ADDRESS CRACEN_SX_PK_MICROCODE_ADDRESS
-#endif
-
 #ifndef NULL
 #define NULL (void *)0
 #endif
@@ -50,7 +47,7 @@ struct sx_pk_cnx {
 	struct sx_pk_blinder *b;
 };
 
-struct sx_pk_cnx silex_pk_engine;
+static struct sx_pk_cnx silex_pk_engine;
 
 NRF_SECURITY_MUTEX_DEFINE(cracen_mutex_asymmetric);
 
@@ -107,9 +104,12 @@ void sx_pk_wrreg(struct sx_regs *regs, uint32_t addr, uint32_t v)
 {
 	volatile uint32_t *p = (uint32_t *)(regs->base + addr);
 
-#ifdef INSTRUMENT_MMIO_WITH_PRINTFS
-	printk("sx_pk_wrreg(addr=0x%x, sum=0x%x, val=0x%x);\r\n", addr, (uint32_t)p, v);
+#ifdef SX_INSTRUMENT_MMIO_WITH_PRINTFS
+	printk("sx_pk_wrreg(addr=0x%x, p=%p, val=0x%x)\r\n", addr, p, v);
 #endif
+	if ((uintptr_t)p % 4) {
+		SX_WARN_UNALIGNED_ADDR(p);
+	}
 
 	*p = v;
 }
@@ -119,10 +119,17 @@ uint32_t sx_pk_rdreg(struct sx_regs *regs, uint32_t addr)
 	volatile uint32_t *p = (uint32_t *)(regs->base + addr);
 	uint32_t v;
 
+
+#ifdef SX_INSTRUMENT_MMIO_WITH_PRINTFS
+	printk("sx_pk_rdreg(addr=0x%x, p=%p)\r\n", addr, p);
+#endif
+	if ((uintptr_t)p % 4) {
+		SX_WARN_UNALIGNED_ADDR(p);
+	}
+
 	v = *p;
 
-#ifdef INSTRUMENT_MMIO_WITH_PRINTFS
-	printk("sx_pk_rdreg(addr=0x%x, sum=0x%x);\r\n", addr, (uint32_t)p);
+#ifdef SX_INSTRUMENT_MMIO_WITH_PRINTFS
 	printk("result = 0x%x\r\n", v);
 #endif
 
diff --git a/subsys/nrf_security/src/drivers/cracen/silexpk/target/hw/ba414/pkhardware_ba414e.h b/subsys/nrf_security/src/drivers/cracen/silexpk/target/hw/ba414/pkhardware_ba414e.h
@@ -8,6 +8,7 @@
 #ifndef PKHARDWARE_BA414E_H
 #define PKHARDWARE_BA414E_H
 
+#include <silexpk/core.h>
 #include <stdint.h>
 
 struct sx_pk_cmd_def {
diff --git a/subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/hw.h b/subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/hw.h
@@ -14,6 +14,10 @@
 #include <sxsymcrypt/internal.h>
 #include <cracen/interrupts.h>
 
+#ifdef SX_INSTRUMENT_MMIO_WITH_PRINTFS
+#include <zephyr/sys/printk.h>
+#endif
+
 #ifdef CONFIG_DCACHE
 #include <zephyr/cache.h>
 #endif
@@ -25,11 +29,8 @@
 #ifndef SX_CM_REGS_ADDR
 #define SX_CM_REGS_ADDR ((uint32_t)NRF_CRACENCORE)
 #endif
-#ifndef SX_TRNG_REGS_OFFSET
-#define SX_TRNG_REGS_OFFSET 0x1000
-#endif
 #ifndef SX_TRNG_REGS_ADDR
-#define SX_TRNG_REGS_ADDR ((SX_CM_REGS_ADDR) + (SX_TRNG_REGS_OFFSET))
+#define SX_TRNG_REGS_ADDR ((uint32_t)&NRF_CRACENCORE->RNGCONTROL)
 #endif
 
 struct sxdesc;
@@ -39,8 +40,8 @@ static inline void sx_wrreg(uint32_t addr, uint32_t val)
 {
 	volatile uint32_t *p = (uint32_t *)(SX_CM_REGS_ADDR + addr);
 
-#ifdef INSTRUMENT_MMIO_WITH_PRINTFS
-	printk("sx_wrregx(addr=%x, sum=%x, val=%d);", addr, p, val);
+#ifdef SX_INSTRUMENT_MMIO_WITH_PRINTFS
+	printk("sx_wrreg(addr=0x%x, p=%p, val=0x%x)\r\n", addr, p, val);
 #endif
 
 	wmb(); /* comment for compliance */
@@ -53,8 +54,8 @@ static inline void sx_wr_trng(uint32_t addr, uint32_t val)
 {
 	volatile uint32_t *p = (uint32_t *)(SX_TRNG_REGS_ADDR + addr);
 
-#ifdef INSTRUMENT_MMIO_WITH_PRINTFS
-	printk("sx_wrregx(addr=%x, sum=%x, val=%d);", addr, p, val);
+#ifdef SX_INSTRUMENT_MMIO_WITH_PRINTFS
+	printk("sx_wr_trng(addr=0x%x, p=%p, val=0x%x)\r\n", addr, p, val);
 #endif
 
 	wmb(); /* comment for compliance */
@@ -67,6 +68,9 @@ static inline void sx_wrreg_addr(uint32_t addr, struct sxdesc *p)
 {
 	volatile size_t *d = (volatile size_t *)(SX_CM_REGS_ADDR + addr);
 
+#ifdef SX_INSTRUMENT_MMIO_WITH_PRINTFS
+	printk("sx_wrreg_addr(addr=0x%x, d=%p, p=%p)\r\n", addr, d, p);
+#endif
 	wmb(); /* comment for compliance */
 	*d = (size_t)p;
 	rmb(); /* comment for compliance */
@@ -78,13 +82,15 @@ static inline uint32_t sx_rdreg(uint32_t addr)
 	volatile uint32_t *p = (uint32_t *)(SX_CM_REGS_ADDR + addr);
 	uint32_t v;
 
+#ifdef SX_INSTRUMENT_MMIO_WITH_PRINTFS
+	printk("sx_rdreg(addr=0x%x, p=%p)\r\n", addr, p);
+#endif
 	wmb(); /* comment for compliance */
 	v = *p;
 	rmb(); /* comment for compliance */
 
-#ifdef INSTRUMENT_MMIO_WITH_PRINTFS
-	printk("sx_rdregx(addr=0x%x, sum=0x%x);\n", addr, p);
-	printk("result = 0x%x\n", v);
+#ifdef SX_INSTRUMENT_MMIO_WITH_PRINTFS
+	printk("result = 0x%x\r\n", v);
 #endif
 
 	return v;
@@ -96,15 +102,16 @@ static inline uint32_t sx_rd_trng(uint32_t addr)
 	volatile uint32_t *p = (uint32_t *)(SX_TRNG_REGS_ADDR + addr);
 	uint32_t v;
 
+#ifdef SX_INSTRUMENT_MMIO_WITH_PRINTFS
+	printk("sx_rd_trng(addr=0x%x, p=%p)\r\n", addr, p);
+#endif
 	wmb(); /* comment for compliance */
 	v = *p;
 	rmb(); /* comment for compliance */
 
-#ifdef INSTRUMENT_MMIO_WITH_PRINTFS
-	printk("sx_rdregx(addr=0x%x, sum=0x%x);\n", addr, p);
-	printk("result = 0x%x\n", v);
+#ifdef SX_INSTRUMENT_MMIO_WITH_PRINTFS
+	printk("result = 0x%x\r\n", v);
 #endif
-
 	return v;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@`
`10`	`10`	`#include <cracen/statuscodes.h>`
`11`	`11`	`#include "waitqueue.h"`
`12`	`12`
`13`		`-extern struct sx_pk_cnx silex_pk_engine;`
`14`		`-`
`15`	`13`	`void si_task_init(struct sitask t, char workmem, size_t workmemsz)`
`16`	`14`	`{`
`17`	`15`	`assert(t);`