From 686cd3b2d83f17703d40013b5980c5f86788a74e Mon Sep 17 00:00:00 2001
From: Jindong Yue <jindong.yue@nxp.com>
Date: Tue, 30 Nov 2021 10:52:01 +0800
Subject: [PATCH] ANDROID: ABI: Add symbols used by clocksource driver

Export three symbols required by timer-imx-tpm.ko

Leaf changes summary: 3 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 3 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

3 Added functions:

  [A] 'function int clocksource_mmio_init(void*, const char*, unsigned long int, int, unsigned int, long long unsigned int (clocksource*)*)'
  [A] 'function u64 clocksource_mmio_readl_up(clocksource*)'
  [A] 'function void sched_clock_register(long long unsigned int ()*, int, unsigned long int)'

Bug: 194108974
Signed-off-by: Jindong Yue <jindong.yue@nxp.com>
Change-Id: I123996fc08740d3e4bf242a1913b22ca83b2e2b9
---
 android/abi_gki_aarch64.xml | 48 +++++++++++++++++++++++++++----------
 android/abi_gki_aarch64_imx | 11 +++++----
 2 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index e1b6fe8384a7..05df1e0ec177 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -1050,6 +1050,8 @@
       <elf-symbol name='clk_unregister' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7757b51a'/>
       <elf-symbol name='clockevents_config_and_register' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x449dcecb'/>
       <elf-symbol name='clocks_calc_mult_shift' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x62bb09bf'/>
+      <elf-symbol name='clocksource_mmio_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x753ddda6'/>
+      <elf-symbol name='clocksource_mmio_readl_up' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7e2d52b0'/>
       <elf-symbol name='close_candev' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x164ae8be'/>
       <elf-symbol name='cma_alloc' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x6e17861c'/>
       <elf-symbol name='cma_for_each_area' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x86d07c22'/>
@@ -4223,6 +4225,7 @@
       <elf-symbol name='scatterwalk_ffwd' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x5bbdfa26'/>
       <elf-symbol name='scatterwalk_map_and_copy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x845dbf3b'/>
       <elf-symbol name='sched_clock' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd653b126'/>
+      <elf-symbol name='sched_clock_register' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x86d43be9'/>
       <elf-symbol name='sched_set_fifo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x964b323d'/>
       <elf-symbol name='sched_set_fifo_low' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8fc66195'/>
       <elf-symbol name='sched_set_normal' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xc52b19c6'/>
@@ -6907,6 +6910,7 @@
         </data-member>
       </class-decl>
       <qualified-type-def type-id='49f5fd4d' const='yes' id='02793b54'/>
+      <pointer-type-def type-id='40ffc582' size-in-bits='64' id='027ab274'/>
       <function-type size-in-bits='64' id='0286989c'>
         <parameter type-id='328dda6e'/>
         <parameter type-id='0fbf3cfd'/>
@@ -23291,7 +23295,7 @@
       <pointer-type-def type-id='6cf6468f' size-in-bits='64' id='2cb135bf'/>
       <pointer-type-def type-id='051f9336' size-in-bits='64' id='2cb49514'/>
       <pointer-type-def type-id='cfb839d2' size-in-bits='64' id='2cbd236c'/>
-      <pointer-type-def type-id='83c3a083' size-in-bits='64' id='2cbe71ce'/>
+      <pointer-type-def type-id='83c3a084' size-in-bits='64' id='2cbe71cf'/>
       <pointer-type-def type-id='455e2261' size-in-bits='64' id='2cc5a575'/>
       <array-type-def dimensions='1' type-id='a7832498' size-in-bits='160' id='2ccab0ee'>
         <subrange length='5' type-id='7ff19f0f' id='53010e10'/>
@@ -24514,6 +24518,7 @@
       </function-type>
       <pointer-type-def type-id='391881a9' size-in-bits='64' id='302e9391'/>
       <pointer-type-def type-id='845f3205' size-in-bits='64' id='30341fa1'/>
+      <pointer-type-def type-id='4f5f116f' size-in-bits='64' id='30351b23'/>
       <pointer-type-def type-id='4657336c' size-in-bits='64' id='303e01fa'/>
       <class-decl name='scmi_notify_ops' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/scmi_protocol.h' line='597' column='1' id='3042e3e4'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -30885,6 +30890,9 @@
         </data-member>
       </class-decl>
       <qualified-type-def type-id='6d84fe29' const='yes' id='40fcf9ec'/>
+      <function-type size-in-bits='64' id='40ffc582'>
+        <return type-id='3a47d82b'/>
+      </function-type>
       <pointer-type-def type-id='f1bdbe5e' size-in-bits='64' id='4110d6d4'/>
       <function-type size-in-bits='64' id='4111263b'>
         <parameter type-id='abd62a96'/>
@@ -33566,7 +33574,7 @@
       <pointer-type-def type-id='f4c2725e' size-in-bits='64' id='498944b4'/>
       <pointer-type-def type-id='0e15337c' size-in-bits='64' id='498f47da'/>
       <function-type size-in-bits='64' id='4993d1b5'>
-        <parameter type-id='4dfe71de'/>
+        <parameter type-id='4dfe71de' name='c'/>
         <return type-id='91ce1af9'/>
       </function-type>
       <pointer-type-def type-id='bfa69bfb' size-in-bits='64' id='4998c99f'/>
@@ -35808,6 +35816,10 @@
           <var-decl name='ContainerID' type-id='9396cabb' visibility='default' filepath='include/uapi/linux/usb/ch9.h' line='945' column='1'/>
         </data-member>
       </class-decl>
+      <function-type size-in-bits='64' id='4f5f116f'>
+        <parameter type-id='4dfe71de'/>
+        <return type-id='3a47d82b'/>
+      </function-type>
       <class-decl name='gendisk' size-in-bits='10496' is-struct='yes' visibility='default' filepath='include/linux/genhd.h' line='176' column='1' id='4f60ffbc'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='major' type-id='95e97e5e' visibility='default' filepath='include/linux/genhd.h' line='180' column='1'/>
@@ -57831,7 +57843,7 @@
           <var-decl name='envelope' type-id='95dfde06' visibility='default' filepath='include/uapi/linux/input.h' line='359' column='1'/>
         </data-member>
       </class-decl>
-      <union-decl name='tcp_cc_info' visibility='default' is-declaration-only='yes' id='83c3a083'/>
+      <union-decl name='tcp_cc_info' visibility='default' is-declaration-only='yes' id='83c3a084'/>
       <function-type size-in-bits='64' id='83c3d80a'>
         <parameter type-id='5dbfcbb1'/>
         <parameter type-id='f9b06939'/>
@@ -64894,9 +64906,6 @@
         <parameter type-id='78c01427'/>
         <return type-id='95e97e5e'/>
       </function-type>
-      <array-type-def dimensions='1' type-id='95e97e5e' size-in-bits='2048' id='93e41790'>
-        <subrange length='64' type-id='7ff19f0f' id='b10be967'/>
-      </array-type-def>
       <pointer-type-def type-id='42b001af' size-in-bits='64' id='93edac17'/>
       <array-type-def dimensions='1' type-id='3b0abfc6' size-in-bits='768' id='93f82aba'>
         <subrange length='6' type-id='7ff19f0f' id='52fa524b'/>
@@ -75240,11 +75249,7 @@
       <pointer-type-def type-id='512ac7cc' size-in-bits='64' id='ac58af12'/>
       <pointer-type-def type-id='b254b8db' size-in-bits='64' id='ac5f2363'/>
       <pointer-type-def type-id='49a0ad34' size-in-bits='64' id='ac6963b2'/>
-      <class-decl name='prot_inuse' size-in-bits='2048' is-struct='yes' visibility='default' filepath='net/core/sock.c' line='3311' column='1' id='ac763c5d'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='val' type-id='93e41790' visibility='default' filepath='net/core/sock.c' line='3312' column='1'/>
-        </data-member>
-      </class-decl>
+      <class-decl name='prot_inuse' is-struct='yes' visibility='default' is-declaration-only='yes' id='ac763c5d'/>
       <function-type size-in-bits='64' id='ac765b39'>
         <parameter type-id='2ba25712'/>
         <parameter type-id='14bde5bf'/>
@@ -112207,7 +112212,7 @@
         <parameter type-id='f772df6d'/>
         <parameter type-id='19c2251e'/>
         <parameter type-id='7292109c'/>
-        <parameter type-id='2cbe71ce'/>
+        <parameter type-id='2cbe71cf'/>
         <return type-id='b59d7dce'/>
       </function-type>
       <pointer-type-def type-id='d71978c5' size-in-bits='64' id='fe17c379'/>
@@ -119540,6 +119545,19 @@
         <parameter type-id='19c2251e' name='maxsec' filepath='kernel/time/clocksource.c' line='45' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='clocksource_mmio_init' mangled-name='clocksource_mmio_init' filepath='include/linux/clocksource.h' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clocksource_mmio_init'>
+        <parameter type-id='eaa32e2f'/>
+        <parameter type-id='80f4b756'/>
+        <parameter type-id='7359adad'/>
+        <parameter type-id='95e97e5e'/>
+        <parameter type-id='f0981eeb'/>
+        <parameter type-id='30351b23'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
+      <function-decl name='clocksource_mmio_readl_up' mangled-name='clocksource_mmio_readl_up' filepath='drivers/clocksource/mmio.c' line='20' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clocksource_mmio_readl_up'>
+        <parameter type-id='4dfe71de' name='c' filepath='drivers/clocksource/mmio.c' line='20' column='1'/>
+        <return type-id='91ce1af9'/>
+      </function-decl>
       <function-decl name='close_candev' mangled-name='close_candev' filepath='drivers/net/can/dev/dev.c' line='902' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='close_candev'>
         <parameter type-id='68a2d05b' name='dev' filepath='drivers/net/can/dev/dev.c' line='902' column='1'/>
         <return type-id='48b5725f'/>
@@ -135874,6 +135892,12 @@
       <function-decl name='sched_clock' mangled-name='sched_clock' filepath='kernel/time/sched_clock.c' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_clock'>
         <return type-id='3a47d82b'/>
       </function-decl>
+      <function-decl name='sched_clock_register' mangled-name='sched_clock_register' filepath='include/linux/sched_clock.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_clock_register'>
+        <parameter type-id='027ab274'/>
+        <parameter type-id='95e97e5e'/>
+        <parameter type-id='7359adad'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <var-decl name='sched_feat_keys' type-id='9cc39ce1' mangled-name='sched_feat_keys' visibility='default' filepath='kernel/sched/debug.c' line='80' column='1' elf-symbol-id='sched_feat_keys'/>
       <var-decl name='sched_feat_names' type-id='3604aecf' mangled-name='sched_feat_names' visibility='default' filepath='kernel/sched/debug.c' line='51' column='1' elf-symbol-id='sched_feat_names'/>
       <function-decl name='sched_set_fifo' mangled-name='sched_set_fifo' filepath='kernel/sched/core.c' line='5799' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_set_fifo'>
diff --git a/android/abi_gki_aarch64_imx b/android/abi_gki_aarch64_imx
index d9b45b8fc993..fdff2573a2fc 100644
--- a/android/abi_gki_aarch64_imx
+++ b/android/abi_gki_aarch64_imx
@@ -67,6 +67,7 @@
   clk_set_parent
   clk_set_rate
   clk_unprepare
+  clockevents_config_and_register
   complete
   complete_all
   completion_done
@@ -590,6 +591,7 @@
   of_alias_get_id
   of_clk_add_hw_provider
   of_clk_get
+  of_clk_get_by_name
   of_clk_hw_onecell_get
   of_count_phandle_with_args
   of_device_get_match_data
@@ -911,6 +913,7 @@
   tasklet_init
   tasklet_kill
   __tasklet_schedule
+  timer_of_init
   trace_event_buffer_commit
   trace_event_buffer_reserve
   trace_event_ignore_this_pid
@@ -1822,7 +1825,6 @@
   clk_unregister
   divider_get_val
   divider_recalc_rate
-  of_clk_get_by_name
   of_clk_get_from_provider
 
 # required by mxc-jpeg-encdec.ko
@@ -2236,9 +2238,10 @@
   dmabuf_page_pool_destroy
   dmabuf_page_pool_free
 
-# required by timer-imx-sysctr.ko
-  clockevents_config_and_register
-  timer_of_init
+# required by timer-imx-tpm.ko
+  clocksource_mmio_init
+  clocksource_mmio_readl_up
+  sched_clock_register
 
 # required by trusty-ipc.ko
   _copy_from_iter