From c9539979a9dd4cccca0aebda0cf99bb47405f1de Mon Sep 17 00:00:00 2001
From: Mao Jinlong <quic_jinlmao@quicinc.com>
Date: Mon, 29 May 2023 03:09:30 -0700
Subject: [PATCH] ANDROID: abi_gki_aarch64_qcom: Update abi_gki_aarch64_qcom
 for DMA

Add dma_alloc_noncontiguous, dma_free_noncontiguous,
dma_vmap_noncontiguous and dma_vunmap_noncontiguous symbols.

Symbols added:
   dma_alloc_noncontiguous
   dma_free_noncontiguous
   dma_vmap_noncontiguous
   dma_vunmap_noncontiguous

Bug: 284818225
Change-Id: Ifb8238071fbd15b2d27d1cfc33b856ae4c18c3f1
Signed-off-by: Chetan C R <quic_cchinnad@quicinc.com>
Signed-off-by: Mao Jinlong <quic_jinlmao@quicinc.com>
Signed-off-by: Zhenhua Huang <quic_zhenhuah@quicinc.com>
(cherry picked from commit b3bb41cebdeb0688b508df20f0db5f55a87e46e8)
---
 android/abi_gki_aarch64.stg  | 47 ++++++++++++++++++++++++++++++++++++
 android/abi_gki_aarch64_qcom |  4 +++
 2 files changed, 51 insertions(+)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 3509e6c17021..f71468d518d5 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -289656,6 +289656,13 @@ function {
   parameter_id: 0x0cc78943
   parameter_id: 0x0660b958
 }
+function {
+  id: 0x55d07307
+  return_type_id: 0x18bd6530
+  parameter_id: 0x0258f96e
+  parameter_id: 0xf435685e
+  parameter_id: 0x00a43052
+}
 function {
   id: 0x55d4825e
   return_type_id: 0x18bd6530
@@ -335052,6 +335059,15 @@ elf_symbol {
   type_id: 0x55df36a2
   full_name: "dma_alloc_attrs"
 }
+elf_symbol {
+  id: 0x12eaf956
+  name: "dma_alloc_noncontiguous"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x8a2ab4a6
+  type_id: 0x420a20df
+  full_name: "dma_alloc_noncontiguous"
+}
 elf_symbol {
   id: 0xac4ecea5
   name: "dma_alloc_pages"
@@ -335502,6 +335518,15 @@ elf_symbol {
   type_id: 0x13db1955
   full_name: "dma_free_attrs"
 }
+elf_symbol {
+  id: 0x1d7e2299
+  name: "dma_free_noncontiguous"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xf2140e70
+  type_id: 0x13dda576
+  full_name: "dma_free_noncontiguous"
+}
 elf_symbol {
   id: 0x23e816b8
   name: "dma_free_pages"
@@ -335943,6 +335968,24 @@ elf_symbol {
   type_id: 0x1053a2da
   full_name: "dma_unmap_sg_attrs"
 }
+elf_symbol {
+  id: 0xc4a6e691
+  name: "dma_vmap_noncontiguous"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xaeb50586
+  type_id: 0x55d07307
+  full_name: "dma_vmap_noncontiguous"
+}
+elf_symbol {
+  id: 0xcb48db3d
+  name: "dma_vunmap_noncontiguous"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa2512f41
+  type_id: 0x106c9a5c
+  full_name: "dma_vunmap_noncontiguous"
+}
 elf_symbol {
   id: 0xfc6b4a0f
   name: "dmabuf_page_pool_alloc"
@@ -377240,6 +377283,7 @@ interface {
   symbol_id: 0x840989b2
   symbol_id: 0x57325158
   symbol_id: 0x6cb15207
+  symbol_id: 0x12eaf956
   symbol_id: 0xac4ecea5
   symbol_id: 0xf907b0c3
   symbol_id: 0x3492f7a1
@@ -377288,6 +377332,7 @@ interface {
   symbol_id: 0xf18ac584
   symbol_id: 0x7ffe50b7
   symbol_id: 0x3b69b427
+  symbol_id: 0x1d7e2299
   symbol_id: 0x23e816b8
   symbol_id: 0xd0e88c9a
   symbol_id: 0x28fa142c
@@ -377337,6 +377382,8 @@ interface {
   symbol_id: 0x45690ea2
   symbol_id: 0x0134874d
   symbol_id: 0xe5a171eb
+  symbol_id: 0xc4a6e691
+  symbol_id: 0xcb48db3d
   symbol_id: 0xfc6b4a0f
   symbol_id: 0xf7f45910
   symbol_id: 0x2b250c73
diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index 404d6a07c192..b68554e69e05 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -732,6 +732,7 @@
   divider_ro_round_rate_parent
   divider_round_rate_parent
   dma_alloc_attrs
+  dma_alloc_noncontiguous
   dma_alloc_pages
   dma_async_device_register
   dma_async_device_unregister
@@ -770,6 +771,7 @@
   dma_fence_signal_timestamp_locked
   dma_fence_wait_timeout
   dma_free_attrs
+  dma_free_noncontiguous
   dma_free_pages
   dma_get_sgtable_attrs
   dma_get_slave_channel
@@ -804,6 +806,8 @@
   dma_unmap_page_attrs
   dma_unmap_resource
   dma_unmap_sg_attrs
+  dma_vmap_noncontiguous
+  dma_vunmap_noncontiguous
   do_trace_netlink_extack
   do_trace_rcu_torture_read
   double_rq_lock