Skip to contentSkip to conversation

arm: omap: RX-51: ARM errata 430973 workaround

PATCH In review Pali Rohár 6 participants 18 messages Feb 28, 2013 – Sep 24, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: omap: RX-51: ARM errata 430973 workaround

---
 arch/arm/mach-omap2/Makefile            |    1 +
 arch/arm/mach-omap2/board-rx51-secure.c |   66 +++++++++++++++++++++++++++++++
 arch/arm/mach-omap2/board-rx51-secure.h |   36 +++++++++++++++++
 arch/arm/mach-omap2/board-rx51-smc.S    |   34 ++++++++++++++++
 arch/arm/mach-omap2/board-rx51.c        |    7 ++++
 5 files changed, 144 insertions(+)
 create mode 100644 arch/arm/mach-omap2/board-rx51-secure.c
 create mode 100644 arch/arm/mach-omap2/board-rx51-secure.h
 create mode 100644 arch/arm/mach-omap2/board-rx51-smc.S
arch/arm/mach-omap2/Makefile +1 -0
index 0ebbdd50..8eb4fb4 100644
@@ -241,6 +241,7 @@ obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51.o sdram-nokia.o
 obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-peripherals.o
 obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-video.o
 obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-camera.o
+obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-smc.o board-rx51-secure.o
 obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom.o board-zoom-peripherals.o
 obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom-display.o
 obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom-debugboard.o
arch/arm/mach-omap2/board-rx51-secure.c new file +66 -0

66 lines not on this page · raw message

arch/arm/mach-omap2/board-rx51-secure.h new file +36 -0
new file mode 100644
index 0000000..61c760b
@@ -0,0 +1,36 @@
+/*
+ * board-rx51-secure.h: OMAP Secure infrastructure header.
+ *
+ * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef OMAP_RX51_SECURE_H
+#define OMAP_RX51_SECURE_H
+
+/* HAL API error codes */
+#define  API_HAL_RET_VALUE_OK           0x00
+#define  API_HAL_RET_VALUE_FAIL         0x01
+
+/* Secure HAL API flags */
+#define FLAG_START_CRITICAL             0x4
+#define FLAG_IRQFIQ_MASK                0x3
+#define FLAG_IRQ_ENABLE                 0x2
+#define FLAG_FIQ_ENABLE                 0x1
+#define NO_FLAG                         0x0
+
+/* Secure PPA(Primary Protected Application) APIs */
+#define RX51_PPA_L2_INVAL               40
+#define RX51_PPA_WRITE_ACR              42
+
+#ifndef __ASSEMBLER__
+
+extern u32 rx51_secure_dispatcher(u32 idx, u32 flag, u32 nargs,
+                                u32 arg1, u32 arg2, u32 arg3, u32 arg4);
+extern u32 rx51_ppa_smc(u32 id, u32 flag, u32 pargs);
+
+extern u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits);
+#endif /* __ASSEMBLER__ */
+#endif /* OMAP_RX51_SECURE_H */
arch/arm/mach-omap2/board-rx51-smc.S new file +34 -0
new file mode 100644
index 0000000..70e2eb7
@@ -0,0 +1,34 @@
+/*
+ * RX51 secure APIs file.
+ *
+ * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]>
+ *
+ *
+ * This program is free software,you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/linkage.h>
+
+/**
+ * u32 rx51_ppa_smc(u32 id, u32 flag, u32 pargs)
+ * Low level common routine for secure HAL and PPA APIs.
+ * @id: Secure Service ID
+ * @flag: Flag to indicate the criticality of operation
+ * @pargs: Physical address of parameter list starting
+ *          with number of parametrs
+ */
+ENTRY(rx51_ppa_smc)
+	.arch_extension sec
+	stmfd	sp!, {r4-r12, lr}
+	mov	r12, r0		@ Copy the secure service ID
+	mov	r3, r2		@ Copy the pointer to va_list in R3
+	mov	r2, r1		@ Copy the flags in R2
+	mov	r1, #0x0	@ Process ID - 0
+	mov	r6, #0xff	@ Indicate new Task call
+	dsb
+	dmb
+	smc	#1		@ call PPA service
+	ldmfd	sp!, {r4-r12, pc}
+ENDPROC(rx51_ppa_smc)
arch/arm/mach-omap2/board-rx51.c +7 -0
index 92117a13..fd85081 100644
@@ -31,6 +31,7 @@
 #include "gpmc.h"
 #include "pm.h"
 #include "sdram-nokia.h"
+#include "board-rx51-secure.h"
 
 #define RX51_GPIO_SLEEP_IND 162
 
@@ -103,6 +104,12 @@ static void __init rx51_init(void)
 	rx51_peripherals_init();
 	rx51_camera_init();
 
+#ifdef CONFIG_ARM_ERRATA_430973
+	printk(KERN_INFO "Enabling ARM errata 430973 workaround.\n");
+	/* set IBE to 1 */
+	rx51_secure_update_aux_cr(1 << 6, 0);
+#endif
+
 	/* Ensure SDRC pins are mux'd for self-refresh */
 	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
 	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 8 lines · Pali Roh?r
---
 arch/arm/mach-omap2/Makefile            |    1 +
 arch/arm/mach-omap2/board-rx51-secure.c |   66 +++++++++++++++++++++++++++++++
 arch/arm/mach-omap2/board-rx51-secure.h |   36 +++++++++++++++++
 arch/arm/mach-omap2/board-rx51-smc.S    |   34 ++++++++++++++++
 arch/arm/mach-omap2/board-rx51.c        |    7 ++++

Wondering if we can integrate these into arch/arm/mach-omap2/omap-smc.S
and
arch/arm/mach-omap2/omap-secure.c
on a quick look, it does seem there are commonalities.

Quoted 204 lines
 5 files changed, 144 insertions(+)
 create mode 100644 arch/arm/mach-omap2/board-rx51-secure.c
 create mode 100644 arch/arm/mach-omap2/board-rx51-secure.h
 create mode 100644 arch/arm/mach-omap2/board-rx51-smc.S
arch/arm/mach-omap2/Makefile +1 -0
index 0ebbdd50..8eb4fb4 100644
@@ -241,6 +241,7 @@ obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51.o sdram-nokia.o
 obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-peripherals.o
 obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-video.o
 obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-camera.o
+obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-smc.o board-rx51-secure.o
 obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom.o board-zoom-peripherals.o
 obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom-display.o
 obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom-debugboard.o
