diff options
| author | Thomas Huth | 2015-11-20 09:11:45 +0100 |
|---|---|---|
| committer | Paul Mackerras | 2015-12-09 06:05:01 +0100 |
| commit | 760a7364f27d974d100118d88190e574626e18a6 (patch) | |
| tree | 0467ed6b66ed1b5a33ac00eb19cb6e08903e36d9 /arch/powerpc/kvm/book3s_hv_rmhandlers.S | |
| parent | KVM: PPC: Book3S HV: Handle unexpected traps in guest entry/exit code better (diff) | |
| download | kernel-qcow2-linux-760a7364f27d974d100118d88190e574626e18a6.tar.gz kernel-qcow2-linux-760a7364f27d974d100118d88190e574626e18a6.tar.xz kernel-qcow2-linux-760a7364f27d974d100118d88190e574626e18a6.zip | |
KVM: PPC: Fix emulation of H_SET_DABR/X on POWER8
In the old DABR register, the BT (Breakpoint Translation) bit
is bit number 61. In the new DAWRX register, the WT (Watchpoint
Translation) bit is bit number 59. So to move the DABR-BT bit
into the position of the DAWRX-WT bit, it has to be shifted by
two, not only by one. This fixes hardware watchpoints in gdb of
older guests that only use the H_SET_DABR/X interface instead
of the new H_SET_MODE interface.
Cc: stable@vger.kernel.org # v3.14+
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv_rmhandlers.S')
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S index b3ce8ff18195..6ee26de9a1de 100644 --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S @@ -2153,7 +2153,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) /* Emulate H_SET_DABR/X on P8 for the sake of compat mode guests */ 2: rlwimi r5, r4, 5, DAWRX_DR | DAWRX_DW - rlwimi r5, r4, 1, DAWRX_WT + rlwimi r5, r4, 2, DAWRX_WT clrrdi r4, r4, 3 std r4, VCPU_DAWR(r3) std r5, VCPU_DAWRX(r3) |