evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sh: rework kexec segment code

Browse source 
Rework the kexec code to avoid using P2SEG. Instead
we walk the page list in machine_kexec() and convert
the addresses from physical to virtual using C.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Magnus Damm 2009-03-18 08:49:45 +00:00 • committed by Paul Mundt
parent 7be5c55af0
commit e4e063d0c2
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
arch/sh/kernel/machine_kexec.c
View file

@ -76,6 +76,21 @@ void machine_kexec(struct kimage *image)
unsigned long page_list; unsigned long page_list;
unsigned long reboot_code_buffer; unsigned long reboot_code_buffer;
relocate_new_kernel_t rnk; relocate_new_kernel_t rnk;
unsigned long entry;
unsigned long *ptr;
/*
* Nicked from the mips version of machine_kexec():
* The generic kexec code builds a page list with physical
* addresses. Use phys_to_virt() to convert them to virtual.
*/
for (ptr = &image->head; (entry = *ptr) && !(entry & IND_DONE);
ptr = (entry & IND_INDIRECTION) ?
phys_to_virt(entry & PAGE_MASK) : ptr + 1) {
if (*ptr & IND_SOURCE || *ptr & IND_INDIRECTION ||
*ptr & IND_DESTINATION)
*ptr = (unsigned long) phys_to_virt(*ptr);
}
/* Interrupts aren't acceptable while we reboot */ /* Interrupts aren't acceptable while we reboot */
local_irq_disable(); local_irq_disable();
@ -101,7 +116,7 @@ void machine_kexec(struct kimage *image)
#endif #endif
/* now call it */ /* now call it */
rnk = (relocate_new_kernel_t) reboot_code_buffer; rnk = (relocate_new_kernel_t) reboot_code_buffer;
(*rnk)(page_list, reboot_code_buffer, P2SEGADDR(image->start)); (*rnk)(page_list, reboot_code_buffer, image->start);
} }
void arch_crash_save_vmcoreinfo(void) void arch_crash_save_vmcoreinfo(void)

6
arch/sh/kernel/relocate_kernel.S
View file

@ -18,7 +18,6 @@ relocate_new_kernel:
/* r6 = start_address */ /* r6 = start_address */
mov.l 10f,r8 /* PAGE_SIZE */ mov.l 10f,r8 /* PAGE_SIZE */
mov.l 11f,r9 /* P2SEG */
/* stack setting */ /* stack setting */
add r8,r5 add r8,r5
@ -29,9 +28,8 @@ relocate_new_kernel:
0: 0:
mov.l @r4+,r0 /* cmd = *ind++ */ mov.l @r4+,r0 /* cmd = *ind++ */
1: /* addr = (cmd | P2SEG) & 0xfffffff0 */ 1: /* addr = cmd & 0xfffffff0 */
mov r0,r2 mov r0,r2
or r9,r2
mov #-16,r1 mov #-16,r1
and r1,r2 and r1,r2
@ -85,8 +83,6 @@ relocate_new_kernel:
.align 2 .align 2
10: 10:
.long PAGE_SIZE .long PAGE_SIZE
11:
.long P2SEG
relocate_new_kernel_end: relocate_new_kernel_end: