Andrew,
This patch adds OCP, interrupt, and memory offset details for the security
block on MPC8555/8541 to support drivers.
Signed-off-by: Kumar Gala <redacted>
--
diff -Nru a/arch/ppc/platforms/85xx/mpc8555.c b/arch/ppc/platforms/85xx/mpc8555.c
--- a/arch/ppc/platforms/85xx/mpc8555.c 2004-11-08 21:33:21 -06:00
+++ b/arch/ppc/platforms/85xx/mpc8555.c 2004-11-08 21:33:21 -06:00
@@ -77,6 +77,13 @@
.pm = OCP_CPM_NA,
},
{ .vendor = OCP_VENDOR_FREESCALE,
+ .function = OCP_FUNC_SEC2,
+ .index = 0,
+ .paddr = MPC85xx_SEC2_OFFSET,
+ .irq = MPC85xx_IRQ_SEC2,
+ .pm = OCP_CPM_NA,
+ },
+ { .vendor = OCP_VENDOR_FREESCALE,
.function = OCP_FUNC_PERFMON,
.index = 0,
.paddr = MPC85xx_PERFMON_OFFSET,diff -Nru a/include/asm-ppc/mpc85xx.h b/include/asm-ppc/mpc85xx.h
--- a/include/asm-ppc/mpc85xx.h 2004-11-08 21:33:21 -06:00
+++ b/include/asm-ppc/mpc85xx.h 2004-11-08 21:33:21 -06:00
@@ -81,6 +81,7 @@
#define MPC85xx_IRQ_DUART (26 + MPC85xx_OPENPIC_IRQ_OFFSET)
#define MPC85xx_IRQ_IIC1 (27 + MPC85xx_OPENPIC_IRQ_OFFSET)
#define MPC85xx_IRQ_PERFMON (28 + MPC85xx_OPENPIC_IRQ_OFFSET)
+#define MPC85xx_IRQ_SEC2 (29 + MPC85xx_OPENPIC_IRQ_OFFSET)
#define MPC85xx_IRQ_CPM (30 + MPC85xx_OPENPIC_IRQ_OFFSET)
/* The 12 external interrupt lines */
@@ -120,6 +121,8 @@
#define MPC85xx_PCI2_SIZE (0x01000)
#define MPC85xx_PERFMON_OFFSET (0xe1000)
#define MPC85xx_PERFMON_SIZE (0x01000)
+#define MPC85xx_SEC2_OFFSET (0x30000)
+#define MPC85xx_SEC2_SIZE (0x10000)
#define MPC85xx_UART0_OFFSET (0x04500)
#define MPC85xx_UART0_SIZE (0x00100)
#define MPC85xx_UART1_OFFSET (0x04600)
diff -Nru a/include/asm-ppc/ocp_ids.h b/include/asm-ppc/ocp_ids.h
--- a/include/asm-ppc/ocp_ids.h 2004-11-08 21:33:21 -06:00
+++ b/include/asm-ppc/ocp_ids.h 2004-11-08 21:33:21 -06:00
@@ -61,6 +61,7 @@
#define OCP_FUNC_PERFMON 0x00D2 /* Performance Monitor */
#define OCP_FUNC_RGMII 0x00D3
#define OCP_FUNC_TAH 0x00D4
+#define OCP_FUNC_SEC2 0x00D5 /* Crypto/Security 2.0 */
/* Network 0x0200 - 0x02FF */
#define OCP_FUNC_EMAC 0x0200
Kumar Gala [off-list ref] wrote:
This patch adds OCP, interrupt, and memory offset details for the security
block on MPC8555/8541 to support drivers.
Your email client did space-stuffing on the message, so the patch gets 100%
rejects. I fixed it up by hand and applied the patch locally, thanks.
I think there's a way of telling Pine to stop doing this.
On Mon, Nov 08, 2004 at 11:25:29PM -0600, Kumar Gala wrote:
quoted hunk
Andrew,
This patch adds OCP, interrupt, and memory offset details for the security
block on MPC8555/8541 to support drivers.
Signed-off-by: Kumar Gala <redacted>
--
diff -Nru a/arch/ppc/platforms/85xx/mpc8555.c
b/arch/ppc/platforms/85xx/mpc8555.c
--- a/arch/ppc/platforms/85xx/mpc8555.c 2004-11-08 21:33:21 -06:00
+++ b/arch/ppc/platforms/85xx/mpc8555.c 2004-11-08 21:33:21 -06:00
@@ -77,6 +77,13 @@
.pm = OCP_CPM_NA,
},
{ .vendor = OCP_VENDOR_FREESCALE,
+ .function = OCP_FUNC_SEC2,
+ .index = 0,
+ .paddr = MPC85xx_SEC2_OFFSET,
+ .irq = MPC85xx_IRQ_SEC2,
+ .pm = OCP_CPM_NA,
+ },
+ { .vendor = OCP_VENDOR_FREESCALE,
.function = OCP_FUNC_PERFMON,
.index = 0,
.paddr = MPC85xx_PERFMON_OFFSET,diff -Nru a/include/asm-ppc/mpc85xx.h b/include/asm-ppc/mpc85xx.h
--- a/include/asm-ppc/mpc85xx.h 2004-11-08 21:33:21 -06:00
+++ b/include/asm-ppc/mpc85xx.h 2004-11-08 21:33:21 -06:00
@@ -81,6 +81,7 @@
#define MPC85xx_IRQ_DUART (26 + MPC85xx_OPENPIC_IRQ_OFFSET)
#define MPC85xx_IRQ_IIC1 (27 + MPC85xx_OPENPIC_IRQ_OFFSET)
#define MPC85xx_IRQ_PERFMON (28 + MPC85xx_OPENPIC_IRQ_OFFSET)
+#define MPC85xx_IRQ_SEC2 (29 + MPC85xx_OPENPIC_IRQ_OFFSET)
#define MPC85xx_IRQ_CPM (30 + MPC85xx_OPENPIC_IRQ_OFFSET)
/* The 12 external interrupt lines */
@@ -120,6 +121,8 @@
#define MPC85xx_PCI2_SIZE (0x01000)
#define MPC85xx_PERFMON_OFFSET (0xe1000)
#define MPC85xx_PERFMON_SIZE (0x01000)
+#define MPC85xx_SEC2_OFFSET (0x30000)
+#define MPC85xx_SEC2_SIZE (0x10000)
#define MPC85xx_UART0_OFFSET (0x04500)
#define MPC85xx_UART0_SIZE (0x00100)
#define MPC85xx_UART1_OFFSET (0x04600)
diff -Nru a/include/asm-ppc/ocp_ids.h b/include/asm-ppc/ocp_ids.h
--- a/include/asm-ppc/ocp_ids.h 2004-11-08 21:33:21 -06:00
+++ b/include/asm-ppc/ocp_ids.h 2004-11-08 21:33:21 -06:00
@@ -61,6 +61,7 @@
#define OCP_FUNC_PERFMON 0x00D2 /* Performance Monitor */
#define OCP_FUNC_RGMII 0x00D3
#define OCP_FUNC_TAH 0x00D4
+#define OCP_FUNC_SEC2 0x00D5 /* Crypto/Security 2.0 */
/* Network 0x0200 - 0x02FF */
#define OCP_FUNC_EMAC 0x0200
I wonder what is the purpose of adding these defines to the header file
and then using them only in one .c file. Are they public interface?
I guess not, and IMHO scattering such stuff among doesn't help
readability and using new C structure initializers shows exactly what
each number means anyway.
For 4xx, for example, we moved all such stuff directly to
corresponding ibm4XXX files.
--
Eugene
Uugh, sorry. The previous version of pine I was using did not do this.=20=
I will look at trying to change its settings. Thanks for reformatting=20=
the patch. Can you explain further what you mean by 'space-stuffing'
thanks
- kumar
On Nov 8, 2004, at 11:34 PM, Andrew Morton wrote:
Kumar Gala [off-list ref] wrote:
>
> This patch adds OCP, interrupt, and memory offset details for the=20=
security
quoted
=A0 block on MPC8555/8541 to support drivers.
Your email client did space-stuffing on the message, so the patch gets=20=
100%
rejects.=A0 I fixed it up by hand and applied the patch locally, =
thanks.
I think there's a way of telling Pine to stop doing this.
quoted
diff -Nru a/include/asm-ppc/mpc85xx.h b/include/asm-ppc/mpc85xx.h
--- a/include/asm-ppc/mpc85xx.h=A0=A0=A0=A0=A0=A0 2004-11-08 =
21:33:21 -06:00
> +++ b/include/asm-ppc/mpc85xx.h=A0=A0=A0=A0=A0=A0 2004-11-08 =
21:33:21 -06:00
> @@ -81,6 +81,7 @@
>=A0 #define MPC85xx_IRQ_DUART=A0=A0=A0 (26 + =
MPC85xx_OPENPIC_IRQ_OFFSET)
quoted
=A0 #define MPC85xx_IRQ_IIC1=A0=A0=A0=A0 (27 + =
MPC85xx_OPENPIC_IRQ_OFFSET)
quoted
=A0 #define MPC85xx_IRQ_PERFMON=A0 (28 + MPC85xx_OPENPIC_IRQ_OFFSET)
+#define MPC85xx_IRQ_SEC2=A0=A0=A0=A0 (29 + =
MPC85xx_OPENPIC_IRQ_OFFSET)
quoted
=A0 #define MPC85xx_IRQ_CPM=A0=A0=A0=A0=A0 =A0=A0=A0=A0=A0=A0=A0 (30 =
+=20
MPC85xx_OPENPIC_IRQ_OFFSET)
quoted
=A0 /* The 12 external interrupt lines */
> @@ -120,6 +121,8 @@
>=A0 #define MPC85xx_PCI2_SIZE=A0=A0=A0 (0x01000)
>=A0 #define MPC85xx_PERFMON_OFFSET=A0=A0=A0=A0=A0=A0 (0xe1000)
>=A0 #define MPC85xx_PERFMON_SIZE (0x01000)
> +#define MPC85xx_SEC2_OFFSET=A0 (0x30000)
> +#define MPC85xx_SEC2_SIZE=A0=A0=A0 (0x10000)
>=A0 #define MPC85xx_UART0_OFFSET (0x04500)
>=A0 #define MPC85xx_UART0_SIZE=A0=A0 (0x00100)
>=A0 #define MPC85xx_UART1_OFFSET (0x04600)
> diff -Nru a/include/asm-ppc/ocp_ids.h b/include/asm-ppc/ocp_ids.h
> --- a/include/asm-ppc/ocp_ids.h=A0=A0=A0=A0=A0=A0 2004-11-08 =
21:33:21 -06:00
> +++ b/include/asm-ppc/ocp_ids.h=A0=A0=A0=A0=A0=A0 2004-11-08 =
21:33:21 -06:00
> @@ -61,6 +61,7 @@
>=A0 #define OCP_FUNC_PERFMON=A0=A0=A0=A0 0x00D2=A0 /* Performance =
Monitor */
>=A0 #define OCP_FUNC_RGMII=A0=A0=A0=A0=A0=A0 =A0=A0=A0=A0=A0=A0=A0 =
0x00D3
>=A0 #define OCP_FUNC_TAH =A0=A0=A0=A0=A0=A0=A0 0x00D4
> +#define OCP_FUNC_SEC2=A0=A0=A0=A0=A0=A0=A0 =A0=A0=A0=A0=A0=A0=A0 =
0x00D5=A0 /* Crypto/Security=20
2.0 */
>
quoted
=A0 /* Network 0x0200 - 0x02FF */
>=A0 #define OCP_FUNC_EMAC=A0=A0=A0=A0=A0=A0=A0 =A0=A0=A0=A0=A0=A0=A0 =
0x0200
I wonder what is the purpose of adding these defines to the header =
file
and then using them only in one .c file. Are they public interface?
I guess not, and IMHO scattering such stuff among doesn't help
readability and using new C structure initializers shows exactly what
each number means anyway.
Well, the SEC2 defines are currently only used in this file at this=20
time. However, I expect in the future other mpc85??.c files will use=20
these defines.
For 4xx, for example, we moved all such stuff directly to
corresponding ibm4XXX files.
The memory offsets and sizes could most likely move there.
- kumar
On Mon, 8 Nov 2004, Kumar Gala wrote:
Uugh, sorry. The previous version of pine I was using did not do this. I
will look at trying to change its settings. Thanks for reformatting the
patch. Can you explain further what you mean by 'space-stuffing'
IIRC, you have to enable quell-flowed-text.
Always read the release notes after upgrading pine ;-)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds