diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2016-12-20 05:19:55 -0800 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-01-16 15:40:07 +0530 |
| commit | 1b1d2ba5e9d46803a2ca503be276f826b2f7f4c3 (patch) | |
| tree | 75454c3f0702deb3a1bb0cdb477478f3226d3b51 /arch | |
| parent | f1d0f40b209060909c7258099908c4ea5a0d6bc2 (diff) | |
Revert "FROMLIST: arm64: xen: Enable user access before a privcmd hvc call"
This reverts commit d4e8046bb8d062a6865ba1f3c4b34fc305ec97f0.
Bug: 31432001
Change-Id: Ie46b07a980cf0ae2af9ae5149caf286c6b9b0e59
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/xen/hypercall.S | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm64/xen/hypercall.S b/arch/arm64/xen/hypercall.S index 6d6e4af1a4bf..8bbe9401f4f0 100644 --- a/arch/arm64/xen/hypercall.S +++ b/arch/arm64/xen/hypercall.S @@ -49,7 +49,6 @@ #include <linux/linkage.h> #include <asm/assembler.h> -#include <asm/uaccess.h> #include <xen/interface/xen.h> @@ -90,24 +89,6 @@ ENTRY(privcmd_call) mov x2, x3 mov x3, x4 mov x4, x5 -#ifdef CONFIG_ARM64_SW_TTBR0_PAN - /* - * Privcmd calls are issued by the userspace. The kernel needs to - * enable access to TTBR0_EL1 as the hypervisor would issue stage 1 - * translations to user memory via AT instructions. Since AT - * instructions are not affected by the PAN bit (ARMv8.1), we only - * need the explicit uaccess_enable/disable if the TTBR0 PAN emulation - * is enabled (it implies that hardware UAO and PAN disabled). - */ - uaccess_enable_not_uao x6, x7 -#endif hvc XEN_IMM - -#ifdef CONFIG_ARM64_SW_TTBR0_PAN - /* - * Disable userspace access from kernel once the hyp call completed. - */ - uaccess_disable_not_uao x6 -#endif ret ENDPROC(privcmd_call); |