From bd552fcbbd0fb7ecd8c9c1eed047ea1b2319a6d0 Mon Sep 17 00:00:00 2001
From: Kever Yang <kever.yang@rock-chips.com>
Date: Fri, 17 May 2024 17:15:54 +0800
Subject: [PATCH] ANDROID: GKI: Update rockchip symbols to add iova APIs

INFO: 2 function symbol(s) added
  'struct iova* alloc_iova(struct iova_domain*, unsigned long, unsigned long, bool)'
  'void free_iova(struct iova_domain*, unsigned long)'

Bug: 300024866
Change-Id: Iccdadf2b516343411871f1df0f46299af9b51c97
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
---
 android/abi_gki_aarch64.stg      | 34 ++++++++++++++++++++++++++++++++
 android/abi_gki_aarch64_rockchip |  6 ++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 9388238c1629..07031ed590d9 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -303391,6 +303391,12 @@ function {
   parameter_id: 0x3ea2e6c1
   parameter_id: 0x2124c9f1
 }
+function {
+  id: 0x1fb4bf8e
+  return_type_id: 0x48b5725f
+  parameter_id: 0x3f84ee3c
+  parameter_id: 0x33756485
+}
 function {
   id: 0x1fb5d3a2
   return_type_id: 0x48b5725f
@@ -305600,6 +305606,14 @@ function {
   return_type_id: 0x18bd6530
   parameter_id: 0x4585663f
 }
+function {
+  id: 0x4812e6a9
+  return_type_id: 0x35304fb1
+  parameter_id: 0x3f84ee3c
+  parameter_id: 0x33756485
+  parameter_id: 0x33756485
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x48135354
   return_type_id: 0x35304fb1
@@ -351008,6 +351022,15 @@ elf_symbol {
   type_id: 0xca4b711f
   full_name: "alloc_io_pgtable_ops"
 }
+elf_symbol {
+  id: 0x82a5f160
+  name: "alloc_iova"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xfd3617ee
+  type_id: 0x4812e6a9
+  full_name: "alloc_iova"
+}
 elf_symbol {
   id: 0x9cff6ebf
   name: "alloc_iova_fast"
@@ -368262,6 +368285,15 @@ elf_symbol {
   type_id: 0x165a4073
   full_name: "free_io_pgtable_ops"
 }
+elf_symbol {
+  id: 0x25649749
+  name: "free_iova"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x42e921d3
+  type_id: 0x1fb4bf8e
+  full_name: "free_iova"
+}
 elf_symbol {
   id: 0x998ad938
   name: "free_iova_fast"
@@ -409865,6 +409897,7 @@ interface {
   symbol_id: 0xc8c5af1c
   symbol_id: 0xdeecf7a4
   symbol_id: 0xeba70df6
+  symbol_id: 0x82a5f160
   symbol_id: 0x9cff6ebf
   symbol_id: 0xcf6df527
   symbol_id: 0x00374dfe
@@ -411781,6 +411814,7 @@ interface {
   symbol_id: 0x0513219e
   symbol_id: 0x1b00ff86
   symbol_id: 0x9b815cdc
+  symbol_id: 0x25649749
   symbol_id: 0x998ad938
   symbol_id: 0x27e49ce0
   symbol_id: 0xa0e729a5
diff --git a/android/abi_gki_aarch64_rockchip b/android/abi_gki_aarch64_rockchip
index 87a61c986242..1679dba4127d 100644
--- a/android/abi_gki_aarch64_rockchip
+++ b/android/abi_gki_aarch64_rockchip
@@ -267,6 +267,8 @@
   devm_usb_get_phy
   _dev_notice
   dev_open
+  dev_pm_domain_attach_by_name
+  dev_pm_domain_detach
   dev_pm_opp_clear_config
   dev_pm_opp_disable
   dev_pm_opp_find_freq_ceil
@@ -2334,12 +2336,12 @@
   reserve_iova
 
 # required by rknpu.ko
-  dev_pm_domain_attach_by_name
-  dev_pm_domain_detach
+  alloc_iova
   drm_gem_handle_delete
   drm_gem_mmap_obj
   drm_gem_prime_export
   drm_gem_prime_import_dev
+  free_iova
   of_dma_configure_id
   set_user_nice
   vmf_insert_mixed