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

Commit 462ee11e authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Paul Mackerras
Browse files

KVM: PPC: Replace SPAPR_TCE_SHIFT with IOMMU_PAGE_SHIFT_4K 



SPAPR_TCE_SHIFT is used in few places only and since IOMMU_PAGE_SHIFT_4K
can be easily used instead, remove SPAPR_TCE_SHIFT.

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent f8626985

arch/powerpc/include/asm/kvm_book3s_64.h

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ static inline void svcpu_put(struct kvmppc_book3s_shadow_vcpu *svcpu) 
}

#endif



#define SPAPR_TCE_SHIFT		12



#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

#define KVM_DEFAULT_HPT_ORDER	24	/* 16MB HPT by default */

#endif

arch/powerpc/kvm/book3s_64_vio.c

+2 −1
Original line number Diff line number Diff line
@@ -36,12 +36,13 @@ 
#include <asm/ppc-opcode.h>

#include <asm/kvm_host.h>

#include <asm/udbg.h>

#include <asm/iommu.h>



#define TCES_PER_PAGE	(PAGE_SIZE / sizeof(u64))



static unsigned long kvmppc_tce_pages(unsigned long window_size)

{

	return ALIGN((window_size >> SPAPR_TCE_SHIFT)

	return ALIGN((window_size >> IOMMU_PAGE_SHIFT_4K)

		     * sizeof(u64), PAGE_SIZE) / PAGE_SIZE;

}

arch/powerpc/kvm/book3s_64_vio_hv.c

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn, 
	if (ret != H_SUCCESS)

		return ret;



	idx = ioba >> SPAPR_TCE_SHIFT;

	idx = ioba >> IOMMU_PAGE_SHIFT_4K;

	page = stt->pages[idx / TCES_PER_PAGE];

	tbl = (u64 *)page_address(page);
@@ -127,7 +127,7 @@ long kvmppc_h_get_tce(struct kvm_vcpu *vcpu, unsigned long liobn, 
	if (ret != H_SUCCESS)

		return ret;



	idx = ioba >> SPAPR_TCE_SHIFT;

	idx = ioba >> IOMMU_PAGE_SHIFT_4K;

	page = stt->pages[idx / TCES_PER_PAGE];

	tbl = (u64 *)page_address(page);