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

Commit 948cf67c authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc: Add NAP mode support on Power7 in HV mode 



Wakeup comes from the system reset handler with a potential loss of
the non-hypervisor CPU state. We save the non-volatile state on the
stack and a pointer to it in the PACA, which the system reset handler
uses to restore things

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 9d07bc84

arch/powerpc/include/asm/machdep.h

+1 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ struct machdep_calls { 


extern void e500_idle(void);

extern void power4_idle(void);

extern void power7_idle(void);

extern void ppc6xx_idle(void);

extern void book3e_idle(void);

arch/powerpc/include/asm/paca.h

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ struct paca_struct { 
	struct task_struct *__current;	/* Pointer to current */

	u64 kstack;			/* Saved Kernel stack addr */

	u64 stab_rr;			/* stab/slb round-robin counter */

	u64 saved_r1;			/* r1 save for RTAS calls */

	u64 saved_r1;			/* r1 save for RTAS calls or PM */

	u64 saved_msr;			/* MSR saved here by enter_rtas */

	u16 trap_save;			/* Used when bad stack is encountered */

	u8 soft_enabled;		/* irq soft-enable flag */

arch/powerpc/include/asm/ppc-opcode.h

+6 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ 
#define PPC_INST_TLBSRX_DOT		0x7c0006a5

#define PPC_INST_XXLOR			0xf0000510



#define PPC_INST_NAP			0x4c000364

#define PPC_INST_SLEEP			0x4c0003a4



/* macros to insert fields into opcodes */

#define __PPC_RA(a)	(((a) & 0x1f) << 16)

#define __PPC_RB(b)	(((b) & 0x1f) << 11)
@@ -126,4 +129,7 @@ 
#define XXLOR(t, a, b)		stringify_in_c(.long PPC_INST_XXLOR | \

					       VSX_XX3((t), (a), (b)))



#define PPC_NAP			stringify_in_c(.long PPC_INST_NAP)

#define PPC_SLEEP		stringify_in_c(.long PPC_INST_SLEEP)



#endif /* _ASM_POWERPC_PPC_OPCODE_H */

arch/powerpc/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ obj-$(CONFIG_PPC_BOOK3E_64) += exceptions-64e.o idle_book3e.o 
obj-$(CONFIG_PPC64)		+= vdso64/

obj-$(CONFIG_ALTIVEC)		+= vecemu.o

obj-$(CONFIG_PPC_970_NAP)	+= idle_power4.o

obj-$(CONFIG_PPC_P7_NAP)	+= idle_power7.o

obj-$(CONFIG_PPC_OF)		+= of_platform.o prom_parse.o

obj-$(CONFIG_PPC_CLOCK)		+= clock.o

procfs-y			:= proc_powerpc.o

arch/powerpc/kernel/exceptions-64s.S

+29 −1
Original line number Diff line number Diff line
@@ -37,7 +37,35 @@ 
	.globl __start_interrupts

__start_interrupts:



	STD_EXCEPTION_PSERIES(0x100, 0x100, system_reset)

	.globl system_reset_pSeries;

system_reset_pSeries:

	HMT_MEDIUM;

	DO_KVM	0x100;

	SET_SCRATCH0(r13)

#ifdef CONFIG_PPC_P7_NAP

BEGIN_FTR_SECTION

	/* Running native on arch 2.06 or later, check if we are

	 * waking up from nap. We only handle no state loss and

	 * supervisor state loss. We do -not- handle hypervisor

	 * state loss at this time.

	 */

	mfspr	r13,SPRN_SRR1

	rlwinm	r13,r13,47-31,30,31

	cmpwi	cr0,r13,1

	bne	1f

	b	.power7_wakeup_noloss

1:	cmpwi	cr0,r13,2

	bne	1f

	b	.power7_wakeup_loss

	/* Total loss of HV state is fatal, we could try to use the

	 * PIR to locate a PACA, then use an emergency stack etc...

	 * but for now, let's just stay stuck here

	 */

1:	cmpwi	cr0,r13,3

	beq	.

END_FTR_SECTION_IFSET(CPU_FTR_HVMODE_206)

#endif /* CONFIG_PPC_P7_NAP */

	EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common, EXC_STD)



	. = 0x200

_machine_check_pSeries: