powerpc/lib/feature-fixups: use raw_patch_instruction()
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 <christophe.leroy@c-s.fr> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
committed by
Michael Ellerman
parent
8cf4c05712
commit
8183d99f4a
@@ -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++;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user