From 1c25cf621d15e9831d7783ae34fb43b4dc084419 Mon Sep 17 00:00:00 2001
From: Lucas Wei <lucaswei@google.com>
Date: Mon, 3 May 2021 17:02:17 +0800
Subject: [PATCH] ANDROID: Add allowed symbols requried from Qualcomm drivers

Kernel modules of qpnp-smb5-charger.ko, swr_ctrl_dlkm.ko and msm_drm.ko
added new requirements to exported kernel symbols. Add these symbols
into symbol list to make it able to boot with android common kernel.

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

4 Added functions:

  [A] 'function ktime_t alarm_expires_remaining(const alarm*)'
  [A] 'function bool drm_edid_is_valid(edid*)'
  [A] 'function unsigned long int pm_runtime_autosuspend_expiration(device*)'
  [A] 'function void tracing_off()'

Bug: 185091725
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: Iadd6de18f536a3763becf1c62e152124be9ef405
Signed-off-by: Will McVicker <willmcvicker@google.com>
---
 android/abi_gki_aarch64.xml  | 153 +++++++++++++++++------------------
 android/abi_gki_aarch64_qcom |  10 ++-
 2 files changed, 84 insertions(+), 79 deletions(-)

diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 3b12c60044c1..c6606fbaa47b 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -235,6 +235,7 @@
       <elf-symbol name='add_wait_queue' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4afb2238'/>
       <elf-symbol name='adjust_managed_page_count' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x370cd115'/>
       <elf-symbol name='alarm_cancel' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf0b3bbbb'/>
+      <elf-symbol name='alarm_expires_remaining' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x69601b41'/>
       <elf-symbol name='alarm_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x63c58846'/>
       <elf-symbol name='alarm_start_relative' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf4c845c2'/>
       <elf-symbol name='alarm_try_to_cancel' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x6c8fceb6'/>
@@ -828,6 +829,7 @@
       <elf-symbol name='drm_dp_update_payload_part1' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x53c06af8'/>
       <elf-symbol name='drm_dp_update_payload_part2' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf02c1b64'/>
       <elf-symbol name='drm_edid_duplicate' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x47f985aa'/>
+      <elf-symbol name='drm_edid_is_valid' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7f88521'/>
       <elf-symbol name='drm_encoder_cleanup' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xafd739cb'/>
       <elf-symbol name='drm_encoder_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x81bf525e'/>
       <elf-symbol name='drm_err' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x1dd71f7a'/>
@@ -1733,6 +1735,7 @@
       <elf-symbol name='pm_qos_update_request_timeout' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7c7744d2'/>
       <elf-symbol name='pm_relax' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7d836ef5'/>
       <elf-symbol name='pm_runtime_allow' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x853cb911'/>
+      <elf-symbol name='pm_runtime_autosuspend_expiration' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x539b1671'/>
       <elf-symbol name='pm_runtime_barrier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8961278f'/>
       <elf-symbol name='pm_runtime_enable' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xcdf8db7e'/>
       <elf-symbol name='pm_runtime_forbid' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x6bad25fb'/>
@@ -2325,6 +2328,7 @@
       <elf-symbol name='trace_print_symbols_seq' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x61520529'/>
       <elf-symbol name='trace_raw_output_prep' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x830e5e3a'/>
       <elf-symbol name='trace_seq_printf' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x11caddc7'/>
+      <elf-symbol name='tracing_off' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7944e0fc'/>
       <elf-symbol name='truncate_inode_pages' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x728ccc88'/>
       <elf-symbol name='try_module_get' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd1f9d731'/>
       <elf-symbol name='try_to_del_timer_sync' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xfaf9e645'/>
@@ -10811,7 +10815,7 @@
           <var-decl name='module' type-id='7a2c185b' visibility='default' filepath='kernel/audit.h' line='205' column='1'/>
         </data-member>
       </union-decl>
