Merge "Merge android11-5.4.54 (261a54f) into msm-5.4" (c0410e7e) · Commits · e / devices / android_kernel_fairphone_FP5

Makefile

+6 −4

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 5
		PATCHLEVEL = 4
		SUBLEVEL = 52
		SUBLEVEL = 54
		EXTRAVERSION =
		NAME = Kleptomaniac Octopus

		@@ -540,7 +540,7 @@ ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)
		$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")
		endif
		GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
		CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
		CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
		GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
		endif
		ifneq ($(GCC_TOOLCHAIN),)
		@@ -1163,7 +1163,8 @@ targets := vmlinux
		$(sort $(vmlinux-deps)): descend ;

		filechk_kernel.release = \
		echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))"
		echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion \
		$(srctree) $(BRANCH) $(KMI_GENERATION))"

		# Store (new) KERNELRELEASE string in include/config/kernel.release
		include/config/kernel.release: FORCE
		@@ -1883,7 +1884,8 @@ checkstack:
		$(PERL) $(srctree)/scripts/checkstack.pl $(CHECKSTACK_ARCH)

		kernelrelease:
		@echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))"
		@echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion \
		$(srctree) $(BRANCH) $(KMI_GENERATION))"

		kernelversion:
		@echo $(KERNELVERSION)

android/abi_gki_aarch64.xml

+3763 −3469

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_c7725aece3.xml→android/abi_gki_aarch64_261a54f37d.xml

+1709 −2105

File changed and moved.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_cuttlefish

+37 −10

Original line number	Diff line number	Diff line
		@@ -15,6 +15,9 @@
		cfg80211_put_bss
		__cfi_slowpath
		__check_object_size
		__class_create
		class_destroy
		complete
		__const_udelay
		consume_skb
		cpu_hwcap_keys
		@@ -60,6 +63,7 @@
		kfree_skb
		__kmalloc
		kmalloc_caches
		kmalloc_order_trace
		kmem_cache_alloc
		kmem_cache_alloc_trace
		kmem_cache_create
		@@ -95,6 +99,7 @@
		netif_tx_stop_all_queues
		netif_tx_wake_queue
		no_llseek
		nonseekable_open
		noop_llseek
		nr_cpu_ids
		param_ops_bool
		@@ -115,6 +120,7 @@
		platform_device_unregister
		__platform_driver_register
		platform_driver_unregister
		preempt_schedule
		preempt_schedule_notrace
		prepare_to_wait_event
		printk
		@@ -169,6 +175,8 @@
		strsep
		synchronize_irq
		synchronize_net
		sysfs_create_group
		sysfs_remove_group
		system_wq
		trace_define_field
		trace_event_buffer_commit
		@@ -179,6 +187,7 @@
		trace_handle_return
		trace_raw_output_prep
		trace_seq_printf
		unlock_page
		unregister_netdev
		unregister_netdevice_notifier
		unregister_netdevice_queue
		@@ -207,6 +216,7 @@
		vring_del_virtqueue
		vring_interrupt
		vring_transport_features
		wait_for_completion
		wait_woken
		__wake_up
		__warn_printk
		@@ -305,7 +315,6 @@
		pagecache_get_page
		path_get
		path_put
		preempt_schedule
		register_filesystem
		seq_puts
		set_anon_super
		@@ -315,11 +324,8 @@
		simple_statfs
		strndup_user
		sync_filesystem
		sysfs_create_group
		sysfs_remove_group
		truncate_inode_pages
		unlock_new_inode
		unlock_page
		unlock_rename
		unregister_filesystem
		user_path_at_empty
		@@ -430,8 +436,6 @@
		cdev_device_add
		cdev_device_del
		cdev_init
		__class_create
		class_destroy
		__compat_only_sysfs_link_entry_to_kobj
		del_timer_sync
		device_initialize
		@@ -591,7 +595,6 @@
		drm_set_preferred_mode
		drm_universal_plane_init
		__get_task_comm
		kmalloc_order_trace
		kvfree
		kvmalloc_node
		memdup_user
		@@ -629,8 +632,6 @@
		ww_mutex_unlock

		# required by virtio-rng.ko
		complete
		wait_for_completion
		wait_for_completion_killable

		# required by virtio_blk.ko
		@@ -679,6 +680,33 @@
		__sysfs_match_string
		unregister_blkdev

		# required by virtio_console.ko
		cancel_work_sync
		cdev_add
		cdev_alloc
		cdev_del
		device_create
		device_destroy
		dma_alloc_attrs
		dma_free_attrs
		fasync_helper
		freezing_slow_path
		hvc_alloc
		hvc_instantiate
		hvc_kick
		hvc_poll
		hvc_remove
		__hvc_resize
		kill_fasync
		kobject_uevent
		pipe_lock
		pipe_unlock
		__refrigerator
		__register_chrdev
		__splice_from_pipe
		system_freezing_cnt
		__unregister_chrdev

		# required by virtio_input.ko
		input_alloc_absinfo
		input_allocate_device
		@@ -803,7 +831,6 @@

		# required by vsock.ko
		autoremove_wake_function
		nonseekable_open
		prandom_u32
		prepare_to_wait
		proto_register

