|
@@ -435,24 +435,6 @@ static inline int is_mmio_hpte(unsigned long v, unsigned long r)
|
|
|
(HPTE_R_KEY_HI | HPTE_R_KEY_LO));
|
|
|
}
|
|
|
|
|
|
-static inline int try_lock_tlbie(unsigned int *lock)
|
|
|
-{
|
|
|
- unsigned int tmp, old;
|
|
|
- unsigned int token = LOCK_TOKEN;
|
|
|
-
|
|
|
- asm volatile("1:lwarx %1,0,%2\n"
|
|
|
- " cmpwi cr0,%1,0\n"
|
|
|
- " bne 2f\n"
|
|
|
- " stwcx. %3,0,%2\n"
|
|
|
- " bne- 1b\n"
|
|
|
- " isync\n"
|
|
|
- "2:"
|
|
|
- : "=&r" (tmp), "=&r" (old)
|
|
|
- : "r" (lock), "r" (token)
|
|
|
- : "cc", "memory");
|
|
|
- return old == 0;
|
|
|
-}
|
|
|
-
|
|
|
static void do_tlbies(struct kvm *kvm, unsigned long *rbvalues,
|
|
|
long npages, int global, bool need_sync)
|
|
|
{
|
|
@@ -464,8 +446,6 @@ static void do_tlbies(struct kvm *kvm, unsigned long *rbvalues,
|
|
|
* the RS field, this is backwards-compatible with P7 and P8.
|
|
|
*/
|
|
|
if (global) {
|
|
|
- while (!try_lock_tlbie(&kvm->arch.tlbie_lock))
|
|
|
- cpu_relax();
|
|
|
if (need_sync)
|
|
|
asm volatile("ptesync" : : : "memory");
|
|
|
for (i = 0; i < npages; ++i) {
|
|
@@ -484,7 +464,6 @@ static void do_tlbies(struct kvm *kvm, unsigned long *rbvalues,
|
|
|
}
|
|
|
|
|
|
asm volatile("eieio; tlbsync; ptesync" : : : "memory");
|
|
|
- kvm->arch.tlbie_lock = 0;
|
|
|
} else {
|
|
|
if (need_sync)
|
|
|
asm volatile("ptesync" : : : "memory");
|