Merge "Upgrade pvmfw.img to build 8821162"
diff --git a/vmbase/Android.bp b/vmbase/Android.bp
index e098ea7..6400ccd 100644
--- a/vmbase/Android.bp
+++ b/vmbase/Android.bp
@@ -70,6 +70,7 @@
srcs: [
"entry.S",
"exceptions.S",
+ "exceptions_panic.S",
],
no_libcrt: true,
apex_available: ["com.android.virt"],
diff --git a/vmbase/entry.S b/vmbase/entry.S
index 490e841..490c2f3 100644
--- a/vmbase/entry.S
+++ b/vmbase/entry.S
@@ -84,6 +84,9 @@
entry:
/* Load and apply the memory management configuration, ready to enable MMU and caches. */
+ adr x30, vector_table_panic
+ msr vbar_el1, x30
+
adrp x30, idmap
msr ttbr0_el1, x30
diff --git a/vmbase/exceptions_panic.S b/vmbase/exceptions_panic.S
new file mode 100644
index 0000000..6f73da8
--- /dev/null
+++ b/vmbase/exceptions_panic.S
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * The following table is intended to trap any fault resulting from the very
+ * first memory accesses. They assume that PSCI v0.2 is available and provides
+ * the PSCI_SYSTEM_RESET call in an attempt to gracefully exit but otherwise
+ * results in the core busy-looping.
+ */
+
+.macro exception_panic
+ mov x0, 0x80400000
+ add x0, x0, 9
+ mov x1, 0
+ mov x2, 0
+ mov x3, 0
+ hvc 0
+0: wfi
+ b 0b
+.endm
+
+.section .text.vector_table_panic, "ax"
+.global vector_table_panic
+.balign 0x800
+vector_table_panic:
+sync_cur_sp0_panic:
+ exception_panic
+
+.balign 0x80
+irq_cur_sp0_panic:
+ exception_panic
+
+.balign 0x80
+fiq_cur_sp0_panic:
+ exception_panic
+
+.balign 0x80
+serr_cur_sp0_panic:
+ exception_panic
+
+.balign 0x80
+sync_cur_spx_panic:
+ exception_panic
+
+.balign 0x80
+irq_cur_spx_panic:
+ exception_panic
+
+.balign 0x80
+fiq_cur_spx_panic:
+ exception_panic
+
+.balign 0x80
+serr_cur_spx_panic:
+ exception_panic
+
+.balign 0x80
+sync_lower_64_panic:
+ exception_panic
+
+.balign 0x80
+irq_lower_64_panic:
+ exception_panic
+
+.balign 0x80
+fiq_lower_64_panic:
+ exception_panic
+
+.balign 0x80
+serr_lower_64_panic:
+ exception_panic
+
+.balign 0x80
+sync_lower_32_panic:
+ exception_panic
+
+.balign 0x80
+irq_lower_32_panic:
+ exception_panic
+
+.balign 0x80
+fiq_lower_32_panic:
+ exception_panic
+
+.balign 0x80
+serr_lower_32_panic:
+ exception_panic