diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2021-10-29 00:00:57 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2021-10-29 00:00:57 +1100 |
| commit | 5b9f69ffa6b4a791d43c0fb28a0d9de3966dcb73 (patch) | |
| tree | 6c98e5c2dba9c337577a408eba096d0457e09d79 /arch/powerpc/include/asm | |
| parent | MAINTAINERS: Update powerpc KVM entry (diff) | |
| parent | KVM: PPC: Tick accounting should defer vtime accounting 'til after IRQ handling (diff) | |
| download | linux-dev-5b9f69ffa6b4a791d43c0fb28a0d9de3966dcb73.tar.xz linux-dev-5b9f69ffa6b4a791d43c0fb28a0d9de3966dcb73.zip | |
Merge branch 'topic/ppc-kvm' into next
Merge a couple of KVM ppc patches we are keeping in a topic branch.
Diffstat (limited to 'arch/powerpc/include/asm')
| -rw-r--r-- | arch/powerpc/include/asm/kvm_book3s_64.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/kvm_book3s_64.h b/arch/powerpc/include/asm/kvm_book3s_64.h index 19b6942c6969..fff391b9b97b 100644 --- a/arch/powerpc/include/asm/kvm_book3s_64.h +++ b/arch/powerpc/include/asm/kvm_book3s_64.h @@ -378,6 +378,10 @@ static inline unsigned long compute_tlbie_rb(unsigned long v, unsigned long r, rb |= 1; /* L field */ rb |= r & 0xff000 & ((1ul << a_pgshift) - 1); /* LP field */ } + /* + * This sets both bits of the B field in the PTE. 0b1x values are + * reserved, but those will have been filtered by kvmppc_do_h_enter. + */ rb |= (v >> HPTE_V_SSIZE_SHIFT) << 8; /* B field */ return rb; } |