From b98ce0fe28ce79642f8b191a448e4ecf0356cad0 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Mon, 20 May 2024 16:00:28 +0000
Subject: [PATCH] ANDROID: GKI: update the abi for tracing changes in 6.1.84

In 6.1.84, a number of internal tracing structures changed.  Those
structures are not used outside of the core kernel, but due to opaque
pointers being carried into some abi signatures, they are tracked by the
.stg file.

Update the .stg file to handle these changes, as they are safe to modify
at this point in time.

The changes are:

INFO: ABI DIFFERENCES HAVE BEEN DETECTED!
INFO: type 'struct trace_buffer' changed
  byte size changed from 224 to 216
  2 members ('bool time_stamp_abs' .. 'struct ring_buffer_ext_cb* ext_cb') changed
    offset changed by -64

type 'struct ring_buffer_per_cpu' changed
  byte size changed from 496 to 488

type 'struct rb_irq_work' changed
  byte size changed from 96 to 88
  member 'long wait_index' was removed
  3 members ('bool waiters_pending' .. 'bool wakeup_full') changed
    offset changed by -64

Fixes: 347385861c50 ("Linux 6.1.84")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id0c90b04188335ffa9a40db0397ed5a12080ca95
---
 android/abi_gki_aarch64.stg               | 43 ++++++++++-------------
 android/abi_gki_protected_exports_aarch64 |  1 +
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 11d5eeb2c32b..b68a1f05e090 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -86586,10 +86586,10 @@ member {
   offset: 58176
 }
 member {
-  id: 0x58d13e53
+  id: 0x58d13a5a
   name: "ext_cb"
   type_id: 0x3fefb42f
-  offset: 1728
+  offset: 1664
 }
 member {
   id: 0x50922243
@@ -95083,10 +95083,10 @@ member {
   offset: 448
 }
 member {
-  id: 0xabba6f98
+  id: 0xabba6185
   name: "full_waiters_pending"
   type_id: 0x6d7f5ff6
-  offset: 712
+  offset: 648
 }
 member {
   id: 0xf667dcee
@@ -192851,10 +192851,10 @@ member {
   type_id: 0x92233392
 }
 member {
-  id: 0xfeab2cc0
+  id: 0xfeab2654
   name: "time_stamp_abs"
   type_id: 0x6d7f5ff6
-  offset: 1664
+  offset: 1600
 }
 member {
   id: 0xd43e1787
@@ -206871,12 +206871,6 @@ member {
   type_id: 0x74d29cf1
   offset: 2880
 }
-member {
-  id: 0x7ab3f5b1
-  name: "wait_index"
-  type_id: 0xfc0e1dbd
-  offset: 640
-}
 member {
   id: 0x7ab3febe
   name: "wait_index"
@@ -207032,10 +207026,10 @@ member {
   offset: 256
 }
 member {
-  id: 0xc133acab
+  id: 0xc133a8ef
   name: "waiters_pending"
   type_id: 0x6d7f5ff6
-  offset: 704
+  offset: 640
 }
 member {
   id: 0x3e50f6f4
@@ -207316,10 +207310,10 @@ member {
   type_id: 0xe62ebf07
 }
 member {
-  id: 0x3766071b
+  id: 0x37660e3b
   name: "wakeup_full"
   type_id: 0x6d7f5ff6
-  offset: 720
+  offset: 656
 }
 member {
   id: 0xf5741316
@@ -252202,14 +252196,13 @@ struct_union {
   kind: STRUCT
   name: "rb_irq_work"
   definition {
-    bytesize: 96
+    bytesize: 88
     member_id: 0xd64000c8
     member_id: 0x939cab56
     member_id: 0x7f337099
-    member_id: 0x7ab3f5b1
-    member_id: 0xc133acab
-    member_id: 0xabba6f98
-    member_id: 0x3766071b
+    member_id: 0xc133a8ef
+    member_id: 0xabba6185
+    member_id: 0x37660e3b
   }
 }
 struct_union {
@@ -253848,7 +253841,7 @@ struct_union {
   kind: STRUCT
   name: "ring_buffer_per_cpu"
   definition {
-    bytesize: 496
+    bytesize: 488
     member_id: 0x5161b0e6
     member_id: 0x9fc7ddba
     member_id: 0xd712613b
@@ -263139,7 +263132,7 @@ struct_union {
   kind: STRUCT
   name: "trace_buffer"
   definition {
-    bytesize: 224
+    bytesize: 216
     member_id: 0x2d2d0138
     member_id: 0xe7102ce7
     member_id: 0x9fc7d460
@@ -263151,8 +263144,8 @@ struct_union {
     member_id: 0x0f3caba2
     member_id: 0x45d166c5
     member_id: 0xedbbc0ae
-    member_id: 0xfeab2cc0
-    member_id: 0x58d13e53
+    member_id: 0xfeab2654
+    member_id: 0x58d13a5a
   }
 }
 struct_union {
diff --git a/android/abi_gki_protected_exports_aarch64 b/android/abi_gki_protected_exports_aarch64
index 7d97572e6175..1f9b851b3947 100644
--- a/android/abi_gki_protected_exports_aarch64
+++ b/android/abi_gki_protected_exports_aarch64
@@ -96,6 +96,7 @@ hci_alloc_dev_priv
 hci_cmd_sync
 hci_cmd_sync_cancel
 hci_cmd_sync_queue
+hci_cmd_sync_submit
 hci_conn_check_secure
 hci_conn_security
 hci_conn_switch_role