-      <union-decl name='__anonymous_union__8' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/cred.h' line='154' column='1' id='0a97cc35'>
+      <union-decl name='__anonymous_union__13' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/cred.h' line='154' column='1' id='0a97cc35'>
         <data-member access='public'>
           <var-decl name='non_rcu' type-id='95e97e5e' visibility='default' filepath='include/linux/cred.h' line='155' column='1'/>
         </data-member>
@@ -16676,7 +16680,7 @@
           <var-decl name='__rcu_head' type-id='e3d8ce29' visibility='default' filepath='include/linux/iocontext.h' line='89' column='1'/>
         </data-member>
       </union-decl>
-      <union-decl name='__anonymous_union__33' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='1176' column='1' id='adf5bf47'>
+      <union-decl name='__anonymous_union__36' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='1176' column='1' id='adf5bf47'>
         <data-member access='public'>
           <var-decl name='hashinfo' type-id='d7a1e3c2' visibility='default' filepath='include/net/sock.h' line='1177' column='1'/>
         </data-member>
@@ -16690,7 +16694,7 @@
           <var-decl name='smc_hash' type-id='aa8162a3' visibility='default' filepath='include/net/sock.h' line='1180' column='1'/>
         </data-member>
       </union-decl>
-      <union-decl name='__anonymous_union__7' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='214' column='1' id='d5d77d48'>
+      <union-decl name='__anonymous_union__12' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='214' column='1' id='d5d77d48'>
         <data-member access='public'>
           <var-decl name='payload' type-id='2888d74a' visibility='default' filepath='include/linux/key.h' line='215' column='1'/>
         </data-member>
@@ -16698,7 +16702,7 @@
           <var-decl name='' type-id='607bacb1' visibility='default' filepath='include/linux/key.h' line='216' column='1'/>
         </data-member>
       </union-decl>
-      <union-decl name='__anonymous_union__6' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='202' column='1' id='5446e20e'>
+      <union-decl name='__anonymous_union__11' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='202' column='1' id='5446e20e'>
         <data-member access='public'>
           <var-decl name='index_key' type-id='16ab8749' visibility='default' filepath='include/linux/key.h' line='203' column='1'/>
         </data-member>
@@ -16714,7 +16718,7 @@
           <var-decl name='d_wait' type-id='03d48e96' visibility='default' filepath='include/linux/dcache.h' line='109' column='1'/>
         </data-member>
       </union-decl>
-      <union-decl name='__anonymous_union__4' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='158' column='1' id='1a65b0a7'>
+      <union-decl name='__anonymous_union__9' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='158' column='1' id='1a65b0a7'>
         <data-member access='public'>
           <var-decl name='graveyard_link' type-id='72f469ec' visibility='default' filepath='include/linux/key.h' line='159' column='1'/>
         </data-member>
@@ -16769,7 +16773,7 @@
           <var-decl name='insnsi' type-id='b50399da' visibility='default' filepath='include/linux/filter.h' line='504' column='1'/>
         </data-member>
       </union-decl>
-      <union-decl name='__anonymous_union__5' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='165' column='1' id='21f0eb77'>
+      <union-decl name='__anonymous_union__10' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='165' column='1' id='21f0eb77'>
         <data-member access='public'>
           <var-decl name='expiry' type-id='1afd27ac' visibility='default' filepath='include/linux/key.h' line='166' column='1'/>
         </data-member>
@@ -22469,7 +22473,7 @@
           <var-decl name='lower' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1814' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' size-in-bits='768' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/slab.h' line='641' column='1' id='26b3aff0'>
+      <class-decl name='__anonymous_struct__3' size-in-bits='768' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/slab.h' line='641' column='1' id='26b3aff0'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='memcg' type-id='223696fb' visibility='default' filepath='include/linux/slab.h' line='642' column='1'/>
         </data-member>
@@ -22486,7 +22490,7 @@
           <var-decl name='' type-id='655b0d99' visibility='default' filepath='include/linux/slab.h' line='647' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' size-in-bits='384' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/slab.h' line='635' column='1' id='22e2627b'>
