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

Commit db507c30 authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

KVM: PPC: move compute_tlbie_rb to book3s common header 



We need the compute_tlbie_rb in _pr and _hv implementations for papr
soon, so let's move it over to a common header file that both
implementations can leverage.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 36442687

arch/powerpc/include/asm/kvm_book3s.h

+33 −0
Original line number Original line Diff line number Diff line
@@ -382,6 +382,39 @@ static inline bool kvmppc_critical_section(struct kvm_vcpu *vcpu) 
}

}

#endif

#endif





static inline unsigned long compute_tlbie_rb(unsigned long v, unsigned long r,

					     unsigned long pte_index)

{

	unsigned long rb, va_low;



	rb = (v & ~0x7fUL) << 16;		/* AVA field */

	va_low = pte_index >> 3;

	if (v & HPTE_V_SECONDARY)

		va_low = ~va_low;

	/* xor vsid from AVA */

	if (!(v & HPTE_V_1TB_SEG))

		va_low ^= v >> 12;

	else

		va_low ^= v >> 24;

	va_low &= 0x7ff;

	if (v & HPTE_V_LARGE) {

		rb |= 1;			/* L field */

		if (cpu_has_feature(CPU_FTR_ARCH_206) &&

		    (r & 0xff000)) {

			/* non-16MB large page, must be 64k */

			/* (masks depend on page size) */

			rb |= 0x1000;		/* page encoding in LP field */

			rb |= (va_low & 0x7f) << 16; /* 7b of VA in AVA/LP field */

			rb |= (va_low & 0xfe);	/* AVAL field (P7 doesn't seem to care) */

		}

	} else {

		/* 4kB page */

		rb |= (va_low & 0x7ff) << 12;	/* remaining 11b of VA */

	}

	rb |= (v >> 54) & 0x300;		/* B field */

	return rb;

}



/* Magic register values loaded into r3 and r4 before the 'sc' assembly

/* Magic register values loaded into r3 and r4 before the 'sc' assembly

 * instruction for the OSI hypercalls */

 * instruction for the OSI hypercalls */

#define OSI_SC_MAGIC_R3			0x113724FA

#define OSI_SC_MAGIC_R3			0x113724FA

arch/powerpc/kvm/book3s_hv_rm_mmu.c

+0 −33
Original line number Original line Diff line number Diff line
@@ -110,39 +110,6 @@ long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags, 
	return H_SUCCESS;

	return H_SUCCESS;

}

}





static unsigned long compute_tlbie_rb(unsigned long v, unsigned long r,

				      unsigned long pte_index)

{

	unsigned long rb, va_low;



	rb = (v & ~0x7fUL) << 16;		/* AVA field */

	va_low = pte_index >> 3;

	if (v & HPTE_V_SECONDARY)

		va_low = ~va_low;

	/* xor vsid from AVA */

	if (!(v & HPTE_V_1TB_SEG))

		va_low ^= v >> 12;

	else

		va_low ^= v >> 24;

	va_low &= 0x7ff;

	if (v & HPTE_V_LARGE) {

		rb |= 1;			/* L field */

		if (cpu_has_feature(CPU_FTR_ARCH_206) &&

		    (r & 0xff000)) {

			/* non-16MB large page, must be 64k */

			/* (masks depend on page size) */

			rb |= 0x1000;		/* page encoding in LP field */

			rb |= (va_low & 0x7f) << 16; /* 7b of VA in AVA/LP field */

			rb |= (va_low & 0xfe);	/* AVAL field (P7 doesn't seem to care) */

		}

	} else {

		/* 4kB page */

		rb |= (va_low & 0x7ff) << 12;	/* remaining 11b of VA */

	}

	rb |= (v >> 54) & 0x300;		/* B field */

	return rb;

}



#define LOCK_TOKEN	(*(u32 *)(&get_paca()->lock_token))

#define LOCK_TOKEN	(*(u32 *)(&get_paca()->lock_token))





static inline int try_lock_tlbie(unsigned int *lock)

static inline int try_lock_tlbie(unsigned int *lock)