From 69a9a62c66bbff7a16e41f0cd6cf9e613463c435 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Thu, 20 Oct 2022 11:36:32 +0530 Subject: [PATCH] ANDROID: GKI: db845c: Update symbols list and ABI android12-5.10-lts is broken on Dragonboard 845c because of recently added symbol, strscpy_pad. So updated the symbols list by running: "BUILD_CONFIG=common/build.config.db845c \ KMI_SYMBOL_LIST_ADD_ONLY=1 build/build_abi.sh -s" And the abi_gki_aarch64 ABI by running: "BUILD_CONFIG=common/build.config.gki.aarch64 \ ABI_DEFINITION=abi_gki_aarch64.xml KMI_SYMBOL_LIST_ADD_ONLY=1 \ build/build_abi.sh --update --print-report" ======================================================== Leaf changes summary: 1 artifact changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 1 Added function: [A] 'function ssize_t strscpy_pad(char*, const char*, size_t)' ======================================================== Its been a while since symbol list for db845c was updated, so this update end up adding a lot more symbols and not just the missing symbol "strscpy_pad" which caused the regression on db845c. So other than strscpy_pad(), the symbols which got added in db845c symbols list are: * devm_platform_get_and_ioremap_resource, which got added in commit 3660db29b030 ("iommu/arm-smmu: fix possible null-ptr-deref in arm_smmu_device_probe()") * devm_get_clk_from_child, which got added in commit 6f3673c8d8ef ("phy: qcom-qmp: fix struct clk leak on probe errors") * xa_* symbols were added in commit 4f7286422a78 ("qrtr: Convert qrtr_ports from IDR to XArray") * snd_pcm_* symbols were added in commit 4c6eb3db8a8b ("UPSTREAM: ALSA: iec958: Split status creation and fill") Bug: 146449535 Fixes: 0a49bfa8f82f ("rpmsg: qcom: glink: replace strncpy() with strscpy_pad()") Signed-off-by: Amit Pundir Change-Id: I05ce0bad8915c2222341f268d4418c8148e393b9 --- android/abi_gki_aarch64.xml | 568 +++++++++++++++++++-------------- android/abi_gki_aarch64_db845c | 30 +- 2 files changed, 356 insertions(+), 242 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index 85811db03b70..fcba4b61f9e8 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -5250,6 +5250,7 @@ + @@ -15147,6 +15148,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -67867,7 +67951,14 @@ - + + + + + + + + @@ -93031,6 +93122,7 @@ + @@ -115532,11 +115624,11 @@ - - - - - + + + + + @@ -116166,9 +116258,9 @@ - - - + + + @@ -116221,9 +116313,9 @@ - - - + + + @@ -116376,9 +116468,9 @@ - - - + + + @@ -116734,9 +116826,9 @@ - - - + + + @@ -116929,8 +117021,8 @@ - - + + @@ -120757,8 +120849,8 @@ - - + + @@ -120807,9 +120899,9 @@ - - - + + + @@ -120933,9 +121025,9 @@ - - - + + + @@ -121974,9 +122066,9 @@ - - - + + + @@ -122583,12 +122675,12 @@ - - + + - - + + @@ -123953,8 +124045,8 @@ - - + + @@ -124278,8 +124370,8 @@ - - + + @@ -129309,8 +129401,8 @@ - - + + @@ -129730,8 +129822,8 @@ - - + + @@ -129860,12 +129952,12 @@ - - + + - - + + @@ -129937,11 +130029,11 @@ - - - - - + + + + + @@ -130093,14 +130185,14 @@ - - - + + + - - - + + + @@ -130644,8 +130736,8 @@ - - + + @@ -130914,7 +131006,7 @@ - + @@ -131020,11 +131112,11 @@ - - - - - + + + + + @@ -131048,8 +131140,8 @@ - - + + @@ -132191,30 +132283,30 @@ - - - - - - + + + + + + - - - + + + - - + + - - + + @@ -132359,16 +132451,16 @@ - - - + + + - - - - - + + + + + @@ -132412,8 +132504,8 @@ - - + + @@ -132457,10 +132549,10 @@ - - - - + + + + @@ -132482,18 +132574,18 @@ - - + + - - + + - - - - + + + + @@ -132501,12 +132593,12 @@ - - + + - - + + @@ -132514,10 +132606,10 @@ - - - - + + + + @@ -132657,8 +132749,8 @@ - - + + @@ -133042,8 +133134,8 @@ - - + + @@ -133435,9 +133527,9 @@ - - - + + + @@ -135779,8 +135871,8 @@ - - + + @@ -136855,14 +136947,14 @@ - - - - + + + + - - + + @@ -138109,29 +138201,29 @@ - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + @@ -141574,9 +141666,9 @@ - - - + + + @@ -141823,11 +141915,11 @@ - + - - + + @@ -143933,6 +144025,12 @@ + + + + + + @@ -144567,9 +144665,9 @@ - - - + + + @@ -144580,8 +144678,8 @@ - - + + @@ -145424,26 +145522,26 @@ - - - + + + - - - + + + - - + + - - + + - - + + @@ -145453,13 +145551,13 @@ - - - + + + - - + + @@ -145689,8 +145787,8 @@ - - + + @@ -146670,10 +146768,10 @@ - - - - + + + + @@ -146684,33 +146782,33 @@ - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - + + @@ -146737,9 +146835,9 @@ - - - + + + @@ -146755,34 +146853,34 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + @@ -147682,16 +147780,16 @@ - - - - + + + + - - - - + + + + diff --git a/android/abi_gki_aarch64_db845c b/android/abi_gki_aarch64_db845c index bea61517e24f..acbd8c5a6d04 100644 --- a/android/abi_gki_aarch64_db845c +++ b/android/abi_gki_aarch64_db845c @@ -522,6 +522,7 @@ request_threaded_irq reset_control_assert reset_control_deassert + reset_control_put reset_control_reset round_jiffies_up rpmsg_register_device @@ -608,6 +609,7 @@ strncpy strnlen strpbrk + strscpy_pad strsep __sw_hweight16 __sw_hweight32 @@ -702,6 +704,7 @@ bus_set_iommu device_link_add device_match_fwnode + devm_platform_get_and_ioremap_resource driver_find_device generic_device_group generic_iommu_put_resv_regions @@ -1300,6 +1303,8 @@ kthread_create_worker kthread_destroy_worker kthread_queue_work + kthread_should_stop + kthread_stop llist_add_batch memdup_user_nul memparse @@ -1417,7 +1422,7 @@ usb_remove_hcd # required by phy-qcom-qmp.ko - of_clk_get_by_name + devm_get_clk_from_child __of_reset_control_get # required by phy-qcom-qusb2.ko @@ -1585,7 +1590,6 @@ autoremove_wake_function datagram_poll do_wait_intr_irq - idr_alloc_u32 lock_sock_nested proto_register proto_unregister @@ -1613,6 +1617,12 @@ sock_queue_rcv_skb sock_register sock_unregister + __xa_alloc + xa_erase + xa_find + xa_find_after + __xa_insert + xa_load # required by reboot-mode.ko devres_add @@ -1648,7 +1658,6 @@ mmc_send_tuning regulator_is_supported_voltage __reset_control_get - reset_control_put __sdhci_add_host sdhci_add_host sdhci_cleanup_host @@ -1681,7 +1690,9 @@ snd_ctl_add snd_ctl_new1 snd_pcm_add_chmap_ctls - snd_pcm_create_iec958_consumer_hw_params + snd_pcm_create_iec958_consumer_default + snd_pcm_fill_iec958_consumer + snd_pcm_fill_iec958_consumer_hw_params snd_pcm_hw_constraint_eld # required by snd-soc-qcom-common.ko @@ -1713,9 +1724,6 @@ # required by snd-soc-wcd9335.ko kmemdup_nul - snd_soc_get_volsw_sx - snd_soc_info_volsw_sx - snd_soc_put_volsw_sx strnstr # required by snd-soc-wcd934x.ko @@ -1797,3 +1805,11 @@ # required by wcd934x.ko mfd_add_devices mfd_remove_devices + +# preserved by --additions-only + idr_alloc_u32 + of_clk_get_by_name + snd_pcm_create_iec958_consumer_hw_params + snd_soc_get_volsw_sx + snd_soc_info_volsw_sx + snd_soc_put_volsw_sx