+      <class-decl name='__anonymous_struct__2' size-in-bits='384' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/slab.h' line='635' column='1' id='22e2627b'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='memcg_caches' type-id='2c8ce02f' visibility='default' filepath='include/linux/slab.h' line='636' column='1'/>
         </data-member>
@@ -30297,7 +30301,7 @@
       <array-type-def dimensions='1' type-id='19c2251e' size-in-bits='64' id='1872161b'>
         <subrange length='2' type-id='7ff19f0f' id='52efc4ef'/>
       </array-type-def>
-      <union-decl name='__anonymous_union__13' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/cfg80211.h' line='2331' column='1' id='0532d6f6'>
+      <union-decl name='__anonymous_union__3' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/cfg80211.h' line='2331' column='1' id='0532d6f6'>
         <data-member access='public'>
           <var-decl name='band_pref' type-id='3eaa0294' visibility='default' filepath='include/net/cfg80211.h' line='2332' column='1'/>
         </data-member>
@@ -31637,6 +31641,9 @@
       </function-decl>
     </abi-instr>
     <abi-instr address-size='64' path='arch/arm64/kernel/traps.c' language='LANG_C89'>
+      <function-decl name='tracing_off' mangled-name='tracing_off' filepath='include/linux/kernel.h' line='641' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tracing_off'>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='do_exit' mangled-name='do_exit' filepath='include/linux/kernel.h' line='307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='do_exit'>
         <parameter type-id='bd54fe1a'/>
         <return type-id='48b5725f'/>
@@ -40837,17 +40844,6 @@
       </class-decl>
       <typedef-decl name='compat_uptr_t' type-id='19c2251e' filepath='arch/arm64/include/asm/compat.h' line='66' column='1' id='782d78af'/>
       <typedef-decl name='compat_long_t' type-id='a7832498' filepath='arch/arm64/include/asm/compat.h' line='60' column='1' id='abb906de'/>
-      <union-decl name='__anonymous_union__21' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/dcache.h' line='154' column='1' id='ecf138a1'>
-        <data-member access='public'>
-          <var-decl name='d_canonical_path' type-id='8581ac2b' visibility='default' filepath='include/linux/dcache.h' line='154' column='1'/>
-        </data-member>
-        <data-member access='public'>
-          <var-decl name='__UNIQUE_ID_android_kabi_hide67' type-id='156952c4' visibility='default' filepath='include/linux/dcache.h' line='154' column='1'/>
-        </data-member>
-        <data-member access='public'>
-          <var-decl name='' type-id='2a125a28' visibility='default' filepath='include/linux/dcache.h' line='154' column='1'/>
-        </data-member>
-      </union-decl>
       <pointer-type-def type-id='85c22421' size-in-bits='64' id='ee406209'/>
       <pointer-type-def type-id='830ee0a7' size-in-bits='64' id='5d3a884e'/>
       <pointer-type-def type-id='3b5c61ad' size-in-bits='64' id='a38aafde'/>
@@ -44722,6 +44718,10 @@
       </function-decl>
     </abi-instr>
     <abi-instr address-size='64' path='drivers/base/power/runtime.c' language='LANG_C89'>
+      <function-decl name='pm_runtime_autosuspend_expiration' mangled-name='pm_runtime_autosuspend_expiration' filepath='drivers/base/power/runtime.c' line='127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_autosuspend_expiration'>
+        <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='127' column='1'/>
+        <return type-id='7359adad'/>
+      </function-decl>
       <function-decl name='__pm_runtime_idle' mangled-name='__pm_runtime_idle' filepath='drivers/base/power/runtime.c' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pm_runtime_idle'>
         <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='963' column='1'/>
         <parameter type-id='95e97e5e' name='rpmflags' filepath='drivers/base/power/runtime.c' line='963' column='1'/>
@@ -52855,7 +52855,7 @@
           <var-decl name='nh' type-id='708c2394' visibility='default' filepath='include/drm/drm_panel.h' line='122' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/drm/drm_device.h' line='205' column='1' id='76c13bb3'>
