diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-01-16 11:56:09 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-16 11:56:09 -0800 |
| commit | fea1ce655de92a5411589d2f4a6b8973cd911a77 (patch) | |
| tree | e2cb15c8bf7ba4ed77133d4a4af7c14e0d215ee9 /pkg/sentry | |
| parent | 420d335fc9495ec18a20f710869770d0708d9a49 (diff) | |
| parent | e91c1675cd49254936d04f01b814a0cd802ff6de (diff) | |
Merge pull request #1272 from lubinszARM:pr_ring0_2
PiperOrigin-RevId: 290113719
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/platform/ring0/entry_arm64.s | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkg/sentry/platform/ring0/entry_arm64.s b/pkg/sentry/platform/ring0/entry_arm64.s index 64e9c0845..da07815ff 100644 --- a/pkg/sentry/platform/ring0/entry_arm64.s +++ b/pkg/sentry/platform/ring0/entry_arm64.s @@ -474,6 +474,16 @@ TEXT ·El1_sync(SB),NOSPLIT,$0 B el1_invalid el1_da: + WORD $0xd538d092 //MRS TPIDR_EL1, R18 + WORD $0xd538601a //MRS FAR_EL1, R26 + + MOVD R26, CPU_FAULT_ADDR(RSV_REG) + + MOVD $0, CPU_ERROR_TYPE(RSV_REG) + + MOVD $PageFault, R3 + MOVD R3, CPU_VECTOR_CODE(RSV_REG) + B ·Halt(SB) el1_ia: |