powerpc/lib/feature-fixups: use raw_patch_instruction()

chleroy · mpe · commit 8183d99f4a22 · 2018-01-21T15:06:25.000+11:00
feature fixups need to use patch_instruction() early in the boot,
even before the code is relocated to its final address, requiring
patch_instruction() to use PTRRELOC() in order to address data.

But feature fixups applies on code before it is set to read only,
even for modules. Therefore, feature fixups can use
raw_patch_instruction() instead.

Signed-off-by: Christophe Leroy &lt;christophe.leroy@c-s.fr&gt;
Signed-off-by: Michael Ellerman &lt;mpe@ellerman.id.au&gt;
diff --git a/arch/powerpc/include/asm/code-patching.h b/arch/powerpc/include/asm/code-patching.h
@@ -31,6 +31,7 @@ unsigned int create_cond_branch(const unsigned int *addr,
 				unsigned long target, int flags);
 int patch_branch(unsigned int *addr, unsigned long target, int flags);
 int patch_instruction(unsigned int *addr, unsigned int instr);
+int raw_patch_instruction(unsigned int *addr, unsigned int instr);
 
 int instr_is_relative_branch(unsigned int instr);
 int instr_is_relative_link_branch(unsigned int instr);
diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c
@@ -38,7 +38,7 @@ static int __patch_instruction(unsigned int *exec_addr, unsigned int instr,
 	return 0;
 }
 
-static int raw_patch_instruction(unsigned int *addr, unsigned int instr)
+int raw_patch_instruction(unsigned int *addr, unsigned int instr)
 {
 	return __patch_instruction(addr, instr, addr);
 }
@@ -155,7 +155,7 @@ int patch_instruction(unsigned int *addr, unsigned int instr)
 	 * when text_poke_area is not ready, but we still need
 	 * to allow patching. We just do the plain old patching
 	 */
-	if (!this_cpu_read(*PTRRELOC(&text_poke_area)))
+	if (!this_cpu_read(text_poke_area))
 		return raw_patch_instruction(addr, instr);
 
 	local_irq_save(flags);
diff --git a/arch/powerpc/lib/feature-fixups.c b/arch/powerpc/lib/feature-fixups.c
@@ -62,7 +62,7 @@ static int patch_alt_instruction(unsigned int *src, unsigned int *dest,
 		}
 	}
 
-	patch_instruction(dest, instr);
+	raw_patch_instruction(dest, instr);
 
 	return 0;
 }
@@ -91,7 +91,7 @@ static int patch_feature_section(unsigned long value, struct fixup_entry *fcur)
 	}
 
 	for (; dest < end; dest++)
-		patch_instruction(dest, PPC_INST_NOP);
+		raw_patch_instruction(dest, PPC_INST_NOP);
 
 	return 0;
 }
@@ -129,7 +129,7 @@ void do_lwsync_fixups(unsigned long value, void *fixup_start, void *fixup_end)
 
 	for (; start < end; start++) {
 		dest = (void *)start + *start;
-		patch_instruction(dest, PPC_INST_LWSYNC);
+		raw_patch_instruction(dest, PPC_INST_LWSYNC);
 	}
 }
 
@@ -147,7 +147,7 @@ static void do_final_fixups(void)
 	length = (__end_interrupts - _stext) / sizeof(int);
 
 	while (length--) {
-		patch_instruction(dest, *src);
+		raw_patch_instruction(dest, *src);
 		src++;
 		dest++;
 	}

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ static int __patch_instruction(unsigned int *exec_addr, unsigned int instr,`
`38`	`38`	`return 0;`
`39`	`39`	`}`
`40`	`40`
`41`		`-static int raw_patch_instruction(unsigned int *addr, unsigned int instr)`
	`41`	`+int raw_patch_instruction(unsigned int *addr, unsigned int instr)`
`42`	`42`	`{`
`43`	`43`	`return __patch_instruction(addr, instr, addr);`
`44`	`44`	`}`
`@@ -155,7 +155,7 @@ int patch_instruction(unsigned int *addr, unsigned int instr)`
`155`	`155`	`* when text_poke_area is not ready, but we still need`
`156`	`156`	`* to allow patching. We just do the plain old patching`
`157`	`157`	`*/`
`158`		`- if (!this_cpu_read(*PTRRELOC(&text_poke_area)))`
	`158`	`+ if (!this_cpu_read(text_poke_area))`
`159`	`159`	`return raw_patch_instruction(addr, instr);`
`160`	`160`
`161`	`161`	`local_irq_save(flags);`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ static int patch_alt_instruction(unsigned int src, unsigned int dest,`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- patch_instruction(dest, instr);`
	`65`	`+ raw_patch_instruction(dest, instr);`
`66`	`66`
`67`	`67`	`return 0;`
`68`	`68`	`}`
`@@ -91,7 +91,7 @@ static int patch_feature_section(unsigned long value, struct fixup_entry *fcur)`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`for (; dest < end; dest++)`
`94`		`- patch_instruction(dest, PPC_INST_NOP);`
	`94`	`+ raw_patch_instruction(dest, PPC_INST_NOP);`
`95`	`95`
`96`	`96`	`return 0;`
`97`	`97`	`}`
`@@ -129,7 +129,7 @@ void do_lwsync_fixups(unsigned long value, void fixup_start, void fixup_end)`
`129`	`129`
`130`	`130`	`for (; start < end; start++) {`
`131`	`131`	`dest = (void )start + start;`
`132`		`- patch_instruction(dest, PPC_INST_LWSYNC);`
	`132`	`+ raw_patch_instruction(dest, PPC_INST_LWSYNC);`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`
`@@ -147,7 +147,7 @@ static void do_final_fixups(void)`
`147`	`147`	`length = (__end_interrupts - _stext) / sizeof(int);`
`148`	`148`
`149`	`149`	`while (length--) {`
`150`		`- patch_instruction(dest, *src);`
	`150`	`+ raw_patch_instruction(dest, *src);`
`151`	`151`	`src++;`
`152`	`152`	`dest++;`
`153`	`153`	`}`