ARM: 7883/1: fix mov to mvn conversion in case of 64 bit phys_addr_t and BE

Fix patching code to convert mov instruction into mvn instruction in case of CONFIG_ARCH_PHYS_ADDR_T_64BIT and CONFIG_ARM_PATCH_PHYS_VIRT. In BE case store into r0 proper bits so byte swapped instruction could be modified correctly. Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org> Reviewed-by: R Sricharan <r.sricharan@ti.com> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Author: Victor Kamensky

arch/arm/kernel/head.S

@@ -644,8 +644,12 @@ ARM_BE8(rev16	ip, ip)
 ldrcc	r7, [r4], #4@ use branch for delay slot
 bcc1b
 bxlr
+#else
+#ifdef CONFIG_CPU_ENDIAN_BE8
+moveq	r0, #0x00004000@ set bit 22, mov to mvn instruction
 #else
 moveq	r0, #0x400000@ set bit 22, mov to mvn instruction
+#endif
 b	2f
 1:	ldrip, [r7, r3]
 #ifdef CONFIG_CPU_ENDIAN_BE8
@@ -654,7 +658,7 @@ ARM_BE8(rev16	ip, ip)
 tstip, #0x000f0000@ check the rotation field
 orrneip, ip, r6, lsl #24 @ mask in offset bits 31-24
 biceqip, ip, #0x00004000 @ clear bit 22
-orreqip, ip, r0, lsl #24 @ mask in offset bits 7-0
+orreqip, ip, r0  @ mask in offset bits 7-0
 #else
 bicip, ip, #0x000000ff
 tstip, #0xf00@ check the rotation field