From 1d65a4b7a6b467a77712051466b33ba4a1c0cc8e Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 25 Aug 2020 18:38:39 +0000 Subject: [PATCH 01/25] ANDROID: dts: hi3660: Fix duplicate adv7533 nodes The adv7533 node had a duplicate entry in the hi3660.dtsi which is misplaced as that hardware is board specific and not soc specific. A recent changes upstream were backported to -stable which recently broke the driver from loading properly, so this patch moves the details from the incorrect node into its proper place, resolving the issue. Fixes: 274f4e9c575a ("arm64: dts: hisilicon: hikey: fixes to comply with adi, adv7533 DT binding") Signed-off-by: John Stultz Change-Id: Iffe78badb08a1a49ed99fb8ab2257cb95e368f3f (cherry picked from commit 623715b470c6c51e54344a274ca90df19556b56a) --- .../boot/dts/hisilicon/hi3660-hikey960.dts | 11 ++++++++++ arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 20 ------------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts index 32f373f19a73..cb9c7c6b746f 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts @@ -654,12 +654,23 @@ status = "ok"; compatible = "adi,adv7533"; reg = <0x39>; + v1p2-supply = <&ldo3>; + vdd-supply = <&ldo3>; + interrupt-parent = <&gpio1>; + interrupts = <1 2>; + pd-gpio = <&gpio5 1 0>; + sel-gpio = <&gpio2 4 0>; adi,dsi-lanes = <4>; + adi,disable-timing-generator; + #sound-dai-cells = <0>; ports { #address-cells = <1>; #size-cells = <0>; port@0 { reg = <0>; + adv7533_in: endpoint@0 { + remote-endpoint = <&dsi_out0>; + }; }; port@1 { reg = <1>; diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi index f6a501e4963b..0637e5883a9b 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -446,26 +446,6 @@ pinctrl-0 = <&i2c1_pmx_func &i2c1_cfg_func>; status = "ok"; - adv7533: adv7533@39 { - status = "ok"; - compatible = "adi,adv7533"; - reg = <0x39>; - v1p2-supply = <&ldo3>; - vdd-supply = <&ldo3>; - interrupt-parent = <&gpio1>; - interrupts = <1 2>; - pd-gpio = <&gpio5 1 0>; - sel-gpio = <&gpio2 4 0>; - adi,dsi-lanes = <4>; - adi,disable-timing-generator; - #sound-dai-cells = <0>; - - port { - adv7533_in: endpoint { - remote-endpoint = <&dsi_out0>; - }; - }; - }; }; i2c3: i2c@fdf0c000 { From 3a95b9057af6671d7c6b1bfdd632bf111f32b081 Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Wed, 23 Sep 2020 19:33:32 +0800 Subject: [PATCH 02/25] 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 From eed9382d521763c70e016ba7415516ea7186d881 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 23 Apr 2020 23:23:52 +0900 Subject: [PATCH 03/25] UPSTREAM: kbuild: ensure full rebuild when the compiler is updated Commit 21c54b774744 ("kconfig: show compiler version text in the top comment") added the environment variable, CC_VERSION_TEXT in the comment of the top Kconfig file. It can detect the compiler update, and invoke the syncconfig because all environment variables referenced in Kconfig files are recorded in include/config/auto.conf.cmd This commit makes it a CONFIG option in order to ensure the full rebuild when the compiler is updated. This works like follows: include/config/kconfig.h contains "CONFIG_CC_VERSION_TEXT" in the comment block. The top Makefile specifies "-include $(srctree)/include/linux/kconfig.h" to guarantee it is included from all kernel source files. fixdep parses every source file and all headers included from it, searching for words prefixed with "CONFIG_". Then, fixdep finds CONFIG_CC_VERSION_TEXT in include/config/kconfig.h and adds include/config/cc/version/text.h into every .*.cmd file. When the compiler is updated, syncconfig is invoked because init/Kconfig contains the reference to the environment variable CC_VERTION_TEXT. CONFIG_CC_VERSION_TEXT is updated to the new version string, and include/config/cc/version/text.h is touched. In the next rebuild, Make will rebuild every files since the timestamp of include/config/cc/version/text.h is newer than that of target. Bug: 168274246 Signed-off-by: Masahiro Yamada (cherry picked from commit 8b59cd81dc5e724eaea283fa6006985891c7bff4) Signed-off-by: Mars Lin Change-Id: Ie52bb8e33b95d0e97998024d28c0d8d7caf8aa59 --- Kconfig | 2 -- include/linux/kconfig.h | 2 ++ init/Kconfig | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Kconfig b/Kconfig index e10b3ee084d4..745bc773f567 100644 --- a/Kconfig +++ b/Kconfig @@ -5,8 +5,6 @@ # mainmenu "Linux/$(ARCH) $(KERNELVERSION) Kernel Configuration" -comment "Compiler: $(CC_VERSION_TEXT)" - source "scripts/Kconfig.include" source "init/Kconfig" diff --git a/include/linux/kconfig.h b/include/linux/kconfig.h index cc8fa109cfa3..9d12c970f18f 100644 --- a/include/linux/kconfig.h +++ b/include/linux/kconfig.h @@ -2,6 +2,8 @@ #ifndef __LINUX_KCONFIG_H #define __LINUX_KCONFIG_H +/* CONFIG_CC_VERSION_TEXT (Do not delete this comment. See help in Kconfig) */ + #include #ifdef CONFIG_CPU_BIG_ENDIAN diff --git a/init/Kconfig b/init/Kconfig index 2e28155b461f..455105d007cd 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -9,6 +9,23 @@ config DEFCONFIG_LIST default ARCH_DEFCONFIG default "arch/$(ARCH)/defconfig" +config CC_VERSION_TEXT + string + default "$(CC_VERSION_TEXT)" + help + This is used in unclear ways: + + - Re-run Kconfig when the compiler is updated + The 'default' property references the environment variable, + CC_VERSION_TEXT so it is recorded in include/config/auto.conf.cmd. + When the compiler is updated, Kconfig will be invoked. + + - Ensure full rebuild when the compier is updated + include/linux/kconfig.h contains this option in the comment line so + fixdep adds include/config/cc/version/text.h into the auto-generated + dependency. When the compiler is updated, syncconfig will touch it + and then every file will be rebuilt. + config CC_IS_GCC def_bool $(success,$(CC) --version | head -n 1 | grep -q gcc) From 68aee2bc3d15bdfcc348042114d4223bbceb9ddd Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sat, 4 Apr 2020 06:24:59 +0900 Subject: [PATCH 04/25] UPSTREAM: kbuild: do not pass $(KBUILD_CFLAGS) to scripts/mkcompile_h scripts/mkcompile_h uses $(CC) only for getting the version string. I suspected there was a specific reason why the additional flags were needed, and dug the commit history. This code dates back to at least 2002 [1], but I could not get any more clue. Just get rid of it. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/history/history.git/commit/?id=29f3df7eba8ddf91a55183f9967f76fbcc3ab742 Bug: 168274246 Signed-off-by: Masahiro Yamada Reviewed-by: Kees Cook (cherry picked from commit 01a6126b5f7efdf75480a2b970377f5724cb885a) Signed-off-by: Mars Lin Change-Id: If887ea1e9e43b9ce83bf8fe9cc0db809818c3bb8 --- init/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/Makefile b/init/Makefile index 30aa8ab11120..d45e967483b2 100644 --- a/init/Makefile +++ b/init/Makefile @@ -35,4 +35,4 @@ include/generated/compile.h: FORCE @$($(quiet)chk_compile.h) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" \ - "$(CONFIG_PREEMPT_RT)" "$(CC) $(KBUILD_CFLAGS)" "$(LD)" + "$(CONFIG_PREEMPT_RT)" "$(CC)" "$(LD)" From bc93285fae0ba5fedcb0cefd5acf711547f0d16d Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 23 Apr 2020 23:23:54 +0900 Subject: [PATCH 05/25] UPSTREAM: kbuild: use CONFIG_CC_VERSION_TEXT to construct LINUX_COMPILER macro scripts/mkcompile_h runs $(CC) just for getting the version string. Reuse CONFIG_CC_VERSION_TEXT for optimization. For GCC, this slightly changes the version string. I do not think it is a big deal as we do not have the defined format for LINUX_COMPILER. In fact, the recent commit 4831f7ad6c569 ("kbuild: mkcompile_h: Include $LD version in /proc/version") added the linker version. Bug: 168274246 Signed-off-by: Masahiro Yamada (cherry picked from commit 9a950154668729a472d17b8e307d92e7c60f45f7) Signed-off-by: Mars Lin Change-Id: I66bac5b44bf764e7c0e432ae17bcdf06d79c96d0 --- init/Makefile | 2 +- scripts/mkcompile_h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/init/Makefile b/init/Makefile index d45e967483b2..57499b1ff471 100644 --- a/init/Makefile +++ b/init/Makefile @@ -35,4 +35,4 @@ include/generated/compile.h: FORCE @$($(quiet)chk_compile.h) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" \ - "$(CONFIG_PREEMPT_RT)" "$(CC)" "$(LD)" + "$(CONFIG_PREEMPT_RT)" $(CONFIG_CC_VERSION_TEXT) "$(LD)" diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h index 528edd041cdf..4578e413bf13 100755 --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h @@ -6,7 +6,7 @@ ARCH=$2 SMP=$3 PREEMPT=$4 PREEMPT_RT=$5 -CC=$6 +CC_VERSION="$6" LD=$7 vecho() { [ "${quiet}" = "silent_" ] || echo "$@" ; } @@ -75,7 +75,6 @@ UTS_TRUNCATE="cut -b -$UTS_LEN" echo \#define LINUX_COMPILE_BY \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\" echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\" - CC_VERSION=$($CC -v 2>&1 | grep ' version ' | sed 's/[[:space:]]*$//') LD_VERSION=$($LD -v | head -n1 | sed 's/(compatible with [^)]*)//' \ | sed 's/[[:space:]]*$//') printf '#define LINUX_COMPILER "%s"\n' "$CC_VERSION, $LD_VERSION" From ce50287a2b7d56f86357a42f7c712e469abea3eb Mon Sep 17 00:00:00 2001 From: Quentin Perret Date: Wed, 16 Sep 2020 18:18:25 +0100 Subject: [PATCH 06/25] UPSTREAM: ehci-hcd: Move include to keep CRC stable The CRC calculation done by genksyms is triggered when the parser hits EXPORT_SYMBOL*() macros. At this point, genksyms recursively expands the types of the function parameters, and uses that as the input for the CRC calculation. In the case of forward-declared structs, the type expands to 'UNKNOWN'. Following this, it appears that the result of the expansion of each type is cached somewhere, and seems to be re-used when/if the same type is seen again for another exported symbol in the same C file. Unfortunately, this can cause CRC 'stability' issues when a struct definition becomes visible in the middle of a C file. For example, let's assume code with the following pattern: struct foo; int bar(struct foo *arg) { /* Do work ... */ } EXPORT_SYMBOL_GPL(bar); /* This contains struct foo's definition */ #include "foo.h" int baz(struct foo *arg) { /* Do more work ... */ } EXPORT_SYMBOL_GPL(baz); Here, baz's CRC will be computed using the expansion of struct foo that was cached after bar's CRC calculation ('UNKOWN' here). But if EXPORT_SYMBOL_GPL(bar) is removed from the file (because of e.g. symbol trimming using CONFIG_TRIM_UNUSED_KSYMS), struct foo will be expanded late, during baz's CRC calculation, which now has visibility over the full struct definition, hence resulting in a different CRC for baz. The proper fix for this certainly is in genksyms, but that will take me some time to get right. In the meantime, we have seen one occurrence of this in the ehci-hcd code which hits this problem because of the way it includes C files halfway through the code together with an unlucky mix of symbol trimming. In order to workaround this, move the include done in ehci-hub.c early in ehci-hcd.c, hence making sure the struct definitions are visible to the entire file. This improves CRC stability of the ehci-hcd exports even when symbol trimming is enabled. Bug: 167230325 Acked-by: Alan Stern Cc: stable Signed-off-by: Quentin Perret Link: https://lore.kernel.org/r/20200916171825.3228122-1-qperret@google.com Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 29231826f3bd65500118c473fccf31c0cf14dbc0) Change-Id: Iae19ae10feb15fd775076acdd2e0b29d7ccb6b20 --- drivers/usb/host/ehci-hcd.c | 1 + drivers/usb/host/ehci-hub.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index cf2b7ae93b7e..0e5c56e06559 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index ce0eaf7d7c12..087402aec5cb 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c @@ -14,7 +14,6 @@ */ /*-------------------------------------------------------------------------*/ -#include #define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E) From 9ed03658fe1a3ba7911d05ae2ba97027b40d93ca Mon Sep 17 00:00:00 2001 From: Quentin Perret Date: Thu, 24 Sep 2020 13:56:52 +0100 Subject: [PATCH 07/25] ANDROID: Update android/abi_gki_aarch64.xml Leaf changes summary: 5 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 5 Changed, 0 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 5 functions with some sub-type change: [C] 'function int ehci_handshake(ehci_hcd*, void*, u32, u32, int)' at ehci-hcd.c:148:1 has some sub-type changes: CRC value (modversions) changed from 0xab5f23a3 to 0xe32dc66c [C] 'function void ehci_init_driver(hc_driver*, const ehci_driver_overrides*)' at ehci.h:879:1 has some sub-type changes: CRC value (modversions) changed from 0x70c01a65 to 0x5bd6ac93 [C] 'function int ehci_resume(usb_hcd*, bool)' at ehci.h:887:1 has some sub-type changes: CRC value (modversions) changed from 0x51dbddda to 0xa250ac83 [C] 'function int ehci_setup(usb_hcd*)' at ehci.h:881:1 has some sub-type changes: CRC value (modversions) changed from 0x175f644c to 0xda517721 [C] 'function int ehci_suspend(usb_hcd*, bool)' at ehci-hcd.c:1085:1 has some sub-type changes: CRC value (modversions) changed from 0x3afe7f3 to 0x5a7df441 Bug: 167230325 Signed-off-by: Quentin Perret Change-Id: I85a93343482eacce6e989f545dcd89432ad70c85 --- android/abi_gki_aarch64.xml | 845 +++++++++++++++++++----------------- 1 file changed, 435 insertions(+), 410 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index f5fd708293b7..b495cd20117a 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -1430,11 +1430,11 @@ - - - - - + + + + + @@ -4522,6 +4522,7 @@ + @@ -14525,6 +14526,21 @@ + + + + + + + + + + + + + + + @@ -32549,7 +32565,7 @@ - + @@ -33933,7 +33949,7 @@ - + @@ -34194,7 +34210,7 @@ - + @@ -35200,7 +35216,7 @@ - + @@ -53861,17 +53877,6 @@ - - - - - - - - - - - @@ -55134,14 +55139,6 @@ - - - - - - - - @@ -83207,17 +83204,17 @@ - - - - - - + + + + + + - - - + + + @@ -88819,14 +88816,6 @@ - - - - - - - - @@ -89053,6 +89042,16 @@ + + + + + + + + + + @@ -90338,7 +90337,7 @@ - + @@ -90352,7 +90351,7 @@ - + @@ -90364,19 +90363,20 @@ - + - + - + - + - + + @@ -91088,6 +91088,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -91889,7 +91947,6 @@ - @@ -91899,24 +91956,12 @@ - - - - - - - - - - - - @@ -107571,65 +107616,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108140,240 +108127,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108526,18 +108282,7 @@ - - - - - - - - - - - @@ -108720,13 +108465,6 @@ - - - - - - - @@ -108734,10 +108472,6 @@ - - - - @@ -109334,6 +109068,25 @@ + + + + + + + + + + + + + + + + + + + @@ -109436,7 +109189,7 @@ - + @@ -109447,8 +109200,8 @@ - - + + @@ -109465,7 +109218,7 @@ - + @@ -109528,6 +109281,17 @@ + + + + + + + + + + + @@ -112663,22 +112427,6 @@ - - - - - - - - - - - - - - - - @@ -113530,7 +113278,7 @@ - + @@ -113694,7 +113442,7 @@ - + @@ -116951,17 +116699,6 @@ - - - - - - - - - - - @@ -117373,7 +117110,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -117445,6 +117443,17 @@ + + + + + + + + + + + @@ -122814,6 +122823,22 @@ + + + + + + + + + + + + + + + + @@ -129819,6 +129844,6 @@ From a24fabe78ac911462ba4ce3519ce0eb36ec6435a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 24 Sep 2020 15:03:31 +0000 Subject: [PATCH 08/25] Revert "ANDROID: Update android/abi_gki_aarch64.xml" Revert submission 1437052 Reason for revert: ABI is changed. While is is correct, we will hold off doing this for another week. Reverted Changes: Iae19ae10f:UPSTREAM: ehci-hcd: Move include to keep CRC stabl... I85a933434:ANDROID: Update android/abi_gki_aarch64.xml Change-Id: If22472924ae1a42956123806eeb4fed750db5204 Signed-off-by: Greg Kroah-Hartman --- android/abi_gki_aarch64.xml | 845 +++++++++++++++++------------------- 1 file changed, 410 insertions(+), 435 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index b495cd20117a..f5fd708293b7 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -1430,11 +1430,11 @@ - - - - - + + + + + @@ -4522,7 +4522,6 @@ - @@ -14526,21 +14525,6 @@ - - - - - - - - - - - - - - - @@ -32565,7 +32549,7 @@ - + @@ -33949,7 +33933,7 @@ - + @@ -34210,7 +34194,7 @@ - + @@ -35216,7 +35200,7 @@ - + @@ -53877,6 +53861,17 @@ + + + + + + + + + + + @@ -55139,6 +55134,14 @@ + + + + + + + + @@ -83204,17 +83207,17 @@ - - - - - - + + + + + + - - - + + + @@ -88816,6 +88819,14 @@ + + + + + + + + @@ -89042,16 +89053,6 @@ - - - - - - - - - - @@ -90337,7 +90338,7 @@ - + @@ -90351,7 +90352,7 @@ - + @@ -90363,20 +90364,19 @@ - + - + - + - + - - + @@ -91088,64 +91088,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -91947,6 +91889,7 @@ + @@ -91956,12 +91899,24 @@ + + + + + + + + + + + + @@ -107616,7 +107571,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -108127,9 +108140,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -108282,7 +108526,18 @@ + + + + + + + + + + + @@ -108465,6 +108720,13 @@ + + + + + + + @@ -108472,6 +108734,10 @@ + + + + @@ -109068,25 +109334,6 @@ - - - - - - - - - - - - - - - - - - - @@ -109189,7 +109436,7 @@ - + @@ -109200,8 +109447,8 @@ - - + + @@ -109218,7 +109465,7 @@ - + @@ -109281,17 +109528,6 @@ - - - - - - - - - - - @@ -112427,6 +112663,22 @@ + + + + + + + + + + + + + + + + @@ -113278,7 +113530,7 @@ - + @@ -113442,7 +113694,7 @@ - + @@ -116699,6 +116951,17 @@ + + + + + + + + + + + @@ -117110,268 +117373,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -117443,17 +117445,6 @@ - - - - - - - - - - - @@ -122823,22 +122814,6 @@ - - - - - - - - - - - - - - - - @@ -129844,6 +129819,6 @@ From 7dded4ebf0d6414f8f876bdb385651dbf0a88f6b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 24 Sep 2020 15:03:31 +0000 Subject: [PATCH 09/25] Revert "UPSTREAM: ehci-hcd: Move include to keep CRC stable" Revert submission 1437052 Reason for revert: ABI is changed. While is is correct, we will hold off doing this for another week. Reverted Changes: Iae19ae10f:UPSTREAM: ehci-hcd: Move include to keep CRC stabl... I85a933434:ANDROID: Update android/abi_gki_aarch64.xml Change-Id: I2859f7b3ffa293371f842c01ecf433a84d5e1179 Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/ehci-hcd.c | 1 - drivers/usb/host/ehci-hub.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 0e5c56e06559..cf2b7ae93b7e 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 087402aec5cb..ce0eaf7d7c12 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c @@ -14,6 +14,7 @@ */ /*-------------------------------------------------------------------------*/ +#include #define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E) From e32adae0a69881ce86532c5d2b0fef385da4b1eb Mon Sep 17 00:00:00 2001 From: Raghavendra Rao Ananta Date: Thu, 24 Sep 2020 11:05:23 -0700 Subject: [PATCH 10/25] ANDROID: ABI: Update allowed list for QCOM 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 int check_zeroed_user(void*, unsigned long int)' Bug: 169321538 Change-Id: Iaa693ec807daf12485d14c54a7205b4703c12de7 Signed-off-by: Raghavendra Rao Ananta --- android/abi_gki_aarch64.xml | 1047 +++++++++++++++++----------------- android/abi_gki_aarch64_qcom | 1 + 2 files changed, 537 insertions(+), 511 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index f5fd708293b7..ec6984e5a793 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -552,6 +552,7 @@ + @@ -14525,6 +14526,21 @@ + + + + + + + + + + + + + + + @@ -19884,35 +19900,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20071,6 +20058,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -32549,7 +32565,7 @@ - + @@ -33933,7 +33949,7 @@ - + @@ -34194,7 +34210,7 @@ - + @@ -35200,7 +35216,7 @@ - + @@ -36561,7 +36577,7 @@ - + @@ -36581,26 +36597,26 @@ - + - + - + - + - + @@ -36895,6 +36911,14 @@ + + + + + + + + @@ -38262,12 +38286,12 @@ - - + + - + @@ -38281,12 +38305,12 @@ - + - + @@ -38306,7 +38330,7 @@ - + @@ -38334,7 +38358,7 @@ - + @@ -44652,7 +44676,7 @@ - + @@ -44922,7 +44946,7 @@ - + @@ -48625,7 +48649,7 @@ - + @@ -50272,7 +50296,7 @@ - + @@ -50628,7 +50652,7 @@ - + @@ -50638,247 +50662,247 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -50892,13 +50916,13 @@ - + - + @@ -50910,7 +50934,7 @@ - + @@ -50919,11 +50943,11 @@ - + - + @@ -50954,12 +50978,12 @@ - + - + @@ -51060,7 +51084,7 @@ - + @@ -51092,7 +51116,7 @@ - + @@ -51148,7 +51172,7 @@ - + @@ -51159,7 +51183,7 @@ - + @@ -52817,13 +52841,13 @@ - + - + @@ -53861,15 +53885,12 @@ - + - + - - - - + @@ -64294,20 +64315,6 @@ - - - - - - - - - - - - - - @@ -79363,6 +79370,17 @@ + + + + + + + + + + + @@ -86667,7 +86685,7 @@ - + @@ -88764,6 +88782,23 @@ + + + + + + + + + + + + + + + + + @@ -88819,25 +88854,6 @@ - - - - - - - - - - - - - - - - - - - @@ -89275,23 +89291,6 @@ - - - - - - - - - - - - - - - - - @@ -89563,7 +89562,6 @@ - @@ -90118,7 +90116,7 @@ - + @@ -90831,6 +90829,7 @@ + @@ -91088,6 +91087,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -91889,7 +91946,6 @@ - @@ -91899,24 +91955,12 @@ - - - - - - - - - - - - @@ -92075,6 +92119,23 @@ + + + + + + + + + + + + + + + + + @@ -92257,6 +92318,11 @@ + + + + + @@ -93151,14 +93217,6 @@ - - - - - - - - @@ -104336,6 +104394,20 @@ + + + + + + + + + + + + + + @@ -107571,65 +107643,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108140,240 +108154,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108526,18 +108309,7 @@ - - - - - - - - - - - @@ -108720,13 +108492,6 @@ - - - - - - - @@ -108734,10 +108499,6 @@ - - - - @@ -110358,7 +110119,7 @@ - + @@ -117373,7 +117134,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -117445,6 +117467,17 @@ + + + + + + + + + + + @@ -122083,15 +122116,7 @@ - - - - - - - - - + diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index a1b98f3e267d..f14b9dbce9ff 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -168,6 +168,7 @@ cfg80211_vendor_cmd_reply check_disk_change __check_object_size + check_zeroed_user __class_create class_destroy class_find_device From b8f04a0f4a767fe22ea9a359ea39230b02c7c0b5 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Mon, 3 Aug 2020 16:18:08 -0700 Subject: [PATCH 11/25] ANDROID: drop KERNEL_DIR setting in build.config.common And replace many references of ${ROOT_DIR}/common with ${ROOT_DIR}/${KERNEL_DIR}, which makes it a lot easier to branch off of ACK and update the KERNEL_DIR. The variable of KERNEL_DIR will be set in build/_setup_env.sh to the directory of the build config file by default if it's not set explicitly in the build config file or in environment. Test: build test with following configs common/build.config.gki.aarch64 common/build.config.db845c common/build.config.hikey960 common-modules/virtual-device/build.config.cuttlefish.aarch64 common-modules/virtual-device/build.config.goldfish.aarch64 Bug: 162785964 Change-Id: I790ac0ded10bd790484f14c6f93d53e06c38b830 Signed-off-by: Will McVicker Signed-off-by: Yongqin Liu (cherry picked from commit 931718fa65fe5e34d143250c048f591a7d74e5f8) --- build.config.allmodconfig.aarch64 | 6 +++--- build.config.allmodconfig.arm | 6 +++--- build.config.allmodconfig.x86_64 | 6 +++--- build.config.common | 1 - build.config.db845c | 8 ++++---- build.config.gki-debug.aarch64 | 2 +- build.config.gki-debug.x86_64 | 2 +- build.config.gki.aarch64 | 6 +++--- build.config.gki.x86_64 | 6 +++--- build.config.gki_kasan | 1 - build.config.gki_kasan.aarch64 | 7 +++---- build.config.gki_kasan.x86_64 | 6 +++--- build.config.hikey960 | 8 ++++---- 13 files changed, 31 insertions(+), 34 deletions(-) diff --git a/build.config.allmodconfig.aarch64 b/build.config.allmodconfig.aarch64 index 863ab1caddab..2fbe380e030a 100644 --- a/build.config.allmodconfig.aarch64 +++ b/build.config.allmodconfig.aarch64 @@ -1,4 +1,4 @@ -. ${ROOT_DIR}/common/build.config.common -. ${ROOT_DIR}/common/build.config.aarch64 -. ${ROOT_DIR}/common/build.config.allmodconfig +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64 +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig diff --git a/build.config.allmodconfig.arm b/build.config.allmodconfig.arm index 5dd94819c871..e92744a9b518 100644 --- a/build.config.allmodconfig.arm +++ b/build.config.allmodconfig.arm @@ -1,4 +1,4 @@ -. ${ROOT_DIR}/common/build.config.common -. ${ROOT_DIR}/common/build.config.arm -. ${ROOT_DIR}/common/build.config.allmodconfig +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.arm +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig diff --git a/build.config.allmodconfig.x86_64 b/build.config.allmodconfig.x86_64 index bedb3869d99b..f06b30c8426f 100644 --- a/build.config.allmodconfig.x86_64 +++ b/build.config.allmodconfig.x86_64 @@ -1,4 +1,4 @@ -. ${ROOT_DIR}/common/build.config.common -. ${ROOT_DIR}/common/build.config.x86_64 -. ${ROOT_DIR}/common/build.config.allmodconfig +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64 +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.allmodconfig diff --git a/build.config.common b/build.config.common index c8cefce4bc90..3936fc8ef5c5 100644 --- a/build.config.common +++ b/build.config.common @@ -1,6 +1,5 @@ BRANCH=android11-5.4 KMI_GENERATION=0 -KERNEL_DIR=common CC=clang LD=ld.lld diff --git a/build.config.db845c b/build.config.db845c index 4a38befde6f0..e4e25e3d8f7e 100644 --- a/build.config.db845c +++ b/build.config.db845c @@ -1,10 +1,10 @@ -. ${ROOT_DIR}/common/build.config.common -. ${ROOT_DIR}/common/build.config.aarch64 +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64 BUILD_INITRAMFS=1 DEFCONFIG=db845c_gki_defconfig -PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/common/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/common/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/common/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/common/arch/arm64/configs/db845c_gki.fragment" -POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/common/arch/arm64/configs/${DEFCONFIG}" +PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/db845c_gki.fragment" +POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}" FILES=" arch/arm64/boot/Image.gz diff --git a/build.config.gki-debug.aarch64 b/build.config.gki-debug.aarch64 index 58cee7a6362b..c1fe2f03a279 100644 --- a/build.config.gki-debug.aarch64 +++ b/build.config.gki-debug.aarch64 @@ -1,3 +1,3 @@ -. ${ROOT_DIR}/common/build.config.gki.aarch64 +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki.aarch64 TRIM_NONLISTED_KMI="" KMI_SYMBOL_LIST_STRICT_MODE="" diff --git a/build.config.gki-debug.x86_64 b/build.config.gki-debug.x86_64 index 9ee51e7de18c..d89b7ad4e804 100644 --- a/build.config.gki-debug.x86_64 +++ b/build.config.gki-debug.x86_64 @@ -1,3 +1,3 @@ -. ${ROOT_DIR}/common/build.config.gki.x86_64 +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki.x86_64 TRIM_NONLISTED_KMI="" KMI_SYMBOL_LIST_STRICT_MODE="" diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64 index 3a875c99c702..b4c53eb05143 100644 --- a/build.config.gki.aarch64 +++ b/build.config.gki.aarch64 @@ -1,6 +1,6 @@ -. ${ROOT_DIR}/common/build.config.common -. ${ROOT_DIR}/common/build.config.aarch64 -. ${ROOT_DIR}/common/build.config.gki +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64 +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki ABI_DEFINITION=android/abi_gki_aarch64.xml KMI_SYMBOL_LIST=android/abi_gki_aarch64 diff --git a/build.config.gki.x86_64 b/build.config.gki.x86_64 index 627d1e1c27ab..0e04fc692df2 100644 --- a/build.config.gki.x86_64 +++ b/build.config.gki.x86_64 @@ -1,4 +1,4 @@ -. ${ROOT_DIR}/common/build.config.common -. ${ROOT_DIR}/common/build.config.x86_64 -. ${ROOT_DIR}/common/build.config.gki +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64 +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki diff --git a/build.config.gki_kasan b/build.config.gki_kasan index e682b0d490bd..b3273b10a01c 100644 --- a/build.config.gki_kasan +++ b/build.config.gki_kasan @@ -1,6 +1,5 @@ DEFCONFIG=gki_defconfig POST_DEFCONFIG_CMDS="check_defconfig && update_kasan_config" -KERNEL_DIR=common function update_kasan_config() { ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \ -e CONFIG_KASAN \ diff --git a/build.config.gki_kasan.aarch64 b/build.config.gki_kasan.aarch64 index 6277fd662863..9fd2560c45e8 100644 --- a/build.config.gki_kasan.aarch64 +++ b/build.config.gki_kasan.aarch64 @@ -1,4 +1,3 @@ -. ${ROOT_DIR}/common/build.config.common -. ${ROOT_DIR}/common/build.config.aarch64 -. ${ROOT_DIR}/common/build.config.gki_kasan - +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64 +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki_kasan diff --git a/build.config.gki_kasan.x86_64 b/build.config.gki_kasan.x86_64 index 6a379eceeb31..eec645805f39 100644 --- a/build.config.gki_kasan.x86_64 +++ b/build.config.gki_kasan.x86_64 @@ -1,4 +1,4 @@ -. ${ROOT_DIR}/common/build.config.common -. ${ROOT_DIR}/common/build.config.x86_64 -. ${ROOT_DIR}/common/build.config.gki_kasan +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64 +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki_kasan diff --git a/build.config.hikey960 b/build.config.hikey960 index 8a4acc616bb8..d57ce98eb95c 100644 --- a/build.config.hikey960 +++ b/build.config.hikey960 @@ -1,9 +1,9 @@ -. ${ROOT_DIR}/common/build.config.common -. ${ROOT_DIR}/common/build.config.aarch64 +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64 DEFCONFIG=hikey960_gki_defconfig -PRE_DEFCONFIG_CMDS="cat ./common/arch/arm64/configs/gki_defconfig ./common/arch/arm64/configs/hikey960_gki.fragment > ./common/arch/arm64/configs/${DEFCONFIG};" -POST_DEFCONFIG_CMDS="rm ./common/arch/arm64/configs/${DEFCONFIG}" +PRE_DEFCONFIG_CMDS="cat ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/hikey960_gki.fragment > ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG};" +POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}" EXT_MODULES=" hikey-modules/midgard From e1cc5b3eb683b8ffd7f9e49b39a900f655ef87eb Mon Sep 17 00:00:00 2001 From: Raghavendra Rao Ananta Date: Fri, 25 Sep 2020 13:42:09 -0700 Subject: [PATCH 12/25] ANDROID: ABI: Update allowed list for QCOM Add the following symbols to QCOM allowed-list: - __cfi_slowpath - of_find_i2c_device_by_node Bug: 169419618 Change-Id: Ief629d53312c8d843361261454d77638438da6f3 Signed-off-by: Raghavendra Rao Ananta --- android/abi_gki_aarch64_qcom | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index f14b9dbce9ff..e9531aa60074 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -166,6 +166,7 @@ cfg80211_unlink_bss cfg80211_update_owe_info_event cfg80211_vendor_cmd_reply + __cfi_slowpath check_disk_change __check_object_size check_zeroed_user @@ -1489,6 +1490,7 @@ of_drm_find_panel of_find_compatible_node of_find_device_by_node + of_find_i2c_device_by_node of_find_matching_node_and_match of_find_node_by_name of_find_node_by_phandle From 605376176c0a1d416af58220e27fc6463912219a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 27 Sep 2020 11:59:13 +0200 Subject: [PATCH 13/25] ANDROID: ABI: Update allowed list for EXYNOS Update the android/abi_gki_aarch64_exynos with recent symbol additions. Note, no new symbols are needed to be exported here, making this a simple change and no need to update the .xml file. Bug: 168666574 Signed-off-by: Jaehyoung Choi Signed-off-by: Greg Kroah-Hartman Change-Id: Ibe92486f6f84163990b65c75be96236f76f8af1e --- android/abi_gki_aarch64_exynos | 147 +++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) diff --git a/android/abi_gki_aarch64_exynos b/android/abi_gki_aarch64_exynos index 97cf3901b7a1..0b41a3f16cad 100644 --- a/android/abi_gki_aarch64_exynos +++ b/android/abi_gki_aarch64_exynos @@ -7,6 +7,7 @@ alarm_cancel alarm_init alarm_start + alarm_start_relative alloc_chrdev_region alloc_etherdev_mqs alloc_netdev_mqs @@ -28,6 +29,7 @@ atomic_notifier_call_chain atomic_notifier_chain_register atomic_notifier_chain_unregister + autoremove_wake_function backlight_device_unregister _bcd2bin bcmp @@ -66,15 +68,43 @@ cancel_delayed_work cancel_delayed_work_sync cancel_work_sync + capable cdev_add cdev_alloc cdev_del cdev_device_add cdev_device_del cdev_init + __cfg80211_alloc_event_skb + __cfg80211_alloc_reply_skb + cfg80211_chandef_create + cfg80211_ch_switch_notify + cfg80211_classify8021d + cfg80211_connect_done + cfg80211_del_sta_sinfo + cfg80211_disconnected + cfg80211_external_auth_request + cfg80211_find_elem_match + cfg80211_find_vendor_elem + cfg80211_get_bss + cfg80211_inform_bss_frame_data + cfg80211_mgmt_tx_status + cfg80211_michael_mic_failure + cfg80211_new_sta + cfg80211_put_bss + cfg80211_ready_on_channel + cfg80211_remain_on_channel_expired + cfg80211_roamed + cfg80211_rx_mgmt + cfg80211_scan_done + cfg80211_sched_scan_results + cfg80211_sched_scan_stopped + __cfg80211_send_event_skb + cfg80211_vendor_cmd_reply __cfi_slowpath __check_object_size __class_create + class_create_file_ns class_destroy class_find_device __class_register @@ -130,6 +160,7 @@ __const_udelay consume_skb contig_page_data + _copy_from_iter_full __cpu_active_mask cpu_all_bits cpu_bit_bitmap @@ -166,20 +197,25 @@ cpu_subsys cpu_topology cpu_up + crc32_le crypto_alloc_shash crypto_destroy_tfm crypto_shash_digest crypto_shash_final crypto_shash_update + csum_partial + csum_tcpudp_nofold _ctype dapm_pinctrl_event dapm_regulator_event + datagram_poll default_llseek default_wake_function delayed_work_timer_fn del_timer del_timer_sync destroy_workqueue + dev_alloc_name _dev_crit dev_driver_string _dev_emerg @@ -201,6 +237,7 @@ device_create device_create_bin_file device_create_file + device_del device_destroy device_find_child device_for_each_child @@ -241,6 +278,7 @@ devm_gpiochip_add_data devm_gpiod_get_optional devm_gpio_request_one + devm_iio_channel_get devm_iio_device_alloc devm_input_allocate_device devm_ioremap @@ -253,6 +291,7 @@ devm_kmalloc devm_kmemdup devm_kstrdup + devm_led_classdev_register_ext __devm_of_phy_provider_register devm_phy_create devm_phy_get @@ -261,6 +300,7 @@ devm_pinctrl_put devm_pinctrl_register devm_platform_ioremap_resource + __devm_regmap_init __devm_regmap_init_i2c __devm_regmap_init_mmio_clk devm_regulator_bulk_get @@ -275,6 +315,7 @@ devm_snd_dmaengine_pcm_register devm_snd_soc_register_card devm_snd_soc_register_component + devm_thermal_zone_of_sensor_register devm_usb_get_phy devm_usb_get_phy_by_phandle _dev_notice @@ -297,6 +338,7 @@ devres_add devres_alloc_node devres_free + devres_release dev_set_mac_address dev_set_name _dev_warn @@ -364,6 +406,7 @@ dma_set_coherent_mask dma_set_mask do_SAK + do_wait_intr down downgrade_write down_interruptible @@ -384,6 +427,7 @@ enable_irq enable_percpu_irq end_buffer_read_sync + ether_setup eth_mac_addr ethtool_op_get_link eth_type_trans @@ -395,6 +439,8 @@ fb_mode_option fd_install fget + filp_close + filp_open find_get_pid find_next_bit find_next_zero_bit @@ -423,6 +469,9 @@ fwnode_property_read_u16_array generic_file_llseek generic_handle_irq + genlmsg_put + genl_register_family + genl_unregister_family gen_pool_add_owner gen_pool_alloc_algo_owner gen_pool_avail @@ -486,6 +535,7 @@ hwrng_register hwrng_unregister i2c_adapter_type + i2c_add_adapter i2c_add_numbered_adapter i2c_bus_type i2c_del_adapter @@ -511,12 +561,18 @@ ida_free idr_alloc idr_remove + ieee80211_channel_to_freq_khz + ieee80211_freq_khz_to_channel + ieee80211_get_channel_khz ignore_console_lock_warning iio_channel_get iio_channel_release + iio_device_alloc + iio_device_free __iio_device_register iio_device_unregister iio_read_channel_processed + iio_read_channel_raw in4_pton in6_pton init_dummy_netdev @@ -582,6 +638,7 @@ __ioremap iounmap __iowrite32_copy + ip_send_check __irq_alloc_descs irq_create_mapping __irq_domain_add @@ -591,6 +648,7 @@ irq_domain_xlate_onetwocell irq_domain_xlate_twocell irq_find_mapping + irq_get_irqchip_state irq_get_irq_data irq_modify_status irq_of_parse_and_map @@ -601,6 +659,7 @@ irq_set_chip_data __irq_set_handler irq_set_handler_data + irq_set_irqchip_state irq_set_irq_wake irq_to_desc irq_work_queue @@ -613,6 +672,7 @@ jiffies_to_usecs kasprintf kernel_kobj + kernel_read kernel_write keyslot_manager_create_passthrough keyslot_manager_private @@ -620,10 +680,12 @@ __kfifo_free __kfifo_in __kfifo_out + __kfifo_to_user kfree kfree_call_rcu kfree_const kfree_skb + kfree_skb_list kimage_vaddr kimage_voffset __kmalloc @@ -637,6 +699,7 @@ kmemdup kobject_add kobject_create_and_add + kobject_get kobject_init kobject_init_and_add kobject_put @@ -687,7 +750,9 @@ __list_del_entry_valid list_sort llist_add_batch + __local_bh_enable_ip __lock_buffer + lock_sock_nested loops_per_jiffy map_vm_area match_string @@ -701,6 +766,7 @@ media_entity_remove_links media_remove_intf_links memchr + memcmp memcpy __memcpy_fromio __memcpy_toio @@ -737,6 +803,7 @@ module_put __msecs_to_jiffies msleep + msleep_interruptible __mutex_init mutex_is_locked mutex_lock @@ -755,11 +822,24 @@ netif_carrier_off netif_carrier_on netif_napi_add + netif_napi_del netif_receive_skb netif_receive_skb_list netif_rx + netif_rx_ni + netif_tx_stop_all_queues netif_tx_wake_queue + netlink_broadcast + netlink_register_notifier + netlink_unicast + netlink_unregister_notifier + nla_memcpy + __nla_parse + nla_put + nla_put_nohdr + nla_strlcpy no_llseek + nonseekable_open noop_llseek nr_cpu_ids nr_irqs @@ -811,6 +891,7 @@ of_match_node of_node_name_eq of_parse_phandle + of_parse_phandle_with_args of_parse_phandle_with_fixed_args of_phandle_iterator_init of_phandle_iterator_next @@ -843,6 +924,7 @@ param_ops_charp param_ops_int param_ops_long + param_ops_string param_ops_uint param_ops_ullong param_ops_ulong @@ -951,19 +1033,26 @@ power_supply_get_property power_supply_put power_supply_register + power_supply_set_property power_supply_unregister preempt_schedule preempt_schedule_notrace prepare_to_wait_event print_hex_dump printk + __printk_ratelimit + printk_timed_ratelimit proc_create proc_create_data proc_create_seq_private proc_mkdir proc_remove proc_set_size + proc_set_user proc_symlink + proto_register + proto_unregister + __pskb_copy_fclone __put_cred put_device __put_page @@ -987,8 +1076,10 @@ raw_notifier_chain_register raw_notifier_chain_unregister _raw_read_lock + _raw_read_lock_bh _raw_read_lock_irqsave _raw_read_unlock + _raw_read_unlock_bh _raw_read_unlock_irqrestore _raw_spin_lock _raw_spin_lock_bh @@ -999,7 +1090,11 @@ _raw_spin_unlock_bh _raw_spin_unlock_irq _raw_spin_unlock_irqrestore + _raw_write_lock + _raw_write_lock_bh _raw_write_lock_irqsave + _raw_write_unlock + _raw_write_unlock_bh _raw_write_unlock_irqrestore rb_erase rb_first @@ -1013,6 +1108,7 @@ rdev_get_id reboot_mode refcount_dec_and_test_checked + refcount_dec_checked refcount_inc_checked refcount_inc_not_zero_checked __refrigerator @@ -1025,7 +1121,10 @@ register_chrdev_region register_console register_die_notifier + register_inet6addr_notifier + register_inetaddr_notifier register_netdev + register_netdevice register_oom_notifier register_pm_notifier register_reboot_notifier @@ -1034,6 +1133,7 @@ register_syscore_ops regmap_async_complete regmap_bulk_read + regmap_bulk_write regmap_multi_reg_write regmap_multi_reg_write_bypassed regmap_raw_read @@ -1059,6 +1159,7 @@ release_firmware release_pages __release_region + release_sock remap_pfn_range remap_vmalloc_range remove_proc_entry @@ -1075,6 +1176,10 @@ reset_control_put reset_control_reset return_address + rfkill_alloc + rfkill_destroy + rfkill_register + rfkill_unregister rps_needed rtc_class_close rtc_class_open @@ -1083,6 +1188,7 @@ rtc_tm_to_time64 rtc_update_irq rtc_valid_tm + rtnl_is_locked rtnl_lock rtnl_unlock sched_clock @@ -1100,6 +1206,7 @@ scsi_print_sense_hdr sdev_prefix_printk sdio_signal_irq + security_sock_graft seq_lseek seq_printf seq_puts @@ -1130,8 +1237,14 @@ simple_write_to_buffer single_open single_release + sk_alloc + skb_clone + skb_copy + skb_copy_bits + skb_copy_datagram_iter skb_copy_expand skb_dequeue + skb_free_datagram skb_pull skb_push skb_put @@ -1139,7 +1252,10 @@ skb_queue_purge skb_queue_tail skb_realloc_headroom + skb_recv_datagram skb_trim + skb_unlink + sk_free smpboot_register_percpu_thread smp_call_function smp_call_function_many @@ -1182,6 +1298,7 @@ snd_soc_component_write snd_soc_dai_set_bclk_ratio snd_soc_dai_set_channel_map + snd_soc_dai_set_fmt snd_soc_dai_set_sysclk snd_soc_dai_set_tdm_slot snd_soc_dapm_add_routes @@ -1194,6 +1311,8 @@ snd_soc_dapm_ignore_suspend snd_soc_dapm_info_pin_switch snd_soc_dapm_kcontrol_dapm + snd_soc_dapm_mixer_update_power + snd_soc_dapm_mux_update_power snd_soc_dapm_new_control snd_soc_dapm_new_controls snd_soc_dapm_put_enum_double @@ -1235,6 +1354,23 @@ snd_vendor_set_ops snprintf soc_device_register + sock_alloc_send_skb + sock_init_data + sock_no_accept + sock_no_bind + sock_no_connect + sock_no_getname + sock_no_getsockopt + sock_no_ioctl + sock_no_listen + sock_no_mmap + sock_no_sendmsg + sock_no_setsockopt + sock_no_shutdown + sock_no_socketpair + sock_queue_rcv_skb + sock_register + sock_unregister softnet_data sort __spi_alloc_controller @@ -1277,6 +1413,7 @@ strncmp strncpy strnlen + strnstr strpbrk strrchr strsep @@ -1312,6 +1449,7 @@ system_unbound_wq system_wq sys_tz + __tasklet_hi_schedule tasklet_init tasklet_kill __tasklet_schedule @@ -1399,7 +1537,10 @@ unmap_mapping_range __unregister_chrdev unregister_chrdev_region + unregister_inet6addr_notifier + unregister_inetaddr_notifier unregister_netdev + unregister_netdevice_queue unregister_pm_notifier unregister_reboot_notifier unregister_restart_handler @@ -1553,6 +1694,7 @@ vfree vfs_fsync vfs_llseek + vfs_statx video_devdata video_device_alloc video_device_release @@ -1593,4 +1735,9 @@ watchdog_register_device watchdog_set_restart_priority watchdog_unregister_device + wiphy_apply_custom_regulatory + wiphy_free + wiphy_new_nm + wiphy_register + wiphy_unregister work_busy From 2d498bbf53ebaaab7ef1fc4538f65f62c6714378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E7=83=81=E7=94=9F?= Date: Mon, 28 Sep 2020 17:24:56 +0800 Subject: [PATCH 14/25] ANDROID: ABI: Added symbols for allwinner Leaf changes summary: 4 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 4 Added functions Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 4 Added functions: [A] 'function device_node* dev_pm_opp_of_get_opp_desc_node(device*)' [A] 'function void dev_pm_opp_put_prop_name(opp_table*)' [A] 'function void dev_pm_opp_put_supported_hw(opp_table*)' [A] 'function opp_table* dev_pm_opp_set_prop_name(device*, const char*)' Bug: 169550958 Signed-off-by: huangshuosheng Signed-off-by: Frank Lee Change-Id: I5b97ea1e58825918e19e530fdc9bbda9682ab621 --- android/abi_gki_aarch64.xml | 562 +++++++++++++++++----------------- android/abi_gki_aarch64_sunxi | 6 + 2 files changed, 289 insertions(+), 279 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index ec6984e5a793..68d9f5c4f8ef 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -810,15 +810,19 @@ + + + + @@ -15262,6 +15266,20 @@ + + + + + + + + + + + + + + @@ -19900,6 +19918,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -20058,35 +20105,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -36577,7 +36595,7 @@ - + @@ -36597,26 +36615,26 @@ - + - + - + - + - + @@ -38286,12 +38304,12 @@ - - + + - + @@ -38305,12 +38323,12 @@ - + - + @@ -38330,7 +38348,7 @@ - + @@ -38358,7 +38376,7 @@ - + @@ -48649,7 +48667,7 @@ - + @@ -50296,7 +50314,7 @@ - + @@ -50652,7 +50670,7 @@ - + @@ -50662,247 +50680,247 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -50916,13 +50934,13 @@ - + - + @@ -50934,7 +50952,7 @@ - + @@ -50943,11 +50961,11 @@ - + - + @@ -50978,12 +50996,12 @@ - + - + @@ -51010,7 +51028,6 @@ - @@ -51083,8 +51100,7 @@ - - + @@ -51116,7 +51132,7 @@ - + @@ -51172,7 +51188,7 @@ - + @@ -51183,7 +51199,7 @@ - + @@ -52841,13 +52857,13 @@ - + - + @@ -53885,14 +53901,6 @@ - - - - - - - - @@ -55155,14 +55163,6 @@ - - - - - - - - @@ -64315,6 +64315,20 @@ + + + + + + + + + + + + + + @@ -64882,6 +64896,19 @@ + + + + + + + + + + + + + @@ -64920,6 +64947,10 @@ + + + + @@ -70955,6 +70986,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -79370,17 +79425,6 @@ - - - - - - - - - - - @@ -84311,8 +84355,6 @@ - - @@ -86685,7 +86727,7 @@ - + @@ -88782,23 +88824,6 @@ - - - - - - - - - - - - - - - - - @@ -88854,6 +88879,17 @@ + + + + + + + + + + + @@ -89291,6 +89327,23 @@ + + + + + + + + + + + + + + + + + @@ -89562,6 +89615,7 @@ + @@ -90116,7 +90170,7 @@ - + @@ -90829,7 +90883,6 @@ - @@ -92119,23 +92172,6 @@ - - - - - - - - - - - - - - - - - @@ -100103,13 +100139,13 @@ - + - + - + @@ -100151,7 +100187,7 @@ - + @@ -104292,7 +104328,7 @@ - + @@ -104308,7 +104344,7 @@ - + @@ -104316,7 +104352,7 @@ - + @@ -104330,7 +104366,7 @@ - + @@ -104394,20 +104430,6 @@ - - - - - - - - - - - - - - @@ -108722,14 +108744,25 @@ - - - + + + - - + + - + + + + + + + + + + + + @@ -109102,6 +109135,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -109451,17 +109519,17 @@ - + - + - + @@ -110119,7 +110187,7 @@ - + @@ -111671,30 +111739,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -111720,7 +111764,7 @@ - + @@ -116712,17 +116756,6 @@ - - - - - - - - - - - @@ -122116,7 +122149,15 @@ - + + + + + + + + + @@ -123562,44 +123603,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -123698,6 +123701,7 @@ + diff --git a/android/abi_gki_aarch64_sunxi b/android/abi_gki_aarch64_sunxi index 9fb7727b17a4..890759b51caf 100644 --- a/android/abi_gki_aarch64_sunxi +++ b/android/abi_gki_aarch64_sunxi @@ -302,3 +302,9 @@ # required by sun6i-dma.ko dma_get_any_slave_channel + +# required by sun50i-cpufreq-nvmem.ko + dev_pm_opp_of_get_opp_desc_node + dev_pm_opp_put_prop_name + dev_pm_opp_put_supported_hw + dev_pm_opp_set_prop_name From 1642b4f813ec418bfb59c11bee26a3390387b5c2 Mon Sep 17 00:00:00 2001 From: Yun Hsiang Date: Mon, 31 Aug 2020 15:13:01 +0800 Subject: [PATCH 15/25] ANDROID: sched: add cpumask parameter to cpu capacity vendor hook Different cpu type will have different suppression ration. So we add cpumask parameter to cpu capacity vendor hook. Bug: 167126223 Signed-off-by: Yun Hsiang Change-Id: I983a3aca2195f7c37c43d31fa588c999a825ee49 --- drivers/base/arch_topology.c | 4 ++-- include/trace/hooks/topology.h | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index f6802ee94bbf..0d10ee372515 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -34,7 +34,7 @@ void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq, scale = (cur_freq << SCHED_CAPACITY_SHIFT) / max_freq; - trace_android_vh_arch_set_freq_scale(cur_freq, max_freq, &scale); + trace_android_vh_arch_set_freq_scale(cpus, cur_freq, max_freq, &scale); for_each_cpu(i, cpus){ per_cpu(freq_scale, i) = scale; @@ -57,7 +57,7 @@ void arch_set_max_freq_scale(struct cpumask *cpus, scale = (policy_max_freq << SCHED_CAPACITY_SHIFT) / max_freq; - trace_android_vh_arch_set_freq_scale(policy_max_freq, max_freq, &scale); + trace_android_vh_arch_set_freq_scale(cpus, policy_max_freq, max_freq, &scale); for_each_cpu(cpu, cpus) per_cpu(max_freq_scale, cpu) = scale; diff --git a/include/trace/hooks/topology.h b/include/trace/hooks/topology.h index 65ee1962b833..32b44c7e5130 100644 --- a/include/trace/hooks/topology.h +++ b/include/trace/hooks/topology.h @@ -9,16 +9,18 @@ #include #include +#include #if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS) DECLARE_HOOK(android_vh_arch_set_freq_scale, - TP_PROTO(unsigned long freq, unsigned long max, unsigned long *scale), - TP_ARGS(freq, max, scale)); + TP_PROTO(struct cpumask *cpus, unsigned long freq, unsigned long max, + unsigned long *scale), + TP_ARGS(cpus, freq, max, scale)); #else -#define trace_android_vh_arch_set_freq_scale(freq, max, scale) +#define trace_android_vh_arch_set_freq_scale(cpus, freq, max, scale) #endif From 527c28ed21ccc46410b988dedf4b469c045054bc Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Mon, 28 Sep 2020 14:42:26 +0100 Subject: [PATCH 16/25] ANDROID: Refresh ABI.xmls with libabigail 1.8.0-98bbf30d This adds missing anonymous to union types, creating some one-time churn. Bug: 167563393 Change-Id: I08f55d48793870c6a82ff2c76d3460733ffdbe41 Signed-off-by: Matthias Maennich --- android/abi_gki_aarch64.xml | 1581 +++++++++++++++++------------------ 1 file changed, 763 insertions(+), 818 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index 68d9f5c4f8ef..83fa1823f50a 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -5693,26 +5693,19 @@ - + - - - - - - - - - - - + + + + @@ -5722,6 +5715,14 @@ + + + + + + + + @@ -6017,7 +6018,7 @@ - + @@ -6774,7 +6775,7 @@ - + @@ -6804,7 +6805,7 @@ - + @@ -6851,7 +6852,7 @@ - + @@ -6863,7 +6864,7 @@ - + @@ -7224,7 +7225,7 @@ - + @@ -7246,7 +7247,7 @@ - + @@ -7352,7 +7353,7 @@ - + @@ -7369,7 +7370,26 @@ - + + + + + + + + + + + + + + + + + + + + @@ -7380,7 +7400,7 @@ - + @@ -7391,6 +7411,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7400,7 +7462,7 @@ - + @@ -7633,13 +7695,13 @@ - + - + @@ -7758,27 +7820,27 @@ - + - + - + - + @@ -7796,7 +7858,7 @@ - + @@ -8421,7 +8483,7 @@ - + @@ -8840,7 +8902,7 @@ - + @@ -8914,7 +8976,7 @@ - + @@ -8934,7 +8996,7 @@ - + @@ -8982,7 +9044,7 @@ - + @@ -9335,7 +9397,7 @@ - + @@ -9354,7 +9416,7 @@ - + @@ -9371,7 +9433,7 @@ - + @@ -9633,7 +9695,7 @@ - + @@ -9663,7 +9725,7 @@ - + @@ -9813,7 +9875,7 @@ - + @@ -9850,7 +9912,7 @@ - + @@ -9858,7 +9920,7 @@ - + @@ -9882,7 +9944,7 @@ - + @@ -9893,7 +9955,7 @@ - + @@ -9911,7 +9973,7 @@ - + @@ -9930,7 +9992,7 @@ - + @@ -9941,7 +10003,7 @@ - + @@ -9949,7 +10011,7 @@ - + @@ -9957,7 +10019,7 @@ - + @@ -9969,7 +10031,7 @@ - + @@ -9991,7 +10053,7 @@ - + @@ -10013,7 +10075,7 @@ - + @@ -10022,6 +10084,14 @@ + + + + + + + + @@ -10145,7 +10215,7 @@ - + @@ -10218,6 +10288,14 @@ + + + + + + + + @@ -10792,7 +10870,7 @@ - + @@ -11172,7 +11250,7 @@ - + @@ -11227,7 +11305,7 @@ - + @@ -11548,7 +11626,7 @@ - + @@ -12230,7 +12308,7 @@ - + @@ -12238,7 +12316,7 @@ - + @@ -14182,6 +14260,14 @@ + + + + + + + + @@ -14190,6 +14276,14 @@ + + + + + + + + @@ -14217,106 +14311,36 @@ - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -14380,22 +14404,6 @@ - - - - - - - - - - - - - - - - @@ -17467,6 +17475,7 @@ + @@ -18721,7 +18730,7 @@ - + @@ -18734,27 +18743,16 @@ - - - - - - - - - - - - - - - - - - + + + + + + + @@ -18770,6 +18768,19 @@ + + + + + + + + + + + + + @@ -18917,7 +18928,7 @@ - + @@ -18955,6 +18966,20 @@ + + + + + + + + + + + + + + @@ -18963,7 +18988,91 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19001,6 +19110,17 @@ + + + + + + + + + + + @@ -19015,7 +19135,7 @@ - + @@ -19026,7 +19146,7 @@ - + @@ -19046,7 +19166,7 @@ - + @@ -19054,7 +19174,24 @@ - + + + + + + + + + + + + + + + + + + @@ -19152,7 +19289,7 @@ - + @@ -19948,150 +20085,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -20101,6 +20115,9 @@ + + + @@ -20174,7 +20191,7 @@ - + @@ -20463,7 +20480,7 @@ - + @@ -23281,6 +23298,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -23469,6 +23506,17 @@ + + + + + + + + + + + @@ -32583,7 +32631,7 @@ - + @@ -33967,7 +34015,7 @@ - + @@ -34228,7 +34276,7 @@ - + @@ -35234,7 +35282,7 @@ - + @@ -35260,7 +35308,7 @@ - + @@ -36929,14 +36977,6 @@ - - - - - - - - @@ -37450,14 +37490,6 @@ - - - - - - - - @@ -38385,6 +38417,14 @@ + + + + + + + + @@ -38393,13 +38433,13 @@ - + - + @@ -38482,7 +38522,7 @@ - + @@ -38572,6 +38612,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -38880,7 +38946,7 @@ - + @@ -42888,7 +42954,7 @@ - + @@ -42963,7 +43029,7 @@ - + @@ -44665,45 +44731,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -44722,6 +44771,14 @@ + + + + + + + + @@ -44964,25 +45021,6 @@ - - - - - - - - - - - - - - - - - - - @@ -51100,6 +51138,7 @@ + @@ -51159,7 +51198,6 @@ - @@ -54993,7 +55031,7 @@ - + @@ -55017,7 +55055,7 @@ - + @@ -55163,6 +55201,14 @@ + + + + + + + + @@ -56169,11 +56215,11 @@ - + - + @@ -59578,7 +59624,7 @@ - + @@ -59589,7 +59635,7 @@ - + @@ -60427,7 +60473,7 @@ - + @@ -60723,7 +60769,7 @@ - + @@ -60731,7 +60777,7 @@ - + @@ -60739,7 +60785,7 @@ - + @@ -60747,7 +60793,7 @@ - + @@ -60840,8 +60886,8 @@ - - + + @@ -60951,7 +60997,7 @@ - + @@ -60987,7 +61033,7 @@ - + @@ -62221,28 +62267,21 @@ - + - - - - - - - - - - - + + + + - + @@ -62250,6 +62289,14 @@ + + + + + + + + @@ -62775,7 +62822,7 @@ - + @@ -62783,7 +62830,7 @@ - + @@ -84355,6 +84402,8 @@ + + @@ -86737,7 +86786,7 @@ - + @@ -87121,7 +87170,7 @@ - + @@ -87951,7 +88000,7 @@ - + @@ -88062,11 +88111,11 @@ - + - + @@ -88094,11 +88143,11 @@ - + - + @@ -88557,12 +88606,12 @@ - + - + @@ -88824,7 +88873,7 @@ - + @@ -88846,7 +88895,7 @@ - + @@ -89414,7 +89463,7 @@ - + @@ -89443,7 +89492,7 @@ - + @@ -90805,33 +90854,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -90879,6 +90902,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -92112,10 +92161,13 @@ - + + + + @@ -92339,11 +92391,11 @@ - + - + @@ -93160,17 +93212,6 @@ - - - - - - - - - - - @@ -93904,7 +93945,7 @@ - + @@ -94765,7 +94806,7 @@ - + @@ -101835,7 +101876,7 @@ - + @@ -101874,63 +101915,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -101978,6 +101981,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -102006,6 +102035,23 @@ + + + + + + + + + + + + + + + + + @@ -102164,7 +102210,7 @@ - + @@ -102193,7 +102239,7 @@ - + @@ -102201,7 +102247,7 @@ - + @@ -103187,7 +103233,7 @@ - + @@ -107279,6 +107325,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -107386,26 +107452,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -107665,7 +107711,7 @@ - + @@ -107675,7 +107721,7 @@ - + @@ -107822,37 +107868,18 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + + + + - + @@ -107874,6 +107901,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -108173,7 +108220,7 @@ - + @@ -108193,7 +108240,7 @@ - + @@ -108573,122 +108620,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108744,25 +108675,14 @@ - - - + + + - - + + - - - - - - - - - - - - + @@ -109135,41 +109055,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -109276,8 +109161,8 @@ - - + + @@ -109294,7 +109179,7 @@ - + @@ -109519,17 +109404,17 @@ - + - + - + @@ -110178,7 +110063,7 @@ - + @@ -110187,26 +110072,13 @@ - - - - - - - - - - - - - - - - - + + + + @@ -110216,6 +110088,20 @@ + + + + + + + + + + + + + + @@ -111609,6 +111495,17 @@ + + + + + + + + + + + @@ -111718,7 +111615,7 @@ - + @@ -111726,7 +111623,7 @@ - + @@ -111739,6 +111636,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -111764,7 +111685,7 @@ - + @@ -112287,7 +112208,7 @@ - + @@ -112914,7 +112835,7 @@ - + @@ -114197,6 +114118,17 @@ + + + + + + + + + + + @@ -115822,11 +115754,11 @@ - + - + @@ -117398,7 +117330,7 @@ - + @@ -117409,6 +117341,20 @@ + + + + + + + + + + + + + + @@ -117556,7 +117502,7 @@ - + @@ -119662,7 +119608,7 @@ - + @@ -123454,7 +123400,7 @@ - + @@ -123475,7 +123421,7 @@ - + @@ -123701,7 +123647,6 @@ - @@ -129848,6 +129793,6 @@ From a4b35b7869371d74b920dce5e107e092ab021e85 Mon Sep 17 00:00:00 2001 From: Abhilasha Rao Date: Wed, 29 Jul 2020 15:40:16 +0530 Subject: [PATCH 17/25] ANDROID: GKI: loadavg: Export for get_avenrun - Add EXPORT_SYMBOL_GPL for get_avenrun() so that drivers be loadable as a module. - This API is required by loadable driver module to get Number of jobs in the run queue (state R) or waiting for disk I/O(state D) averaged over 1 min. Signed-off-by: Abhilasha Rao Signed-off-by: Todd Kjos Bug: 158067689 Change-Id: I56c12c908be068f78e16004df876be3bee0e7229 (cherry picked from commit 64ea6f327359a90eca8ec9fe2a8f0caba0188e45) --- kernel/sched/loadavg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/sched/loadavg.c b/kernel/sched/loadavg.c index de22da666ac7..b1dfb50f60b5 100644 --- a/kernel/sched/loadavg.c +++ b/kernel/sched/loadavg.c @@ -75,6 +75,7 @@ void get_avenrun(unsigned long *loads, unsigned long offset, int shift) loads[1] = (avenrun[1] + offset) << shift; loads[2] = (avenrun[2] + offset) << shift; } +EXPORT_SYMBOL_GPL(get_avenrun); long calc_load_fold_active(struct rq *this_rq, long adjust) { From 91c336eebe62fa326d96ea6c490c0c712a24a651 Mon Sep 17 00:00:00 2001 From: Abhilasha Rao Date: Wed, 29 Jul 2020 15:37:30 +0530 Subject: [PATCH 18/25] ANDROID: GKI: cputime: Export for thread_group_cputime_adjusted - Add EXPORT_SYMBOL_GPL for thread_group_cputime_adjusted() to allow drivers to be loadable as a module. - This API is required by loadable driver module from samsung to fetch process uptime based on CPU clock ticks to get the exact duration of time app is scheduled in user mode. Signed-off-by: Abhilasha Rao Bug: 158067689 Change-Id: I1843de08edf5bb2eee806845f4b5e0a305da5fe7 (cherry picked from commit bf679b941237ae76d0bba8d98e670819e029847a) --- kernel/sched/cputime.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index fc49c1e169d9..a147909bcf16 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -471,6 +471,7 @@ void thread_group_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st) *ut = cputime.utime; *st = cputime.stime; } +EXPORT_SYMBOL_GPL(thread_group_cputime_adjusted); #else /* !CONFIG_VIRT_CPU_ACCOUNTING_NATIVE: */ @@ -685,6 +686,8 @@ void thread_group_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st) thread_group_cputime(p, &cputime); cputime_adjust(&cputime, &p->signal->prev_cputime, ut, st); } +EXPORT_SYMBOL_GPL(thread_group_cputime_adjusted); + #endif /* !CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */ #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN From c2832245248357991a5a40aff1a8be2569b9375f Mon Sep 17 00:00:00 2001 From: Abhilasha Rao Date: Wed, 29 Jul 2020 15:41:10 +0530 Subject: [PATCH 19/25] ANDROID: GKI: signal: Export for __lock_task_sighand - Add EXPORT_SYMBOL_GPL for __lock_task_sighand() - This API is required by loadable driver module from samsung to Lock task structure, when reading task/process related information. Signed-off-by: Abhilasha Rao Bug: 158067689 Change-Id: Ia54e17b1f2630bcc648e7840cf36e743f08ba9c9 (cherry picked from commit a719abf03114cfc0b9f68937d9cd900d74d65cae) --- kernel/signal.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/signal.c b/kernel/signal.c index 595a36ab87d0..7a9592b4b4d7 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1396,6 +1396,7 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk, return sighand; } +EXPORT_SYMBOL_GPL(__lock_task_sighand); /* * send signal info to all the members of a group From 9b5925ce78f66df111764777a407610ea4b9d387 Mon Sep 17 00:00:00 2001 From: Abhilasha Rao Date: Wed, 29 Jul 2020 15:45:19 +0530 Subject: [PATCH 20/25] ANDROID: GKI: time: Export for nsec_to_clock_t - Add EXPORT_SYMBOL_GPL for nsec_to_clock_t() so that drivers be loadable as a module. - This API is required by loadable driver module from samsung to fetch process uptime based on CPU clock ticks to get the exact time during which app is scheduled in user mode. Signed-off-by: Abhilasha Rao Bug: 158067689 Change-Id: I45be5fd7873dc7c21aa583313499f48f8b10bb1b (cherry picked from commit 0575bec804810d9b8abf533c4ef4a957968553fc) --- kernel/time/time.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/time/time.c b/kernel/time/time.c index 83f403e7a15c..7353f04dba36 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -776,6 +776,7 @@ u64 nsec_to_clock_t(u64 x) return div_u64(x * 9, (9ull * NSEC_PER_SEC + (USER_HZ / 2)) / USER_HZ); #endif } +EXPORT_SYMBOL_GPL(nsec_to_clock_t); u64 jiffies64_to_nsecs(u64 j) { From 6765da7d2c9df8ea051ef8eefccd550e0bb62534 Mon Sep 17 00:00:00 2001 From: Abhilasha Rao Date: Wed, 29 Jul 2020 15:38:58 +0530 Subject: [PATCH 21/25] ANDROID: GKI: core: Export for runqueues - Add EXPORT_SYMBOL_GPL for runqueues(). - This API is required by loadable driver module,to get number of jobs in the run queue (state R) or waiting for disk I/O (state D) averaged over 1 min. Signed-off-by: Abhilasha Rao Bug: 158067689 Change-Id: I3e80a46bef2e7c92714b68cc5b6b617ac50bc478 (cherry picked from commit 6b0a9dc6df8d8be21c8d178a01e0711b0fe6ce73) --- kernel/sched/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 1961fad0b93f..26b519579120 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -42,6 +42,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(pelt_se_tp); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_overutilized_tp); DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); +EXPORT_SYMBOL_GPL(runqueues); #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_JUMP_LABEL) /* From 92bfdf631ed55cd904464d11b7543e716f6e5450 Mon Sep 17 00:00:00 2001 From: Abhilasha Rao Date: Wed, 29 Jul 2020 15:43:52 +0530 Subject: [PATCH 22/25] ANDROID: GKI: pid: Export for find_task_by_vpid - Add EXPORT_SYMBOL_GPL for find_task_by_vpid() so that drivers can be loadable as a module. - This API is required by loadable driver module from samsung to read process related information based on pid and thread id. To get information on when a certain process or thread was started, duration of run, Average load contributed by it. Signed-off-by: Abhilasha Rao Bug: 158067689 Change-Id: I0db9cc50c93eedff0f3e9dea0ac09a5d17d118f0 (cherry picked from commit bee18dd57e89f4e7aa79f6054b9238b99e45c191) --- kernel/pid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/pid.c b/kernel/pid.c index 0a9f2e437217..f4649916e7fc 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -354,6 +354,7 @@ struct task_struct *find_task_by_vpid(pid_t vnr) { return find_task_by_pid_ns(vnr, task_active_pid_ns(current)); } +EXPORT_SYMBOL_GPL(find_task_by_vpid); struct task_struct *find_get_task_by_vpid(pid_t nr) { From f4c28ebfcd7fd1c927dd7e711e7cfd38b7fd1358 Mon Sep 17 00:00:00 2001 From: Mayank Grover Date: Tue, 29 Sep 2020 17:22:17 +0530 Subject: [PATCH 23/25] ANDROID: ABI: update allowed list for QCOM 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 void hrtimer_init_sleeper(hrtimer_sleeper*, clockid_t, hrtimer_mode)' Bug: 169648430 Change-Id: I3dd359f8af64fbca2ef364becfb4b1f5f75510c0 Signed-off-by: Mayank Grover --- android/abi_gki_aarch64.xml | 755 ++++++++++++++++++++--------------- android/abi_gki_aarch64_qcom | 1 + 2 files changed, 423 insertions(+), 333 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index 83fa1823f50a..c01a54c1a9ee 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -1677,6 +1677,7 @@ + @@ -15254,7 +15255,6 @@ - @@ -17475,7 +17475,6 @@ - @@ -20084,6 +20083,23 @@ + + + + + + + + + + + + + + + + + @@ -20122,23 +20138,6 @@ - - - - - - - - - - - - - - - - - @@ -23298,26 +23297,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -23506,17 +23485,6 @@ - - - - - - - - - - - @@ -32631,7 +32599,7 @@ - + @@ -34015,7 +33983,7 @@ - + @@ -34276,7 +34244,7 @@ - + @@ -35282,7 +35250,7 @@ - + @@ -35308,7 +35276,7 @@ - + @@ -36977,6 +36945,14 @@ + + + + + + + + @@ -37490,6 +37466,14 @@ + + + + + + + + @@ -38417,14 +38401,6 @@ - - - - - - - - @@ -38433,13 +38409,13 @@ - + - + @@ -38522,7 +38498,7 @@ - + @@ -38612,32 +38588,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -38946,7 +38896,7 @@ - + @@ -44731,7 +44681,7 @@ - + @@ -44771,14 +44721,6 @@ - - - - - - - - @@ -51066,6 +51008,7 @@ + @@ -51138,7 +51081,7 @@ - + @@ -51198,6 +51141,7 @@ + @@ -55031,7 +54975,7 @@ - + @@ -55055,7 +54999,7 @@ - + @@ -55201,14 +55145,6 @@ - - - - - - - - @@ -58679,7 +58615,6 @@ - @@ -60886,8 +60821,8 @@ - - + + @@ -62830,7 +62765,7 @@ - + @@ -70869,6 +70804,7 @@ + @@ -71033,30 +70969,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -71800,14 +71712,6 @@ - - - - - - - - @@ -71987,6 +71891,14 @@ + + + + + + + + @@ -73892,6 +73804,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -79472,6 +79408,17 @@ + + + + + + + + + + + @@ -88928,17 +88875,6 @@ - - - - - - - - - - - @@ -88964,14 +88900,6 @@ - - - - - - - - @@ -90854,7 +90782,33 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -90902,32 +90856,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -93212,6 +93140,17 @@ + + + + + + + + + + + @@ -93298,15 +93237,15 @@ - - - + + + - - - - + + + + @@ -93733,44 +93672,44 @@ - + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - + - - + + @@ -93945,7 +93884,7 @@ - + @@ -94340,7 +94279,7 @@ - + @@ -94806,7 +94745,7 @@ - + @@ -103233,7 +103172,7 @@ - + @@ -104420,7 +104359,7 @@ - + @@ -104493,25 +104432,25 @@ - - - - + + + + - - - - + + + + - - - + + + @@ -104921,7 +104860,16 @@ + + + + + + + + + @@ -104932,6 +104880,12 @@ + + + + + + @@ -104983,16 +104937,16 @@ - - + + - - + + - - + + @@ -107325,26 +107279,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -107452,6 +107386,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -108620,6 +108574,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -111495,17 +111583,6 @@ - - - - - - - - - - - @@ -111615,7 +111692,7 @@ - + @@ -111623,7 +111700,7 @@ - + @@ -112389,22 +112466,6 @@ - - - - - - - - - - - - - - - - @@ -114118,17 +114179,6 @@ - - - - - - - - - - - @@ -114315,7 +114365,7 @@ - + @@ -114385,7 +114435,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -114393,7 +114467,7 @@ - + @@ -116041,7 +116115,7 @@ - + @@ -116137,7 +116211,7 @@ - + @@ -116152,7 +116226,6 @@ - @@ -116311,7 +116384,7 @@ - + @@ -116409,7 +116482,7 @@ - + @@ -116517,6 +116590,25 @@ + + + + + + + + + + + + + + + + + + + @@ -116570,7 +116662,7 @@ - + @@ -116582,7 +116674,7 @@ - + @@ -116595,7 +116687,7 @@ - + @@ -116688,6 +116780,17 @@ + + + + + + + + + + + @@ -117341,20 +117444,6 @@ - - - - - - - - - - - - - - @@ -117482,7 +117571,7 @@ - + @@ -117497,7 +117586,7 @@ - + @@ -123400,7 +123489,7 @@ - + @@ -123421,7 +123510,7 @@ - + @@ -129793,6 +129882,6 @@ diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index e9531aa60074..1580a6ba2422 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -1010,6 +1010,7 @@ hrtimer_init hrtimer_start_range_ns hrtimer_try_to_cancel + hrtimer_init_sleeper hvc_alloc hvc_instantiate hvc_kick From 2318165502fb53fd6c24159006a13b5e2ac81fd2 Mon Sep 17 00:00:00 2001 From: Daniel Mentz Date: Thu, 24 Sep 2020 17:01:20 -0700 Subject: [PATCH 24/25] ANDROID: Disable kthread delayed work fp check in CFI builds With non-canonical CFI, LLVM generates jump table entries for external symbols in modules and as a result, a function pointer passed from a module to the core kernel will have a different address. Disable the warning for now. Bug: 145210207 Signed-off-by: Daniel Mentz Change-Id: I576a07206a465902773481e51a84529f0ac2e84b --- kernel/kthread.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/kthread.c b/kernel/kthread.c index bfbfa481be3a..1e9bf63a30de 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -886,7 +886,9 @@ static void __kthread_queue_delayed_work(struct kthread_worker *worker, struct timer_list *timer = &dwork->timer; struct kthread_work *work = &dwork->work; +#ifndef CONFIG_CFI_CLANG WARN_ON_ONCE(timer->function != kthread_delayed_work_timer_fn); +#endif /* * If @delay is 0, queue @dwork->work immediately. This is for From de645857eeb9061321882e9df37944d4f2b814fa Mon Sep 17 00:00:00 2001 From: wangting11 Date: Sun, 27 Sep 2020 20:47:47 +0800 Subject: [PATCH 25/25] ANDROID: GKI: add allowed list file for xiaomi add abi_gki_aarch64_xiaomi Leaf changes summary: 2 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 2 Added functions Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 2 Added functions: [A] 'function int __kfifo_from_user(__kfifo*, void*, unsigned long int, unsigned int*)' [A] 'function int kobject_set_name(kobject*, const char*, ...)' Bug: 169498251 Change-Id: I43d9c59e8833e76f943e3d1df066165e2fd60dc2 Signed-off-by: wangting11 --- android/abi_gki_aarch64.xml | 1796 ++++++++++++++++---------------- android/abi_gki_aarch64_xiaomi | 80 ++ build.config.gki.aarch64 | 1 + 3 files changed, 980 insertions(+), 897 deletions(-) create mode 100644 android/abi_gki_aarch64_xiaomi diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index c01a54c1a9ee..3ca8c00c964d 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -119,6 +119,7 @@ + @@ -2083,6 +2084,7 @@ + @@ -5694,19 +5696,26 @@ - + - + + + + + + + + + + + - - - @@ -5716,14 +5725,6 @@ - - - - - - - - @@ -6019,7 +6020,7 @@ - + @@ -6776,7 +6777,7 @@ - + @@ -6806,7 +6807,7 @@ - + @@ -6853,7 +6854,7 @@ - + @@ -6865,7 +6866,7 @@ - + @@ -7226,7 +7227,7 @@ - + @@ -7248,7 +7249,7 @@ - + @@ -7354,7 +7355,7 @@ - + @@ -7371,26 +7372,7 @@ - - - - - - - - - - - - - - - - - - - - + @@ -7401,7 +7383,7 @@ - + @@ -7412,48 +7394,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7463,7 +7403,7 @@ - + @@ -7696,13 +7636,13 @@ - + - + @@ -7821,27 +7761,27 @@ - + - + - + - + @@ -7859,7 +7799,7 @@ - + @@ -8484,7 +8424,7 @@ - + @@ -8903,7 +8843,7 @@ - + @@ -8977,7 +8917,7 @@ - + @@ -8997,7 +8937,7 @@ - + @@ -9045,7 +8985,7 @@ - + @@ -9398,7 +9338,7 @@ - + @@ -9417,7 +9357,7 @@ - + @@ -9434,7 +9374,7 @@ - + @@ -9696,7 +9636,7 @@ - + @@ -9726,7 +9666,7 @@ - + @@ -9876,7 +9816,7 @@ - + @@ -9913,7 +9853,7 @@ - + @@ -9921,7 +9861,7 @@ - + @@ -9945,7 +9885,7 @@ - + @@ -9956,7 +9896,7 @@ - + @@ -9974,7 +9914,7 @@ - + @@ -9993,7 +9933,7 @@ - + @@ -10004,7 +9944,7 @@ - + @@ -10012,7 +9952,7 @@ - + @@ -10020,7 +9960,7 @@ - + @@ -10032,7 +9972,7 @@ - + @@ -10054,7 +9994,7 @@ - + @@ -10076,7 +10016,7 @@ - + @@ -10085,14 +10025,6 @@ - - - - - - - - @@ -10216,7 +10148,7 @@ - + @@ -10289,14 +10221,6 @@ - - - - - - - - @@ -10871,7 +10795,7 @@ - + @@ -11251,7 +11175,7 @@ - + @@ -11276,23 +11200,6 @@ - - - - - - - - - - - - - - - - - @@ -11306,7 +11213,7 @@ - + @@ -11627,7 +11534,7 @@ - + @@ -12309,7 +12216,7 @@ - + @@ -12317,7 +12224,7 @@ - + @@ -14261,14 +14168,6 @@ - - - - - - - - @@ -14277,14 +14176,6 @@ - - - - - - - - @@ -14296,6 +14187,23 @@ + + + + + + + + + + + + + + + + + @@ -14312,36 +14220,106 @@ - + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -14405,6 +14383,22 @@ + + + + + + + + + + + + + + + + @@ -15255,6 +15249,22 @@ + + + + + + + + + + + + + + + + @@ -15274,20 +15284,6 @@ - - - - - - - - - - - - - - @@ -15920,6 +15916,7 @@ + @@ -16054,22 +16051,6 @@ - - - - - - - - - - - - - - - - @@ -18729,7 +18710,7 @@ - + @@ -18742,16 +18723,27 @@ - + + + + + + + + + + + + + + + + + + - - - - - - @@ -18767,19 +18759,6 @@ - - - - - - - - - - - - - @@ -18927,7 +18906,7 @@ - + @@ -18965,20 +18944,6 @@ - - - - - - - - - - - - - - @@ -18987,91 +18952,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -19109,17 +18990,164 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + + + + + + + + + + @@ -19134,7 +19162,7 @@ - + @@ -19145,7 +19173,7 @@ - + @@ -19165,7 +19193,7 @@ - + @@ -19173,24 +19201,7 @@ - - - - - - - - - - - - - - - - - - + @@ -19288,7 +19299,7 @@ - + @@ -20100,44 +20111,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20190,7 +20163,7 @@ - + @@ -20479,7 +20452,7 @@ - + @@ -26964,7 +26937,7 @@ - + @@ -26975,7 +26948,7 @@ - + @@ -31522,7 +31495,7 @@ - + @@ -32599,7 +32572,7 @@ - + @@ -33983,7 +33956,7 @@ - + @@ -34244,7 +34217,7 @@ - + @@ -34458,7 +34431,6 @@ - @@ -35250,7 +35222,7 @@ - + @@ -36945,14 +36917,6 @@ - - - - - - - - @@ -37972,6 +37936,7 @@ + @@ -42904,7 +42869,7 @@ - + @@ -42979,7 +42944,7 @@ - + @@ -44681,28 +44646,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -44963,6 +44945,25 @@ + + + + + + + + + + + + + + + + + + + @@ -53883,6 +53884,14 @@ + + + + + + + + @@ -55145,6 +55154,14 @@ + + + + + + + + @@ -55911,6 +55928,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -56055,6 +56102,8 @@ + + @@ -56062,6 +56111,8 @@ + + @@ -56151,11 +56202,11 @@ - + - + @@ -58615,6 +58666,7 @@ + @@ -58630,9 +58682,6 @@ - - - @@ -58695,7 +58744,7 @@ - + @@ -58932,10 +58981,10 @@ - + - + @@ -59547,7 +59596,7 @@ - + @@ -59559,7 +59608,7 @@ - + @@ -59570,7 +59619,7 @@ - + @@ -59592,7 +59641,7 @@ - + @@ -59766,7 +59815,7 @@ - + @@ -59821,7 +59870,7 @@ - + @@ -60408,7 +60457,7 @@ - + @@ -60615,7 +60664,7 @@ - + @@ -60704,7 +60753,7 @@ - + @@ -60712,7 +60761,7 @@ - + @@ -60720,7 +60769,7 @@ - + @@ -60728,7 +60777,7 @@ - + @@ -60932,7 +60981,7 @@ - + @@ -60946,7 +60995,7 @@ - + @@ -60960,7 +61009,7 @@ - + @@ -60968,7 +61017,7 @@ - + @@ -61002,7 +61051,7 @@ - + @@ -61251,33 +61300,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -62202,21 +62224,28 @@ - + - + + + + + + + + + + + - - - - + @@ -62224,14 +62253,6 @@ - - - - - - - - @@ -62757,7 +62778,7 @@ - + @@ -62888,8 +62909,7 @@ - - + @@ -62913,7 +62933,6 @@ - @@ -62934,16 +62953,12 @@ - - - - @@ -63026,7 +63041,6 @@ - @@ -63038,8 +63052,7 @@ - - + @@ -63053,10 +63066,8 @@ - - - + @@ -63162,7 +63173,7 @@ - + @@ -63257,7 +63268,7 @@ - + @@ -63337,7 +63348,7 @@ - + @@ -63351,7 +63362,7 @@ - + @@ -63416,11 +63427,11 @@ - + - + @@ -63740,7 +63751,7 @@ - + @@ -63832,7 +63843,7 @@ - + @@ -63861,11 +63872,11 @@ - + - + @@ -63970,7 +63981,7 @@ - + @@ -63981,7 +63992,7 @@ - + @@ -63989,7 +64000,7 @@ - + @@ -64005,7 +64016,7 @@ - + @@ -64021,7 +64032,7 @@ - + @@ -64029,7 +64040,7 @@ - + @@ -64043,7 +64054,7 @@ - + @@ -64054,7 +64065,7 @@ - + @@ -64062,7 +64073,7 @@ - + @@ -64070,7 +64081,7 @@ - + @@ -64078,7 +64089,7 @@ - + @@ -64086,7 +64097,7 @@ - + @@ -64105,7 +64116,7 @@ - + @@ -70804,7 +70815,6 @@ - @@ -71712,6 +71722,14 @@ + + + + + + + + @@ -71891,14 +71909,6 @@ - - - - - - - - @@ -73804,30 +73814,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -84349,8 +84335,6 @@ - - @@ -86733,7 +86717,7 @@ - + @@ -87117,7 +87101,7 @@ - + @@ -87947,7 +87931,7 @@ - + @@ -88058,11 +88042,11 @@ - + - + @@ -88090,11 +88074,11 @@ - + - + @@ -88469,6 +88453,12 @@ + + + + + + @@ -88553,12 +88543,12 @@ - + - + @@ -88820,7 +88810,7 @@ - + @@ -88842,7 +88832,7 @@ - + @@ -88900,6 +88890,14 @@ + + + + + + + + @@ -89304,23 +89302,6 @@ - - - - - - - - - - - - - - - - - @@ -89391,7 +89372,7 @@ - + @@ -89420,7 +89401,7 @@ - + @@ -90195,6 +90176,23 @@ + + + + + + + + + + + + + + + + + @@ -91098,12 +91096,12 @@ - + - + - + @@ -92089,13 +92087,10 @@ - + - - - @@ -92319,11 +92314,11 @@ - + - + @@ -92807,36 +92802,36 @@ - - - - + + + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + @@ -93233,6 +93228,14 @@ + + + + + + + + @@ -93888,7 +93891,6 @@ - @@ -93902,10 +93904,8 @@ - - @@ -94279,7 +94279,7 @@ - + @@ -98009,7 +98009,7 @@ - + @@ -98351,13 +98351,13 @@ - + - + @@ -98684,7 +98684,7 @@ - + @@ -98762,10 +98762,10 @@ - + - + @@ -100119,13 +100119,13 @@ - + - + - + @@ -100167,7 +100167,7 @@ - + @@ -101815,7 +101815,7 @@ - + @@ -101854,25 +101854,63 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - @@ -101920,32 +101958,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -101974,23 +101986,6 @@ - - - - - - - - - - - - - - - - - @@ -102149,7 +102144,7 @@ - + @@ -102178,7 +102173,7 @@ - + @@ -102186,7 +102181,7 @@ - + @@ -103185,9 +103180,9 @@ - + - + @@ -103271,7 +103266,7 @@ - + @@ -104313,7 +104308,7 @@ - + @@ -104329,7 +104324,7 @@ - + @@ -104337,7 +104332,7 @@ - + @@ -104351,7 +104346,7 @@ - + @@ -104359,7 +104354,7 @@ - + @@ -105223,7 +105218,7 @@ - + @@ -105233,7 +105228,7 @@ - + @@ -105244,7 +105239,7 @@ - + @@ -105256,7 +105251,7 @@ - + @@ -105269,7 +105264,7 @@ - + @@ -105283,7 +105278,7 @@ - + @@ -105298,7 +105293,7 @@ - + @@ -106641,6 +106636,13 @@ + + + + + + + @@ -107665,7 +107667,7 @@ - + @@ -107675,7 +107677,7 @@ - + @@ -107822,18 +107824,37 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + - - - - + @@ -107855,26 +107876,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -108174,7 +108175,7 @@ - + @@ -108194,7 +108195,7 @@ - + @@ -108654,28 +108655,10 @@ - + - - - - - - - - - - - - - - - - - - @@ -108705,6 +108688,17 @@ + + + + + + + + + + + @@ -108949,7 +108943,7 @@ - + @@ -109249,8 +109243,8 @@ - - + + @@ -109267,7 +109261,7 @@ - + @@ -109392,7 +109386,7 @@ - + @@ -110151,7 +110145,7 @@ - + @@ -110160,13 +110154,26 @@ - + + + + + + + + + + + + + + + + + - - - @@ -110176,20 +110183,6 @@ - - - - - - - - - - - - - - @@ -110199,7 +110192,7 @@ - + @@ -111686,7 +111679,7 @@ - + @@ -111701,19 +111694,19 @@ - + - + - + @@ -111721,7 +111714,7 @@ - + @@ -111729,7 +111722,7 @@ - + @@ -111751,7 +111744,7 @@ - + @@ -112285,7 +112278,7 @@ - + @@ -112896,7 +112889,7 @@ - + @@ -113317,7 +113310,7 @@ - + @@ -113481,7 +113474,7 @@ - + @@ -114365,7 +114358,7 @@ - + @@ -114435,31 +114428,45 @@ - + - + - + - + - + - + + + + + + + - + - + - + - + + + + + + + + + @@ -114467,7 +114474,7 @@ - + @@ -115377,7 +115384,7 @@ - + @@ -115429,7 +115436,7 @@ - + @@ -115781,8 +115788,6 @@ - - @@ -115792,6 +115797,7 @@ + @@ -115804,7 +115810,6 @@ - @@ -115828,11 +115833,11 @@ - + - + @@ -116115,7 +116120,7 @@ - + @@ -116138,7 +116143,7 @@ - + @@ -116211,7 +116216,7 @@ - + @@ -116219,6 +116224,7 @@ + @@ -116226,6 +116232,7 @@ + @@ -116384,7 +116391,7 @@ - + @@ -116482,7 +116489,7 @@ - + @@ -116590,25 +116597,6 @@ - - - - - - - - - - - - - - - - - - - @@ -116662,7 +116650,7 @@ - + @@ -116674,7 +116662,7 @@ - + @@ -116687,7 +116675,7 @@ - + @@ -116780,24 +116768,13 @@ - - - - - - - - - - - - + @@ -117433,7 +117410,7 @@ - + @@ -117571,7 +117548,7 @@ - + @@ -117586,12 +117563,12 @@ - + - + @@ -119697,7 +119674,7 @@ - + @@ -122184,15 +122161,7 @@ - - - - - - - - - + @@ -122915,6 +122884,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -129882,6 +129884,6 @@ diff --git a/android/abi_gki_aarch64_xiaomi b/android/abi_gki_aarch64_xiaomi new file mode 100644 index 000000000000..8d1df4df7ba0 --- /dev/null +++ b/android/abi_gki_aarch64_xiaomi @@ -0,0 +1,80 @@ +[abi_symbol_list] +# required by cs35l41_dlkm.ko + regmap_async_complete + regmap_multi_reg_write + regmap_multi_reg_write_bypassed + regmap_raw_write + regmap_raw_write_async + regulator_bulk_enable + snd_pcm_format_physical_width + snd_soc_get_volsw_range + snd_soc_info_volsw_range + snd_soc_put_volsw_range + +# required by q6_dlkm.ko + down_interruptible + __kfifo_alloc + __kfifo_free + __kfifo_from_user + snd_soc_bytes_info_ext + +# required by aw8697.ko + devm_gpio_free + +# required by msm_drm.ko + kobject_set_name + +# required by exfat.ko + block_write_full_page + __blockdev_direct_IO + __bread_gfp + __brelse + cont_write_begin + d_find_alias + d_move + filemap_fdatawait_range + filemap_fdatawrite_range + full_name_hash + generic_block_bmap + generic_cont_expand_simple + generic_fh_to_dentry + generic_fh_to_parent + generic_file_fsync + generic_file_write_iter + generic_fillattr + generic_write_end + __getblk_gfp + ilookup + in_group_p + inc_nlink + invalidate_bdev + invalidate_inode_buffers + iunique + __insert_inode_hash + kill_block_super + load_nls + __lock_buffer + mark_buffer_dirty + match_octal + match_strdup + mount_bdev + mpage_readpage + mpage_readpages + mpage_writepages + __mark_inode_dirty + nf_register_net_hooks + nf_unregister_net_hooks + sb_min_blocksize + sb_set_blocksize + setattr_copy + sync_blockdev + sync_dirty_buffer + sync_mapping_buffers + __remove_inode_hash + touch_buffer + truncate_pagecache + unload_nls + unlock_buffer + utf16s_to_utf8s + utf8s_to_utf16s + write_inode_now diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64 index b4c53eb05143..cd27f0ad7076 100644 --- a/build.config.gki.aarch64 +++ b/build.config.gki.aarch64 @@ -18,6 +18,7 @@ android/abi_gki_aarch64_sunxi android/abi_gki_aarch64_unisoc android/abi_gki_aarch64_vivo android/abi_gki_aarch64_workarounds +android/abi_gki_aarch64_xiaomi " TRIM_NONLISTED_KMI=1 KMI_SYMBOL_LIST_ADD_ONLY=1