arch/arm/mach-omap2/board-rx51-secure.c new file +66 -0
new file mode 100644
index 0000000..361dc78
@@ -0,0 +1,66 @@
+/*
+ * RX51 Secure PPA API.
+ *
+ * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]>
+ *
+ *
+ * This program is free software,you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <asm/cacheflush.h>
+
+#include "board-rx51-secure.h"
+
+/**
+ * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls
+ * @idx: The PPA API index
+ * @flag: The flag indicating criticality of operation
+ * @nargs: Number of valid arguments out of four.
+ * @arg1, arg2, arg3 args4: Parameters passed to secure API
+ *
+ * Return the non-zero error value on failure.
+ */
+u32 rx51_secure_dispatcher(u32 idx, u32 flag, u32 nargs, u32 arg1, u32 arg2,
+			   u32 arg3, u32 arg4)
+{
+	u32 ret;
+	u32 param[5];
+
+	param[0] = nargs+1;
+	param[1] = arg1;
+	param[2] = arg2;
+	param[3] = arg3;
+	param[4] = arg4;
+
+	/*
+	 * Secure API needs physical address
+	 * pointer for the parameters
+	 */
+	flush_cache_all();
+	outer_clean_range(__pa(param), __pa(param + 5));
+	ret = rx51_ppa_smc(idx, flag, __pa(param));
+
+	return ret;
+}
+
+/**
+ * rx51_secure_update_aux_cr: Routine to modify the contents of Auxiliary Control Register
+ *  @set_bits: bits to set in ACR
+ *  @clr_bits: bits to clear in ACR
+ *
+ * Return the non-zero error value on failure.
+*/
+u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits)
+{
+	u32 acr;
+
+	/* Read ACR */
+	asm volatile ("mrc p15, 0, %0, c1, c0, 1" : "=r" (acr));
+	acr &= ~clear_bits;
+	acr |= set_bits;
+
+	return rx51_secure_dispatcher(RX51_PPA_WRITE_ACR,
+			       FLAG_START_CRITICAL,
+			       1,acr,0,0,0);
+}
arch/arm/mach-omap2/board-rx51-secure.h new file +36 -0
new file mode 100644
index 0000000..61c760b
@@ -0,0 +1,36 @@
+/*
+ * board-rx51-secure.h: OMAP Secure infrastructure header.
+ *
+ * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef OMAP_RX51_SECURE_H
+#define OMAP_RX51_SECURE_H
+
+/* HAL API error codes */
+#define  API_HAL_RET_VALUE_OK           0x00
+#define  API_HAL_RET_VALUE_FAIL         0x01
+
+/* Secure HAL API flags */
+#define FLAG_START_CRITICAL             0x4
+#define FLAG_IRQFIQ_MASK                0x3
+#define FLAG_IRQ_ENABLE                 0x2
+#define FLAG_FIQ_ENABLE                 0x1
+#define NO_FLAG                         0x0
+
+/* Secure PPA(Primary Protected Application) APIs */
+#define RX51_PPA_L2_INVAL               40
+#define RX51_PPA_WRITE_ACR              42
+
+#ifndef __ASSEMBLER__
+
+extern u32 rx51_secure_dispatcher(u32 idx, u32 flag, u32 nargs,
+                                u32 arg1, u32 arg2, u32 arg3, u32 arg4);
+extern u32 rx51_ppa_smc(u32 id, u32 flag, u32 pargs);
+
+extern u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits);
+#endif /* __ASSEMBLER__ */
+#endif /* OMAP_RX51_SECURE_H */
arch/arm/mach-omap2/board-rx51-smc.S new file +34 -0
new file mode 100644
index 0000000..70e2eb7
@@ -0,0 +1,34 @@
+/*
+ * RX51 secure APIs file.
+ *
+ * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]>
+ *
+ *
+ * This program is free software,you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/linkage.h>
+
+/**
+ * u32 rx51_ppa_smc(u32 id, u32 flag, u32 pargs)
+ * Low level common routine for secure HAL and PPA APIs.
+ * @id: Secure Service ID
+ * @flag: Flag to indicate the criticality of operation
+ * @pargs: Physical address of parameter list starting
+ *          with number of parametrs
+ */
+ENTRY(rx51_ppa_smc)
+	.arch_extension sec
+	stmfd	sp!, {r4-r12, lr}
+	mov	r12, r0		@ Copy the secure service ID
+	mov	r3, r2		@ Copy the pointer to va_list in R3
+	mov	r2, r1		@ Copy the flags in R2
+	mov	r1, #0x0	@ Process ID - 0
+	mov	r6, #0xff	@ Indicate new Task call
+	dsb
+	dmb
+	smc	#1		@ call PPA service
+	ldmfd	sp!, {r4-r12, pc}
+ENDPROC(rx51_ppa_smc)
arch/arm/mach-omap2/board-rx51.c +7 -0
index 92117a13..fd85081 100644
@@ -31,6 +31,7 @@
 #include "gpmc.h"
 #include "pm.h"
 #include "sdram-nokia.h"
+#include "board-rx51-secure.h"
 
 #define RX51_GPIO_SLEEP_IND 162
 
@@ -103,6 +104,12 @@ static void __init rx51_init(void)
 	rx51_peripherals_init();
 	rx51_camera_init();
 
+#ifdef CONFIG_ARM_ERRATA_430973
+	printk(KERN_INFO "Enabling ARM errata 430973 workaround.\n");
+	/* set IBE to 1 */
+	rx51_secure_update_aux_cr(1 << 6, 0);
+#endif
+
 	/* Ensure SDRC pins are mux'd for self-refresh */
 	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
 	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
Signature · 7 lines
1.7.10.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 2 lines
Regards,
Nishanth Menon
#2 lore raw
In reply to Pali Rohár
Quoted 13 lines · Pali Roh?r
---
 arch/arm/mach-omap2/Makefile            |    1 +
 arch/arm/mach-omap2/board-rx51-secure.c |   66 +++++++++++++++++++++++++++++++
 arch/arm/mach-omap2/board-rx51-secure.h |   36 +++++++++++++++++
 arch/arm/mach-omap2/board-rx51-smc.S    |   34 ++++++++++++++++
 arch/arm/mach-omap2/board-rx51.c        |    7 ++++
 5 files changed, 144 insertions(+)
 create mode 100644 arch/arm/mach-omap2/board-rx51-secure.c
 create mode 100644 arch/arm/mach-omap2/board-rx51-secure.h
 create mode 100644 arch/arm/mach-omap2/board-rx51-smc.S

Is this necessary? I thought the PPA sets this bit?

Cheers,

Peter.

#3 lore raw
In reply to Pali Rohár

Hi!

Quoted 12 lines
arch/arm/mach-omap2/board-rx51-secure.c new file +12 -0
+u32 rx51_secure_dispatcher(u32 idx, u32 flag, u32 nargs, u32 arg1, u32 arg2,
+			   u32 arg3, u32 arg4)
+{
+	u32 ret;
+	u32 param[5];
+
+	param[0] = nargs+1;
+	param[1] = arg1;
+	param[2] = arg2;
+	param[3] = arg3;
+	param[4] = arg4;
+

arch/arm/mach-omap2/board-rx51-secure.c line 45

Quoted 10 lines
arch/arm/mach-omap2/board-rx51-secure.c new file +10 -0
+	/*
+	 * Secure API needs physical address
+	 * pointer for the parameters
+	 */
+	flush_cache_all();
+	outer_clean_range(__pa(param), __pa(param + 5));
+	ret = rx51_ppa_smc(idx, flag, __pa(param));
+
+	return ret;
+}

You can do without ret variable... Also more detailed changelog would be nice... like what exact problem this works around.

<google>

So... some CPU errata where code sharing virtual addresses could be executed improperly?

arch/arm/mach-omap2/board-rx51.c static void __init rx51_init(void) · line 112

Quoted 10 lines
arch/arm/mach-omap2/board-rx51.c +6 -0
@@ -103,6 +104,12 @@ static void __init rx51_init(void)
 	rx51_peripherals_init();
 	rx51_camera_init();
 
+#ifdef CONFIG_ARM_ERRATA_430973
+	printk(KERN_INFO "Enabling ARM errata 430973 workaround.\n");
+	/* set IBE to 1 */
+	rx51_secure_update_aux_cr(1 << 6, 0);
+#endif
+

Thanks,
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#4 lore raw

v2 cover arm: omap: RX-51: ARM errata 430973 workaround

In reply to Pali Rohár

This patch adds RX-51 specific SMC support and sets IBE bit in ACTLR during board init code for ARM errata 430973 workaround.

