Skip to content

Commit

Permalink
powerpc: Make load_hander handle upto 64k offset
Browse files Browse the repository at this point in the history
If we change load_hander() to use an ori instead of addi, we can load handlers
upto 64k away provided we are still 64k aligned.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Michael Neuling authored and Benjamin Herrenschmidt committed Nov 15, 2012
1 parent faab4dd commit 61e2390
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
3 changes: 2 additions & 1 deletion arch/powerpc/include/asm/exception-64s.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
* word.
*/
#define LOAD_HANDLER(reg, label) \
addi reg,reg,(label)-_stext; /* virt addr of handler ... */
/* Handlers must be within 64K of kbase, which must be 64k aligned */ \
ori reg,reg,(label)-_stext; /* virt addr of handler ... */

/* Exception register prefixes */
#define EXC_HV H
Expand Down
4 changes: 2 additions & 2 deletions arch/powerpc/kernel/exceptions-64s.S
Original file line number Diff line number Diff line change
Expand Up @@ -585,8 +585,8 @@ __end_interrupts:
* Code from here down to __end_handlers is invoked from the
* exception prologs above. Because the prologs assemble the
* addresses of these handlers using the LOAD_HANDLER macro,
* which uses an addi instruction, these handlers must be in
* the first 32k of the kernel image.
* which uses an ori instruction, these handlers must be in
* the first 64k of the kernel image.
*/

/*** Common interrupt handlers ***/
Expand Down
5 changes: 5 additions & 0 deletions arch/powerpc/kernel/setup_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,11 @@ void __init setup_arch(char **cmdline_p)

kvm_linear_init();

/* Interrupt code needs to be 64K-aligned */
if ((unsigned long)_stext & 0xffff)
panic("Kernelbase not 64K-aligned (0x%lx)!\n",
(unsigned long)_stext);

ppc64_boot_msg(0x15, "Setup Done");
}

Expand Down

0 comments on commit 61e2390

Please sign in to comment.