fix up white space corruption in highbank-secure-smc.patch
This commit is contained in:
parent
26dfa93c6b
commit
b920e9b748
|
@ -18,15 +18,15 @@ index f8437dd..ded4652 100644
|
|||
--- a/arch/arm/mach-highbank/Makefile
|
||||
+++ b/arch/arm/mach-highbank/Makefile
|
||||
@@ -1,4 +1,8 @@
|
||||
-obj-y := clock.o highbank.o system.o
|
||||
+obj-y := clock.o highbank.o system.o smc.o
|
||||
-obj-y := clock.o highbank.o system.o
|
||||
+obj-y := clock.o highbank.o system.o smc.o
|
||||
+
|
||||
+plus_sec := $(call as-instr,.arch_extension sec,+sec)
|
||||
+AFLAGS_smc.o :=-Wa,-march=armv7-a$(plus_sec)
|
||||
+AFLAGS_smc.o :=-Wa,-march=armv7-a$(plus_sec)
|
||||
+
|
||||
obj-$(CONFIG_DEBUG_HIGHBANK_UART) += lluart.o
|
||||
obj-$(CONFIG_SMP) += platsmp.o
|
||||
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
|
||||
obj-$(CONFIG_DEBUG_HIGHBANK_UART) += lluart.o
|
||||
obj-$(CONFIG_SMP) += platsmp.o
|
||||
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
|
||||
diff --git a/arch/arm/mach-highbank/core.h b/arch/arm/mach-highbank/core.h
|
||||
index d8e2d0b..141ed51 100644
|
||||
--- a/arch/arm/mach-highbank/core.h
|
||||
|
@ -35,41 +35,35 @@ index d8e2d0b..141ed51 100644
|
|||
static inline void highbank_lluart_map_io(void) {}
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
+extern void highbank_smc1(int fn, int arg);
|
||||
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
|
||||
index 410a112..8777612 100644
|
||||
--- a/arch/arm/mach-highbank/highbank.c
|
||||
+++ b/arch/arm/mach-highbank/highbank.c
|
||||
@@ -85,10 +85,24 @@ const static struct of_device_id irq_match[] = {
|
||||
{}
|
||||
{}
|
||||
};
|
||||
|
||||
|
||||
|
||||
+#ifdef CONFIG_CACHE_L2X0
|
||||
+static void highbank_l2x0_disable(void)
|
||||
+{
|
||||
+ /* Disable PL310 L2 Cache controller */
|
||||
+ highbank_smc1(0x102, 0x0);
|
||||
+ /* Disable PL310 L2 Cache controller */
|
||||
+ highbank_smc1(0x102, 0x0);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
static void __init highbank_init_irq(void)
|
||||
{
|
||||
of_irq_init(irq_match);
|
||||
of_irq_init(irq_match);
|
||||
+
|
||||
+#ifdef CONFIG_CACHE_L2X0
|
||||
+ /* Enable PL310 L2 Cache controller */
|
||||
+ highbank_smc1(0x102, 0x1);
|
||||
l2x0_of_init(0, ~0UL);
|
||||
+ outer_cache.disable = highbank_l2x0_disable;
|
||||
+ /* Enable PL310 L2 Cache controller */
|
||||
+ highbank_smc1(0x102, 0x1);
|
||||
l2x0_of_init(0, ~0UL);
|
||||
+ outer_cache.disable = highbank_l2x0_disable;
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void __init highbank_timer_init(void)
|
||||
diff --git a/arch/arm/mach-highbank/smc.S b/arch/arm/mach-highbank/smc.S
|
||||
new file mode 100644
|
||||
|
@ -99,12 +93,12 @@ index 0000000..bba369e
|
|||
+ */
|
||||
+
|
||||
+ENTRY(highbank_smc1)
|
||||
+ stmfd sp!, {r2-r12, lr}
|
||||
+ mov r12, r0
|
||||
+ mov r0, r1
|
||||
+ dsb
|
||||
+ smc #0
|
||||
+ ldmfd sp!, {r2-r12, pc}
|
||||
+ stmfd sp!, {r2-r12, lr}
|
||||
+ mov r12, r0
|
||||
+ mov r0, r1
|
||||
+ dsb
|
||||
+ smc #0
|
||||
+ ldmfd sp!, {r2-r12, pc}
|
||||
+ENDPROC(highbank_smc1)
|
||||
--
|
||||
1.7.9.5
|
||||
|
|
Loading…
Reference in New Issue