android/abi_gki_aarch64_db845c

+73 −115

Original line number	Diff line number	Diff line
		[abi_whitelist]
		# commonly used symbols
		add_uevent_var
		__alloc_skb
		alloc_workqueue
		__arch_copy_from_user
		__arch_copy_to_user
		arm64_const_caps_ready
		@@ -10,9 +7,7 @@
		bpf_trace_run2
		bpf_trace_run3
		bpf_trace_run4
		bt_err
		bt_info
		cancel_delayed_work
		bpf_trace_run5
		cancel_delayed_work_sync
		cancel_work_sync
		__cfi_slowpath
		@@ -34,8 +29,6 @@
		clk_set_rate
		clk_sync_state
		clk_unprepare
		cmd_db_read_addr
		cmd_db_read_aux_data
		complete
		complete_all
		__const_udelay
		@@ -48,21 +41,12 @@
		delayed_work_timer_fn
		del_timer
		del_timer_sync
		destroy_workqueue
		dev_driver_string
		_dev_err
		dev_fwnode
		dev_get_regmap
		device_create_file
		device_init_wakeup
		device_match_fwnode
		device_property_present
		device_property_read_string
		device_property_read_u32_array
		device_register
		device_release_driver
		device_set_wakeup_capable
		device_unregister
		device_wakeup_enable
		_dev_info
		__dev_kfree_skb_any
		@@ -81,23 +65,20 @@
		__devm_of_phy_provider_register
		devm_of_platform_populate
		devm_phy_create
		devm_phy_get
		devm_pinctrl_register
		__devm_regmap_init_mmio_clk
		devm_regulator_bulk_get
		devm_regulator_get
		devm_regulator_register
		devm_request_threaded_irq
		devm_reset_control_array_get
		__devm_reset_control_get
		devm_reset_controller_register
		devm_usb_get_phy_by_phandle
		devm_watchdog_register_device
		_dev_notice
		dev_pm_opp_get_level
		dev_set_name
		_dev_warn
		disable_irq
		disable_irq_nosync
		divider_get_val
		divider_recalc_rate
		divider_round_rate_parent
		@@ -116,7 +97,6 @@
		dma_set_coherent_mask
		dma_set_mask
		do_SAK
		down_write
		driver_unregister
		drm_add_edid_modes
		drm_atomic_helper_connector_destroy_state
		@@ -134,10 +114,6 @@
		enable_irq
		eth_validate_addr
		event_triggers_call
		extcon_get_edev_by_phandle
		extcon_get_state
		extcon_register_notifier
		extcon_unregister_notifier
		fd_install
		find_next_bit
		find_next_zero_bit
		@@ -158,8 +134,6 @@
		handle_edge_irq
		handle_level_irq
		hdmi_audio_infoframe_init
		hrtimer_init
		hrtimer_start_range_ns
		i2c_add_adapter
		i2c_del_adapter
		idr_find
		@@ -182,7 +156,6 @@
		irq_domain_remove
		irq_find_mapping
		irq_find_matching_fwspec
		irq_modify_status
		irq_of_parse_and_map
		irq_set_chained_handler_and_data
		irq_set_chip_and_handler_name
		@@ -196,19 +169,18 @@
		__kmalloc
		kmalloc_caches
		kmem_cache_alloc_trace
		kmemdup
		kstrdup
		ktime_get
		ktime_get_mono_fast_ns
		__list_add_valid
		__list_del_entry_valid
		memcpy
		memremap
		memset
		mii_ethtool_gset
		mii_nway_restart
		mod_timer
		module_layout
		module_put
		__msecs_to_jiffies
		msleep
		__mutex_init
		@@ -224,14 +196,13 @@
		of_alias_get_id
		of_clk_add_hw_provider
		of_clk_del_provider
		of_clk_get
		of_clk_hw_onecell_get
		of_clk_set_defaults
		of_device_get_match_data
		of_device_is_compatible
		of_find_device_by_node
		of_find_property
		of_fwnode_ops
		of_genpd_add_provider_onecell
		of_get_child_by_name
		of_get_next_available_child
		of_get_next_child
		@@ -242,43 +213,27 @@
		of_match_node
		of_parse_phandle
		of_phy_simple_xlate
		of_platform_depopulate
		of_platform_populate
		of_property_count_elems_of_size
		of_property_read_string
		of_property_read_u32_index
		of_property_read_variable_u32_array
		of_reserved_mem_lookup
		param_ops_bool
		param_ops_int
		param_ops_uint
		pci_bus_type
		pci_dev_put
		pci_match_id
		pci_read_config_byte
		pci_read_config_dword
		pci_read_config_word
		__pci_register_driver
		pci_set_mwi
		pci_unregister_driver
		pci_write_config_byte
		perf_trace_buf_alloc
		perf_trace_run_bpf_submit
		phy_exit
		phy_init
		phy_power_off
		phy_power_on
		phy_set_mode_ext
		pinconf_generic_dt_node_to_map
		pinctrl_dev_get_drvdata
		pinctrl_pm_select_default_state
		pinctrl_pm_select_sleep_state
		pinctrl_utils_free_map
		platform_bus_type
		platform_device_add
		platform_device_add_properties
		platform_device_add_resources
		platform_device_alloc
		platform_device_put
		platform_device_register_full
		platform_device_unregister
		__platform_driver_register
		@@ -287,6 +242,8 @@
		platform_get_irq_byname
		platform_get_resource
		platform_get_resource_byname
		pm_genpd_add_subdomain
		pm_genpd_init
		pm_runtime_allow
		__pm_runtime_disable
		pm_runtime_enable
		@@ -331,13 +288,10 @@
		regulator_disable
		regulator_enable
		regulator_set_load
		regulator_set_voltage
		release_firmware
		request_firmware
		request_threaded_irq
		reset_control_assert
		reset_control_deassert
		rpmh_write_async
		schedule_timeout
		schedule_timeout_uninterruptible
		scnprintf
		@@ -347,22 +301,19 @@
		sg_next
		skb_clone
		skb_dequeue
		skb_pull
		skb_push
		skb_put
		skb_queue_purge
		skb_queue_tail
		snprintf
		sort
		sprintf
		sscanf
		__stack_chk_fail
		__stack_chk_guard
		strcmp
		strcpy
		strlcpy
		strlen
		strncmp
		strncpy
		__sw_hweight32
		__sw_hweight64
		synchronize_irq
		@@ -378,10 +329,8 @@
		trace_handle_return
		trace_raw_output_prep
		trace_seq_printf
		try_module_get
		tty_flip_buffer_push
		__tty_insert_flip_char
		tty_termios_encode_baud_rate
		uart_add_one_port
		uart_get_baud_rate
		uart_register_driver
		@@ -392,19 +341,14 @@
		uart_update_timeout
		uart_write_wakeup
		unregister_reboot_notifier
		up_write
		usb_add_hcd
		usb_amd_dev_put
		usb_amd_quirk_pll_check
		usb_amd_quirk_pll_disable
		usb_amd_quirk_pll_enable
		usb_calc_bus_time
		usb_create_hcd
		usb_deregister
		usb_disabled
		usb_get_dr_mode
		usb_hcd_check_unlink_urb
		usb_hcd_end_port_resume
		usb_hcd_giveback_urb
		usb_hc_died
		usb_hcd_is_primary_hcd
		@@ -416,10 +360,7 @@
		usb_hcd_platform_shutdown
		usb_hcd_poll_rh_status
		usb_hcd_resume_root_hub
		usb_hcds_loaded
		usb_hcd_start_port_resume
		usb_hcd_unlink_urb_from_ep
		usb_hub_clear_tt_buffer
		usbnet_disconnect
		usbnet_get_endpoints
		usbnet_get_msglevel
		@@ -480,11 +421,8 @@
		__clk_mux_determine_rate_closest
		divider_ro_round_rate_parent
		of_find_node_opts_by_path
		of_genpd_add_provider_onecell
		of_genpd_del_provider
		of_prop_next_u32
		pm_genpd_add_subdomain
		pm_genpd_init
		pm_genpd_remove_subdomain

		# required by clk-rpmh.ko
		@@ -518,9 +456,9 @@
		regmap_multi_reg_write

		# required by msm.ko
		alloc_workqueue
		__bitmap_andnot
		__bitmap_weight
		bpf_trace_run5
		bpf_trace_run6
		bpf_trace_run8
		clk_get
		@@ -542,6 +480,7 @@
		component_master_del
		component_unbind_all
		_ctype
		destroy_workqueue
		devfreq_recommended_opp
		devfreq_resume_device
		devfreq_suspend_device
		@@ -557,7 +496,6 @@
		dev_pm_opp_find_freq_ceil
		dev_pm_opp_find_freq_exact
		dev_pm_opp_find_freq_floor
		dev_pm_opp_get_level
		dev_pm_opp_get_opp_count
		dev_pm_opp_get_voltage
		dev_pm_opp_of_add_table
		@@ -739,6 +677,8 @@
		gpiod_set_value
		hdmi_audio_infoframe_pack
		hdmi_infoframe_pack
		hrtimer_init
		hrtimer_start_range_ns
		i2c_transfer
		icc_put
		icc_set_bw
		@@ -752,6 +692,7 @@
		iommu_unmap
		irq_domain_xlate_onecell
		kasprintf
		kmemdup
		kstrdup_quotable_cmdline
		kthread_create_on_node
		kthread_destroy_worker
		@@ -763,7 +704,6 @@
		kvmalloc_node
		llist_add_batch
		memparse
		memremap
		memunmap
		mipi_dsi_create_packet
		mipi_dsi_host_register
		@@ -779,6 +719,7 @@
		of_dma_configure
		of_drm_find_bridge
		of_drm_find_panel
		of_find_device_by_node
		of_find_matching_node_and_match
		of_get_compatible_child
		of_graph_get_endpoint_by_regs
		@@ -786,6 +727,7 @@
		of_graph_get_remote_port_parent
		of_graph_parse_endpoint
		of_icc_get
		of_platform_depopulate
		of_property_read_string_helper
		param_ops_charp
		pm_runtime_get_if_in_use
		@@ -799,13 +741,14 @@
		register_vmap_purge_notifier
		regulator_get
		regulator_put
		request_firmware
		request_firmware_direct
		reservation_ww_class
		round_jiffies_up
		sched_setscheduler
		sg_free_table
		shmem_truncate_range
		strncpy
		sscanf
		strstr
		sync_file_create
		sync_file_get_fence
		@@ -835,6 +778,7 @@
		of_machine_is_compatible

		# required by i2c-qup.ko
		param_ops_uint
		__usecs_to_jiffies

		# required by pm8941-pwrkey.ko
		@@ -852,14 +796,13 @@
		icc_provider_add
		icc_provider_del
		of_icc_xlate_onecell
		rpmh_invalidate
		rpmh_write_batch

		# required by arm_smmu.ko
		alloc_io_pgtable_ops
		amba_bustype
		bus_set_iommu
		device_link_add
		device_match_fwnode
		devm_free_irq
		driver_find_device
		free_io_pgtable_ops
		@@ -946,6 +889,7 @@
		mii_ethtool_set_link_ksettings
		netif_carrier_on
		pskb_expand_head
		skb_pull
		skb_trim

		# required by nvmem_qfprom.ko
		@@ -960,7 +904,12 @@
		devm_nvmem_cell_get

		# required by phy-qcom-usb-hs.ko
		extcon_get_edev_by_phandle
		extcon_get_state
		extcon_register_notifier
		extcon_unregister_notifier
		of_property_read_variable_u8_array
		regulator_set_voltage
		reset_control_reset

		# required by pinctrl-msm.ko
		@@ -970,10 +919,12 @@
		gpiochip_set_chained_irqchip
		gpiochip_unlock_as_irq
		handle_bad_irq
		module_put
		pinctrl_force_default
		pinctrl_force_sleep
		pm_power_off
		register_restart_handler
		try_module_get
		unregister_restart_handler

		# required by pinctrl-spmi-gpio.ko
		@@ -991,12 +942,12 @@
		devres_release
		kfree_const
		kstrdup_const
		strncmp

		# required by qcom-rpmh-regulator.ko
		of_get_regulator_init_data
		of_node_name_eq
		regulator_list_voltage_linear_range
		rpmh_write

		# required by qcom_spmi-regulator.ko
		jiffies_to_usecs
		@@ -1014,6 +965,12 @@
		rtc_valid_tm

		# required by ufs-qcom.ko
		devm_phy_get
		phy_exit
		phy_init
		phy_power_off
		phy_power_on
		phy_set_mode_ext
		print_hex_dump
		ufshcd_dme_get_attr
		ufshcd_dme_set_attr
		@@ -1036,6 +993,11 @@
		# required by mdt_loader.ko
		request_firmware_into_buf

		# required by qcom_rpmh.ko
		bitmap_find_next_zero_area_off
		__bitmap_set
		of_get_property

		# required by rmtfs_mem.ko
		alloc_chrdev_region
		cdev_device_add
		@@ -1046,7 +1008,6 @@
		default_llseek
		device_initialize
		devm_memremap
		of_reserved_mem_lookup
		remap_pfn_range
		unregister_chrdev_region

		@@ -1061,6 +1022,7 @@
		# required by smsm.ko
		handle_nested_irq
		irq_domain_xlate_twocell
		irq_modify_status
		qcom_smem_state_register
		qcom_smem_state_unregister

		@@ -1075,9 +1037,11 @@
		__release_region
		__request_region
		tty_termios_baud_rate
		tty_termios_encode_baud_rate

		# required by qcom_geni_serial.ko
		console_stop
		device_create_file
		devm_platform_ioremap_resource
		handle_sysrq
		kstrtoint
		@@ -1090,58 +1054,50 @@
		uart_set_options

		# required by ulpi.ko
		add_uevent_var
		bus_register
		bus_unregister
		device_register
		device_unregister
		driver_register
		of_device_modalias
		of_device_request_module
		of_device_uevent_modalias
		__request_module

		# required by dwc3-qcom.ko
		devm_extcon_register_notifier
		of_clk_get_parent_count

		# required by dwc3.ko
		device_property_read_u8_array
		devm_usb_get_phy
		extcon_find_edev_by_node
		extcon_get_extcon_dev
		of_usb_get_phy_mode
		phy_pm_runtime_get_sync
		phy_pm_runtime_put_sync
		platform_get_irq_byname_optional
		system_freezable_wq
		usb_add_gadget_udc
		usb_decode_ctrl
		usb_del_gadget_udc
		usb_ep_set_maxpacket_limit
		usb_gadget_giveback_request
		usb_gadget_map_request_by_dev
		usb_gadget_set_state
		usb_gadget_udc_reset
		usb_gadget_unmap_request_by_dev
		usb_get_maximum_speed

		# required by ohci-hcd.ko
		flush_work
		gen_pool_dma_alloc_align
		gen_pool_dma_zalloc_align
		gen_pool_free_owner
		sb800_prefetch
		usb_calc_bus_time
		usb_hcds_loaded

		# required by ohci-pci.ko
		pci_get_slot
		pci_match_id
		usb_amd_prefetch_quirk

		# required by ohci-platform.ko
		devm_reset_control_array_get
		of_clk_get
		usb_create_hcd

		# required by xhci-hcd.ko
		add_timer
		cancel_delayed_work
		mod_delayed_work_on
		__num_online_cpus
		param_ops_ullong
		pci_alloc_irq_vectors_affinity
		pci_free_irq_vectors
		pci_irq_vector
		platform_device_add
		platform_device_add_properties
		platform_device_add_resources
		platform_device_alloc
		platform_device_put
		radix_tree_maybe_preload
		sg_pcopy_from_buffer
		sg_pcopy_to_buffer
		@@ -1149,38 +1105,36 @@
		usb_amd_pt_check_port
		usb_asmedia_modifyflowcontrol
		usb_disable_xhci_ports
		usb_hcd_end_port_resume
		usb_hcd_irq
		usb_hcd_map_urb_for_dma
		usb_hcd_start_port_resume
		usb_hub_clear_tt_buffer
		usb_wakeup_notification
		wait_for_completion

		# required by xhci-pci-renesas.ko
		device_release_driver
		pci_dev_get
		pci_read_config_dword
		pci_read_config_word
		pci_write_config_byte
		pci_write_config_dword
		request_firmware_nowait

		# required by xhci-pci.ko
		pci_d3cold_disable
		pci_set_mwi
		pci_set_power_state
		usb_create_shared_hcd
		usb_enable_intel_xhci_ports

		# required by xhci-plat-hcd.ko
		device_property_present
		devm_usb_get_phy_by_phandle
		of_usb_host_tpl_support
		__usb_create_hcd

		# required by roles.ko
		__class_create
		class_destroy
		class_find_device
		device_connection_find_match
		device_match_name
		fwnode_connection_find_match
		fwnode_get_parent
		fwnode_property_present
		kstrtobool
		__sysfs_match_string

		# required by qcom-wdt.ko
		platform_get_irq_optional

		@@ -1200,6 +1154,7 @@
		dget_parent
		d_instantiate
		d_make_root
		down_write
		dput
		fget
		flush_dcache_page
		@@ -1255,6 +1210,7 @@
		unlock_page
		unlock_rename
		unregister_filesystem
		up_write
		user_path_at_empty
		vfs_create
		vfs_fallocate
		@@ -1275,6 +1231,7 @@
		schedule

		# required by qrtr.ko
		__alloc_skb
		capable
		datagram_poll
		idr_alloc
		@@ -1296,6 +1253,7 @@
		skb_copy_datagram_iter
		skb_free_datagram
		__skb_pad
		skb_queue_purge
		skb_recv_datagram
		skb_set_owner_w
		sk_free