From 9c9ee611cfa6fd2c816e883eacec3bd3374f51f7 Mon Sep 17 00:00:00 2001
From: Kever Yang <kever.yang@rock-chips.com>
Date: Thu, 14 Sep 2023 11:23:10 +0800
Subject: [PATCH] ANDROID: GKI: Add crypto symbols for rockchip

INFO: ABI DIFFERENCES HAVE BEEN DETECTED!
INFO: 14 function symbol(s) added
  'int crypto_ahash_final(struct ahash_request*)'
  'int crypto_ahash_finup(struct ahash_request*)'
  'void crypto_cipher_encrypt_one(struct crypto_cipher*, u8*, const u8*)'
  'int crypto_register_akcipher(struct akcipher_alg*)'
  'int crypto_register_alg(struct crypto_alg*)'
  'int crypto_register_template(struct crypto_template*)'
  'int crypto_sha1_finup(struct shash_desc*, const u8*, unsigned int, u8*)'
  'int crypto_sha1_update(struct shash_desc*, const u8*, unsigned int)'
  'void crypto_unregister_akcipher(struct akcipher_alg*)'
  'void crypto_unregister_alg(struct crypto_alg*)'
  'void crypto_unregister_template(struct crypto_template*)'
  'int des_expand_key(struct des_ctx*, const u8*, unsigned int)'
  'int rsa_parse_priv_key(struct rsa_key*, const void*, unsigned int)'
  'int rsa_parse_pub_key(struct rsa_key*, const void*, unsigned int)'

2 variable symbol(s) added
  'bool fpsimd_context_busy'
  'irq_cpustat_t irq_stat'

Bug: 300024866
Change-Id: I8266e5ca7683d3ffc4924b1926b5b70ba6cd7a81
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
---
 android/abi_gki_aarch64.stg      | 566 +++++++++++++++++++++++++++++++
 android/abi_gki_aarch64_rockchip |  57 ++++
 2 files changed, 623 insertions(+)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index fa80fac5fa33..d5d5725e1d7c 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -2003,6 +2003,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x37265f81
 }
+pointer_reference {
+  id: 0x076327a3
+  kind: POINTER
+  pointee_type_id: 0x37cc7810
+}
 pointer_reference {
   id: 0x07665a1f
   kind: POINTER
@@ -5618,6 +5623,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x12c79320
 }
+pointer_reference {
+  id: 0x0e2271e2
+  kind: POINTER
+  pointee_type_id: 0x12c92116
+}
 pointer_reference {
   id: 0x0e22e25f
   kind: POINTER
@@ -8068,6 +8078,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x6fb840c8
 }
+pointer_reference {
+  id: 0x117e85f5
+  kind: POINTER
+  pointee_type_id: 0x6fbaf148
+}
 pointer_reference {
   id: 0x118d97cb
   kind: POINTER
@@ -8258,6 +8273,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x6054a6ab
 }
+pointer_reference {
+  id: 0x128a8a58
+  kind: POINTER
+  pointee_type_id: 0x606acffd
+}
 pointer_reference {
   id: 0x1291c430
   kind: POINTER
@@ -15788,6 +15808,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9921a72c
 }
+pointer_reference {
+  id: 0x2cd8a9c9
+  kind: POINTER
+  pointee_type_id: 0x992241b9
+}
 pointer_reference {
   id: 0x2cd9dff0
   kind: POINTER
@@ -17013,6 +17038,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9f1dcaea
 }
+pointer_reference {
+  id: 0x2d591a0e
+  kind: POINTER
+  pointee_type_id: 0x9f248ea4
+}
 pointer_reference {
   id: 0x2d594ead
   kind: POINTER
@@ -17128,6 +17158,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9fd1a709
 }
+pointer_reference {
+  id: 0x2d645d4d
+  kind: POINTER
+  pointee_type_id: 0x9fd193aa
+}
 pointer_reference {
   id: 0x2d646f41
   kind: POINTER
@@ -22698,6 +22733,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xef9a648b
 }
+pointer_reference {
+  id: 0x31790b1e
+  kind: POINTER
+  pointee_type_id: 0xefa4cae6
+}
 pointer_reference {
   id: 0x31829648
   kind: POINTER
@@ -25788,6 +25828,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xca5a7101
 }