This is second version of patch which simplifing API and moving all board functions to one file board-rx51.c. Wrapper around smc #1 instruction is in omap-smc.S file because some other board may use it too.

Pali Roh?r (2):
ARM: OMAP: Add secure function omap_smc3() which calling instruction

    smc #1

RX-51: ARM errata 430973 workaround

 arch/arm/mach-omap2/board-rx51.c  |   78 +++++++++++++++++++++++++++++++++++++
 arch/arm/mach-omap2/omap-secure.h |    1 +
 arch/arm/mach-omap2/omap-smc.S    |   22 ++++++++++-
 3 files changed, 100 insertions(+), 1 deletion(-)
Signature · 1 line
1.7.10.4
#5 lore raw

PATCH v2 1/2 ARM: OMAP: Add secure function omap_smc3() which calling instruction smc #1

Other secure functions omap_smc1() and omap_smc2() calling instruction smc #0 but Nokia RX-51 board needs to call smc #1 for PPA access.

---
 arch/arm/mach-omap2/omap-secure.h |    1 +
 arch/arm/mach-omap2/omap-smc.S    |   22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/omap-secure.h +1 -0
index 0e72917..c4586f4 100644
@@ -51,6 +51,7 @@
 extern u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs,
 				u32 arg1, u32 arg2, u32 arg3, u32 arg4);
 extern u32 omap_smc2(u32 id, u32 falg, u32 pargs);
+extern u32 omap_smc3(u32 id, u32 process, u32 flag, u32 pargs);
 extern phys_addr_t omap_secure_ram_mempool_base(void);
 extern int omap_secure_ram_reserve_memblock(void);
 
arch/arm/mach-omap2/omap-smc.S +21 -1
index f6441c1..5c02b8d 100644
@@ -1,9 +1,11 @@
 /*
- * OMAP44xx secure APIs file.
+ * OMAP34xx and OMAP44xx secure APIs file.
  *
  * Copyright (C) 2010 Texas Instruments, Inc.
  * Written by Santosh Shilimkar <[email protected]>
  *
+ * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]>
+ * Copyright (C) 2013 Pali Roh?r <[email protected]>
  *
  * This program is free software,you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -54,6 +56,24 @@ ENTRY(omap_smc2)
 	ldmfd   sp!, {r4-r12, pc}
 ENDPROC(omap_smc2)
 
+/**
+ * u32 omap_smc3(u32 service_id, u32 process_id, u32 flag, u32 pargs)
+ * Low level common routine for secure HAL and PPA APIs via smc #1
+ * r0 - @service_id: Secure Service ID
+ * r1 - @process_id: Process ID
+ * r2 - @flag: Flag to indicate the criticality of operation
+ * r3 - @pargs: Physical address of parameter list
+ */
+ENTRY(omap_smc3)
+	stmfd	sp!, {r4-r12, lr}
+	mov	r12, r0		@ Copy the secure service ID
+	mov	r6, #0xff	@ Indicate new Task call
+	dsb
+	dmb
+	smc	#1		@ call PPA service
+	ldmfd	sp!, {r4-r12, pc}
+ENDPROC(omap_smc3)
+
 ENTRY(omap_modify_auxcoreboot0)
 	stmfd   sp!, {r1-r12, lr}
 	ldr	r12, =0x104
Signature · 1 line
1.7.10.4
#6 lore raw

Re: [PATCH v2 1/2] ARM: OMAP: Add secure function omap_smc3() which calling instruction smc #1

Quoted 43 lines · Pali Roh?r

Other secure functions omap_smc1() and omap_smc2() calling instruction smc #0 but Nokia RX-51 board needs to call smc #1 for PPA access.

---
 arch/arm/mach-omap2/omap-secure.h |    1 +
 arch/arm/mach-omap2/omap-smc.S    |   22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/omap-secure.h +1 -0
index 0e72917..c4586f4 100644
@@ -51,6 +51,7 @@
 extern u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs,
 				u32 arg1, u32 arg2, u32 arg3, u32 arg4);
 extern u32 omap_smc2(u32 id, u32 falg, u32 pargs);
+extern u32 omap_smc3(u32 id, u32 process, u32 flag, u32 pargs);
 extern phys_addr_t omap_secure_ram_mempool_base(void);
 extern int omap_secure_ram_reserve_memblock(void);
 
arch/arm/mach-omap2/omap-smc.S +3 -1
index f6441c1..5c02b8d 100644
@@ -1,9 +1,11 @@
 /*
- * OMAP44xx secure APIs file.
+ * OMAP34xx and OMAP44xx secure APIs file.
  *
  * Copyright (C) 2010 Texas Instruments, Inc.
  * Written by Santosh Shilimkar <[email protected]>
  *
+ * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]>
+ * Copyright (C) 2013 Pali Roh?r <[email protected]>
  *
  * This program is free software,you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -54,6 +56,24 @@ ENTRY(omap_smc2)
 	ldmfd   sp!, {r4-r12, pc}
 ENDPROC(omap_smc2)
 

arch/arm/mach-omap2/omap-smc.S ENTRY(omap_smc2) · line 68

Quoted 10 lines
arch/arm/mach-omap2/omap-smc.S +10 -0
+/**
+ * u32 omap_smc3(u32 service_id, u32 process_id, u32 flag, u32 pargs)
+ * Low level common routine for secure HAL and PPA APIs via smc #1
+ * r0 - @service_id: Secure Service ID
+ * r1 - @process_id: Process ID
+ * r2 - @flag: Flag to indicate the criticality of operation
+ * r3 - @pargs: Physical address of parameter list
+ */
+ENTRY(omap_smc3)
+	stmfd	sp!, {r4-r12, lr}

You don't need to save/restore r12. The ABI allows it to be clobbered across function calls.

arch/arm/mach-omap2/omap-smc.S ENTRY(omap_smc2) · line 72

Quoted 4 lines
arch/arm/mach-omap2/omap-smc.S +4 -0
+	mov	r12, r0		@ Copy the secure service ID
+	mov	r6, #0xff	@ Indicate new Task call
+	dsb
+	dmb

dsb synchronises a superset of what dmb synchronises, so the dmb here is not useful.

In any case, any code calling this must flush the region addressed by r3 beforehand anyway, which will include a dsb as part of its semantics -- this is how you call it from rx51_secure_dispatcher().

So I think the dsb may not be needed here (?)

Cheers
---Dave

#7 lore raw

PATCH v2 2/2 RX-51: ARM errata 430973 workaround

In reply to Pali Rohár

Closed and signed Nokia X-Loader bootloader stored in RX-51 nand does not set IBE bit in ACTLR and starting kernel in non-secure mode. So direct write to ACTLR by our kernel does not working and the code for ARM errata 430973 in commit 7ce236fcd6fd45b0441a2d49acb2ceb2de2e8a47 that sets IBE bit is a noop.

In order to have workaround for ARM errata 430973 from non-secure world on RX-51 we needs Secure Monitor Call to set IBE BIT in ACTLR.

This patch adds RX-51 specific SMC support and sets IBE bit in ACTLR during board init code for ARM errata 430973 workaround.

ARM errata 430973 workaround is needed for thumb-2 ISA compiled userspace binaries. Without this workaround thumb-2 binaries crashing. So with this patch it is possible to recompile and run applications/binaries with thumb-2 ISA on RX-51.

---
 arch/arm/mach-omap2/board-rx51.c |   78 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
arch/arm/mach-omap2/board-rx51.c +78 -0
index 03663c2..f234dee 100644
@@ -2,6 +2,8 @@
  * Board support file for Nokia N900 (aka RX-51).
  *
  * Copyright (C) 2007, 2008 Nokia
+ * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]>
+ * Copyright (C) 2013 Pali Roh?r <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -21,6 +23,7 @@
 #include <linux/usb/musb.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 
+#include <asm/cacheflush.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -31,7 +34,14 @@
 #include "mux.h"
 #include "gpmc.h"
 #include "pm.h"
+#include "soc.h"
 #include "sdram-nokia.h"
+#include "omap-secure.h"
+
+/* Secure PPA (Primary Protected Application) APIs */
+#define RX51_PPA_HWRNG			29
+#define RX51_PPA_L2_INVAL		40
+#define RX51_PPA_WRITE_ACR		42
 
 #define RX51_GPIO_SLEEP_IND 162
 
@@ -90,6 +100,66 @@ static struct omap_musb_board_data musb_board_data = {
 	.power			= 0,
 };
 
+/**
+ * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls
+ * @idx: The PPA API index
+ * @process: Process ID
+ * @flag: The flag indicating criticality of operation
+ * @nargs: Number of valid arguments out of four.
+ * @arg1, arg2, arg3 args4: Parameters passed to secure API
+ *
+ * Return the non-zero error value on failure.
+ */
+static u32 rx51_secure_dispatcher(u32 idx, u32 process, u32 flag, u32 nargs,
+			   u32 arg1, u32 arg2, u32 arg3, u32 arg4)
+{
+	u32 ret;
+	u32 param[5];
+
+	param[0] = nargs+1; /* RX-51 needs number of arguments + 1 */
+	param[1] = arg1;
+	param[2] = arg2;
+	param[3] = arg3;
+	param[4] = arg4;
+
+	/*
+	 * Secure API needs physical address
+	 * pointer for the parameters
+	 */
+	local_irq_disable();
+	local_fiq_disable();
+	flush_cache_all();
+	outer_clean_range(__pa(param), __pa(param + 5));
+	ret = omap_smc3(idx, process, flag, __pa(param));
+	flush_cache_all();
+	local_fiq_enable();
+	local_irq_enable();
+
+	return ret;
+}
+
+/**
+ * rx51_secure_update_aux_cr: Routine to modify the contents of Auxiliary Control Register
+ *  @set_bits: bits to set in ACR
+ *  @clr_bits: bits to clear in ACR
+ *
+ * Return the non-zero error value on failure.
+*/
+static u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits)
+{
+	u32 acr;
+
+	/* Read ACR */
+	asm volatile ("mrc p15, 0, %0, c1, c0, 1" : "=r" (acr));
+	acr &= ~clear_bits;
+	acr |= set_bits;
+
+	return rx51_secure_dispatcher(RX51_PPA_WRITE_ACR,
+				      0,
+				      FLAG_START_CRITICAL,
+				      1, acr, 0, 0, 0);
+}
+
 static void __init rx51_init(void)
 {
 	struct omap_sdrc_params *sdrc_params;
@@ -105,6 +175,14 @@ static void __init rx51_init(void)
 	rx51_peripherals_init();
 	rx51_camera_init();
 
+	if (omap_type() == OMAP2_DEVICE_TYPE_SEC) {
+#ifdef CONFIG_ARM_ERRATA_430973
+		pr_info("RX-51: Enabling ARM errata 430973 workaround\n");
+		/* set IBE to 1 */
+		rx51_secure_update_aux_cr(BIT(6), 0);
+#endif
+	}
+
 	/* Ensure SDRC pins are mux'd for self-refresh */
 	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
 	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
Signature · 1 line
1.7.10.4
maintainer
#8 lore raw

Re: [PATCH v2 2/2] RX-51: ARM errata 430973 workaround

arch/arm/mach-omap2/board-rx51.c

Quoted 2 lines · Pali Roh?r
arch/arm/mach-omap2/board-rx51.c +0 -0

This file will be gone as soon as we're moving to device tree based booting. So let's do this in more future proof way.

Quoted 27 lines
arch/arm/mach-omap2/board-rx51.c +27 -0
+/**
+ * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls
+ * @idx: The PPA API index
+ * @process: Process ID
+ * @flag: The flag indicating criticality of operation
+ * @nargs: Number of valid arguments out of four.
+ * @arg1, arg2, arg3 args4: Parameters passed to secure API
+ *
+ * Return the non-zero error value on failure.
+ */
+static u32 rx51_secure_dispatcher(u32 idx, u32 process, u32 flag, u32 nargs,
+			   u32 arg1, u32 arg2, u32 arg3, u32 arg4)
+{
+	u32 ret;
+	u32 param[5];
+
+	param[0] = nargs+1; /* RX-51 needs number of arguments + 1 */
+	param[1] = arg1;
+	param[2] = arg2;
+	param[3] = arg3;
+	param[4] = arg4;
+
+	/*
+	 * Secure API needs physical address
+	 * pointer for the parameters
+	 */
+	local_irq_disable();

arch/arm/mach-omap2/board-rx51.c static struct omap_musb_board_data musb_board_data = { · line 139

Quoted 10 lines
arch/arm/mach-omap2/board-rx51.c +10 -0
+	local_fiq_disable();
+	flush_cache_all();
+	outer_clean_range(__pa(param), __pa(param + 5));
+	ret = omap_smc3(idx, process, flag, __pa(param));
+	flush_cache_all();
+	local_fiq_enable();
+	local_irq_enable();
+
+	return ret;
+}

I think this used to be in omap-secure.c, and then made rx51 specific.. But since board-rx51.c is going away, let's move this function to omap-secure.c.

Quoted 10 lines

+ * rx51_secure_update_aux_cr: Routine to modify the contents of Auxiliary Control Register
+ * @set_bits: bits to set in ACR
+ * @clr_bits: bits to clear in ACR
+ *
+ * Return the non-zero error value on failure.

arch/arm/mach-omap2/board-rx51.c +5 -0
+*/
+static u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits)
+{
+	u32 acr;
+

arch/arm/mach-omap2/board-rx51.c static struct omap_musb_board_data musb_board_data = { · line 161

Quoted 10 lines
arch/arm/mach-omap2/board-rx51.c +10 -0
+	/* Read ACR */
+	asm volatile ("mrc p15, 0, %0, c1, c0, 1" : "=r" (acr));
+	acr &= ~clear_bits;
+	acr |= set_bits;
+
+	return rx51_secure_dispatcher(RX51_PPA_WRITE_ACR,
+				      0,
+				      FLAG_START_CRITICAL,
+				      1, acr, 0, 0, 0);
+}

This too.

Quoted 8 lines

static void __init rx51_init(void)
{

arch/arm/mach-omap2/board-rx51.c +1 -0
 	struct omap_sdrc_params *sdrc_params;
@@ -105,6 +175,14 @@ static void __init rx51_init(void)
 	rx51_peripherals_init();
 	rx51_camera_init();
 
+	if (omap_type() == OMAP2_DEVICE_TYPE_SEC) {

arch/arm/mach-omap2/board-rx51.c static void __init rx51_init(void) · line 188

Quoted 10 lines
arch/arm/mach-omap2/board-rx51.c +7 -0
+#ifdef CONFIG_ARM_ERRATA_430973
+		pr_info("RX-51: Enabling ARM errata 430973 workaround\n");
+		/* set IBE to 1 */
+		rx51_secure_update_aux_cr(BIT(6), 0);
+#endif
+	}
+
 	/* Ensure SDRC pins are mux'd for self-refresh */
 	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
 	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);

Then this can be called both from board-generic.c based on the compatible flag, and board-rx51.c for now.

Regards,

Tony

#9 lore raw

Re: [PATCH v2 2/2] RX-51: ARM errata 430973 workaround

Quoted 18 lines · On Wednesday 18 September 2013 01:24:17 Tony Lindgren wrote:

arch/arm/mach-omap2/board-rx51.c

Quoted 2 lines · Pali Roh?r
arch/arm/mach-omap2/board-rx51.c +0 -0

This file will be gone as soon as we're moving to device tree based booting. So let's do this in more future proof way.

Quoted 10 lines

+/**
+ * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls + * @idx: The PPA API index
+ * @process: Process ID
+ * @flag: The flag indicating criticality of operation
+ * @nargs: Number of valid arguments out of four.
+ * @arg1, arg2, arg3 args4: Parameters passed to secure API
+ *
+ * Return the non-zero error value on failure.
+ */

Quoted 8 lines

arch/arm/mach-omap2/board-rx51.c static struct omap_musb_board_data musb_board_data = {

Quoted 8 lines

+static u32 rx51_secure_dispatcher(u32 idx, u32 process, u32
flag, u32 nargs, + u32 arg1, u32 arg2, u32 arg3, u32
arg4)

arch/arm/mach-omap2/board-rx51.c +5 -0
+{
+	u32 ret;
+	u32 param[5];
+
+	param[0] = nargs+1; /* RX-51 needs number of arguments + 

1

Quoted 75 lines
Quoted 10 lines

*/ + param[1] = arg1;

arch/arm/mach-omap2/board-rx51.c +9 -0
+	param[2] = arg2;
+	param[3] = arg3;
+	param[4] = arg4;
+
+	/*
+	 * Secure API needs physical address
+	 * pointer for the parameters
+	 */
+	local_irq_disable();

arch/arm/mach-omap2/board-rx51.c static struct omap_musb_board_data musb_board_data = { · line 139

Quoted 10 lines
arch/arm/mach-omap2/board-rx51.c +10 -0
+	local_fiq_disable();
+	flush_cache_all();
+	outer_clean_range(__pa(param), __pa(param + 5));
+	ret = omap_smc3(idx, process, flag, __pa(param));
+	flush_cache_all();
+	local_fiq_enable();
+	local_irq_enable();
+
+	return ret;
+}

I think this used to be in omap-secure.c, and then made rx51 specific.. But since board-rx51.c is going away, let's move this function to omap-secure.c.

Quoted 11 lines

+ * rx51_secure_update_aux_cr: Routine to modify the contents of Auxiliary Control Register + * @set_bits: bits to set in ACR
+ * @clr_bits: bits to clear in ACR
+ *
+ * Return the non-zero error value on failure.

arch/arm/mach-omap2/board-rx51.c +2 -0
+*/
+static u32 rx51_secure_update_aux_cr(u32 set_bits, u32

clear_bits) +{

arch/arm/mach-omap2/board-rx51.c +2 -0
+	u32 acr;
+

arch/arm/mach-omap2/board-rx51.c static struct omap_musb_board_data musb_board_data = { · line 161

Quoted 10 lines
arch/arm/mach-omap2/board-rx51.c +10 -0
+	/* Read ACR */
+	asm volatile ("mrc p15, 0, %0, c1, c0, 1" : "=r" (acr));
+	acr &= ~clear_bits;
+	acr |= set_bits;
+
+	return rx51_secure_dispatcher(RX51_PPA_WRITE_ACR,
+				      0,
+				      FLAG_START_CRITICAL,
+				      1, acr, 0, 0, 0);
+}

This too.

Quoted 14 lines

static void __init rx51_init(void)
{

arch/arm/mach-omap2/board-rx51.c +3 -0
 	struct omap_sdrc_params *sdrc_params;
@@ -105,6 +175,14 @@ static void __init rx51_init(void)
 
 	rx51_peripherals_init();
 	rx51_camera_init();
 
+	if (omap_type() == OMAP2_DEVICE_TYPE_SEC) {
+#ifdef CONFIG_ARM_ERRATA_430973
+		pr_info("RX-51: Enabling ARM errata 430973

workaround\n"); + /* set IBE to 1 */

arch/arm/mach-omap2/board-rx51.c static void __init rx51_init(void) · line 188

Quoted 8 lines
arch/arm/mach-omap2/board-rx51.c +4 -0
+		rx51_secure_update_aux_cr(BIT(6), 0);
+#endif
+	}
+
 
 	/* Ensure SDRC pins are mux'd for self-refresh */
 	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
 	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);

Then this can be called both from board-generic.c based on the compatible flag, and board-rx51.c for now.

Quoted 3 lines

Regards,

Tony

Hi Tony,

I'm not very happy. I sent this patch 6 months ago and only now you commented that needs rework again. This patch is needed because all thumb-2 userspace binaries crashing. I want to have working support for Nokia N900 and not always rebasing and changing patches. Also DT still not working on N900 (file contains only small subset of devices as in board files plus it is not in stable kernel) so I do not want to switch to DT. I need something which is working and not something new non-working. I belive that you and other kernel guys do not remove all n900 board files until every one line will be rewritten to DT and tested that everything working. And from this and other conversation it looks for me that you are going to do that. So please clarify what you want to do (and when) with board-rx51-* files. Aftethat I can decide what to do in future.

For now I see this situation something like: I wrote patches, send them to ML and after half of year maintainer politely rejected them becuase my patches not using new uber cool technology with still not working and also was not available half year ago. What happen if I find another time to rework this patch and send it again in next 2 or 5 months?

Tony, if you did not have time for review this patch months ago or you found it only today - no problem, I understand it. But what I need to know is what will happen with board-rx51-* files (and when?) You can see that DT does not have definitions of all n900 hw parts (plus it is not in last 3.11 kernel!) which means that DT is not usable for me and other n900 people. This also means that I cannot rewrite my patches for DT and test if they working.

Signature · 9 lines
Pali Roh?r
pali.rohar at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130918/573a27bd/attachment-0001.sig>
maintainer
#10 lore raw

Re: [PATCH v2 2/2] RX-51: ARM errata 430973 workaround

Quoted 15 lines · Pali Roh?r

I'm not very happy. I sent this patch 6 months ago and only now you commented that needs rework again. This patch is needed because all thumb-2 userspace binaries crashing. I want to have working support for Nokia N900 and not always rebasing and changing patches. Also DT still not working on N900 (file contains only small subset of devices as in board files plus it is not in stable kernel) so I do not want to switch to DT. I need something which is working and not something new non-working. I belive that you and other kernel guys do not remove all n900 board files until every one line will be rewritten to DT and tested that everything working. And from this and other conversation it looks for me that you are going to do that. So please clarify what you want to do (and when) with board-rx51-* files. Aftethat I can decide what to do in future.

Sorry if there's been some going back and forth with the patches, I think pretty much everybody wants n900 support in the mainline.

It's obvious that we're moving everything to be devicetree only as discussed on the mailing lists over past few years. For most drivers it's already working, and we can still initialize platform data too for the legacy devices until they have bindings, so it should not be too intrusive except for the configuration changes to use appended DTB or a chained bootloader with DTB support.

Quoted 6 lines

For now I see this situation something like: I wrote patches, send them to ML and after half of year maintainer politely rejected them becuase my patches not using new uber cool technology with still not working and also was not available half year ago. What happen if I find another time to rework this patch and send it again in next 2 or 5 months?

Hmm hasn't there been pending comments until recently on your patches?

It seems that with the changes I suggested your patches should work for both legacy booting and DT based booting, so maybe just try to update them over next few weeks, let's say by -rc3 rather than wait 2 to 5 months? :) No need to test them currently on the DT based booting if you don't have that set up, just move the code out of the board-*.c file.

Quoted 8 lines

Tony, if you did not have time for review this patch months ago or you found it only today - no problem, I understand it. But what I need to know is what will happen with board-rx51-* files (and when?) You can see that DT does not have definitions of all n900 hw parts (plus it is not in last 3.11 kernel!) which means that DT is not usable for me and other n900 people. This also means that I cannot rewrite my patches for DT and test if they working.

I usually stop looking at new code around -rc4 and concentrate on fixes until -rc1 or so. So there can be easily one month delays on reviewing stuff depending on where we are with the current merge window or -rc cycle, sorry if that's annoying.

The .dts files will be separate from the kernel soonish, so that's not be a show stopper. Just like all the board specific .config files are separate from the kernel already. Too bad our .dts changes did not get merged for v3.12 because of conflicts with other branches, but hey, they should be independent from the kernel anyways.

The board files will be going away as soon as things are working with DT. We've been pretty much only applying fixes to them for quite some time now. For the timeline, the earliest we'll be able to remove the board-*.c files and platform data is for v3.13 assuming the PM dependencies get sorted out before that. Making omap3 DT only is going remove about 25k LOC, so that's a good reason for doing that.

Cheers,

Tony

#11 lore raw

Re: [PATCH v2 2/2] RX-51: ARM errata 430973 workaround

Hello,

Quoted 37 lines · On Wednesday 18 September 2013 19:18:17 Tony Lindgren wrote:
Quoted 7 lines · Pali Roh?r

I'm not very happy. I sent this patch 6 months ago and only now you commented that needs rework again. This patch is needed because all thumb-2 userspace binaries crashing. I want to have working support for Nokia N900 and not always rebasing and changing patches. Also DT still not working on N900 (file contains only small subset of devices as in board files plus it is not in stable kernel) so I do not

Quoted 8 lines

want to switch to DT. I need something which is working and not something new non-working. I belive that you and other kernel guys do not remove all n900 board files until every one line will be rewritten to DT and tested that everything working. And from this and other conversation it looks for me that you are going to do that. So please clarify what you want to do (and when) with board-rx51-* files. Aftethat I can decide what to do in future.

Sorry if there's been some going back and forth with the patches, I think pretty much everybody wants n900 support in the mainline.

It's obvious that we're moving everything to be devicetree only as discussed on the mailing lists over past few years. For most drivers it's already working, and we can still initialize platform data too for the legacy devices until they have bindings, so it should not be too intrusive except for the configuration changes to use appended DTB or a chained bootloader with DTB support.

Quoted 7 lines

For now I see this situation something like: I wrote patches, send them to ML and after half of year maintainer politely rejected them becuase my patches not using new uber cool technology with still not working and also was not available half year ago. What happen if I find another time to rework this patch and send it again in next 2 or 5 months?

Quoted 3 lines

Hmm hasn't there been pending comments until recently on your patches?

Since 10.07.2013 I do not have any emails for patch 2/2. If I missed something from you, please resend me it.

Quoted 7 lines

It seems that with the changes I suggested your patches should work for both legacy booting and DT based booting, so maybe just try to update them over next few weeks, let's say by -rc3 rather than wait 2 to 5 months? :) No need to test them currently on the DT based booting if you don't have that set up, just move the code out of the board-*.c file.

Ok, no problem. I will move code as you suggested.

Quoted 29 lines
Quoted 8 lines

Tony, if you did not have time for review this patch months ago or you found it only today - no problem, I understand it. But what I need to know is what will happen with board-rx51-* files (and when?) You can see that DT does not have definitions of all n900 hw parts (plus it is not in last 3.11 kernel!) which means that DT is not usable for me and other n900 people. This also means that I cannot rewrite my patches for DT and test if they working.

I usually stop looking at new code around -rc4 and concentrate on fixes until -rc1 or so. So there can be easily one month delays on reviewing stuff depending on where we are with the current merge window or -rc cycle, sorry if that's annoying.

The .dts files will be separate from the kernel soonish, so that's not be a show stopper. Just like all the board specific .config files are separate from the kernel already. Too bad our .dts changes did not get merged for v3.12 because of conflicts with other branches, but hey, they should be independent from the kernel anyways.

The board files will be going away as soon as things are working with DT. We've been pretty much only applying fixes to them for quite some time now. For the timeline, the earliest we'll be able to remove the board-*.c files and platform data is for v3.13 assuming the PM dependencies get sorted out before that. Making omap3 DT only is going remove about 25k LOC, so that's a good reason for doing that.

Quoted 3 lines

Cheers,

Tony

Thanks for clarification.

Signature · 9 lines
Pali Roh?r
pali.rohar at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130918/98fd8ae4/attachment.sig>
maintainer
#12 lore raw

Re: [PATCH v2 2/2] RX-51: ARM errata 430973 workaround

Quoted 8 lines · Pali Roh?r
Quoted 4 lines · On Wednesday 18 September 2013 19:18:17 Tony Lindgren wrote:

Hmm hasn't there been pending comments until recently on your patches?

Since 10.07.2013 I do not have any emails for patch 2/2. If I missed something from you, please resend me it.

Sorry I noticed it only when looking at them again from "keep in my inbox for applying" or "mark as read and archive" point of view. So no other comments from me are pending.

Quoted 9 lines
Quoted 7 lines

It seems that with the changes I suggested your patches should work for both legacy booting and DT based booting, so maybe just try to update them over next few weeks, let's say by -rc3 rather than wait 2 to 5 months? :) No need to test them currently on the DT based booting if you don't have that set up, just move the code out of the board-*.c file.

Ok, no problem. I will move code as you suggested.

Thanks,

Tony

#13 lore raw

Re: [PATCH v2 2/2] RX-51: ARM errata 430973 workaround

In reply to Tony Lindgren

Hi!

Quoted 14 lines
Quoted 8 lines

Tony, if you did not have time for review this patch months ago or you found it only today - no problem, I understand it. But what I need to know is what will happen with board-rx51-* files (and when?) You can see that DT does not have definitions of all n900 hw parts (plus it is not in last 3.11 kernel!) which means that DT is not usable for me and other n900 people. This also means that I cannot rewrite my patches for DT and test if they working.

I usually stop looking at new code around -rc4 and concentrate on fixes until -rc1 or so. So there can be easily one month delays on reviewing stuff depending on where we are with the current merge window or -rc cycle, sorry if that's annoying.

Quoted 6 lines

The .dts files will be separate from the kernel soonish, so that's not be a show stopper. Just like all the board specific .config files are separate from the kernel already. Too bad our .dts changes did not get merged for v3.12 because of conflicts with other branches, but hey, they should be independent from the kernel anyways.

Well... I'd say it is still time to merge them. "New hardware support" is ok after -rc1.

Quoted 4 lines

The board files will be going away as soon as things are working with DT. We've been pretty much only applying fixes to them for quite some time now. For the timeline, the earliest we'll be able to remove the board-*.c files and platform data is for v3.13

And it would be good to merge n900 dts support for 3.12. Adding device tree at the same release as removing board support files in same release leaves zero room for testing, and practically guarantees regressions.

Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
maintainer
#14 lore raw

Re: [PATCH v2 2/2] RX-51: ARM errata 430973 workaround

Quoted 23 lines · Pavel Machek

Hi!

Quoted 14 lines
Quoted 8 lines

Tony, if you did not have time for review this patch months ago or you found it only today - no problem, I understand it. But what I need to know is what will happen with board-rx51-* files (and when?) You can see that DT does not have definitions of all n900 hw parts (plus it is not in last 3.11 kernel!) which means that DT is not usable for me and other n900 people. This also means that I cannot rewrite my patches for DT and test if they working.

I usually stop looking at new code around -rc4 and concentrate on fixes until -rc1 or so. So there can be easily one month delays on reviewing stuff depending on where we are with the current merge window or -rc cycle, sorry if that's annoying.

Quoted 6 lines

The .dts files will be separate from the kernel soonish, so that's not be a show stopper. Just like all the board specific .config files are separate from the kernel already. Too bad our .dts changes did not get merged for v3.12 because of conflicts with other branches, but hey, they should be independent from the kernel anyways.

Quoted 2 lines

Well... I'd say it is still time to merge them. "New hardware support" is ok after -rc1.

Sure if there's a good reason like "driver foo is already device tree only and cannot be used for board bar without blah".

Quoted 9 lines
Quoted 4 lines

The board files will be going away as soon as things are working with DT. We've been pretty much only applying fixes to them for quite some time now. For the timeline, the earliest we'll be able to remove the board-*.c files and platform data is for v3.13

And it would be good to merge n900 dts support for 3.12. Adding device tree at the same release as removing board support files in same release leaves zero room for testing, and practically guarantees regressions.

Yes we experienced that with omap4 conversion where it caused some wl12xx regression. So we might want to keep some omap3 board files around until v3.14 if necessary.

Also please take a look at the "[PATCH 0/4] Clean up legacy platform data handling for omaps for v3.13" patches I posted few days ago, those should make it easy to have board specific pdata quirks for DT based booting.

Regards,

Tony

#15 lore raw

PATCH v3 2/2 RX-51: ARM errata 430973 workaround

In reply to Tony Lindgren

Hello Tony,

here is new v3 patch. I just only moved functions rx51_secure_dispatcher and rx51_secure_update_aux_cr to omap-secure.c and added header to omap-secure.h Because I only moved two functions to other source file I tested only compilation. It is OK now?

arch/arm/mach-omap2/board-rx51.c +12 -0
index 773510556..db168c9 100644
@@ -2,6 +2,8 @@
  * Board support file for Nokia N900 (aka RX-51).
  *
  * Copyright (C) 2007, 2008 Nokia
+ * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]>
+ * Copyright (C) 2013 Pali Roh?r <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -31,7 +33,9 @@
 #include "mux.h"
 #include "gpmc.h"
 #include "pm.h"
+#include "soc.h"
 #include "sdram-nokia.h"
+#include "omap-secure.h"
 
 #define RX51_GPIO_SLEEP_IND 162
 
@@ -103,6 +107,14 @@ static void __init rx51_init(void)
 	usb_musb_init(&musb_board_data);
 	rx51_peripherals_init();
 
+	if (omap_type() == OMAP2_DEVICE_TYPE_SEC) {
+#ifdef CONFIG_ARM_ERRATA_430973
+		pr_info("RX-51: Enabling ARM errata 430973 workaround\n");
+		/* set IBE to 1 */
+		rx51_secure_update_aux_cr(BIT(6), 0);
+#endif
+	}
+
 	/* Ensure SDRC pins are mux'd for self-refresh */
 	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
 	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
arch/arm/mach-omap2/omap-secure.c +62 -0

71 lines not on this page · raw message

arch/arm/mach-omap2/omap-secure.h +11 -0
index c4586f4..51b59c6 100644
@@ -3,6 +3,8 @@
  *
  * Copyright (C) 2011 Texas Instruments, Inc.
  *	Santosh Shilimkar <[email protected]>
+ * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]>
+ * Copyright (C) 2013 Pali Roh?r <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -46,6 +48,11 @@
 #define OMAP4_PPA_L2_POR_INDEX		0x23
 #define OMAP4_PPA_CPU_ACTRL_SMP_INDEX	0x25
 
+/* Secure RX-51 PPA (Primary Protected Application) APIs */
+#define RX51_PPA_HWRNG			29
+#define RX51_PPA_L2_INVAL		40
+#define RX51_PPA_WRITE_ACR		42
+
 #ifndef __ASSEMBLER__
 
 extern u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs,
@@ -55,6 +62,10 @@ extern u32 omap_smc3(u32 id, u32 process, u32 flag, u32 pargs);
 extern phys_addr_t omap_secure_ram_mempool_base(void);
 extern int omap_secure_ram_reserve_memblock(void);
 
+extern u32 rx51_secure_dispatcher(u32 idx, u32 process, u32 flag, u32 nargs,
+				  u32 arg1, u32 arg2, u32 arg3, u32 arg4);
+extern u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits);
+
 #ifdef CONFIG_OMAP4_ERRATA_I688
 extern int omap_barrier_reserve_memblock(void);
 #else
Signature · 9 lines
Pali Roh?r
pali.rohar at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130918/9da07aa7/attachment.sig>
maintainer
#16 lore raw

Re: [PATCH v3 2/2] RX-51: ARM errata 430973 workaround

Quoted 6 lines · Pali Roh?r

Hello Tony,

here is new v3 patch. I just only moved functions rx51_secure_dispatcher and rx51_secure_update_aux_cr to omap-secure.c and added header to omap-secure.h Because I only moved two functions to other source file I tested only compilation. It is OK now?

Yes looks OK to me for v3.13 for the patch.

For the patch description, maybe also add something saying that the rx51_secure_dispatcher() is different from the existing smc function as that may be easy to miss while glancing over the code?

Regards,

Tony

Quoted 156 lines
arch/arm/mach-omap2/board-rx51.c +12 -0
index 773510556..db168c9 100644
@@ -2,6 +2,8 @@
  * Board support file for Nokia N900 (aka RX-51).
  *
  * Copyright (C) 2007, 2008 Nokia
+ * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]>
+ * Copyright (C) 2013 Pali Roh?r <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -31,7 +33,9 @@
 #include "mux.h"
 #include "gpmc.h"
 #include "pm.h"
+#include "soc.h"
 #include "sdram-nokia.h"
+#include "omap-secure.h"
 
 #define RX51_GPIO_SLEEP_IND 162
 
@@ -103,6 +107,14 @@ static void __init rx51_init(void)
 	usb_musb_init(&musb_board_data);
 	rx51_peripherals_init();
 
+	if (omap_type() == OMAP2_DEVICE_TYPE_SEC) {
+#ifdef CONFIG_ARM_ERRATA_430973
+		pr_info("RX-51: Enabling ARM errata 430973 workaround\n");
+		/* set IBE to 1 */
+		rx51_secure_update_aux_cr(BIT(6), 0);
+#endif
+	}
+
 	/* Ensure SDRC pins are mux'd for self-refresh */
 	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
 	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
arch/arm/mach-omap2/omap-secure.c +62 -0
index b970440..eba74cf 100644
@@ -3,6 +3,8 @@
  *
  * Copyright (C) 2011 Texas Instruments, Inc.
  *	Santosh Shilimkar <[email protected]>
+ * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]>
+ * Copyright (C) 2013 Pali Roh?r <[email protected]>
  *
  *
  * This program is free software,you can redistribute it and/or modify
@@ -70,3 +72,63 @@ phys_addr_t omap_secure_ram_mempool_base(void)
 {
 	return omap_secure_memblock_base;
 }
+
+/**
+ * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls
+ * @idx: The PPA API index
+ * @process: Process ID
+ * @flag: The flag indicating criticality of operation
+ * @nargs: Number of valid arguments out of four.
+ * @arg1, arg2, arg3 args4: Parameters passed to secure API
+ *
+ * Return the non-zero error value on failure.
+ */
+u32 rx51_secure_dispatcher(u32 idx, u32 process, u32 flag, u32 nargs,
+			   u32 arg1, u32 arg2, u32 arg3, u32 arg4)
+{
+	u32 ret;
+	u32 param[5];
+
+	param[0] = nargs+1; /* RX-51 needs number of arguments + 1 */
+	param[1] = arg1;
+	param[2] = arg2;
+	param[3] = arg3;
+	param[4] = arg4;
+
+	/*
+	 * Secure API needs physical address
+	 * pointer for the parameters
+	 */
+	local_irq_disable();
+	local_fiq_disable();
+	flush_cache_all();
+	outer_clean_range(__pa(param), __pa(param + 5));
+	ret = omap_smc3(idx, process, flag, __pa(param));
+	flush_cache_all();
+	local_fiq_enable();
+	local_irq_enable();
+
+	return ret;
+}
+
+/**
+ * rx51_secure_update_aux_cr: Routine to modify the contents of Auxiliary Control Register
+ *  @set_bits: bits to set in ACR
+ *  @clr_bits: bits to clear in ACR
+ *
+ * Return the non-zero error value on failure.
+*/
+u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits)
+{
+	u32 acr;
+
+	/* Read ACR */
+	asm volatile ("mrc p15, 0, %0, c1, c0, 1" : "=r" (acr));
+	acr &= ~clear_bits;
+	acr |= set_bits;
+
+	return rx51_secure_dispatcher(RX51_PPA_WRITE_ACR,
+				      0,
+				      FLAG_START_CRITICAL,
+				      1, acr, 0, 0, 0);
+}
arch/arm/mach-omap2/omap-secure.h +11 -0
index c4586f4..51b59c6 100644
@@ -3,6 +3,8 @@
  *
  * Copyright (C) 2011 Texas Instruments, Inc.
  *	Santosh Shilimkar <[email protected]>
+ * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]>
+ * Copyright (C) 2013 Pali Roh?r <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -46,6 +48,11 @@
 #define OMAP4_PPA_L2_POR_INDEX		0x23
 #define OMAP4_PPA_CPU_ACTRL_SMP_INDEX	0x25
 
+/* Secure RX-51 PPA (Primary Protected Application) APIs */
+#define RX51_PPA_HWRNG			29
+#define RX51_PPA_L2_INVAL		40
+#define RX51_PPA_WRITE_ACR		42
+
 #ifndef __ASSEMBLER__
 
 extern u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs,
@@ -55,6 +62,10 @@ extern u32 omap_smc3(u32 id, u32 process, u32 flag, u32 pargs);
 extern phys_addr_t omap_secure_ram_mempool_base(void);
 extern int omap_secure_ram_reserve_memblock(void);
 
+extern u32 rx51_secure_dispatcher(u32 idx, u32 process, u32 flag, u32 nargs,
+				  u32 arg1, u32 arg2, u32 arg3, u32 arg4);
+extern u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits);
+
 #ifdef CONFIG_OMAP4_ERRATA_I688
 extern int omap_barrier_reserve_memblock(void);
 #else
Signature · 3 lines
-- 
Pali Roh?r
pali.rohar at gmail.com
#17 lore raw