+      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/drm/drm_device.h' line='205' column='1' id='76c13bb3'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='context' type-id='95e97e5e' visibility='default' filepath='include/drm/drm_device.h' line='206' column='1'/>
         </data-member>
@@ -54478,7 +54478,7 @@
           <var-decl name='skip_vt_switch' type-id='b50a4934' visibility='default' filepath='include/linux/fb.h' line='530' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/drm/drm_connector.h' line='399' column='1' id='34ac2cf8'>
+      <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/drm/drm_connector.h' line='399' column='1' id='34ac2cf8'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='left' type-id='f0981eeb' visibility='default' filepath='include/drm/drm_connector.h' line='400' column='1'/>
         </data-member>
@@ -58165,7 +58165,7 @@
         <enumerator name='NOT_SUPPORTED' value='0'/>
         <enumerator name='SUPPORTED' value='1'/>
       </enum-decl>
-      <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/drm/drm_device.h' line='205' column='1' id='76c13bb3'>
+      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/drm/drm_device.h' line='205' column='1' id='76c13bb3'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='context' type-id='95e97e5e' visibility='default' filepath='include/drm/drm_device.h' line='206' column='1'/>
         </data-member>
@@ -59778,7 +59778,7 @@
         <enumerator name='DRM_MODE_SUBCONNECTOR_Component' value='8'/>
         <enumerator name='DRM_MODE_SUBCONNECTOR_SCART' value='9'/>
       </enum-decl>
-      <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/drm/drm_connector.h' line='399' column='1' id='34ac2cf8'>
+      <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/drm/drm_connector.h' line='399' column='1' id='34ac2cf8'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='left' type-id='f0981eeb' visibility='default' filepath='include/drm/drm_connector.h' line='400' column='1'/>
         </data-member>
@@ -62576,6 +62576,10 @@
     </abi-instr>
     <abi-instr address-size='64' path='drivers/gpu/drm/drm_edid.c' language='LANG_C89'>
       <pointer-type-def type-id='c3fc04e5' size-in-bits='64' id='e879a339'/>
+      <function-decl name='drm_edid_is_valid' mangled-name='drm_edid_is_valid' filepath='drivers/gpu/drm/drm_edid.c' line='1488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_edid_is_valid'>
+        <parameter type-id='c91d1bf1' name='edid' filepath='drivers/gpu/drm/drm_edid.c' line='1488' column='1'/>
+        <return type-id='b50a4934'/>
+      </function-decl>
       <function-decl name='drm_add_edid_modes' mangled-name='drm_add_edid_modes' filepath='drivers/gpu/drm/drm_edid.c' line='5101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_add_edid_modes'>
         <parameter type-id='4db02c58' name='connector' filepath='drivers/gpu/drm/drm_edid.c' line='5101' column='1'/>
         <parameter type-id='c91d1bf1' name='edid' filepath='drivers/gpu/drm/drm_edid.c' line='5101' column='1'/>
@@ -80197,6 +80201,17 @@
           <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/net/netns/generic.h' line='32' column='1'/>
         </data-member>
       </class-decl>
+      <union-decl name='__anonymous_union__24' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/dcache.h' line='154' column='1' id='11e6121d'>
+        <data-member access='public'>
+          <var-decl name='d_canonical_path' type-id='8581ac2b' visibility='default' filepath='include/linux/dcache.h' line='154' column='1'/>
+        </data-member>
+        <data-member access='public'>
+          <var-decl name='__UNIQUE_ID_android_kabi_hide56' type-id='156952c4' visibility='default' filepath='include/linux/dcache.h' line='154' column='1'/>
+        </data-member>
+        <data-member access='public'>
+          <var-decl name='' type-id='2a125a28' visibility='default' filepath='include/linux/dcache.h' line='154' column='1'/>
+        </data-member>
+      </union-decl>
       <class-decl name='nf_conntrack' size-in-bits='32' is-struct='yes' visibility='default' filepath='include/linux/skbuff.h' line='248' column='1' id='d9fc42c3'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='use' type-id='49178f86' visibility='default' filepath='include/linux/skbuff.h' line='249' column='1'/>
@@ -87534,7 +87549,7 @@
         <enumerator name='PIN_MAP_TYPE_CONFIGS_PIN' value='3'/>
         <enumerator name='PIN_MAP_TYPE_CONFIGS_GROUP' value='4'/>
       </enum-decl>
-      <union-decl name='__anonymous_union__1' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/pinctrl/machine.h' line='73' column='1' id='2789d524'>
+      <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/pinctrl/machine.h' line='73' column='1' id='2789d524'>
         <data-member access='public'>
           <var-decl name='mux' type-id='ad4dd73d' visibility='default' filepath='include/linux/pinctrl/machine.h' line='74' column='1'/>
         </data-member>
@@ -110341,24 +110356,24 @@
         <enumerator name='PM_QOS_REQ_AFFINE_IRQ' value='2'/>
       </enum-decl>
       <pointer-type-def type-id='cd6fc142' size-in-bits='64' id='221c3010'/>
-      <function-decl name='pm_qos_request_for_cpu' mangled-name='pm_qos_request_for_cpu' filepath='kernel/power/qos.c' line='437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_qos_request_for_cpu'>
-        <parameter type-id='95e97e5e' name='pm_qos_class' filepath='kernel/power/qos.c' line='437' column='1'/>
-        <parameter type-id='95e97e5e' name='cpu' filepath='kernel/power/qos.c' line='437' column='1'/>
+      <function-decl name='pm_qos_request_for_cpu' mangled-name='pm_qos_request_for_cpu' filepath='kernel/power/qos.c' line='451' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_qos_request_for_cpu'>
+        <parameter type-id='95e97e5e' name='pm_qos_class' filepath='kernel/power/qos.c' line='451' column='1'/>
+        <parameter type-id='95e97e5e' name='cpu' filepath='kernel/power/qos.c' line='451' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
-      <function-decl name='pm_qos_request_active' mangled-name='pm_qos_request_active' filepath='kernel/power/qos.c' line='443' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_qos_request_active'>
-        <parameter type-id='221c3010' name='req' filepath='kernel/power/qos.c' line='443' column='1'/>
+      <function-decl name='pm_qos_request_active' mangled-name='pm_qos_request_active' filepath='kernel/power/qos.c' line='457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_qos_request_active'>
+        <parameter type-id='221c3010' name='req' filepath='kernel/power/qos.c' line='457' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
-      <function-decl name='pm_qos_request_for_cpumask' mangled-name='pm_qos_request_for_cpumask' filepath='kernel/power/qos.c' line='449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_qos_request_for_cpumask'>
-        <parameter type-id='95e97e5e' name='pm_qos_class' filepath='kernel/power/qos.c' line='449' column='1'/>
-        <parameter type-id='74bccedd' name='mask' filepath='kernel/power/qos.c' line='449' column='1'/>
+      <function-decl name='pm_qos_request_for_cpumask' mangled-name='pm_qos_request_for_cpumask' filepath='kernel/power/qos.c' line='463' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_qos_request_for_cpumask'>
+        <parameter type-id='95e97e5e' name='pm_qos_class' filepath='kernel/power/qos.c' line='463' column='1'/>
+        <parameter type-id='74bccedd' name='mask' filepath='kernel/power/qos.c' line='463' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
-      <function-decl name='pm_qos_add_request' mangled-name='pm_qos_add_request' filepath='kernel/power/qos.c' line='555' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_qos_add_request'>
-        <parameter type-id='221c3010' name='req' filepath='kernel/power/qos.c' line='555' column='1'/>
-        <parameter type-id='95e97e5e' name='pm_qos_class' filepath='kernel/power/qos.c' line='556' column='1'/>
-        <parameter type-id='a7832498' name='value' filepath='kernel/power/qos.c' line='556' column='1'/>
+      <function-decl name='pm_qos_add_request' mangled-name='pm_qos_add_request' filepath='kernel/power/qos.c' line='570' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_qos_add_request'>
+        <parameter type-id='221c3010' name='req' filepath='kernel/power/qos.c' line='570' column='1'/>
+        <parameter type-id='95e97e5e' name='pm_qos_class' filepath='kernel/power/qos.c' line='571' column='1'/>
+        <parameter type-id='a7832498' name='value' filepath='kernel/power/qos.c' line='571' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='irq_set_affinity_notifier' mangled-name='irq_set_affinity_notifier' filepath='include/linux/interrupt.h' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_set_affinity_notifier'>
@@ -110366,19 +110381,19 @@
         <parameter type-id='7ca8e198'/>
         <return type-id='95e97e5e'/>
       </function-decl>
-      <function-decl name='pm_qos_update_request' mangled-name='pm_qos_update_request' filepath='kernel/power/qos.c' line='643' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_qos_update_request'>
-        <parameter type-id='221c3010' name='req' filepath='kernel/power/qos.c' line='643' column='1'/>
-        <parameter type-id='a7832498' name='new_value' filepath='kernel/power/qos.c' line='644' column='1'/>
+      <function-decl name='pm_qos_update_request' mangled-name='pm_qos_update_request' filepath='kernel/power/qos.c' line='658' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_qos_update_request'>
+        <parameter type-id='221c3010' name='req' filepath='kernel/power/qos.c' line='658' column='1'/>
+        <parameter type-id='a7832498' name='new_value' filepath='kernel/power/qos.c' line='659' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='pm_qos_update_request_timeout' mangled-name='pm_qos_update_request_timeout' filepath='kernel/power/qos.c' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_qos_update_request_timeout'>
-        <parameter type-id='221c3010' name='req' filepath='kernel/power/qos.c' line='667' column='1'/>
-        <parameter type-id='a7832498' name='new_value' filepath='kernel/power/qos.c' line='667' column='1'/>
-        <parameter type-id='7359adad' name='timeout_us' filepath='kernel/power/qos.c' line='668' column='1'/>
+      <function-decl name='pm_qos_update_request_timeout' mangled-name='pm_qos_update_request_timeout' filepath='kernel/power/qos.c' line='682' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_qos_update_request_timeout'>
+        <parameter type-id='221c3010' name='req' filepath='kernel/power/qos.c' line='682' column='1'/>
+        <parameter type-id='a7832498' name='new_value' filepath='kernel/power/qos.c' line='682' column='1'/>
+        <parameter type-id='7359adad' name='timeout_us' filepath='kernel/power/qos.c' line='683' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='pm_qos_remove_request' mangled-name='pm_qos_remove_request' filepath='kernel/power/qos.c' line='697' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_qos_remove_request'>
-        <parameter type-id='221c3010' name='req' filepath='kernel/power/qos.c' line='697' column='1'/>
+      <function-decl name='pm_qos_remove_request' mangled-name='pm_qos_remove_request' filepath='kernel/power/qos.c' line='712' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_qos_remove_request'>
+        <parameter type-id='221c3010' name='req' filepath='kernel/power/qos.c' line='712' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
     </abi-instr>
@@ -123630,10 +123645,16 @@
         <enumerator name='ALARM_BOOTTIME_FREEZER' value='4'/>
       </enum-decl>
       <pointer-type-def type-id='f6b32752' size-in-bits='64' id='be65fdd0'/>
+      <qualified-type-def type-id='f6b32752' const='yes' id='dba44491'/>
+      <pointer-type-def type-id='dba44491' size-in-bits='64' id='7e983261'/>
       <pointer-type-def type-id='63df6bcc' size-in-bits='64' id='7432d5be'/>
       <function-decl name='alarmtimer_get_rtcdev' mangled-name='alarmtimer_get_rtcdev' filepath='kernel/time/alarmtimer.c' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='alarmtimer_get_rtcdev'>
         <return type-id='5992ae83'/>
       </function-decl>
+      <function-decl name='alarm_expires_remaining' mangled-name='alarm_expires_remaining' filepath='kernel/time/alarmtimer.c' line='230' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='alarm_expires_remaining'>
+        <parameter type-id='7e983261' name='alarm' filepath='kernel/time/alarmtimer.c' line='230' column='1'/>
+        <return type-id='fbc017ef'/>
+      </function-decl>
       <function-decl name='alarm_init' mangled-name='alarm_init' filepath='kernel/time/alarmtimer.c' line='348' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='alarm_init'>
         <parameter type-id='be65fdd0' name='alarm' filepath='kernel/time/alarmtimer.c' line='348' column='1'/>
         <parameter type-id='6b8d4b77' name='type' filepath='kernel/time/alarmtimer.c' line='348' column='1'/>
@@ -125572,12 +125593,12 @@
     </abi-instr>
     <abi-instr address-size='64' path='mm/gup.c' language='LANG_C89'>
       <pointer-type-def type-id='2ae08426' size-in-bits='64' id='8b6fdee4'/>
-      <function-decl name='get_user_pages' mangled-name='get_user_pages' filepath='mm/gup.c' line='1110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_user_pages'>
-        <parameter type-id='7359adad' name='start' filepath='mm/gup.c' line='1110' column='1'/>
-        <parameter type-id='7359adad' name='nr_pages' filepath='mm/gup.c' line='1110' column='1'/>
-        <parameter type-id='f0981eeb' name='gup_flags' filepath='mm/gup.c' line='1111' column='1'/>
-        <parameter type-id='9f93c9da' name='pages' filepath='mm/gup.c' line='1111' column='1'/>
-        <parameter type-id='8b6fdee4' name='vmas' filepath='mm/gup.c' line='1112' column='1'/>
+      <function-decl name='get_user_pages' mangled-name='get_user_pages' filepath='mm/gup.c' line='1125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_user_pages'>
+        <parameter type-id='7359adad' name='start' filepath='mm/gup.c' line='1125' column='1'/>
+        <parameter type-id='7359adad' name='nr_pages' filepath='mm/gup.c' line='1125' column='1'/>
+        <parameter type-id='f0981eeb' name='gup_flags' filepath='mm/gup.c' line='1126' column='1'/>
+        <parameter type-id='9f93c9da' name='pages' filepath='mm/gup.c' line='1126' column='1'/>
+        <parameter type-id='8b6fdee4' name='vmas' filepath='mm/gup.c' line='1127' column='1'/>
         <return type-id='bd54fe1a'/>
       </function-decl>
     </abi-instr>
@@ -125787,28 +125808,6 @@
       </function-decl>
     </abi-instr>
     <abi-instr address-size='64' path='mm/shmem.c' language='LANG_C89'>
-      <union-decl name='__anonymous_union__8' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/sched.h' line='1296' column='1' id='8b4442cd'>
-        <data-member access='public'>
-          <var-decl name='frozen' type-id='f0981eeb' visibility='default' filepath='include/linux/sched.h' line='1296' column='1'/>
-        </data-member>
-        <data-member access='public'>
-          <var-decl name='__UNIQUE_ID_android_kabi_hide46' type-id='156952c4' visibility='default' filepath='include/linux/sched.h' line='1296' column='1'/>
-        </data-member>
-        <data-member access='public'>
-          <var-decl name='' type-id='2a125a28' visibility='default' filepath='include/linux/sched.h' line='1296' column='1'/>
-        </data-member>
-      </union-decl>
-      <union-decl name='__anonymous_union__10' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/sched.h' line='1299' column='1' id='121e4767'>
-        <data-member access='public'>
-          <var-decl name='futex_state' type-id='f0981eeb' visibility='default' filepath='include/linux/sched.h' line='1299' column='1'/>
-        </data-member>
-        <data-member access='public'>
-          <var-decl name='__UNIQUE_ID_android_kabi_hide47' type-id='6040de71' visibility='default' filepath='include/linux/sched.h' line='1299' column='1'/>
-        </data-member>
-        <data-member access='public'>
-          <var-decl name='' type-id='2a125a28' visibility='default' filepath='include/linux/sched.h' line='1299' column='1'/>
-        </data-member>
-      </union-decl>
       <function-decl name='shmem_truncate_range' mangled-name='shmem_truncate_range' filepath='mm/shmem.c' line='993' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='shmem_truncate_range'>
         <parameter type-id='7e666abe' name='inode' filepath='mm/shmem.c' line='993' column='1'/>
         <parameter type-id='69bf7bee' name='lstart' filepath='mm/shmem.c' line='993' column='1'/>
