From ba06e1f121e1c9f4b221f751fbbe6e2e64f80a1e Mon Sep 17 00:00:00 2001
From: Giuliano Procida <gprocida@google.com>
Date: Wed, 2 Oct 2024 16:38:27 +0000
Subject: [PATCH] ANDROID: fix up ABI with change to private struct
 geni_wrapper

Commit 63fc9af83c11e02ea9c981d3bd0382e36f49916f ("soc: qcom: geni-se:
add desc struct to specify clocks from device match data") modifies a
structure in drivers/soc/qcom/qcom-geni-se.c as follows.

type 'struct geni_wrapper' changed
  byte size changed from 48 to 56
  member 'struct clk_bulk_data ahb_clks[2]' was removed
  member 'struct clk_bulk_data clks[2]' was added
  member 'unsigned int num_clks' was added

The Android 14 ABI tooling does not exclude this type definition.
This commit updates the ABI representation with the apparent break.
This is safe because the type is not visible to any other code.

Bug: 370629635
Change-Id: I9caeba4a48c4485e209352fa8fe56244e7859ea7
Signed-off-by: Giuliano Procida <gprocida@google.com>
---
 android/abi_gki_aarch64.stg | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 89b82746833f..295f4b61cab4 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -45846,12 +45846,6 @@ member {
   name: "ah_ip6_spec"
   type_id: 0x6df98672
 }
-member {
-  id: 0x22e9c7ff
-  name: "ahb_clks"
-  type_id: 0x5f9de25a
-  offset: 128
-}
 member {
   id: 0xadeefc03
   name: "ahit"
@@ -63413,6 +63407,12 @@ member {
   type_id: 0x5e8dc7f4
   offset: 1728
 }
+member {
+  id: 0x08f5b5b5
+  name: "clks"
+  type_id: 0x5f9de25a
+  offset: 128
+}
 member {
   id: 0x5f036ab2
   name: "clks_node"
@@ -140444,6 +140444,12 @@ member {
   type_id: 0x4585663f
   offset: 256
 }
+member {
+  id: 0xf14cac21
+  name: "num_clks"
+  type_id: 0x4585663f
+  offset: 384
+}
 member {
   id: 0xdd3030e0
   name: "num_closed_socks"
@@ -236420,10 +236426,11 @@ struct_union {
   kind: STRUCT
   name: "geni_wrapper"
   definition {
-    bytesize: 48
+    bytesize: 56
     member_id: 0xce3bbab3
     member_id: 0x85c2570f
-    member_id: 0x22e9c7ff
+    member_id: 0x08f5b5b5
+    member_id: 0xf14cac21
   }
 }
 struct_union {