Skip to content

Commit

Permalink
[POWERPC] FWNMI is only used on pSeries
Browse files Browse the repository at this point in the history
This saves 4k on non pSeries builds (except for iSeries where it saves
almost 4k).

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Stephen Rothwell authored and Paul Mackerras committed Sep 19, 2007
1 parent ee7a76d commit 9e4859e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/powerpc/kernel/crash_dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ void __init setup_kdump_trampoline(void)
create_trampoline(i);
}

#ifdef CONFIG_PPC_PSERIES
create_trampoline(__pa(system_reset_fwnmi) - PHYSICAL_START);
create_trampoline(__pa(machine_check_fwnmi) - PHYSICAL_START);
#endif /* CONFIG_PPC_PSERIES */

DBG(" <- setup_kdump_trampoline()\n");
}
Expand Down
7 changes: 7 additions & 0 deletions arch/powerpc/kernel/head_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ slb_miss_user_pseries:
b . /* prevent spec. execution */
#endif /* __DISABLED__ */

#ifdef CONFIG_PPC_PSERIES
/*
* Vectors for the FWNMI option. Share common code.
*/
Expand All @@ -358,6 +359,8 @@ machine_check_fwnmi:
mtspr SPRN_SPRG1,r13 /* save r13 */
EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(PACA_EXMC, machine_check_common)

#endif /* CONFIG_PPC_PSERIES */

/*** Common interrupt handlers ***/

STD_EXCEPTION_COMMON(0x100, system_reset, .system_reset_exception)
Expand Down Expand Up @@ -1012,13 +1015,15 @@ _GLOBAL(do_stab_bolted)
initial_stab:
.space 4096

#ifdef CONFIG_PPC_PSERIES
/*
* Data area reserved for FWNMI option.
* This address (0x7000) is fixed by the RPA.
*/
.= 0x7000
.globl fwnmi_data_area
fwnmi_data_area:
#endif /* CONFIG_PPC_PSERIES */

/* iSeries does not use the FWNMI stuff, so it is safe to put
* this here, even if we later allow kernels that will boot on
Expand All @@ -1043,7 +1048,9 @@ xLparMap:

#endif /* CONFIG_PPC_ISERIES */

#ifdef CONFIG_PPC_PSERIES
. = 0x8000
#endif /* CONFIG_PPC_PSERIES */

/*
* On pSeries and most other platforms, secondary processors spin
Expand Down

0 comments on commit 9e4859e

Please sign in to comment.