diff --git a/android/GKI_VERSION b/android/GKI_VERSION
index 5bf5856b8bc6..62b24f895063 100644
--- a/android/GKI_VERSION
+++ b/android/GKI_VERSION
@@ -1 +1 @@
-LTS_5.4.61_e0b1644a472e
+LTS_5.4.61_662e2b3ab8fb
diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 77fd73d8c10c..541fa1afd553 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -1706,6 +1706,7 @@
+
@@ -2012,6 +2013,7 @@
+
@@ -2756,6 +2758,7 @@
+
@@ -2868,6 +2871,7 @@
+
@@ -4733,7 +4737,6 @@
-
@@ -14763,6 +14766,13 @@
+
+
+
+
+
+
+
@@ -14956,7 +14966,7 @@
-
+
@@ -15476,6 +15486,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -16009,7 +16033,7 @@
-
+
@@ -16079,18 +16103,18 @@
-
+
-
+
-
+
@@ -16098,7 +16122,7 @@
-
+
@@ -23194,6 +23218,8 @@
+
+
@@ -23249,6 +23275,11 @@
+
+
+
+
+
@@ -27275,7 +27306,6 @@
-
@@ -27315,7 +27345,7 @@
-
+
@@ -27372,6 +27402,7 @@
+
@@ -29096,55 +29127,55 @@
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -30831,6 +30862,12 @@
+
+
+
+
+
+
@@ -37765,6 +37802,7 @@
+
@@ -54251,6 +54289,7 @@
+
@@ -54338,8 +54377,6 @@
-
-
@@ -54522,6 +54559,7 @@
+
@@ -56023,14 +56061,6 @@
-
-
-
-
-
-
-
-
@@ -67750,6 +67780,10 @@
+
+
+
+
@@ -72180,6 +72214,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -82056,6 +82114,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -82349,17 +82418,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -89396,6 +89454,14 @@
+
+
+
+
+
+
+
+
@@ -89487,14 +89553,6 @@
-
-
-
-
-
-
-
-
@@ -89533,6 +89591,14 @@
+
+
+
+
+
+
+
+
@@ -94306,11 +94372,11 @@
-
+
-
-
+
+
@@ -100720,13 +100786,13 @@
-
+
-
+
-
+
@@ -100768,7 +100834,7 @@
-
+
@@ -104931,7 +104997,7 @@
-
+
@@ -104947,7 +105013,7 @@
-
+
@@ -104955,7 +105021,7 @@
-
+
@@ -104969,7 +105035,7 @@
-
+
@@ -110187,17 +110253,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -115440,7 +115495,7 @@
-
+
@@ -117843,6 +117898,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -123254,6 +123320,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -124729,44 +124814,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -126824,8 +126871,6 @@
-
-
diff --git a/android/abi_gki_aarch64_d6430e6763.xml b/android/abi_gki_aarch64_d6430e6763.xml
index 3612f4152f77..46b89758ac90 100644
--- a/android/abi_gki_aarch64_d6430e6763.xml
+++ b/android/abi_gki_aarch64_d6430e6763.xml
@@ -7495,7 +7495,7 @@
-
+
@@ -7673,7 +7673,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7784,24 +7802,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -8403,26 +8403,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -11422,44 +11402,44 @@
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
@@ -19354,12 +19334,12 @@
-
+
-
+
@@ -20346,12 +20326,12 @@
-
+
-
+
@@ -22417,17 +22397,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -30937,9 +30906,9 @@
-
-
-
+
+
+
@@ -32210,6 +32179,14 @@
+
+
+
+
+
+
+
+
@@ -33447,14 +33424,6 @@
-
-
-
-
-
-
-
-
@@ -33478,7 +33447,7 @@
-
+
@@ -33546,7 +33515,7 @@
-
+
@@ -40900,7 +40869,7 @@
-
+
@@ -40911,7 +40880,7 @@
-
+
@@ -40919,7 +40888,7 @@
-
+
@@ -40927,7 +40896,7 @@
-
+
@@ -43465,12 +43434,12 @@
-
+
-
+
-
+
@@ -47255,31 +47224,31 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -47301,8 +47270,8 @@
-
-
+
+
@@ -48293,8 +48262,8 @@
-
-
+
+
@@ -48816,17 +48785,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -48856,6 +48814,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -53966,7 +53935,7 @@
-
+
@@ -54731,12 +54700,12 @@
-
+
-
+
-
+
@@ -55156,7 +55125,7 @@
-
+
@@ -55346,7 +55315,7 @@
-
+
@@ -57202,7 +57171,7 @@
-
+
@@ -59512,573 +59481,573 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -60293,118 +60262,118 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -61290,9 +61259,9 @@
-
+
-
+
@@ -66461,7 +66430,7 @@
-
+
@@ -67736,7 +67705,7 @@
-
+
@@ -67991,7 +67960,7 @@
-
+
@@ -68345,7 +68314,7 @@
-
+
@@ -70232,12 +70201,12 @@
-
+
-
+
-
+
@@ -70290,7 +70259,7 @@
-
+
@@ -78908,13 +78877,13 @@
-
+
-
+
@@ -83705,6 +83674,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -86017,15 +85997,15 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
@@ -86449,7 +86429,7 @@
-
+
@@ -88740,12 +88720,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/android/abi_gki_aarch64_exynosauto b/android/abi_gki_aarch64_exynosauto
index bff65a71356a..7dc2d76ffe84 100644
--- a/android/abi_gki_aarch64_exynosauto
+++ b/android/abi_gki_aarch64_exynosauto
@@ -1,14 +1,17 @@
[abi_symbol_list]
# commonly used symbols
add_timer
+ add_wait_queue
__alloc_pages_nodemask
alloc_workqueue
__arch_copy_from_user
__arch_copy_to_user
+ arch_setup_dma_ops
arm64_const_caps_ready
__arm_smccc_smc
atomic_notifier_call_chain
atomic_notifier_chain_register
+ atomic_notifier_chain_unregister
__bitmap_and
__bitmap_andnot
blocking_notifier_call_chain
@@ -32,16 +35,21 @@
clk_enable
clk_get
clk_get_rate
+ __clk_is_enabled
clk_prepare
clk_put
+ clk_register
clk_set_rate
clk_unprepare
+ clk_unregister
complete
complete_all
+ complete_and_exit
__const_udelay
cpu_bit_bitmap
cpu_hwcap_keys
cpu_hwcaps
+ cpumask_next
cpu_number
__cpu_online_mask
__cpu_possible_mask
@@ -63,6 +71,7 @@
device_property_read_u32_array
device_remove_file
_dev_info
+ __dev_kfree_skb_any
devm_add_action
devm_clk_get
devm_free_irq
@@ -127,9 +136,8 @@
dma_request_slave_channel
dma_set_coherent_mask
dma_set_mask
- down
+ down_interruptible
down_read
- down_trylock
drm_add_edid_modes
drm_atomic_helper_connector_destroy_state
drm_atomic_helper_connector_duplicate_state
@@ -152,8 +160,10 @@
drm_mode_vrefresh
drm_panel_detach
enable_irq
+ eth_type_trans
event_triggers_call
fd_install
+ filp_open
find_next_bit
find_vma
finish_wait
@@ -163,6 +173,7 @@
fput
frame_vector_to_pages
free_irq
+ free_netdev
__free_pages
free_pages
freezing_slow_path
@@ -202,6 +213,8 @@
iommu_register_device_fault_handler
iommu_unregister_device_fault_handler
ion_alloc
+ __ion_device_add_heap
+ ion_device_remove_heap
ion_query_heaps_kernel
__ioremap
iounmap
@@ -231,6 +244,8 @@
kmem_cache_free
kmemdup
kobject_create_and_add
+ kobject_init_and_add
+ kobject_put
krealloc
kstrdup
kstrtobool
@@ -241,6 +256,7 @@
kthread_create_on_node
__kthread_init_worker
kthread_queue_work
+ kthread_should_stop
kthread_stop
kthread_worker_fn
ktime_get
@@ -268,19 +284,26 @@
mod_delayed_work_on
mod_timer
module_layout
+ module_put
__msecs_to_jiffies
msleep
__mutex_init
- mutex_is_locked
mutex_lock
+ mutex_lock_interruptible
mutex_unlock
names_cachep
+ __netdev_alloc_skb
netif_carrier_off
+ netif_carrier_on
+ netif_tx_wake_queue
no_llseek
+ nonseekable_open
nr_cpu_ids
__num_online_cpus
of_address_to_resource
of_alias_get_id
+ of_clk_add_provider
+ of_clk_del_provider
of_clk_get
of_device_get_match_data
of_device_is_available
@@ -290,6 +313,7 @@
of_find_matching_node_and_match
of_find_mipi_dsi_host_by_node
of_find_node_by_name
+ of_find_node_opts_by_path
of_find_property
of_get_child_by_name
of_get_display_timings
@@ -320,6 +344,7 @@
param_ops_bool
param_ops_int
param_ops_uint
+ PDE_DATA
perf_trace_buf_alloc
perf_trace_run_bpf_submit
pfn_valid
@@ -351,6 +376,7 @@
platform_get_irq
platform_get_resource
platform_get_resource_byname
+ pm_power_off
pm_qos_update_request
pm_runtime_allow
__pm_runtime_disable
@@ -363,17 +389,23 @@
__pm_runtime_suspend
__pm_runtime_use_autosuspend
pm_wakeup_dev_event
+ pm_wakeup_ws_event
preempt_schedule
preempt_schedule_notrace
prepare_to_wait_event
print_hex_dump
printk
+ proc_create_data
put_device
__put_page
__put_task_struct
put_unused_fd
queue_delayed_work_on
queue_work_on
+ radix_tree_delete
+ radix_tree_insert
+ radix_tree_lookup
+ radix_tree_next_chunk
___ratelimit
_raw_spin_lock
_raw_spin_lock_irq
@@ -391,6 +423,8 @@
__refrigerator
regcache_mark_dirty
regcache_sync
+ __register_chrdev
+ register_netdev
register_pm_notifier
register_reboot_notifier
register_restart_handler
@@ -410,6 +444,7 @@
regulator_unregister
release_firmware
__release_region
+ remove_proc_entry
request_firmware
__request_region
request_threaded_irq
@@ -418,7 +453,9 @@
schedule
schedule_timeout
scnprintf
+ seq_lseek
seq_printf
+ seq_read
set_cpus_allowed_ptr
set_page_dirty_lock
sg_alloc_table
@@ -428,6 +465,9 @@
sg_next
simple_read_from_buffer
simple_strtoul
+ single_open
+ single_release
+ skb_put
snd_pcm_format_width
snd_soc_component_update_bits
snd_soc_component_write
@@ -436,6 +476,7 @@
snd_soc_of_get_dai_link_codecs
snd_soc_of_get_dai_name
snd_soc_of_parse_audio_routing
+ snd_soc_of_put_dai_link_codecs
snd_soc_pm_ops
snprintf
sprintf
@@ -445,6 +486,7 @@
strcasecmp
strcmp
strcpy
+ strcspn
strlcpy
strlen
strncmp
@@ -478,8 +520,11 @@
trace_raw_output_prep
trace_seq_printf
__udelay
+ __unregister_chrdev
unregister_chrdev_region
+ unregister_netdev
unregister_pm_notifier
+ unregister_reboot_notifier
up
up_read
usb_add_hcd
@@ -530,6 +575,8 @@
wait_for_completion_timeout
__wake_up
wake_up_process
+ wakeup_source_register
+ wakeup_source_unregister
__warn_printk
work_busy
@@ -563,7 +610,6 @@
clk_hw_unregister_gate
clk_hw_unregister_mux
of_clk_add_hw_provider
- of_clk_del_provider
of_clk_hw_onecell_get
pm_runtime_force_resume
pm_runtime_force_suspend
@@ -571,16 +617,13 @@
# required by clk_exynos.ko
__clk_get_hw
clk_hw_get_parent
- clk_register
clk_register_clkdev
clk_register_fixed_factor
clk_register_fixed_rate
- of_clk_add_provider
of_clk_src_onecell_get
# required by dss.ko
__alloc_percpu
- cpumask_next
init_task
kstat
nr_irqs
@@ -655,14 +698,6 @@
usb_otg_state_string
usb_role_switch_register
usb_role_switch_unregister
- wakeup_source_register
- wakeup_source_unregister
-
-# required by ect_parser.ko
- seq_lseek
- seq_read
- single_open
- single_release
# required by exynos-acme.ko
bitmap_parselist
@@ -685,7 +720,6 @@
system_state
# required by exynos-chipid_v2.ko
- of_find_node_opts_by_path
soc_device_register
subsys_system_register
@@ -694,11 +728,7 @@
pm_genpd_add_subdomain
pm_genpd_init
-# required by exynos-reboot.ko
- pm_power_off
-
# required by exynos9drm.ko
- add_wait_queue
bus_find_device
component_add
component_bind_all
@@ -709,7 +739,6 @@
console_trylock
console_unlock
device_rename
- drm_atomic_helper_async_check
drm_atomic_helper_check
drm_atomic_helper_cleanup_planes
drm_atomic_helper_commit
@@ -851,9 +880,9 @@
drm_vblank_init
mipi_dsi_host_register
mipi_dsi_host_unregister
+ mutex_is_locked
of_drm_find_bridge
of_drm_find_panel
- of_get_next_available_child
of_graph_get_endpoint_by_regs
of_graph_get_endpoint_count
of_graph_get_next_endpoint
@@ -861,10 +890,9 @@
of_graph_get_remote_port
of_graph_get_remote_port_parent
of_graph_parse_endpoint
- of_io_request_and_map
- of_platform_device_create
- of_platform_device_destroy
- of_property_match_string
+ of_phandle_iterator_init
+ of_phandle_iterator_next
+ platform_find_device_by_driver
strlcat
videomode_from_timings
@@ -878,14 +906,12 @@
dev_pm_opp_disable
dev_pm_opp_get_freq
dev_pm_opp_put
- unregister_reboot_notifier
update_devfreq
# required by exynos_mfc.ko
iommu_dma_reserve_iova
iommu_map_sg
iommu_unmap
- mutex_lock_interruptible
ns_to_timeval
# required by exynos_pm_qos.ko
@@ -924,13 +950,13 @@
uart_update_timeout
uart_write_wakeup
-# required by exynosauto9-itmon.ko
- atomic_notifier_chain_unregister
-
# required by exynosauto9-sadk-tas6424.ko
snd_soc_dai_set_tdm_slot
snd_soc_dai_set_tristate
+# required by fmp-core.ko
+ bcmp
+
# required by g2d.ko
__arch_copy_in_user
compat_alloc_user_space
@@ -960,7 +986,6 @@
# required by ion_exynos_mod.ko
adjust_managed_page_count
- arch_setup_dma_ops
cma_alloc
cma_get_name
cma_release
@@ -972,13 +997,10 @@
gen_pool_free_owner
ion_buffer_prep_noncached
ion_buffer_zero
- __ion_device_add_heap
- ion_device_remove_heap
ion_free
ion_heap_map_kernel
ion_heap_map_user
ion_heap_unmap_kernel
- kthread_should_stop
list_sort
mod_node_page_state
of_reserved_mem_device_release
@@ -992,14 +1014,15 @@
bpf_trace_run5
cache_line_size
clear_page
- __clk_is_enabled
__close_fd
dev_pm_opp_of_add_table
dev_pm_opp_of_remove_table
dev_pm_opp_put_regulators
dev_pm_opp_set_regulators
dma_fence_get_status
+ down
downgrade_write
+ down_trylock
down_write
dump_stack
__get_task_comm
@@ -1011,10 +1034,8 @@
hrtimer_init
hrtimer_start_range_ns
kfree_call_rcu
- kobject_put
ktime_get_raw
__mmdrop
- module_put
of_machine_is_compatible
param_ops_byte
rb_erase
@@ -1028,7 +1049,6 @@
remap_vmalloc_range
static_key_slow_dec
static_key_slow_inc
- strcspn
strncasecmp
synchronize_rcu
sysfs_remove_file_ns
@@ -1118,6 +1138,7 @@
irq_domain_get_irq_data
irq_domain_set_info
irq_domain_update_bus_token
+ pcie_get_mps
pcie_set_mps
pci_find_bus
pci_get_device
@@ -1143,7 +1164,6 @@
gpiod_get_value_cansleep
gpiod_put
netdev_printk
- netif_carrier_on
of_phy_attach
phy_attach_direct
phy_detach
@@ -1175,6 +1195,7 @@
pinctrl_add_gpio_range
pinctrl_dev_get_drvdata
pinctrl_remove_gpio_range
+ pin_get_name
# required by pl330.ko
amba_driver_register
@@ -1191,9 +1212,6 @@
# required by rtc-s2vps01.ko
devm_rtc_device_register
- pm_wakeup_ws_event
- rtc_time64_to_tm
- rtc_tm_to_time64
rtc_update_irq
rtc_valid_tm
@@ -1210,20 +1228,14 @@
v4l2_i2c_subdev_init
# required by sam-is.ko
- down_interruptible
- filp_close
- filp_open
- get_random_u32
get_task_pid
i2c_new_device
jiffies_to_msecs
+ kobject_del
kstrtou16
kthread_flush_work
- kthread_flush_worker
ktime_get_ts64
ktime_get_with_offset
- map_vm_area
- mutex_trylock
ns_to_timespec
param_ops_string
phy_configure
@@ -1233,12 +1245,10 @@
regulator_is_enabled
regulator_set_voltage
sched_setscheduler_nocheck
- unmap_kernel_range
v4l2_device_register_subdev
v4l2_device_set_name
v4l2_device_unregister_subdev
v4l2_subdev_call_wrappers
- vscnprintf
# required by samsung-iommu-group.ko
iommu_group_alloc
@@ -1251,15 +1261,12 @@
dev_close
device_set_wakeup_capable
device_set_wakeup_enable
- __dev_kfree_skb_any
dev_open
dql_completed
dql_reset
eth_mac_addr
ethtool_op_get_link
ethtool_op_get_ts_info
- eth_type_trans
- free_netdev
in4_pton
in6_pton
jiffies_to_usecs
@@ -1275,7 +1282,6 @@
__napi_schedule_irqoff
napi_schedule_prep
netdev_alert
- __netdev_alloc_skb
netdev_err
netdev_info
netdev_update_features
@@ -1287,7 +1293,6 @@
netif_schedule_queue
netif_set_real_num_rx_queues
netif_set_real_num_tx_queues
- netif_tx_wake_queue
net_ratelimit
ns_to_timespec64
of_get_mac_address
@@ -1305,13 +1310,10 @@
platform_get_irq_byname
_raw_spin_lock_bh
_raw_spin_unlock_bh
- register_netdev
rtnl_lock
rtnl_unlock
skb_pull
- skb_put
skb_tstamp_tx
- unregister_netdev
# required by samsung_iommu.ko
bus_set_iommu
@@ -1334,7 +1336,6 @@
iommu_group_get
iommu_group_get_for_dev
iommu_group_get_iommudata
- iommu_group_put
iommu_group_remove_device
iommu_group_set_iommudata
iommu_put_dma_cookie
@@ -1366,7 +1367,6 @@
__devm_regmap_init
__devm_regmap_init_mmio_clk
dma_mmap_attrs
- iommu_attach_device
__platform_register_drivers
platform_unregister_drivers
pm_runtime_no_callbacks
@@ -1379,7 +1379,6 @@
snd_pcm_lib_preallocate_pages
snd_pcm_period_elapsed
snd_pcm_release_substream
- snd_soc_component_exit_regmap
snd_soc_component_init_regmap
snd_soc_component_read
snd_soc_dapm_add_routes
@@ -1388,7 +1387,6 @@
snd_soc_dapm_new_controls
snd_soc_dapm_put_enum_double
snd_soc_info_enum_double
- snd_soc_register_component
snd_soc_set_runtime_hwparams
snd_soc_unregister_component
@@ -1410,14 +1408,14 @@
# required by spidev.ko
driver_unregister
find_next_zero_bit
- __register_chrdev
__spi_register_driver
spi_setup
spi_sync
stream_open
- __unregister_chrdev
# required by ufs-exynos-core.ko
+ bio_crypt_should_process
+ keyslot_manager_create_passthrough
ufshcd_config_pwr_mode
ufshcd_dme_get_attr
ufshcd_dme_set_attr
@@ -1442,6 +1440,19 @@
vb2_expbuf
vb2_request_object_is_buffer
+# required by vbufq-be-module.ko
+ drain_workqueue
+ filp_close
+
+# required by vdriver-lib-module.ko
+ kobject_get
+ kset_create_and_add
+
+# required by veth2-module.ko
+ alloc_netdev_mqs
+ ether_setup
+ netif_rx
+
# required by videobuf2-dma-sg.ko
kvfree
kvmalloc_node
@@ -1453,6 +1464,43 @@
vm_map_ram
vm_unmap_ram
+# required by vlx-clk-ctrl-common-module.ko
+ vscnprintf
+
+# required by vlx-hyp-module.ko
+ ioremap_cache
+ irq_create_of_mapping
+ irq_dispose_mapping
+ irq_find_matching_fwspec
+ of_irq_find_parent
+ proc_mkdir
+
+# required by vlx-last-kmsg-module.ko
+ proc_set_size
+
+# required by vlx-prop-module.ko
+ kobject_uevent
+ kset_unregister
+ sysfs_create_bin_file
+ sysfs_remove_bin_file
+
+# required by vlx-vion-module.ko
+ dma_buf_fd
+ idr_alloc_cyclic
+ idr_find
+ idr_remove
+ __module_get
+ platform_device_register_full
+ __platform_driver_probe
+ radix_tree_iter_delete
+ refcount_dec_and_mutex_lock
+ uuid_gen
+ __vmalloc
+
+# required by vlx-vmq-module.ko
+ default_wake_function
+ remove_wait_queue
+
# required by xhci-hcd.ko
dma_pool_alloc
dma_pool_create
@@ -1462,9 +1510,6 @@
pci_alloc_irq_vectors_affinity
pci_free_irq_vectors
pci_irq_vector
- radix_tree_delete
- radix_tree_insert
- radix_tree_lookup
radix_tree_maybe_preload
schedule_timeout_uninterruptible
sg_pcopy_from_buffer
@@ -1513,3 +1558,20 @@
pci_bus_type
__usb_create_hcd
usb_hcd_platform_shutdown
+
+# preserved by --additions-only
+ drm_atomic_helper_async_check
+ get_random_u32
+ iommu_attach_device
+ iommu_group_put
+ kthread_flush_worker
+ map_vm_area
+ mutex_trylock
+ of_get_next_available_child
+ of_io_request_and_map
+ of_platform_device_create
+ of_platform_device_destroy
+ of_property_match_string
+ snd_soc_component_exit_regmap
+ snd_soc_register_component
+ unmap_kernel_range
diff --git a/android/abi_gki_aarch64_unisoc b/android/abi_gki_aarch64_unisoc
index 5b300379d79e..0f3c2df59e3b 100644
--- a/android/abi_gki_aarch64_unisoc
+++ b/android/abi_gki_aarch64_unisoc
@@ -225,6 +225,7 @@
gpiochip_line_is_irq
gpiod_direction_input
gpiod_direction_output_raw
+ gpiod_get
gpiod_get_raw_value
gpiod_set_raw_value
gpiod_set_raw_value_cansleep
@@ -2026,6 +2027,7 @@
sg_nents_for_len
# required by wcn_bsp.ko
+ gpiod_set_value
memdup_user
pci_disable_device
pci_disable_msi
diff --git a/drivers/usb/gadget/function/f_accessory.c b/drivers/usb/gadget/function/f_accessory.c
index bd84fa84e098..a2e27c4cfe42 100644
--- a/drivers/usb/gadget/function/f_accessory.c
+++ b/drivers/usb/gadget/function/f_accessory.c
@@ -568,6 +568,7 @@ static ssize_t acc_read(struct file *fp, char __user *buf,
struct acc_dev *dev = fp->private_data;
struct usb_request *req;
ssize_t r = count;
+ ssize_t data_length;
unsigned xfer;
int ret = 0;
@@ -589,6 +590,15 @@ static ssize_t acc_read(struct file *fp, char __user *buf,
goto done;
}
+ /*
+ * Calculate the data length by considering termination character.
+ * Then compansite the difference of rounding up to
+ * integer multiple of maxpacket size.
+ */
+ data_length = count;
+ data_length += dev->ep_out->maxpacket - 1;
+ data_length -= data_length % dev->ep_out->maxpacket;
+
if (dev->rx_done) {
// last req cancelled. try to get it.
req = dev->rx_req[0];
@@ -598,7 +608,7 @@ static ssize_t acc_read(struct file *fp, char __user *buf,
requeue_req:
/* queue a request */
req = dev->rx_req[0];
- req->length = count;
+ req->length = data_length;
dev->rx_done = 0;
ret = usb_ep_queue(dev->ep_out, req, GFP_KERNEL);
if (ret < 0) {
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 34fc3e0ad441..c5b5ec2ef436 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5255,6 +5255,7 @@ int sched_setattr_nocheck(struct task_struct *p, const struct sched_attr *attr)
{
return __sched_setscheduler(p, attr, false, true);
}
+EXPORT_SYMBOL_GPL(sched_setattr_nocheck);
/**
* sched_setscheduler_nocheck - change the scheduling policy and/or RT priority of a thread from kernelspace.