Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1df870d authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc: Merge asm-ppc/kexec.h and asm-ppc64/kexec.h 



Merge include/asm-ppc/kexec.h and include/asm-ppc64/kexec.h.

The only thing that's really changed is that we now allocate crash_notes
properly on PPC32. It's address is exported via sysfs, so it's not correct
for it to be a pointer.

I've also removed some of the "we don't use this" comments, because they're
wrong (or perhaps were referring only to arch code).

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
parent a1218720

arch/ppc/kernel/machine_kexec.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ const extern unsigned int relocate_new_kernel_size; 
 * Provide a dummy crash_notes definition while crash dump arrives to ppc.

 * This prevents breakage of crash_notes attribute in kernel/ksysfs.c.

 */

void *crash_notes = NULL;

note_buf_t crash_notes[NR_CPUS];



void machine_shutdown(void)

{

include/asm-ppc64/kexec.h→include/asm-powerpc/kexec.h

+49 −0
Original line number Diff line number Diff line 
#ifndef _PPC64_KEXEC_H

#define _PPC64_KEXEC_H

#ifndef _ASM_POWERPC_KEXEC_H

#define _ASM_POWERPC_KEXEC_H



/*

 * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return.

 * I.e. Maximum page that is mapped directly into kernel memory,

 * and kmap is not required.

 * Maximum page that is mapped directly into kernel memory.

 * XXX: Since we copy virt we can use any page we allocate

 */



/* Maximum physical address we can use pages from */

/* XXX: since we copy virt we can use any page we allocate */

#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)



/* Maximum address we can reach in physical address mode */

/* XXX: I want to allow initrd in highmem.  otherwise set to rmo on lpar */

/*

 * Maximum address we can reach in physical address mode.

 * XXX: I want to allow initrd in highmem. Otherwise set to rmo on LPAR.

 */

#define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)



/* Maximum address we can use for the control code buffer */

/* XXX: unused today, ppc32 uses TASK_SIZE, probably left over from use_mm  */

#ifdef __powerpc64__

#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL)

#else

/* TASK_SIZE, probably left over from use_mm ?? */

#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE

#endif



/* XXX: today we don't use this at all, althogh we have a static stack */

#define KEXEC_CONTROL_CODE_SIZE 4096



/* The native architecture */

#ifdef __powerpc64__

#define KEXEC_ARCH KEXEC_ARCH_PPC64



#define MAX_NOTE_BYTES 1024

#else

#define KEXEC_ARCH KEXEC_ARCH_PPC

#endif



#ifndef __ASSEMBLY__



typedef u32 note_buf_t[MAX_NOTE_BYTES/4];

#define MAX_NOTE_BYTES 1024

typedef u32 note_buf_t[MAX_NOTE_BYTES / sizeof(u32)];



extern note_buf_t crash_notes[];



#ifdef __powerpc64__

extern void kexec_smp_wait(void);	/* get and clear naca physid, wait for

					  master to copy new code to 0 */

#else

struct kimage;

extern void machine_kexec_simple(struct kimage *image);

#endif



#endif /* __ASSEMBLY__ */

#endif /* _PPC_KEXEC_H */

#endif /* ! __ASSEMBLY__ */

#endif /* _ASM_POWERPC_KEXEC_H */

include/asm-ppc/kexec.h

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
#ifndef _PPC_KEXEC_H

#define _PPC_KEXEC_H



#ifdef CONFIG_KEXEC



/*

 * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return.

 * I.e. Maximum page that is mapped directly into kernel memory,

 * and kmap is not required.

 *

 * Someone correct me if FIXADDR_START - PAGEOFFSET is not the correct

 * calculation for the amount of memory directly mappable into the

 * kernel memory space.

 */



/* Maximum physical address we can use pages from */

#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)

/* Maximum address we can reach in physical address mode */

#define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)

/* Maximum address we can use for the control code buffer */

#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE



#define KEXEC_CONTROL_CODE_SIZE	4096



/* The native architecture */

#define KEXEC_ARCH KEXEC_ARCH_PPC



#ifndef __ASSEMBLY__



extern void *crash_notes;



struct kimage;



extern void machine_kexec_simple(struct kimage *image);



#endif /* __ASSEMBLY__ */



#endif /* CONFIG_KEXEC */



#endif /* _PPC_KEXEC_H */