Skip to contentSkip to conversation

fdt_support: add entry for sec3.1 and remove tls_ssl_stream descriptor type capability for sec3.3

PATCH New Kim Phillips 3 participants 7 messages Apr 23, 2010 – Jun 30, 2010

Subsystems (2)
PowerPC Kbuild
lore
Share & tools
lore

Kim Phillips

author
#0 lore raw

PATCH 1/1 fdt_support: add entry for sec3.1 and remove tls_ssl_stream descriptor type capability for sec3.3

Add sec3.1 h/w geometry for fdt node fixups.

Also, technically, whilst SEC v3.3 h/w honours the tls_ssl_stream descriptor type, it lacks the ARC4 algorithm execution unit required to be able to execute anything meaningful with it. Change the node to agree with the documentation that declares that the sec3.3 really doesn't have such a descriptor type.

Reported-by Haiying Wang <[email protected]>
Signed-off-by Kim Phillips <[email protected]>
---
 common/fdt_support.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
common/fdt_support.c +2 -1
index b6f252a..a8ac617 100644
@@ -534,7 +534,8 @@ void fdt_fixup_crypto_node(void *blob, int sec_rev)
 		{ 0x0202, 1, 24, 0x04c, 0x0122003f }, /* SEC 2.2 */
 		{ 0x0204, 4, 24, 0x07e, 0x012b0ebf }, /* SEC 2.4 */
 		{ 0x0300, 4, 24, 0x9fe, 0x03ab0ebf }, /* SEC 3.0 */
-		{ 0x0303, 4, 24, 0x97c, 0x03ab0abf }, /* SEC 3.3 */
+		{ 0x0301, 4, 24, 0xbfe, 0x03ab0ebf }, /* SEC 3.1 */
+		{ 0x0303, 4, 24, 0x97c, 0x03a30abf }, /* SEC 3.3 */
 	};
 	char compat_strlist[ARRAY_SIZE(sec_rev_prop_list) *
 			    sizeof("fsl,secX.Y")];
Signature · 1 line
1.7.0.5
#1 lore raw

PATCH 1/1 fdt_support: add entry for sec3.1 and remove tls_ssl_stream descriptor type capability for sec3.3

Hi Kim, Haiying,

Quoted 19 lines · Kim Phillips

Add sec3.1 h/w geometry for fdt node fixups.

Also, technically, whilst SEC v3.3 h/w honours the tls_ssl_stream descriptor type, it lacks the ARC4 algorithm execution unit required to be able to execute anything meaningful with it. Change the node to agree with the documentation that declares that the sec3.3 really doesn't have such a descriptor type.

Reported-by Haiying Wang <[email protected]>
Signed-off-by Kim Phillips <[email protected]>
---
 common/fdt_support.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
common/fdt_support.c +0 -0
index b6f252a..a8ac617 100644

common/fdt_support.c void fdt_fixup_crypto_node(void *blob, int sec_rev) · line 541

Quoted 9 lines
common/fdt_support.c +2 -1
@@ -534,7 +534,8 @@ void fdt_fixup_crypto_node(void *blob, int sec_rev)
 		{ 0x0202, 1, 24, 0x04c, 0x0122003f }, /* SEC 2.2 */
 		{ 0x0204, 4, 24, 0x07e, 0x012b0ebf }, /* SEC 2.4 */
 		{ 0x0300, 4, 24, 0x9fe, 0x03ab0ebf }, /* SEC 3.0 */
-		{ 0x0303, 4, 24, 0x97c, 0x03ab0abf }, /* SEC 3.3 */
+		{ 0x0301, 4, 24, 0xbfe, 0x03ab0ebf }, /* SEC 3.1 */
+		{ 0x0303, 4, 24, 0x97c, 0x03a30abf }, /* SEC 3.3 */
 	};
 	char compat_strlist[ARRAY_SIZE(sec_rev_prop_list) *
 			    sizeof("fsl,secX.Y")];

Hmmm, we have two pieces of Freescale processor-specific fixups in fdt_support.c:

#ifdef CONFIG_HAS_FSL_DR_USB
void fdt_fixup_dr_usb(void *blob, bd_t *bd)
:
:
#endif /* CONFIG_HAS_FSL_DR_USB */

#if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx)
/*
* update crypto node properties to a specified revision of the SEC
* called with sec_rev == 0 if not on an mpc8xxxE processor */
void fdt_fixup_crypto_node(void *blob, int sec_rev)
:
:
#endif /* defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) */

While I'm OK with the change and am willing to ack since it appears to be a small and necessary improvement to existing code, it would be better to move the Freescale specific fixups into a Freescale CPU subdirectory, probably cpu/mpc8xxx/fdt.c.

Thanks,
gvb

author
#2 lore raw

PATCH 1/1 fdt_support: add entry for sec3.1 and remove tls_ssl_stream descriptor type capability for sec3.3

Quoted 1 line · On Sun, 25 Apr 2010 19:55:27 -0400 Jerry Van Baren <[email protected]> wrote:

Hi Kim, Haiying,

Hi Jerry,

Quoted 15 lines
Quoted 8 lines · Kim Phillips

Add sec3.1 h/w geometry for fdt node fixups.

Also, technically, whilst SEC v3.3 h/w honours the tls_ssl_stream descriptor type, it lacks the ARC4 algorithm execution unit required to be able to execute anything meaningful with it. Change the node to agree with the documentation that declares that the sec3.3 really doesn't have such a descriptor type.

Quoted 5 lines
Reported-by Haiying Wang <[email protected]>
Signed-off-by Kim Phillips <[email protected]>
---
 common/fdt_support.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
Quoted 8 lines

Hmmm, we have two pieces of Freescale processor-specific fixups in fdt_support.c:

#ifdef CONFIG_HAS_FSL_DR_USB

#endif /* defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) */

While I'm OK with the change and am willing to ack since it appears to

thanks.

Quoted 3 lines

be a small and necessary improvement to existing code, it would be better to move the Freescale specific fixups into a Freescale CPU subdirectory, probably cpu/mpc8xxx/fdt.c.

to do that properly, a merge of 83xx and 8[56]xx families' both cpu and pci code would have to be made - something that I feel is way out of scope for this patch subject.

Kim

#3 lore raw

PATCH 1/1 fdt_support: add entry for sec3.1 and remove tls_ssl_stream descriptor type capability for sec3.3

Quoted 7 lines
Quoted 3 lines

be a small and necessary improvement to existing code, it would be better to move the Freescale specific fixups into a Freescale CPU subdirectory, probably cpu/mpc8xxx/fdt.c.

to do that properly, a merge of 83xx and 8[56]xx families' both cpu and pci code would have to be made - something that I feel is way out of scope for this patch subject.

Why can't we move fdt_fixup_crypto_node & fdt_fixup_dr_usb into arch/powerpc/cpu/mpc8xxx/fdt.c ?

- k

author
#4 lore raw

PATCH 1/1 fdt: move fsl specific code from common fdt area to mpc8xxx/fdt.c

Signed-off-by Kim Phillips <[email protected]>

---
unnecessarily introducing mpc83xx-specific conditions in the mpc8xxx Makefile due to current development logistics is ugly IMHO, but it sounds like this is what the people want anyway.

 Makefile                          |    1 +
 arch/powerpc/cpu/mpc8xxx/Makefile |    7 ++-
 arch/powerpc/cpu/mpc8xxx/fdt.c    |  133 ++++++++++++++++++++++++++++++++++++-
 common/fdt_support.c              |  129 -----------------------------------
 4 files changed, 138 insertions(+), 132 deletions(-)
Makefile +1 -0
index 34f10ce..50a403d 100644
@@ -220,6 +220,7 @@ LIBS += drivers/power/libpower.a
 LIBS += drivers/spi/libspi.a
 ifeq ($(CPU),mpc83xx)
 LIBS += drivers/qe/qe.a
+LIBS += arch/powerpc/cpu/mpc8xxx/lib8xxx.a
 endif
 ifeq ($(CPU),mpc85xx)
 LIBS += drivers/qe/qe.a
arch/powerpc/cpu/mpc8xxx/Makefile +5 -2
index 481f9e5..67bb5cf 100644
@@ -1,5 +1,5 @@
 #
-# Copyright 2009 Freescale Semiconductor, Inc.
+# Copyright 2009-2010 Freescale Semiconductor, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

@@ -10,9 +10,12 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib8xxx.a
 
+ifneq ($(CPU),mpc83xx)
 COBJS-y	+= cpu.o
-COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
 COBJS-$(CONFIG_PCI)	+= pci_cfg.o
+endif
+
+COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
 
 SRCS	:= $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
arch/powerpc/cpu/mpc8xxx/fdt.c +132 -1

146 lines not on this page · raw message

common/fdt_support.c +0 -129

135 lines not on this page · raw message

Signature · 1 line
1.7.0.5
Applied
#5 lore raw

PATCH 1/1 fdt: move fsl specific code from common fdt area to mpc8xxx/fdt.c

Quoted 7 lines · Kim Phillips
Signed-off-by Kim Phillips <[email protected]>

---
unnecessarily introducing mpc83xx-specific conditions in the mpc8xxx Makefile due to current development logistics is ugly IMHO, but it sounds like this is what the people want anyway.

Quoted 5 lines
Makefile                          |    1 +
arch/powerpc/cpu/mpc8xxx/Makefile |    7 ++-
arch/powerpc/cpu/mpc8xxx/fdt.c    |  133 ++++++++++++++++++++++++++++++++++++-
common/fdt_support.c              |  129 -----------------------------------
4 files changed, 138 insertions(+), 132 deletions(-)

applied to 85xx

- k

Applied
#6 lore raw

PATCH 1/1 fdt_support: add entry for sec3.1 and remove tls_ssl_stream descriptor type capability for sec3.3

In reply to Kim Phillips
Quoted 8 lines · Kim Phillips

Add sec3.1 h/w geometry for fdt node fixups.

Also, technically, whilst SEC v3.3 h/w honours the tls_ssl_stream descriptor type, it lacks the ARC4 algorithm execution unit required to be able to execute anything meaningful with it. Change the node to agree with the documentation that declares that the sec3.3 really doesn't have such a descriptor type.

Quoted 5 lines
Reported-by Haiying Wang <[email protected]>
Signed-off-by Kim Phillips <[email protected]>

---
common/fdt_support.c | 3 ++-

1 files changed, 2 insertions(+), 1 deletions(-)

applied

I've shorten the first line of the commit to be within 80 chars.

- k