From 4c868837facf5191ea599ad65db1ac28ebeb01e4 Mon Sep 17 00:00:00 2001
From: Elliot Berman <quic_eberman@quicinc.com>
Date: Tue, 9 May 2023 10:10:59 -0700
Subject: [PATCH] ANDROID: abi_gki_aarch64_qcom: Add
 gh_rm_register_platform_ops

From commit 80dfafb2b9b6 ("ANDROID: gunyah: Sync with latest "firmware:
qcom_scm: Register Gunyah platform ops""), the QCOM platform extensions
now use gh_rm_(un)register_platform_ops instead of the devm_ equivalent
because the platform extensions are no longer directly backed by a
device.

 2 function symbol(s) added
  'int gh_rm_register_platform_ops(struct gh_rm_platform_ops*)'
  'void gh_rm_unregister_platform_ops(struct gh_rm_platform_ops*)'

Bug: 279506910
Change-Id: I7ad36387a9d254691ecf9b769e058d972bd41c42
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
---
 android/abi_gki_aarch64.stg  | 36 ++++++++++++++++++++++++++++++++++++
 android/abi_gki_aarch64_qcom |  2 ++
 2 files changed, 38 insertions(+)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index fb992fc1426c..b7f287d9c8b0 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -285979,6 +285979,11 @@ function {
   parameter_id: 0x3f222c68
   parameter_id: 0x15b54c6f
 }
+function {
+  id: 0x1f07d2c7
+  return_type_id: 0x48b5725f
+  parameter_id: 0x3e7e0d52
+}
 function {
   id: 0x1f0d7714
   return_type_id: 0x48b5725f
@@ -294940,6 +294945,11 @@ function {
   parameter_id: 0xf435685e
   parameter_id: 0x0efc9002
 }
+function {
+  id: 0x921f607b
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3e7e0d52
+}
 function {
   id: 0x9220b9bd
   return_type_id: 0x6720d32f
@@ -340695,6 +340705,24 @@ elf_symbol {
   type_id: 0x977a5487
   full_name: "gh_rm_notifier_unregister"
 }
+elf_symbol {
+  id: 0x62906068
+  name: "gh_rm_register_platform_ops"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa577ae43
+  type_id: 0x921f607b
+  full_name: "gh_rm_register_platform_ops"
+}
+elf_symbol {
+  id: 0x35ffaad3
+  name: "gh_rm_unregister_platform_ops"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x5759f053
+  type_id: 0x1f07d2c7
+  full_name: "gh_rm_unregister_platform_ops"
+}
 elf_symbol {
   id: 0x5a582da8
   name: "gic_nonsecure_priorities"
@@ -383995,6 +384023,14 @@ symbols {
     key: "gh_rm_notifier_unregister"
     value: 0x3049a5e5
   }
+  symbol {
+    key: "gh_rm_register_platform_ops"
+    value: 0x62906068
+  }
+  symbol {
+    key: "gh_rm_unregister_platform_ops"
+    value: 0x35ffaad3
+  }
   symbol {
     key: "gic_nonsecure_priorities"
     value: 0x5a582da8
diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index eda7c6d6cf3c..5c5d9a97b1f2 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -1225,6 +1225,8 @@
   gh_rm_call
   gh_rm_notifier_register
   gh_rm_notifier_unregister
+  gh_rm_register_platform_ops
+  gh_rm_unregister_platform_ops
   gic_nonsecure_priorities
   gov_attr_set_init
   gov_attr_set_put