Skip to contentSkip to conversation

powerpc/mpc85xx: Add property 'fsl, sec-era' in device tree node 'crypto'.

PATCH Superseded Vakul Garg 2 participants 2 messages Jan 10, 2013 – Jan 24, 2013 PowerPC

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Vakul Garg

author
#0 lore raw

PATCH 1/1 powerpc/mpc85xx: Add property 'fsl, sec-era' in device tree node 'crypto'.

If property 'fsl,sec-era' is already present, it is updated. This property is required so that applications can ascertain which descriptor commands are supported on a particular CAAM version.

---
 arch/powerpc/cpu/mpc85xx/fdt.c        |    8 +++
 arch/powerpc/cpu/mpc8xxx/fdt.c        |   78 ++++++++++++++++++++++++++++++++-
 arch/powerpc/include/asm/immap_85xx.h |    6 +++
 3 files changed, 91 insertions(+), 1 deletions(-)
arch/powerpc/cpu/mpc85xx/fdt.c +8 -0
index 5af2661..e7b5dfd 100644
@@ -591,6 +591,14 @@ void ft_cpu_setup(void *blob, bd_t *bd)
 	/* delete crypto node if not on an E-processor */
 	if (!IS_E_PROCESSOR(get_svr()))
 		fdt_fixup_crypto_node(blob, 0);
+#if CONFIG_SYS_FSL_SEC_COMPAT >= 4  /* SEC 4.x/5.x */
+	else {
+		ccsr_sec_t __iomem *sec;
+
+		sec = (void __iomem *)CONFIG_SYS_FSL_SEC_ADDR;
+		fdt_fixup_crypto_node(blob, in_be32(&sec->secvid_ms));
+	}
+#endif
 
 	fdt_fixup_ethernet(blob);
 
arch/powerpc/cpu/mpc8xxx/fdt.c +77 -1

87 lines not on this page · raw message

arch/powerpc/include/asm/immap_85xx.h +6 -0
index 70608fe..6b2c05c 100644
@@ -2757,6 +2757,12 @@ typedef struct ccsr_sec {
 #define SEC_CHANUM_MS_JRNUM_SHIFT	28
 #define SEC_CHANUM_MS_DECONUM_MASK	0x0f000000
 #define SEC_CHANUM_MS_DECONUM_SHIFT	24
+#define SEC_SECVID_MS_IPID_MASK	0xffff0000
+#define SEC_SECVID_MS_IPID_SHIFT	16
+#define SEC_SECVID_MS_MAJ_REV_MASK	0x0000ff00
+#define SEC_SECVID_MS_MAJ_REV_SHIFT	8
+#define SEC_CCBVID_ERA_MASK		0xff000000
+#define SEC_CCBVID_ERA_SHIFT		24
 #endif
 
 typedef struct ccsr_qman {
Signature · 1 line
1.7.7
#1 lore raw

PATCH 1/1 powerpc/mpc85xx: Add property 'fsl, sec-era' in device tree node 'crypto'.

Quoted 8 lines
arch/powerpc/cpu/mpc85xx/fdt.c +0 -0
index 5af2661..e7b5dfd 100644

arch/powerpc/cpu/mpc85xx/fdt.c void ft_cpu_setup(void *blob, bd_t *bd) · line 599

Quoted 9 lines
arch/powerpc/cpu/mpc85xx/fdt.c +5 -0
@@ -591,6 +591,14 @@ void ft_cpu_setup(void *blob, bd_t *bd)
        /* delete crypto node if not on an E-processor */
        if (!IS_E_PROCESSOR(get_svr()))
                fdt_fixup_crypto_node(blob, 0);
+#if CONFIG_SYS_FSL_SEC_COMPAT >= 4  /* SEC 4.x/5.x */
+       else {
+               ccsr_sec_t __iomem *sec;
+
+               sec = (void __iomem *)CONFIG_SYS_FSL_SEC_ADDR;
 

This isn't defined for every board. It breaks the build.

Andy