+pointer_reference {
+  id: 0x380882e7
+  kind: POINTER
+  pointee_type_id: 0xca62ed00
+}
 pointer_reference {
   id: 0x3808938b
   kind: POINTER
@@ -26523,6 +26568,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xcc81b8d3
 }
+pointer_reference {
+  id: 0x39b2ba38
+  kind: POINTER
+  pointee_type_id: 0xcc8a0e7e
+}
 pointer_reference {
   id: 0x39b425bc
   kind: POINTER
@@ -29968,6 +30018,11 @@ typedef {
   name: "iommu_fault_handler_t"
   referred_type_id: 0x2f184276
 }
+typedef {
+  id: 0x0b098126
+  name: "irq_cpustat_t"
+  referred_type_id: 0x3b85198b
+}
 typedef {
   id: 0xb0c2eb21
   name: "irq_flow_handler_t"
@@ -40955,6 +41010,11 @@ member {
   name: "__sk_common"
   type_id: 0x61a74d47
 }
+member {
+  id: 0x8fa57542
+  name: "__softirq_pending"
+  type_id: 0x4585663f
+}
 member {
   id: 0x11319dfd
   name: "__stack"
@@ -51690,6 +51750,12 @@ member {
   type_id: 0x2ac43c51
   offset: 128
 }
+member {
+  id: 0x85f3d282
+  name: "base"
+  type_id: 0x293b162f
+  offset: 1024
+}
 member {
   id: 0x85f3de85
   name: "base"
@@ -68747,6 +68813,12 @@ member {
   type_id: 0xc93e017b
   offset: 16
 }
+member {
+  id: 0xc325cba2
+  name: "d"
+  type_id: 0x3f0185ef
+  offset: 128
+}
 member {
   id: 0x8b60974a
   name: "d1_support"
@@ -69061,6 +69133,12 @@ member {
   type_id: 0xd3c80119
   offset: 1280
 }
+member {
+  id: 0xcc4dd9fb
+  name: "d_sz"
+  type_id: 0xf435685e
+  offset: 640
+}
 member {
   id: 0x8fb0e835
   name: "d_term_en"
@@ -71374,6 +71452,12 @@ member {
   type_id: 0x2ed391e2
   offset: 192
 }
+member {
+  id: 0x70fa6b40
+  name: "decrypt"
+  type_id: 0x2cd8a9c9
+  offset: 192
+}
 member {
   id: 0x70fa8381
   name: "decrypt"
@@ -77733,12 +77817,24 @@ member {
   name: "dp"
   type_id: 0x80ba3719
 }
+member {
+  id: 0x55f0c48b
+  name: "dp"
+  type_id: 0x3f0185ef
+  offset: 320
+}
 member {
   id: 0x1e95895b
   name: "dp_subconnector_property"
   type_id: 0x2a670b41
   offset: 7424
 }
+member {
+  id: 0x086093bd
+  name: "dp_sz"
+  type_id: 0xf435685e
+  offset: 832
+}
 member {
   id: 0x93b48e83
   name: "dpa"
@@ -77877,6 +77973,12 @@ member {
   type_id: 0x3e79e71f
   offset: 1056
 }
+member {
+  id: 0x12302e1a
+  name: "dq"
+  type_id: 0x3f0185ef
+  offset: 384
+}
 member {
   id: 0x535fdeda
   name: "dq_count"
@@ -77960,6 +78062,12 @@ member {
   type_id: 0x26ee682a
   offset: 960
 }
+member {
+  id: 0x8d88c04b
+  name: "dq_sz"
+  type_id: 0xf435685e
+  offset: 896
+}
 member {
   id: 0xdae271b1
   name: "dqb_bhardlimit"
@@ -79033,6 +79141,12 @@ member {
   type_id: 0x43c73e81
   offset: 896
 }
+member {
+  id: 0xbbe061af
+  name: "dst"
+  type_id: 0x11cffa09
+  offset: 448
+}
 member {
   id: 0xbbe06e11
   name: "dst"
@@ -79147,6 +79261,12 @@ member {
   type_id: 0x6d7f5ff6
   offset: 168
 }
+member {
+  id: 0x352c27f4
+  name: "dst_len"
+  type_id: 0x4585663f
+  offset: 544
+}
 member {
   id: 0x35da4011
   name: "dst_len"
@@ -79952,6 +80072,12 @@ member {
   type_id: 0x007e8ce4
   offset: 32
 }
+member {
+  id: 0x87e623f5
+  name: "e"
+  type_id: 0x3f0185ef
+  offset: 64
+}
 member {
   id: 0x8d6d2188
   name: "e1000_base_cx"
@@ -80065,6 +80191,12 @@ member {
   type_id: 0xc93e017b
   offset: 16
 }
+member {
+  id: 0xab258a23
+  name: "e_sz"
+  type_id: 0xf435685e
+  offset: 576
+}
 member {
   id: 0x8c50076a
   name: "e_tag"
@@ -81582,6 +81714,12 @@ member {
   type_id: 0x2c316317
   offset: 64
 }
+member {
+  id: 0x893e9a51
+  name: "encrypt"
+  type_id: 0x2cd8a9c9
+  offset: 128
+}
 member {
   id: 0x897f3adb
   name: "encrypt"
@@ -84000,6 +84138,12 @@ member {
   type_id: 0x0d301752
   offset: 1792
 }
+member {
+  id: 0x0d2e2ebd
+  name: "exit"
+  type_id: 0x0e2271e2
+  offset: 512
+}
 member {
   id: 0x0d2e75d7
   name: "exit"
@@ -84429,6 +84573,11 @@ member {
   type_id: 0x4585663f
   offset: 608
 }
+member {
+  id: 0xbd3cd538
+  name: "expkey"
+  type_id: 0x668e8237
+}
 member {
   id: 0x01992270
   name: "explicit_contract"
@@ -105618,6 +105767,12 @@ member {
   type_id: 0x2d5e4b40
   offset: 1408
 }
+member {
+  id: 0x1ac7a60f
+  name: "init"
+  type_id: 0x2d645d4d
+  offset: 448
+}
 member {
   id: 0x1ac7a665
   name: "init"
@@ -122480,6 +122635,12 @@ member {
   type_id: 0x4585663f
   offset: 64
 }
+member {
+  id: 0xcfd59103
+  name: "max_size"
+  type_id: 0x39b2ba38
+  offset: 384
+}
 member {
   id: 0xc288bba2
   name: "max_slices"
@@ -128785,6 +128946,11 @@ member {
   type_id: 0x1592957f
   offset: 2688
 }
+member {
+  id: 0x4659cf92
+  name: "n"
+  type_id: 0x3f0185ef
+}
 member {
   id: 0xc101e64f
   name: "n2"
@@ -129105,6 +129271,12 @@ member {
   type_id: 0xe62ebf07
   offset: 32
 }
+member {
+  id: 0x0cc91dc5
+  name: "n_sz"
+  type_id: 0xf435685e
+  offset: 512
+}
 member {
   id: 0xdc10e384
   name: "n_tables"
@@ -141846,6 +142018,12 @@ member {
   type_id: 0x3d7c93df
   offset: 896
 }
+member {
+  id: 0xa68e47c8
+  name: "p"
+  type_id: 0x3f0185ef
+  offset: 192
+}
 member {
   id: 0xa6984880
   name: "p"
@@ -142073,6 +142251,12 @@ member {
   name: "p_s64"
   type_id: 0x0113dde3
 }
+member {
+  id: 0x73d7a8f4
+  name: "p_sz"
+  type_id: 0xf435685e
+  offset: 704
+}
 member {
   id: 0x5fce0bc2
   name: "p_u16"
@@ -154656,6 +154840,12 @@ member {
   name: "q"
   type_id: 0x407489b0
 }
+member {
+  id: 0xe94def1c
+  name: "q"
+  type_id: 0x3f0185ef
+  offset: 256
+}
 member {
   id: 0xe95c6150
   name: "q"
@@ -154707,6 +154897,12 @@ member {
   name: "q_node"
   type_id: 0xd3c80119
 }
+member {
+  id: 0x30c8a340
+  name: "q_sz"
+  type_id: 0xf435685e
+  offset: 768
+}
 member {
   id: 0xc5c43282
   name: "q_usage_counter"
@@ -154807,6 +155003,18 @@ member {
   type_id: 0x295c7202
   offset: 1056
 }
+member {
+  id: 0x060b5e2a
+  name: "qinv"
+  type_id: 0x3f0185ef
+  offset: 448
+}
+member {
+  id: 0x112d65f6
+  name: "qinv_sz"
+  type_id: 0xf435685e
+  offset: 960
+}
 member {
   id: 0x9b5b8e67
   name: "qlen"
@@ -162075,6 +162283,12 @@ member {
   type_id: 0x4585663f
   offset: 32
 }
+member {
+  id: 0xa9e8c522
+  name: "reqsize"
+  type_id: 0x4585663f
+  offset: 576
+}
 member {
   id: 0xa9e8c748
   name: "reqsize"
@@ -173211,6 +173425,12 @@ member {
   type_id: 0x2e136b7a
   offset: 1856
 }
+member {
+  id: 0x4117392b
+  name: "set_priv_key"
+  type_id: 0x2d591a0e
+  offset: 320
+}
 member {
   id: 0x9fa5cb5f
   name: "set_promiscuous_mode"
@@ -173241,6 +173461,12 @@ member {
   type_id: 0x2ec0f499
   offset: 320
 }
+member {
+  id: 0xfd2d3002
+  name: "set_pub_key"
+  type_id: 0x2d591a0e
+  offset: 256
+}
 member {
   id: 0xff542925
   name: "set_pull_down"
@@ -175379,6 +175605,11 @@ member {
   type_id: 0x4050ae51
   offset: 24
 }
+member {
+  id: 0x9063e9c1
+  name: "sign"
+  type_id: 0x2cd8a9c9
+}
 member {
   id: 0x90777e15
   name: "sign"
@@ -179170,6 +179401,12 @@ member {
   type_id: 0x11cffa09
   offset: 448
 }
+member {
+  id: 0x4427a46d
+  name: "src"
+  type_id: 0x11cffa09
+  offset: 384
+}
 member {
   id: 0x4427ac3d
   name: "src"
@@ -179322,6 +179559,12 @@ member {
   type_id: 0xb3e7bac9
   offset: 16
 }
+member {
+  id: 0xe29869f3
+  name: "src_len"
+  type_id: 0x4585663f
+  offset: 512
+}
 member {
   id: 0x031b1a4e
   name: "src_maxburst"
@@ -200084,6 +200327,12 @@ member {
   type_id: 0x6d7f5ff6
   offset: 1216
 }
+member {
+  id: 0xf584ce40
+  name: "verify"
+  type_id: 0x2cd8a9c9
+  offset: 64
+}
 member {
   id: 0xf586d6a4
   name: "verify"
@@ -209779,6 +210028,14 @@ struct_union {
     member_id: 0xc446e43e
   }
 }
+struct_union {
+  id: 0x3b85198b
+  kind: STRUCT
+  definition {
+    bytesize: 64
+    member_id: 0x8fa57542
+  }
+}
 struct_union {
   id: 0x3bf747f0
   kind: STRUCT
@@ -213935,6 +214192,39 @@ struct_union {
     member_id: 0x75906a36
   }
 }
+struct_union {
+  id: 0x6fbaf148
+  kind: STRUCT
+  name: "akcipher_alg"
+  definition {
+    bytesize: 512
+    member_id: 0x9063e9c1
+    member_id: 0xf584ce40
+    member_id: 0x893e9a51
+    member_id: 0x70fa6b40
+    member_id: 0xfd2d3002
+    member_id: 0x4117392b
+    member_id: 0xcfd59103
+    member_id: 0x1ac7a60f
+    member_id: 0x0d2e2ebd
+    member_id: 0xa9e8c522
+    member_id: 0x85f3d282
+  }
+}
+struct_union {
+  id: 0x606acffd
+  kind: STRUCT
+  name: "akcipher_request"
+  definition {
+    bytesize: 128
+    member_id: 0x85e1e383
+    member_id: 0x4427a46d
+    member_id: 0xbbe061af
+    member_id: 0xe29869f3
+    member_id: 0x352c27f4
+    member_id: 0x75906a36
+  }
+}
 struct_union {
   id: 0x91212402
   kind: STRUCT
@@ -219839,6 +220129,15 @@ struct_union {
     member_id: 0x2da18bb2
   }
 }
+struct_union {
+  id: 0x37cc7810
+  kind: STRUCT
+  name: "crypto_cipher"
+  definition {
+    bytesize: 64
+    member_id: 0x8597be7c
+  }
+}
 struct_union {
   id: 0x85b25628
   kind: STRUCT
@@ -220375,6 +220674,15 @@ struct_union {
     member_id: 0xe0f6393d
   }
 }
+struct_union {
+  id: 0xefa4cae6
+  kind: STRUCT
+  name: "des_ctx"
+  definition {
+    bytesize: 128
+    member_id: 0xbd3cd538
+  }
+}
 struct_union {
   id: 0x2729c17d
   kind: STRUCT
@@ -248823,6 +249131,30 @@ struct_union {
     member_id: 0x055225e4
   }
 }
+struct_union {
+  id: 0xca62ed00
+  kind: STRUCT
+  name: "rsa_key"
+  definition {
+    bytesize: 128
+    member_id: 0x4659cf92
+    member_id: 0x87e623f5
+    member_id: 0xc325cba2
+    member_id: 0xa68e47c8
+    member_id: 0xe94def1c
+    member_id: 0x55f0c48b
+    member_id: 0x12302e1a
+    member_id: 0x060b5e2a
+    member_id: 0x0cc91dc5
+    member_id: 0xab258a23
+    member_id: 0xcc4dd9fb
+    member_id: 0x73d7a8f4
+    member_id: 0x30c8a340
+    member_id: 0x086093bd
+    member_id: 0x8d88c04b
+    member_id: 0x112d65f6
+  }
+}
 struct_union {
   id: 0xdbc8b0ff
   kind: STRUCT
@@ -286194,6 +286526,13 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x074f1a14
 }
+function {
+  id: 0x114c448e
+  return_type_id: 0x48b5725f
+  parameter_id: 0x076327a3
+  parameter_id: 0x00c72527
+  parameter_id: 0x3f0185ef
+}
 function {
   id: 0x11508453
   return_type_id: 0x9547a3da
@@ -287279,6 +287618,11 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x09427c40
 }
+function {
+  id: 0x12c92116
+  return_type_id: 0x48b5725f
+  parameter_id: 0x0945c216
+}
 function {
   id: 0x12ca5ec4
   return_type_id: 0x48b5725f
@@ -288661,6 +289005,11 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x117e2995
 }
+function {
+  id: 0x14c7f0ee
+  return_type_id: 0x48b5725f
+  parameter_id: 0x117e85f5
+}
 function {
   id: 0x14c81bbb
   return_type_id: 0x48b5725f
@@ -290460,6 +290809,11 @@ function {
   parameter_id: 0x1c2f6323
   parameter_id: 0x3f1a5886
 }
+function {
+  id: 0x1776cedc
+  return_type_id: 0x48b5725f
+  parameter_id: 0x1fba7d3d
+}
 function {
   id: 0x177cb160
   return_type_id: 0x48b5725f
@@ -302990,6 +303344,13 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x32caaf24
 }
+function {
+  id: 0x9133c6a6
+  return_type_id: 0x6720d32f
+  parameter_id: 0x31790b1e
+  parameter_id: 0x3f0185ef
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x913618b5
   return_type_id: 0x6720d32f
@@ -306274,6 +306635,13 @@ function {
   parameter_id: 0x3dcee85d
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x9377de98
+  return_type_id: 0x6720d32f
+  parameter_id: 0x380882e7
+  parameter_id: 0x391f15ea
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x93788ff8
   return_type_id: 0x6720d32f
@@ -311062,6 +311430,11 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x1285100d
 }
+function {
+  id: 0x992241b9
+  return_type_id: 0x6720d32f
+  parameter_id: 0x128a8a58
+}
 function {
   id: 0x9927995d
   return_type_id: 0xf435685e
@@ -311877,6 +312250,11 @@ function {
   parameter_id: 0x3b04bead
   parameter_id: 0x2d1f457b
 }
+function {
+  id: 0x99df4252
+  return_type_id: 0x6720d32f
+  parameter_id: 0x117e85f5
+}
 function {
   id: 0x99e0f6e0
   return_type_id: 0x6720d32f
@@ -312664,6 +313042,11 @@ function {
   parameter_id: 0x3e10b518
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x9a6e7c60
+  return_type_id: 0x6720d32f
+  parameter_id: 0x1fba7d3d
+}
 function {
   id: 0x9a702edf
   return_type_id: 0x6720d32f
@@ -319709,6 +320092,11 @@ function {
   parameter_id: 0x295c7202
   parameter_id: 0x4585663f
 }
+function {
+  id: 0x9db75c24
+  return_type_id: 0x6720d32f
+  parameter_id: 0x00defc2c
+}
 function {
   id: 0x9db78784
   return_type_id: 0x6720d32f
@@ -321891,6 +322279,13 @@ function {
   parameter_id: 0x097315c2
   parameter_id: 0x3e10b518
 }
+function {
+  id: 0x9f248ea4
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0945c216
+  parameter_id: 0x391f15ea
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x9f25dc29
   return_type_id: 0x6720d32f
@@ -322790,6 +323185,11 @@ function {
   id: 0x9fd15b99
   return_type_id: 0x11c404ba
 }
+function {
+  id: 0x9fd193aa
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0945c216
+}
 function {
   id: 0x9fd1a709
   return_type_id: 0x6720d32f
@@ -324993,6 +325393,11 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0xcc8a0e7e
+  return_type_id: 0x4585663f
+  parameter_id: 0x0945c216
+}
 function {
   id: 0xcc9736e7
   return_type_id: 0x65d74a06
@@ -344045,6 +344450,24 @@ elf_symbol {
   type_id: 0x911583bf
   full_name: "crypto_ahash_digest"
 }
+elf_symbol {
+  id: 0xf8751b15
+  name: "crypto_ahash_final"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1af67977
+  type_id: 0x911583bf
+  full_name: "crypto_ahash_final"
+}
+elf_symbol {
+  id: 0xdd9947d5
+  name: "crypto_ahash_finup"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x095c49bc
+  type_id: 0x911583bf
+  full_name: "crypto_ahash_finup"
+}
 elf_symbol {
   id: 0xff08526f
   name: "crypto_ahash_setkey"
@@ -344126,6 +344549,16 @@ elf_symbol {
   type_id: 0x329319f8
   full_name: "crypto_alloc_sync_skcipher"
 }
+elf_symbol {
+  id: 0xa3db58f1
+  name: "crypto_cipher_encrypt_one"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1f362def
+  namespace: "CRYPTO_INTERNAL"
+  type_id: 0x114c448e
+  full_name: "crypto_cipher_encrypt_one"
+}
 elf_symbol {
   id: 0x1257590d
   name: "crypto_comp_compress"
@@ -344270,6 +344703,24 @@ elf_symbol {
   type_id: 0x9ee20867
   full_name: "crypto_register_ahash"
 }
+elf_symbol {
+  id: 0xc60881ee
+  name: "crypto_register_akcipher"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x44f8c5fe
+  type_id: 0x99df4252
+  full_name: "crypto_register_akcipher"
+}
+elf_symbol {
+  id: 0xd9005076
+  name: "crypto_register_alg"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x4a1204f0
+  type_id: 0x9db75c24
+  full_name: "crypto_register_alg"
+}
 elf_symbol {
   id: 0xcb0ffe5b
   name: "crypto_register_notifier"
@@ -344315,6 +344766,15 @@ elf_symbol {
   type_id: 0x928f1946
   full_name: "crypto_register_skcipher"
 }
+elf_symbol {
+  id: 0x8e0112d7
+  name: "crypto_register_template"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xf1da2be6
+  type_id: 0x9a6e7c60
+  full_name: "crypto_register_template"
+}
 elf_symbol {
   id: 0x0e52d725
   name: "crypto_req_done"
@@ -344324,6 +344784,24 @@ elf_symbol {
   type_id: 0x10100c3c
   full_name: "crypto_req_done"
 }
+elf_symbol {
+  id: 0x162a73f7
+  name: "crypto_sha1_finup"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xe1737405
+  type_id: 0x9fb1dc71
+  full_name: "crypto_sha1_finup"
+}
+elf_symbol {
+  id: 0x7dcc32e4
+  name: "crypto_sha1_update"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xb7dbc187
+  type_id: 0x9fb1df6d
+  full_name: "crypto_sha1_update"
+}
 elf_symbol {
   id: 0x91309df9
   name: "crypto_shash_digest"
@@ -344423,6 +344901,24 @@ elf_symbol {
   type_id: 0x13fabadb
   full_name: "crypto_unregister_ahash"
 }
+elf_symbol {
+  id: 0xdb6ddedf
+  name: "crypto_unregister_akcipher"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xbfd52d96
+  type_id: 0x14c7f0ee
+  full_name: "crypto_unregister_akcipher"
+}
+elf_symbol {
+  id: 0x883df740
+  name: "crypto_unregister_alg"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa0dbb600
+  type_id: 0x10afee98
+  full_name: "crypto_unregister_alg"
+}
 elf_symbol {
   id: 0x551c18d1
   name: "crypto_unregister_notifier"
@@ -344468,6 +344964,15 @@ elf_symbol {
   type_id: 0x1f97abfa
   full_name: "crypto_unregister_skcipher"
 }
+elf_symbol {
+  id: 0x801e3d5d
+  name: "crypto_unregister_template"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd6fa098b
+  type_id: 0x1776cedc
+  full_name: "crypto_unregister_template"
+}
 elf_symbol {
   id: 0xd36400de
   name: "css_next_child"
@@ -345026,6 +345531,15 @@ elf_symbol {
   type_id: 0x1f15d172
   full_name: "delayed_work_timer_fn"
 }
+elf_symbol {
+  id: 0x1ef313dc
+  name: "des_expand_key"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa8fb743d
+  type_id: 0x9133c6a6
+  full_name: "des_expand_key"
+}
 elf_symbol {
   id: 0x67daf3cf
   name: "desc_to_gpio"
@@ -354926,6 +355440,15 @@ elf_symbol {
   type_id: 0x1f1c7cd5
   full_name: "fortify_panic"
 }
+elf_symbol {
+  id: 0x5c388f41
+  name: "fpsimd_context_busy"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x535be82a
+  type_id: 0x6d7f5ff6
+  full_name: "fpsimd_context_busy"
+}
 elf_symbol {
   id: 0x93b9959a
   name: "fput"
@@ -361373,6 +361896,15 @@ elf_symbol {
   type_id: 0x85d454a8
   full_name: "irq_set_parent"
 }
+elf_symbol {
+  id: 0x3b8e2bac
+  name: "irq_stat"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xcc365d07
+  type_id: 0x0b098126
+  full_name: "irq_stat"
+}
 elf_symbol {
   id: 0xc89a8e29
   name: "irq_to_desc"
@@ -375809,6 +376341,24 @@ elf_symbol {
   type_id: 0x8e47c273
   full_name: "rps_needed"
 }
+elf_symbol {
+  id: 0xde4d20e6
+  name: "rsa_parse_priv_key"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd75b20aa
+  type_id: 0x9377de98
+  full_name: "rsa_parse_priv_key"
+}
+elf_symbol {
+  id: 0x6a82e2a4
+  name: "rsa_parse_pub_key"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x89ae7aa0
+  type_id: 0x9377de98
+  full_name: "rsa_parse_pub_key"
+}
 elf_symbol {
   id: 0xec5e9065
   name: "rt6_lookup"
@@ -393476,6 +394026,8 @@ interface {
   symbol_id: 0x0a2b21ec
   symbol_id: 0xbdd0f4c6
   symbol_id: 0xe5e28fcd
+  symbol_id: 0xf8751b15
+  symbol_id: 0xdd9947d5
   symbol_id: 0xff08526f
   symbol_id: 0xc81e9eb3
   symbol_id: 0x237a3562
@@ -393485,6 +394037,7 @@ interface {
   symbol_id: 0xef67fe16
   symbol_id: 0x9eca665b
   symbol_id: 0x3ea8bbd7
+  symbol_id: 0xa3db58f1
   symbol_id: 0x1257590d
   symbol_id: 0x833374c8
   symbol_id: 0x717034d4
@@ -393501,12 +394054,17 @@ interface {
   symbol_id: 0x053cd2eb
   symbol_id: 0xd1471c13
   symbol_id: 0x3359f049
+  symbol_id: 0xc60881ee
+  symbol_id: 0xd9005076
   symbol_id: 0xcb0ffe5b
   symbol_id: 0xa79ba8cc
   symbol_id: 0x23b67585
   symbol_id: 0x1e81ded9
   symbol_id: 0xfca661a6
+  symbol_id: 0x8e0112d7
   symbol_id: 0x0e52d725
+  symbol_id: 0x162a73f7
+  symbol_id: 0x7dcc32e4
   symbol_id: 0x91309df9
   symbol_id: 0xfdca589d
   symbol_id: 0xb50ff8bd
@@ -393518,11 +394076,14 @@ interface {
   symbol_id: 0xbb92068e
   symbol_id: 0x81600265
   symbol_id: 0x57a4fa38
+  symbol_id: 0xdb6ddedf
+  symbol_id: 0x883df740
   symbol_id: 0x551c18d1
   symbol_id: 0xeb9b8f1f
   symbol_id: 0x4d669c6d
   symbol_id: 0x6715c595
   symbol_id: 0x9f75c77b
+  symbol_id: 0x801e3d5d
   symbol_id: 0xd36400de
   symbol_id: 0x2c08983d
   symbol_id: 0x81bdacc5
@@ -393585,6 +394146,7 @@ interface {
   symbol_id: 0xf666562b
   symbol_id: 0xa5179b7b
   symbol_id: 0xc1583575
+  symbol_id: 0x1ef313dc
   symbol_id: 0x67daf3cf
   symbol_id: 0xe5161e20
   symbol_id: 0x31d27334
@@ -394683,6 +395245,7 @@ interface {
   symbol_id: 0x1721c938
   symbol_id: 0x1bf542c4
   symbol_id: 0x5c93a483
+  symbol_id: 0x5c388f41
   symbol_id: 0x93b9959a
   symbol_id: 0x618f059e
   symbol_id: 0x48641588
@@ -395399,6 +395962,7 @@ interface {
   symbol_id: 0x5904d735
   symbol_id: 0xcb7dc482
   symbol_id: 0xaed00f8c
+  symbol_id: 0x3b8e2bac
   symbol_id: 0xc89a8e29
   symbol_id: 0x92dfef70
   symbol_id: 0xd1f69ecb
@@ -397003,6 +397567,8 @@ interface {
   symbol_id: 0x74c27ecd
   symbol_id: 0x80913de9
   symbol_id: 0xbffd1c46
+  symbol_id: 0xde4d20e6
+  symbol_id: 0x6a82e2a4
   symbol_id: 0xec5e9065
   symbol_id: 0x264c5308
   symbol_id: 0x205145e9
diff --git a/android/abi_gki_aarch64_rockchip b/android/abi_gki_aarch64_rockchip
index 8159959b2849..258aec25213a 100644
--- a/android/abi_gki_aarch64_rockchip
+++ b/android/abi_gki_aarch64_rockchip
@@ -105,6 +105,28 @@
   cpus_read_unlock
   crc16
   crc32_le
+  crypto_aead_decrypt
+  crypto_aead_encrypt
+  crypto_aead_setauthsize
+  crypto_aead_setkey
+  crypto_ahash_final
+  crypto_ahash_setkey
+  crypto_alloc_aead
+  crypto_alloc_ahash
+  crypto_alloc_shash
+  crypto_alloc_skcipher
+  crypto_cipher_encrypt_one
+  crypto_destroy_tfm
+  __crypto_memneq
+  crypto_register_aead
+  crypto_register_template
+  crypto_shash_update
+  crypto_skcipher_decrypt
+  crypto_skcipher_encrypt
+  crypto_skcipher_setkey
+  crypto_unregister_aead
+  crypto_unregister_template
+  __crypto_xor
   csum_partial
   _ctype
   default_llseek
@@ -1916,6 +1938,29 @@
 # required by rk860x-regulator.ko
   regulator_suspend_enable
 
+# required by rk_crypto.ko
+  crypto_ahash_digest
+  crypto_ahash_finup
+  crypto_dequeue_request
+  crypto_enqueue_request
+  crypto_init_queue
+  crypto_register_ahash
+  crypto_register_akcipher
+  crypto_register_skcipher
+  crypto_req_done
+  crypto_unregister_ahash
+  crypto_unregister_akcipher
+  crypto_unregister_skcipher
+  des_expand_key
+  rsa_parse_priv_key
+  rsa_parse_pub_key
+  scatterwalk_ffwd
+  sg_copy_from_buffer
+  sg_copy_to_buffer
+  sg_nents_for_len
+  sg_pcopy_from_buffer
+  sg_pcopy_to_buffer
+
 # required by rk_fiq_debugger.ko
   console_lock
   console_unlock
@@ -2198,6 +2243,14 @@
   scsi_register_interface
   sdev_prefix_printk
 
+# required by sha1-ce.ko
+  crypto_register_shash
+  crypto_sha1_finup
+  crypto_sha1_update
+  crypto_unregister_shash
+  fpsimd_context_busy
+  irq_stat
+
 # required by sii902x.ko
   hdmi_avi_infoframe_pack
 
@@ -2453,6 +2506,10 @@
   usb_get_dev
   usb_put_dev
 
+# required by twofish_generic.ko
+  crypto_register_alg
+  crypto_unregister_alg
+
 # required by usblp.ko
   add_wait_queue
   default_wake_function