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

Commit e40542af authored by Jordan Niethe's avatar Jordan Niethe Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S HV: Fix build failure without IOMMU support 



Currently trying to build without IOMMU support will fail:

  (.text+0x1380): undefined reference to `kvmppc_h_get_tce'
  (.text+0x1384): undefined reference to `kvmppc_rm_h_put_tce'
  (.text+0x149c): undefined reference to `kvmppc_rm_h_stuff_tce'
  (.text+0x14a0): undefined reference to `kvmppc_rm_h_put_tce_indirect'

This happens because turning off IOMMU support will prevent
book3s_64_vio_hv.c from being built because it is only built when
SPAPR_TCE_IOMMU is set, which depends on IOMMU support.

Fix it using ifdefs for the undefined references.

Fixes: 76d837a4 ("KVM: PPC: Book3S PR: Don't include SPAPR TCE code on non-pseries platforms")
Signed-off-by: default avatarJordan Niethe <jniethe5@gmail.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 8f1f7b9b

arch/powerpc/kvm/book3s_hv.c

+2 −0
Original line number Diff line number Diff line
@@ -937,6 +937,7 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu) 
		ret = kvmppc_h_set_xdabr(vcpu, kvmppc_get_gpr(vcpu, 4),

						kvmppc_get_gpr(vcpu, 5));

		break;

#ifdef CONFIG_SPAPR_TCE_IOMMU

	case H_GET_TCE:

		ret = kvmppc_h_get_tce(vcpu, kvmppc_get_gpr(vcpu, 4),

						kvmppc_get_gpr(vcpu, 5));
@@ -966,6 +967,7 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu) 
		if (ret == H_TOO_HARD)

			return RESUME_HOST;

		break;

#endif

	case H_RANDOM:

		if (!powernv_get_random_long(&vcpu->arch.regs.gpr[4]))

			ret = H_HARDWARE;

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+10 −0
Original line number Diff line number Diff line
@@ -2264,8 +2264,13 @@ hcall_real_table: 
	.long	DOTSYM(kvmppc_h_clear_mod) - hcall_real_table

	.long	DOTSYM(kvmppc_h_clear_ref) - hcall_real_table

	.long	DOTSYM(kvmppc_h_protect) - hcall_real_table

#ifdef CONFIG_SPAPR_TCE_IOMMU

	.long	DOTSYM(kvmppc_h_get_tce) - hcall_real_table

	.long	DOTSYM(kvmppc_rm_h_put_tce) - hcall_real_table

#else

	.long	0		/* 0x1c */

	.long	0		/* 0x20 */

#endif

	.long	0		/* 0x24 - H_SET_SPRG0 */

	.long	DOTSYM(kvmppc_h_set_dabr) - hcall_real_table

	.long	0		/* 0x2c */
@@ -2343,8 +2348,13 @@ hcall_real_table: 
	.long	0		/* 0x12c */

	.long	0		/* 0x130 */

	.long	DOTSYM(kvmppc_h_set_xdabr) - hcall_real_table

#ifdef CONFIG_SPAPR_TCE_IOMMU

	.long	DOTSYM(kvmppc_rm_h_stuff_tce) - hcall_real_table

	.long	DOTSYM(kvmppc_rm_h_put_tce_indirect) - hcall_real_table

#else

	.long	0		/* 0x138 */

	.long	0		/* 0x13c */

#endif

	.long	0		/* 0x140 */

	.long	0		/* 0x144 */

	.long	0		/* 0x148 */