2 files changed, 8 insertions, 5 deletions

diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h
index 79ab8faf18e..c7db69f1e77 100644
--- a/arch/powerpc/include/asm/kvm_book3s.h
+++ b/arch/powerpc/include/asm/kvm_book3s.h
@@ -34,7 +34,8 @@ struct kvmppc_slb {
         bool Ks;
         bool Kp;
         bool nx;
-        bool large;
+        bool large;     /* PTEs are 16MB */
+        bool tb;        /* 1TB segment */
         bool class;
 };
 
diff --git a/arch/powerpc/kvm/book3s_64_mmu.c b/arch/powerpc/kvm/book3s_64_mmu.c
index e4beeb371a7..512dcff7755 100644
--- a/arch/powerpc/kvm/book3s_64_mmu.c
+++ b/arch/powerpc/kvm/book3s_64_mmu.c
@@ -54,7 +54,7 @@ static struct kvmppc_slb *kvmppc_mmu_book3s_64_find_slbe(
                 if (!vcpu_book3s->slb[i].valid)
                         continue;
 
-                if (vcpu_book3s->slb[i].large)
+                if (vcpu_book3s->slb[i].tb)
                         cmp_esid = esid_1t;
 
                 if (vcpu_book3s->slb[i].esid == cmp_esid)
@@ -65,9 +65,10 @@ static struct kvmppc_slb *kvmppc_mmu_book3s_64_find_slbe(
                 eaddr, esid, esid_1t);
         for (i = 0; i < vcpu_book3s->slb_nr; i++) {
             if (vcpu_book3s->slb[i].vsid)
-                dprintk("  %d: %c%c %llx %llx\n", i,
+                dprintk("  %d: %c%c%c %llx %llx\n", i,
                         vcpu_book3s->slb[i].valid ? 'v' : ' ',
                         vcpu_book3s->slb[i].large ? 'l' : ' ',
+                        vcpu_book3s->slb[i].tb    ? 't' : ' ',
                         vcpu_book3s->slb[i].esid,
                         vcpu_book3s->slb[i].vsid);
         }
@@ -84,7 +85,7 @@ static u64 kvmppc_mmu_book3s_64_ea_to_vp(struct kvm_vcpu *vcpu, gva_t eaddr,
         if (!slb)
                 return 0;
 
-        if (slb->large)
+        if (slb->tb)
                 return (((u64)eaddr >> 12) & 0xfffffff) |
                        (((u64)slb->vsid) << 28);
 
@@ -309,7 +310,8 @@ static void kvmppc_mmu_book3s_64_slbmte(struct kvm_vcpu *vcpu, u64 rs, u64 rb)
         slbe = &vcpu_book3s->slb[slb_nr];
 
         slbe->large = (rs & SLB_VSID_L) ? 1 : 0;
-        slbe->esid  = slbe->large ? esid_1t : esid;
+        slbe->tb    = (rs & SLB_VSID_B_1T) ? 1 : 0;
+        slbe->esid  = slbe->tb ? esid_1t : esid;
         slbe->vsid  = rs >> 12;
         slbe->valid = (rb & SLB_ESID_V) ? 1 : 0;
         slbe->Ks    = (rs & SLB_VSID_KS) ? 1 : 0;