PATCH v4 2/2 RX-51: ARM errata 430973 workaround

Closed and signed Nokia X-Loader bootloader stored in RX-51 nand does not set IBE bit in ACTLR and starting kernel in non-secure mode. So direct write to ACTLR by our kernel does not working and the code for ARM errata 430973 in commit 7ce236fcd6fd45b0441a2d49acb2ceb2de2e8a47 that sets IBE bit is a noop.

In order to have workaround for ARM errata 430973 from non-secure world on RX-51 we needs Secure Monitor Call to set IBE BIT in ACTLR.

This patch adds RX-51 specific secure support code and sets IBE bit in ACTLR during board init code for ARM errata 430973 workaround.

Note that new function rx51_secure_dispatcher() differs from existing omap_secure_dispatcher(). It calling omap_smc3() and param[0] is nargs+1.

ARM errata 430973 workaround is needed for thumb-2 ISA compiled userspace binaries. Without this workaround thumb-2 binaries crashing. So with this patch it is possible to recompile and run applications/binaries with thumb-2 ISA on RX-51.

---

I added note about difference between rx51_secure_dispatcher and omap_secure_dispatcher to commit message and also to code.

 arch/arm/mach-omap2/board-rx51.c  |   12 +++++++
 arch/arm/mach-omap2/omap-secure.c |   65 +++++++++++++++++++++++++++++++++++++
 arch/arm/mach-omap2/omap-secure.h |   11 +++++++
 3 files changed, 88 insertions(+)
arch/arm/mach-omap2/board-rx51.c +12 -0
index 773510556..db168c9 100644
@@ -2,6 +2,8 @@
  * Board support file for Nokia N900 (aka RX-51).
  *
  * Copyright (C) 2007, 2008 Nokia
+ * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]>
+ * Copyright (C) 2013 Pali Roh?r <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -31,7 +33,9 @@
 #include "mux.h"
 #include "gpmc.h"
 #include "pm.h"
+#include "soc.h"
 #include "sdram-nokia.h"
+#include "omap-secure.h"
 
 #define RX51_GPIO_SLEEP_IND 162
 
@@ -103,6 +107,14 @@ static void __init rx51_init(void)
 	usb_musb_init(&musb_board_data);
 	rx51_peripherals_init();
 
+	if (omap_type() == OMAP2_DEVICE_TYPE_SEC) {
+#ifdef CONFIG_ARM_ERRATA_430973
+		pr_info("RX-51: Enabling ARM errata 430973 workaround\n");
+		/* set IBE to 1 */
+		rx51_secure_update_aux_cr(BIT(6), 0);
+#endif
+	}
+
 	/* Ensure SDRC pins are mux'd for self-refresh */
 	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
 	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
arch/arm/mach-omap2/omap-secure.c +65 -0

