powerpc: Move code patching code into arch/powerpc/lib/code-patching.c
authorMichael Ellerman <michael@ellerman.id.au>
Tue, 24 Jun 2008 01:32:21 +0000 (11:32 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 1 Jul 2008 01:28:18 +0000 (11:28 +1000)
We currently have a few routines for patching code in asm/system.h, because
they didn't fit anywhere else. I'd like to clean them up a little and add
some more, so first move them into a dedicated C file - they don't need to
be inlined.

While we're moving the code, drop create_function_call(), it's intended
caller never got merged and will be replaced in future with something
different.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/crash_dump.c
arch/powerpc/lib/Makefile
arch/powerpc/lib/code-patching.c [new file with mode: 0644]
arch/powerpc/platforms/86xx/mpc86xx_smp.c
arch/powerpc/platforms/powermac/smp.c
include/asm-powerpc/code-patching.h [new file with mode: 0644]
include/asm-powerpc/system.h

index 9ee3c5278db0a955425b4b1206a8e200ae01e6cc..35b9a668b0e18f9b756da53fb38050ecdf2b75fa 100644 (file)
@@ -14,6 +14,7 @@
 #include <linux/crash_dump.h>
 #include <linux/bootmem.h>
 #include <linux/lmb.h>
+#include <asm/code-patching.h>
 #include <asm/kdump.h>
 #include <asm/prom.h>
 #include <asm/firmware.h>
index e522b06cc42ff7eed9faca3e7a663749f0f7ecdd..e7f7042b9f61eb934be06b60a0410d30471cb6ab 100644 (file)
@@ -24,3 +24,5 @@ obj-$(CONFIG_SMP)     += locks.o
 endif
 
 obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
+
+obj-y                  += code-patching.o
diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c
new file mode 100644 (file)
index 0000000..7afae88
--- /dev/null
@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2008 Michael Ellerman, IBM Corporation.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <asm/code-patching.h>
+
+
+void create_instruction(unsigned long addr, unsigned int instr)
+{
+       unsigned int *p;
+       p  = (unsigned int *)addr;
+       *p = instr;
+       asm ("dcbst 0, %0; sync; icbi 0,%0; sync; isync" : : "r" (p));
+}
+
+void create_branch(unsigned long addr, unsigned long target, int flags)
+{
+       unsigned int instruction;
+
+       if (! (flags & BRANCH_ABSOLUTE))
+               target = target - addr;
+
+       /* Mask out the flags and target, so they don't step on each other. */
+       instruction = 0x48000000 | (flags & 0x3) | (target & 0x03FFFFFC);
+
+       create_instruction(addr, instruction);
+}
index ba55b0ff0f746a4c60dd848c06bfb41faa97d026..63f55853cd69a7ff5584405b31a58f5f457cd525 100644 (file)
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 
+#include <asm/code-patching.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/pci-bridge.h>
index cb2d894541c642609d3e9f408fd91484daa99fa4..bf202f7eadf8f1907ee931f61d00b1669a343064 100644 (file)
@@ -36,6 +36,7 @@
 
 #include <asm/ptrace.h>
 #include <asm/atomic.h>
+#include <asm/code-patching.h>
 #include <asm/irq.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
diff --git a/include/asm-powerpc/code-patching.h b/include/asm-powerpc/code-patching.h
new file mode 100644 (file)
index 0000000..0b91fdf
--- /dev/null
@@ -0,0 +1,25 @@
+#ifndef _ASM_POWERPC_CODE_PATCHING_H
+#define _ASM_POWERPC_CODE_PATCHING_H
+
+/*
+ * Copyright 2008, Michael Ellerman, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+/* Flags for create_branch:
+ * "b"   == create_branch(addr, target, 0);
+ * "ba"  == create_branch(addr, target, BRANCH_ABSOLUTE);
+ * "bl"  == create_branch(addr, target, BRANCH_SET_LINK);
+ * "bla" == create_branch(addr, target, BRANCH_ABSOLUTE | BRANCH_SET_LINK);
+ */
+#define BRANCH_SET_LINK        0x1
+#define BRANCH_ABSOLUTE        0x2
+
+extern void create_branch(unsigned long addr, unsigned long target, int flags);
+extern void create_instruction(unsigned long addr, unsigned int instr);
+
+#endif /* _ASM_POWERPC_CODE_PATCHING_H */
index 145b70f6d22ba33125459e55093310fc51abd5b4..2642a92b724fc0bf7611b810f9ac1d0617d8aad3 100644 (file)
@@ -526,54 +526,6 @@ extern void reloc_got2(unsigned long);
 
 #define PTRRELOC(x)    ((typeof(x)) add_reloc_offset((unsigned long)(x)))
 
-static inline void create_instruction(unsigned long addr, unsigned int instr)
-{
-       unsigned int *p;
-       p  = (unsigned int *)addr;
-       *p = instr;
-       asm ("dcbst 0, %0; sync; icbi 0,%0; sync; isync" : : "r" (p));
-}
-
-/* Flags for create_branch:
- * "b"   == create_branch(addr, target, 0);
- * "ba"  == create_branch(addr, target, BRANCH_ABSOLUTE);
- * "bl"  == create_branch(addr, target, BRANCH_SET_LINK);
- * "bla" == create_branch(addr, target, BRANCH_ABSOLUTE | BRANCH_SET_LINK);
- */
-#define BRANCH_SET_LINK        0x1
-#define BRANCH_ABSOLUTE        0x2
-
-static inline void create_branch(unsigned long addr,
-               unsigned long target, int flags)
-{
-       unsigned int instruction;
-
-       if (! (flags & BRANCH_ABSOLUTE))
-               target = target - addr;
-
-       /* Mask out the flags and target, so they don't step on each other. */
-       instruction = 0x48000000 | (flags & 0x3) | (target & 0x03FFFFFC);
-
-       create_instruction(addr, instruction);
-}
-
-static inline void create_function_call(unsigned long addr, void * func)
-{
-       unsigned long func_addr;
-
-#ifdef CONFIG_PPC64
-       /*
-        * On PPC64 the function pointer actually points to the function's
-        * descriptor. The first entry in the descriptor is the address
-        * of the function text.
-        */
-       func_addr = *(unsigned long *)func;
-#else
-       func_addr = (unsigned long)func;
-#endif
-       create_branch(addr, func_addr, BRANCH_SET_LINK);
-}
-
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
 extern void account_system_vtime(struct task_struct *);
 #endif