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

Commit 5ccf55dd authored by Alexander Graf's avatar Alexander Graf Committed by Benjamin Herrenschmidt
Browse files

powerpc/kvm: Fix build failure with HV KVM and CBE 



When running with HV KVM and CBE config options enabled, I get
build failures like the following:

  arch/powerpc/kernel/head_64.o: In function `cbe_system_error_hv':
  (.text+0x1228): undefined reference to `do_kvm_0x1202'
  arch/powerpc/kernel/head_64.o: In function `cbe_maintenance_hv':
  (.text+0x1628): undefined reference to `do_kvm_0x1602'
  arch/powerpc/kernel/head_64.o: In function `cbe_thermal_hv':
  (.text+0x1828): undefined reference to `do_kvm_0x1802'

This is because we jump to a KVM handler when HV is enabled, but we
only generate the handler with PR KVM mode.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent f81f5e14

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

+3 −3
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ vsx_unavailable_pSeries_1: 


#ifdef CONFIG_CBE_RAS

	STD_EXCEPTION_HV(0x1200, 0x1202, cbe_system_error)

	KVM_HANDLER_PR_SKIP(PACA_EXGEN, EXC_HV, 0x1202)

	KVM_HANDLER_SKIP(PACA_EXGEN, EXC_HV, 0x1202)

#endif /* CONFIG_CBE_RAS */



	STD_EXCEPTION_PSERIES(0x1300, 0x1300, instruction_breakpoint)
@@ -275,7 +275,7 @@ vsx_unavailable_pSeries_1: 


#ifdef CONFIG_CBE_RAS

	STD_EXCEPTION_HV(0x1600, 0x1602, cbe_maintenance)

	KVM_HANDLER_PR_SKIP(PACA_EXGEN, EXC_HV, 0x1602)

	KVM_HANDLER_SKIP(PACA_EXGEN, EXC_HV, 0x1602)

#endif /* CONFIG_CBE_RAS */



	STD_EXCEPTION_PSERIES(0x1700, 0x1700, altivec_assist)
@@ -283,7 +283,7 @@ vsx_unavailable_pSeries_1: 


#ifdef CONFIG_CBE_RAS

	STD_EXCEPTION_HV(0x1800, 0x1802, cbe_thermal)

	KVM_HANDLER_PR_SKIP(PACA_EXGEN, EXC_HV, 0x1802)

	KVM_HANDLER_SKIP(PACA_EXGEN, EXC_HV, 0x1802)

#endif /* CONFIG_CBE_RAS */



	. = 0x3000