summaryrefslogtreecommitdiff
path: root/arch/arm64/xen
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2017-08-10 13:58:16 +0100
committerWill Deacon <will.deacon@arm.com>2017-12-11 13:40:35 +0000
commit27a921e75711d924617269e0ba4adb8bae9fd0d1 (patch)
treebb4db9089fb6bb5606197222704a7522d2c9b2c6 /arch/arm64/xen
parent158d495899ce55db453f682a8ac8390d5a426578 (diff)
arm64: mm: Fix and re-enable ARM64_SW_TTBR0_PAN
With the ASID now installed in TTBR1, we can re-enable ARM64_SW_TTBR0_PAN by ensuring that we switch to a reserved ASID of zero when disabling user access and restore the active user ASID on the uaccess enable path. Reviewed-by: Mark Rutland <mark.rutland@arm.com> Tested-by: Laura Abbott <labbott@redhat.com> Tested-by: Shanker Donthineni <shankerd@codeaurora.org> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/xen')
-rw-r--r--arch/arm64/xen/hypercall.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/xen/hypercall.S b/arch/arm64/xen/hypercall.S
index 401ceb71540c..acdbd2c9e899 100644
--- a/arch/arm64/xen/hypercall.S
+++ b/arch/arm64/xen/hypercall.S
@@ -101,7 +101,7 @@ ENTRY(privcmd_call)
* need the explicit uaccess_enable/disable if the TTBR0 PAN emulation
* is enabled (it implies that hardware UAO and PAN disabled).
*/
- uaccess_ttbr0_enable x6, x7
+ uaccess_ttbr0_enable x6, x7, x8
hvc XEN_IMM
/*