diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-13 15:02:57 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-13 15:02:57 -0700 |
| commit | b99f15e06d1a800b52bcd0cc241296f182878b9a (patch) | |
| tree | 7964b1f28211e9ff62456524f8b6d17c8eaf8965 /pkg/sentry | |
| parent | 51913ba400ccff88be58ed12ac3f393258629a50 (diff) | |
| parent | eefcc478c385c504c2312594bef24806c87f825e (diff) | |
Merge pull request #4374 from lubinszARM:pr_ffmpeg_kvm_01
PiperOrigin-RevId: 336962937
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/platform/ring0/entry_arm64.s | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/pkg/sentry/platform/ring0/entry_arm64.s b/pkg/sentry/platform/ring0/entry_arm64.s index 494baaa4d..274576e2d 100644 --- a/pkg/sentry/platform/ring0/entry_arm64.s +++ b/pkg/sentry/platform/ring0/entry_arm64.s @@ -297,9 +297,7 @@ LOAD_KERNEL_ADDRESS(CPU_SELF(from), RSV_REG); \ MOVD $CPU_STACK_TOP(RSV_REG), RSV_REG; \ MOVD RSV_REG, RSP; \ - WORD $0xd538d092; \ //MRS TPIDR_EL1, R18 - ISB $15; \ - DSB $15; + WORD $0xd538d092; //MRS TPIDR_EL1, R18 // SWITCH_TO_APP_PAGETABLE sets a new pagetable for a container application. #define SWITCH_TO_APP_PAGETABLE(from) \ @@ -382,8 +380,6 @@ TEXT ·Halt(SB),NOSPLIT,$0 BNE mmio_exit MOVD $0, CPU_REGISTERS+PTRACE_R9(RSV_REG) - // Flush dcache. - WORD $0xd5087e52 // DC CISW mmio_exit: // Disable fpsimd. WORD $0xd5381041 // MRS CPACR_EL1, R1 @@ -401,9 +397,6 @@ mmio_exit: MRS VBAR_EL1, R9 MOVD R0, 0x0(R9) - // Flush dcahce. - WORD $0xd5087e52 // DC CISW - RET // HaltAndResume halts execution and point the pointer to the resume function. @@ -522,8 +515,6 @@ TEXT ·kernelExitToEl1(SB),NOSPLIT,$0 // Start is the CPU entrypoint. TEXT ·Start(SB),NOSPLIT,$0 - // Flush dcache. - WORD $0xd5087e52 // DC CISW // Init. MOVD $SCTLR_EL1_DEFAULT, R1 MSR R1, SCTLR_EL1 |