@@ -125871,7 +125870,7 @@
           <var-decl name='' type-id='26b3aff0' visibility='default' filepath='include/linux/slab.h' line='641' column='1'/>
         </data-member>
       </union-decl>
-      <class-decl name='__anonymous_struct__3' size-in-bits='384' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/slab.h' line='635' column='1' id='22e2627b'>
+      <class-decl name='__anonymous_struct__2' size-in-bits='384' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/slab.h' line='635' column='1' id='22e2627b'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='memcg_caches' type-id='2c8ce02f' visibility='default' filepath='include/linux/slab.h' line='636' column='1'/>
         </data-member>
@@ -125893,7 +125892,7 @@
           <var-decl name='entries' type-id='c66d33bc' visibility='default' filepath='include/linux/slab.h' line='596' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' size-in-bits='768' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/slab.h' line='641' column='1' id='26b3aff0'>
+      <class-decl name='__anonymous_struct__3' size-in-bits='768' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/slab.h' line='641' column='1' id='26b3aff0'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='memcg' type-id='223696fb' visibility='default' filepath='include/linux/slab.h' line='642' column='1'/>
         </data-member>
@@ -132744,7 +132743,7 @@
         <enumerator name='__NL80211_BSS_SELECT_ATTR_AFTER_LAST' value='4'/>
         <enumerator name='NL80211_BSS_SELECT_ATTR_MAX' value='3'/>
       </enum-decl>
-      <union-decl name='__anonymous_union__13' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/cfg80211.h' line='2331' column='1' id='0532d6f6'>
+      <union-decl name='__anonymous_union__3' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/cfg80211.h' line='2331' column='1' id='0532d6f6'>
         <data-member access='public'>
           <var-decl name='band_pref' type-id='3eaa0294' visibility='default' filepath='include/net/cfg80211.h' line='2332' column='1'/>
         </data-member>
diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index e7069cb82026..d832a05c4ef8 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -1054,7 +1054,6 @@
 # required by adsprpc.ko
   set_normalized_timespec64
   try_wait_for_completion
-  vfs_statx
 
 # required by arm-memlat-mon.ko
   perf_event_create_kernel_counter
@@ -1752,6 +1751,7 @@
   drm_dp_update_payload_part1
   drm_dp_update_payload_part2
   drm_edid_duplicate
+  drm_edid_is_valid
   drm_encoder_cleanup
   drm_encoder_init
   drm_err
@@ -1898,6 +1898,7 @@
   shmem_truncate_range
   strreplace
   timespec64_to_jiffies
+  tracing_off
   unmap_kernel_range
   unmap_mapping_range
   vm_get_page_prot
@@ -2150,6 +2151,7 @@
   rtc_read_time
 
 # required by qpnp-smb5-charger.ko
+  alarm_expires_remaining
   iio_channel_release
 
 # required by qpnp_pdphy.ko
@@ -2160,7 +2162,6 @@
 # required by qrtr.ko
   alloc_skb_with_frags
   datagram_poll
-  idr_alloc_u32
   in_egroup_p
   netlink_capable
   __radix_tree_insert
@@ -2496,6 +2497,9 @@
 # required by subsystem-restart.ko
   system_state
 
+# required by swr_ctrl_dlkm.ko
+  pm_runtime_autosuspend_expiration
+
 # required by system_pm.ko
   arch_timer_mem_get_cval
 
@@ -2755,8 +2759,10 @@
 # preserved by --additions-only
   crc32_le
   generic_file_mmap
+  idr_alloc_u32
   simple_getattr
   simple_strtoull
   soc_find_component
+  vfs_statx
   vm_map_ram
   vm_unmap_ram