From 3a95b9057af6671d7c6b1bfdd632bf111f32b081 Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Wed, 23 Sep 2020 19:33:32 +0800 Subject: [PATCH] ANDROID: abi: update for hikey960 Leaf changes summary: 9 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 9 Added functions Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 9 Added functions: [A] 'function void tcpm_cc_change(tcpm_port*)' [A] 'function void tcpm_pd_hard_reset(tcpm_port*)' [A] 'function void tcpm_pd_receive(tcpm_port*, const pd_message*)' [A] 'function void tcpm_pd_transmit_complete(tcpm_port*, tcpm_transmit_status)' [A] 'function tcpm_port* tcpm_register_port(device*, tcpc_dev*)' [A] 'function void tcpm_tcpc_reset(tcpm_port*)' [A] 'function void tcpm_unregister_port(tcpm_port*)' [A] 'function void tcpm_vbus_change(tcpm_port*)' [A] 'function usb_role usb_role_switch_get_role(usb_role_switch*)' and fix insmod failures reported like the following when use the gki kernel: [ 5.829264] hisi_hikey_usb: Unknown symbol usb_role_switch_get_role (err -2) [ 7.989462] tcpci: Unknown symbol tcpm_cc_change (err -2) [ 7.994896] tcpci: Unknown symbol tcpm_tcpc_reset (err -2) [ 8.000384] tcpci: Unknown symbol tcpm_vbus_change (err -2) [ 8.005961] tcpci: Unknown symbol tcpm_pd_receive (err -2) [ 8.011462] tcpci: Unknown symbol tcpm_pd_hard_reset (err -2) [ 8.017221] tcpci: Unknown symbol tcpm_pd_transmit_complete (err -2) [ 8.023576] tcpci: Unknown symbol tcpm_register_port (err -2) [ 8.029323] tcpci: Unknown symbol tcpm_unregister_port (err -2) Via the following commands: $ ./build/abi/bootstrap $ BUILD_CONFIG=common/build.config.hikey960 build/build_abi.sh --update --print-report $ BUILD_CONFIG=common/build.config.gki.aarch64 build/build_abi.sh --update --print-report Test: boot tested with hikey960 android11 builds Fixes: bb765ef8427e ("ANDROID: GKI: enable QCOM and HISI UFS drivers") Fixes: 5625a6460e96 ("ANDROID: GKI: enable CONFIG_TYPEC_TCPM") Fixes: f82716d6b72a ("ANDROID: hikey960_gki.fragment: Remove UFS and USB bits") Signed-off-by: Yongqin Liu Change-Id: I700cc535d7281ea43b72a5268493656151c77d3d --- android/abi_gki_aarch64.xml | 1826 ++++++++++++++++++++---------- android/abi_gki_aarch64_hikey960 | 80 +- 2 files changed, 1256 insertions(+), 650 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index d798d258de56..f5fd708293b7 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -3614,6 +3614,14 @@ + + + + + + + + @@ -3712,13 +3720,8 @@ - - - - - @@ -3949,6 +3952,7 @@ + @@ -4551,6 +4555,7 @@ + @@ -11187,6 +11192,23 @@ + + + + + + + + + + + + + + + + + @@ -14174,23 +14196,6 @@ - - - - - - - - - - - - - - - - - @@ -32544,7 +32549,7 @@ - + @@ -33928,7 +33933,7 @@ - + @@ -34189,7 +34194,7 @@ - + @@ -35195,7 +35200,7 @@ - + @@ -42848,7 +42853,6 @@ - @@ -53857,12 +53861,15 @@ - + - + - + + + + @@ -66297,6 +66304,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -80982,17 +81070,6 @@ - - - - - - - - - - - @@ -81025,6 +81102,17 @@ + + + + + + + + + + + @@ -84324,6 +84412,10 @@ + + + + @@ -84510,7 +84602,6 @@ - @@ -84533,13 +84624,6 @@ - - - - - - - @@ -84839,10 +84923,6 @@ - - - - @@ -84877,18 +84957,6 @@ - - - - - - - - - - - - @@ -84971,13 +85039,642 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -84986,11 +85683,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -88002,14 +88764,6 @@ - - - - - - - - @@ -88065,6 +88819,14 @@ + + + + + + + + @@ -88101,6 +88863,14 @@ + + + + + + + + @@ -88139,14 +88909,6 @@ - - - - - - - - @@ -88513,6 +89275,23 @@ + + + + + + + + + + + + + + + + + @@ -89387,23 +90166,6 @@ - - - - - - - - - - - - - - - - - @@ -90326,64 +91088,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -91927,9 +92631,9 @@ - - - + + + @@ -102263,23 +102967,6 @@ - - - - - - - - - - - - - - - - - @@ -106884,7 +107571,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -107395,9 +108140,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -107550,7 +108526,18 @@ + + + + + + + + + + + @@ -107733,6 +108720,13 @@ + + + + + + + @@ -107740,6 +108734,10 @@ + + + + @@ -108659,93 +109657,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108754,7 +109665,6 @@ - @@ -111590,9 +112500,6 @@ - - - @@ -111734,15 +112641,7 @@ - - - - - - - - - + @@ -111750,7 +112649,21 @@ - + + + + + + + + + + + + + + + @@ -111758,7 +112671,7 @@ - + @@ -112617,7 +113530,7 @@ - + @@ -112781,7 +113694,7 @@ - + @@ -113527,25 +114440,6 @@ - - - - - - - - - - - - - - - - - - - @@ -113684,6 +114578,14 @@ + + + + + + + + @@ -113746,26 +114648,23 @@ - + - + - + - + - + - + - - - - + @@ -115274,6 +116173,7 @@ + @@ -116473,268 +117373,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -116806,17 +117445,6 @@ - - - - - - - - - - - @@ -121447,7 +122075,23 @@ - + + + + + + + + + + + + + + + + + @@ -128265,14 +128909,6 @@ - - - - - - - - @@ -128471,6 +129107,14 @@ + + + + + + + + @@ -129175,6 +129819,6 @@ diff --git a/android/abi_gki_aarch64_hikey960 b/android/abi_gki_aarch64_hikey960 index f4997bb0639b..128ac45e94b9 100644 --- a/android/abi_gki_aarch64_hikey960 +++ b/android/abi_gki_aarch64_hikey960 @@ -1,6 +1,5 @@ [abi_symbol_list] # commonly used symbols - add_uevent_var alloc_chrdev_region __alloc_disk_node __alloc_pages_nodemask @@ -89,11 +88,9 @@ device_property_present device_property_read_string device_property_read_u32_array - device_register device_release_driver device_remove_file device_set_wakeup_capable - device_unregister device_wakeup_enable _dev_info devm_clk_get @@ -172,7 +169,6 @@ free_irq __free_pages free_pages - fwnode_property_present get_device __get_free_pages get_random_bytes @@ -203,7 +199,6 @@ irq_of_parse_and_map irq_set_irq_wake jiffies - jiffies_to_msecs kfree kfree_const kfree_skb @@ -213,7 +208,6 @@ kmalloc_order_trace kmem_cache_alloc_trace kmemdup - kstrtobool kstrtoint kstrtouint kstrtoull @@ -462,6 +456,8 @@ usb_hub_clear_tt_buffer usb_put_hcd usb_remove_hcd + usb_role_switch_register + usb_role_switch_unregister usb_root_hub_lost_power __usecs_to_jiffies usleep_range @@ -700,6 +696,12 @@ # required by hi655x-regulator.ko regulator_list_voltage_linear +# required by hisi_hikey_usb.ko + usb_role_switch_get + usb_role_switch_get_role + usb_role_switch_put + usb_role_switch_set_role + # required by hisi_powerkey.ko devm_input_allocate_device devm_request_any_context_irq @@ -716,6 +718,8 @@ # required by hwmon.ko __class_register class_unregister + device_register + device_unregister kstrtoll strpbrk @@ -1058,6 +1062,7 @@ spi_sync_locked # required by nvme-core.ko + add_uevent_var blk_freeze_queue_start blk_mq_alloc_request blk_mq_alloc_request_hctx @@ -1161,6 +1166,7 @@ kmem_cache_create kmem_cache_destroy kstrndup + kstrtobool kstrtou16 mempool_alloc_slab mempool_create @@ -1211,15 +1217,6 @@ rfkill_register rfkill_unregister -# required by roles.ko - class_find_device - device_connection_find_match - device_match_fwnode - device_match_name - fwnode_connection_find_match - fwnode_get_parent - __sysfs_match_string - # required by rtc-efi.ko devm_rtc_device_register efi @@ -1291,54 +1288,18 @@ # required by tcpci.ko device_get_named_child_node + tcpm_cc_change + tcpm_pd_hard_reset + tcpm_pd_receive + tcpm_pd_transmit_complete + tcpm_register_port + tcpm_tcpc_reset + tcpm_unregister_port + tcpm_vbus_change # required by tcpci_rt1711h.ko i2c_smbus_read_word_data -# required by tcpm.ko - devm_power_supply_register - fwnode_property_read_string - fwnode_property_read_u32_array - power_supply_changed - power_supply_get_drvdata - typec_altmode_attention - typec_altmode_notify - typec_altmode_update_active - typec_altmode_vdm - typec_find_port_data_role - typec_find_port_power_role - typec_find_power_role - typec_get_drvdata - typec_match_altmode - typec_partner_register_altmode - typec_partner_set_identity - typec_port_register_altmode - typec_register_partner - typec_register_port - typec_set_data_role - typec_set_mode - typec_set_orientation - typec_set_pwr_opmode - typec_set_pwr_role - typec_set_vconn_role - typec_unregister_altmode - typec_unregister_partner - typec_unregister_port - -# required by ufs-hisi.ko - devm_platform_ioremap_resource - ufshcd_dme_get_attr - ufshcd_dme_set_attr - ufshcd_get_pwr_dev_param - ufshcd_pltfrm_init - ufshcd_pltfrm_resume - ufshcd_pltfrm_runtime_idle - ufshcd_pltfrm_runtime_resume - ufshcd_pltfrm_runtime_suspend - ufshcd_pltfrm_shutdown - ufshcd_pltfrm_suspend - ufshcd_remove - # required by wl18xx.ko __cfg80211_alloc_event_skb __cfg80211_send_event_skb @@ -1388,6 +1349,7 @@ ieee80211_unregister_hw ieee80211_wake_queue ieee80211_wake_queues + jiffies_to_msecs jiffies_to_usecs __local_bh_enable_ip __netdev_alloc_skb