From 092ae9d3433b213b1631906bb4c24b07bf41665e Mon Sep 17 00:00:00 2001
From: Will McVicker <willmcvicker@google.com>
Date: Mon, 1 May 2023 12:15:15 -0700
Subject: [PATCH] ANDROID: Add symbols for pkvm module support

6 function symbol(s) added
  'int __pkvm_load_el2_module(struct module*, unsigned long*)'
  'int pkvm_iommu_driver_init(u64, void*, size_t)'
  'int pkvm_iommu_finalize(int)'
  'int pkvm_iommu_register(struct device*, u64, phys_addr_t, size_t,
                           struct device*, u8)'
  'int pkvm_iommu_resume(struct device*)'
  'int pkvm_iommu_suspend(struct device*)'

Bug: 279090118
Change-Id: Ic09dacdcc460ab22802ddc655c34aa0b24932364
Signed-off-by: Will McVicker <willmcvicker@google.com>
---
 android/abi_gki_aarch64.stg   | 101 ++++++++++++++++++++++++++++++++++
 android/abi_gki_aarch64_pixel |   7 +++
 2 files changed, 108 insertions(+)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index ed8d7511658f..9613e02c143e 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -328554,6 +328554,12 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x9f5021bd
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0b27dc43
+  parameter_id: 0x064d6086
+}
 function {
   id: 0x9f5327f4
   return_type_id: 0x6720d32f
@@ -328688,6 +328694,16 @@ function {
   parameter_id: 0x0beab59b
   parameter_id: 0x054f691a
 }
+function {
+  id: 0x9f72f53e
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0258f96e
+  parameter_id: 0x92233392
+  parameter_id: 0xbdd18903
+  parameter_id: 0xf435685e
+  parameter_id: 0x0258f96e
+  parameter_id: 0x295c7202
+}
 function {
   id: 0x9f7a4e49
   return_type_id: 0x6720d32f
@@ -330458,6 +330474,13 @@ function {
   parameter_id: 0x4585663f
   parameter_id: 0x6d7f5ff6
 }
+function {
+  id: 0xb957d705
+  return_type_id: 0x6720d32f
+  parameter_id: 0x92233392
+  parameter_id: 0x18bd6530
+  parameter_id: 0xf435685e
+}
 function {
   id: 0xb9640b60
   return_type_id: 0x064d6086
@@ -335976,6 +335999,15 @@ elf_symbol {
   type_id: 0x92df7dfb
   full_name: "__phy_modify"
 }
+elf_symbol {
+  id: 0xd9bec400
+  name: "__pkvm_load_el2_module"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd1d2c552
+  type_id: 0x9f5021bd
+  full_name: "__pkvm_load_el2_module"
+}
 elf_symbol {
   id: 0x430bd907
   name: "__platform_driver_probe"
@@ -372044,6 +372076,51 @@ elf_symbol {
   type_id: 0x9cd82046
   full_name: "pktgen_xfrm_outer_mode_output"
 }
+elf_symbol {
+  id: 0x9e86d87a
+  name: "pkvm_iommu_driver_init"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xf04a072e
+  type_id: 0xb957d705
+  full_name: "pkvm_iommu_driver_init"
+}
+elf_symbol {
+  id: 0x6f7172e0
+  name: "pkvm_iommu_finalize"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xbc2fdabc
+  type_id: 0x8448d7e4
+  full_name: "pkvm_iommu_finalize"
+}
+elf_symbol {
+  id: 0xa74e4e73
+  name: "pkvm_iommu_register"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x7dbf092d
+  type_id: 0x9f72f53e
+  full_name: "pkvm_iommu_register"
+}
+elf_symbol {
+  id: 0x508c3717
+  name: "pkvm_iommu_resume"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x19a525d9
+  type_id: 0x9d16dd74
+  full_name: "pkvm_iommu_resume"
+}
+elf_symbol {
+  id: 0xe5abcddf
+  name: "pkvm_iommu_suspend"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x976a4802
+  type_id: 0x9d16dd74
+  full_name: "pkvm_iommu_suspend"
+}
 elf_symbol {
   id: 0xb30e2978
   name: "platform_bus"
@@ -391121,6 +391198,10 @@ symbols {
     key: "__phy_modify"
     value: 0x28bdd181
   }
+  symbol {
+    key: "__pkvm_load_el2_module"
+    value: 0xd9bec400
+  }
   symbol {
     key: "__platform_driver_probe"
     value: 0x430bd907
@@ -407149,6 +407230,26 @@ symbols {
     key: "pktgen_xfrm_outer_mode_output"
     value: 0xac156dd0
   }
+  symbol {
+    key: "pkvm_iommu_driver_init"
+    value: 0x9e86d87a
+  }
+  symbol {
+    key: "pkvm_iommu_finalize"
+    value: 0x6f7172e0
+  }
+  symbol {
+    key: "pkvm_iommu_register"
+    value: 0xa74e4e73
+  }
+  symbol {
+    key: "pkvm_iommu_resume"
+    value: 0x508c3717
+  }
+  symbol {
+    key: "pkvm_iommu_suspend"
+    value: 0xe5abcddf
+  }
   symbol {
     key: "platform_bus"
     value: 0xb30e2978
diff --git a/android/abi_gki_aarch64_pixel b/android/abi_gki_aarch64_pixel
index 6c9e8eebbf71..d9fce8768f7c 100644
--- a/android/abi_gki_aarch64_pixel
+++ b/android/abi_gki_aarch64_pixel
@@ -31,6 +31,7 @@
   argv_split
   arm64_use_ng_mappings
   __arm_smccc_smc
+  __arm_smccc_sve_check
   async_schedule_node_domain
   async_synchronize_full_domain
   atomic_notifier_call_chain
@@ -1381,6 +1382,12 @@
   pin_user_pages_fast
   pin_user_pages_remote
   pktgen_xfrm_outer_mode_output
+  pkvm_iommu_driver_init
+  pkvm_iommu_finalize
+  pkvm_iommu_register
+  pkvm_iommu_resume
+  pkvm_iommu_suspend
+  __pkvm_load_el2_module
   platform_bus_type
   platform_device_add
   platform_device_add_data