From 8afacb8faf2b2a15ff66e74210869b586eee7cfa Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 5 Aug 2021 09:04:13 +0200 Subject: [PATCH 1/2] ANDROID: GKI: add padding to struct hid_device struct hid_device was not being tracked as a "stable" symbol in the past, but that looks to change with some future abi requirements. So add needed padding now, to ensure that we can support this over the long-term. This does not change the existing api at all as this symbol was not supported yet. Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: I8c3064fb7a19006a29dabbaf25c9ed1737f62e75 --- include/linux/hid.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/hid.h b/include/linux/hid.h index c7044a14200e..745ee8547e54 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -26,6 +26,7 @@ #include #include #include +#include /* * We parse each description item into this structure. Short items data @@ -618,6 +619,9 @@ struct hid_device { /* device report descriptor */ struct list_head debug_list; spinlock_t debug_list_lock; wait_queue_head_t debug_wait; + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); }; #define to_hid_device(pdev) \ From e588439d0c5ad117e82eea0d1633fb2956687106 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Fri, 30 Jul 2021 18:42:34 -0700 Subject: [PATCH 2/2] ANDROID: ABI: Update allowed list for Microsoft Leaf changes summary: 6 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 6 Added functions Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 6 Added functions: [A] 'function int hid_add_device(hid_device*)' [A] 'function hid_device* hid_allocate_device()' [A] 'function void hid_destroy_device(hid_device*)' [A] 'function int hid_input_report(hid_device*, int, unsigned char*, unsigned int, int)' [A] 'function int hid_parse_report(hid_device*, unsigned char*, unsigned int)' [A] 'function int spi_async(spi_device*, spi_message*)' Bug: 194673479 Signed-off-by: Dmitry Antipov Signed-off-by: Greg Kroah-Hartman Change-Id: I7af3139b3670ac6d4eb87b0774362aaf79160e76 --- android/abi_gki_aarch64.xml | 1451 ++++++++++++++++++++--------- android/abi_gki_aarch64_microsoft | 8 + build.config.gki.aarch64 | 1 + 3 files changed, 1025 insertions(+), 435 deletions(-) create mode 100644 android/abi_gki_aarch64_microsoft diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index a5dea0bef699..e2c8f6bd0fa6 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -1916,6 +1916,11 @@ + + + + + @@ -3982,6 +3987,7 @@ + @@ -19898,26 +19904,7 @@ - - - - - - - - - - - - - - - - - - - - + @@ -20454,7 +20441,7 @@ - + @@ -23070,20 +23057,6 @@ - - - - - - - - - - - - - - @@ -23490,9 +23463,6 @@ - - - @@ -23656,7 +23626,7 @@ - + @@ -23672,7 +23642,7 @@ - + @@ -23680,7 +23650,7 @@ - + @@ -23688,7 +23658,7 @@ - + @@ -26118,7 +26088,6 @@ - @@ -26218,7 +26187,6 @@ - @@ -27756,14 +27724,7 @@ - - - - - - - - + @@ -28283,7 +28244,7 @@ - + @@ -30315,7 +30276,7 @@ - + @@ -32041,7 +32002,7 @@ - + @@ -32588,7 +32549,7 @@ - + @@ -36384,14 +36345,7 @@ - - - - - - - - + @@ -36682,26 +36636,7 @@ - - - - - - - - - - - - - - - - - - - - + @@ -59892,6 +59827,11 @@ + + + + + @@ -85149,6 +85089,15 @@ + + + + + + + + + @@ -85160,13 +85109,500 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -85406,40 +85842,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -85447,58 +85887,124 @@ + + + + + + + + - + - - - - - - - - + + - - + + + + + - - - - - + + - - - - - - - - - - - - - - - - - - - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -85516,6 +86022,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -85769,6 +86308,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -119436,7 +120050,6 @@ - @@ -148521,23 +149134,6 @@ - - - - - - - - - - - - - - - - - @@ -148646,7 +149242,7 @@ - + @@ -148674,16 +149270,12 @@ - - - - @@ -148715,11 +149307,6 @@ - - - - - @@ -148741,12 +149328,6 @@ - - - - - - @@ -166038,7 +166619,7 @@ - + @@ -166122,7 +166703,7 @@ - + @@ -172808,7 +173389,7 @@ - + @@ -172972,7 +173553,7 @@ - + @@ -178359,157 +178940,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -178563,91 +178993,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -178662,6 +179007,24 @@ + + + + + + + + + + + + + + + + + + @@ -178764,6 +179127,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -179034,6 +179420,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -180629,7 +181210,7 @@ - + diff --git a/android/abi_gki_aarch64_microsoft b/android/abi_gki_aarch64_microsoft new file mode 100644 index 000000000000..111b2e3478e8 --- /dev/null +++ b/android/abi_gki_aarch64_microsoft @@ -0,0 +1,8 @@ +[abi_symbol_list] +# required by spi-hid.ko + hid_add_device + hid_allocate_device + hid_destroy_device + hid_input_report + hid_parse_report + spi_async \ No newline at end of file diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64 index 32fbb3b18ae1..6ce620fe85bf 100644 --- a/build.config.gki.aarch64 +++ b/build.config.gki.aarch64 @@ -14,6 +14,7 @@ android/abi_gki_aarch64_goldfish android/abi_gki_aarch64_hikey960 android/abi_gki_aarch64_imx android/abi_gki_aarch64_oneplus +android/abi_gki_aarch64_microsoft android/abi_gki_aarch64_oplus android/abi_gki_aarch64_qcom android/abi_gki_aarch64_sony