74 lines not on this page · raw message

arch/arm/mach-omap2/omap-secure.h +11 -0
index c4586f4..51b59c6 100644
@@ -3,6 +3,8 @@
  *
  * Copyright (C) 2011 Texas Instruments, Inc.
  *	Santosh Shilimkar <[email protected]>
+ * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]>
+ * Copyright (C) 2013 Pali Roh?r <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -46,6 +48,11 @@
 #define OMAP4_PPA_L2_POR_INDEX		0x23
 #define OMAP4_PPA_CPU_ACTRL_SMP_INDEX	0x25
 
+/* Secure RX-51 PPA (Primary Protected Application) APIs */
+#define RX51_PPA_HWRNG			29
+#define RX51_PPA_L2_INVAL		40
+#define RX51_PPA_WRITE_ACR		42
+
 #ifndef __ASSEMBLER__
 
 extern u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs,
@@ -55,6 +62,10 @@ extern u32 omap_smc3(u32 id, u32 process, u32 flag, u32 pargs);
 extern phys_addr_t omap_secure_ram_mempool_base(void);
 extern int omap_secure_ram_reserve_memblock(void);
 
+extern u32 rx51_secure_dispatcher(u32 idx, u32 process, u32 flag, u32 nargs,
+				  u32 arg1, u32 arg2, u32 arg3, u32 arg4);
+extern u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits);
+
 #ifdef CONFIG_OMAP4_ERRATA_I688
 extern int omap_barrier_reserve_memblock(void);
 #else
Signature · 8 lines
1.7.10.4
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130918/cb9fc46e/attachment.sig>