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

Commit 7c379526 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Benjamin Herrenschmidt
Browse files

powerpc: move hmi.c to arch/powerpc/kvm/ 



hmi.c functions are unused unless sibling_subcore_state is nonzero, and
that in turn happens only if KVM is in use.  So move the code to
arch/powerpc/kvm/, putting it under CONFIG_KVM_BOOK3S_HV_POSSIBLE
rather than CONFIG_PPC_BOOK3S_64.  The sibling_subcore_state is also
included in struct paca_struct only if KVM is supported by the kernel.

Cc: Daniel Axtens <dja@axtens.net>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: kvm-ppc@vger.kernel.org
Cc: kvm@vger.kernel.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 41017a75

arch/powerpc/include/asm/hmi.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#ifndef __ASM_PPC64_HMI_H__

#define __ASM_PPC64_HMI_H__



#ifdef CONFIG_PPC_BOOK3S_64

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE



#define	CORE_TB_RESYNC_REQ_BIT		63

#define MAX_SUBCORE_PER_CORE		4

arch/powerpc/include/asm/paca.h

+7 −5
Original line number Diff line number Diff line
@@ -183,11 +183,6 @@ struct paca_struct { 
	 */

	u16 in_mce;

	u8 hmi_event_available;		 /* HMI event is available */

	/*

	 * Bitmap for sibling subcore status. See kvm/book3s_hv_ras.c for

	 * more details

	 */

	struct sibling_subcore_state *sibling_subcore_state;

#endif



	/* Stuff for accurate time accounting */
@@ -202,6 +197,13 @@ struct paca_struct { 
	struct kvmppc_book3s_shadow_vcpu shadow_vcpu;

#endif

	struct kvmppc_host_state kvm_hstate;

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	/*

	 * Bitmap for sibling subcore status. See kvm/book3s_hv_ras.c for

	 * more details

	 */

	struct sibling_subcore_state *sibling_subcore_state;

#endif

#endif

};

arch/powerpc/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ obj-$(CONFIG_VDSO32) += vdso32/ 
obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= hw_breakpoint.o

obj-$(CONFIG_PPC_BOOK3S_64)	+= cpu_setup_ppc970.o cpu_setup_pa6t.o

obj-$(CONFIG_PPC_BOOK3S_64)	+= cpu_setup_power.o

obj-$(CONFIG_PPC_BOOK3S_64)	+= mce.o mce_power.o hmi.o

obj-$(CONFIG_PPC_BOOK3S_64)	+= mce.o mce_power.o

obj-$(CONFIG_PPC_BOOK3E_64)	+= exceptions-64e.o idle_book3e.o

obj-$(CONFIG_PPC64)		+= vdso64/

obj-$(CONFIG_ALTIVEC)		+= vecemu.o

arch/powerpc/kvm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ kvm-book3s_64-builtin-xics-objs-$(CONFIG_KVM_XICS) := \ 


ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) += \

	book3s_hv_hmi.o \

	book3s_hv_rmhandlers.o \

	book3s_hv_rm_mmu.o \

	book3s_hv_ras.o \