diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 49832c52416e..67f1874ac840 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -2499,6 +2499,8 @@
+
+
@@ -2562,6 +2564,10 @@
+
+
+
+
@@ -3667,6 +3673,7 @@
+
@@ -3912,6 +3919,11 @@
+
+
+
+
+
@@ -4144,9 +4156,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7170,6 +7198,7 @@
+
@@ -7294,6 +7323,9 @@
+
+
+
@@ -10036,11 +10068,20 @@
+
+
+
+
+
+
+
+
+
@@ -11797,6 +11838,14 @@
+
+
+
+
+
+
+
+
@@ -11983,6 +12032,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -15162,6 +15222,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -19310,6 +19426,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -21332,6 +21474,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -21871,6 +22027,14 @@
+
+
+
+
+
+
+
+
@@ -22301,6 +22465,7 @@
+
@@ -23535,6 +23700,7 @@
+
@@ -27508,6 +27674,7 @@
+
@@ -27535,6 +27702,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -31735,6 +31922,7 @@
+
@@ -33688,6 +33876,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -34300,6 +34499,9 @@
+
+
+
@@ -38886,6 +39088,14 @@
+
+
+
+
+
+
+
+
@@ -39921,6 +40131,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -40490,6 +40711,7 @@
+
@@ -40788,6 +41010,14 @@
+
+
+
+
+
+
+
+
@@ -41378,6 +41608,7 @@
+
@@ -41767,6 +41998,7 @@
+
@@ -46527,6 +46759,7 @@
+
@@ -46639,6 +46872,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -48756,6 +49015,7 @@
+
@@ -49016,6 +49276,7 @@
+
@@ -50662,6 +50923,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -51599,6 +51895,14 @@
+
+
+
+
+
+
+
+
@@ -52087,6 +52391,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -53056,6 +53374,7 @@
+
@@ -54164,6 +54483,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -54977,6 +55310,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -59147,6 +59491,7 @@
+
@@ -60256,6 +60601,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -62717,6 +63100,7 @@
+
@@ -63894,6 +64278,7 @@
+
@@ -64694,6 +65079,11 @@
+
+
+
+
+
@@ -65669,6 +66059,7 @@
+
@@ -66257,6 +66648,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -66555,6 +66960,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -67200,6 +67616,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -71936,6 +72385,14 @@
+
+
+
+
+
+
+
+
@@ -75007,6 +75464,11 @@
+
+
+
+
+
@@ -75646,6 +76108,7 @@
+
@@ -77713,6 +78176,14 @@
+
+
+
+
+
+
+
+
@@ -83297,6 +83768,14 @@
+
+
+
+
+
+
+
+
@@ -88787,6 +89266,15 @@
+
+
+
+
+
+
+
+
+
@@ -91285,6 +91773,7 @@
+
@@ -93341,6 +93830,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -93815,6 +94315,7 @@
+
@@ -94366,6 +94867,11 @@
+
+
+
+
+
@@ -94997,6 +95503,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -100058,6 +100587,7 @@
+
@@ -101118,6 +101648,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -102500,6 +103047,14 @@
+
+
+
+
+
+
+
+
@@ -110691,6 +111246,14 @@
+
+
+
+
+
+
+
+
@@ -111371,6 +111934,14 @@
+
+
+
+
+
+
+
+
@@ -129997,6 +130568,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -130331,7 +130912,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -135962,6 +136567,11 @@
+
+
+
+
+
@@ -137236,6 +137846,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -138448,6 +139083,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -138458,10 +139156,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/abi_gki_aarch64_rockchip b/android/abi_gki_aarch64_rockchip
index 6489a344910d..12d5af00e945 100644
--- a/android/abi_gki_aarch64_rockchip
+++ b/android/abi_gki_aarch64_rockchip
@@ -22,6 +22,8 @@
bdget_disk
bdput
_bin2bcd
+ __bitmap_and
+ __bitmap_andnot
blk_cleanup_queue
blk_execute_rq_nowait
blk_mq_free_request
@@ -174,6 +176,7 @@
debugfs_create_file
debugfs_create_regset32
debugfs_remove
+ debugfs_rename
default_llseek
delayed_work_timer_fn
del_gendisk
@@ -200,6 +203,7 @@
device_del
device_destroy
device_get_child_node_count
+ device_get_match_data
device_get_named_child_node
device_get_next_child_node
device_initialize
@@ -285,6 +289,7 @@
devm_snd_soc_register_component
devm_usb_get_phy
_dev_notice
+ dev_open
dev_pm_domain_detach
dev_pm_opp_find_freq_ceil
dev_pm_opp_find_freq_floor
@@ -469,6 +474,8 @@
enable_irq
eth_mac_addr
eth_platform_get_mac_address
+ ethtool_op_get_link
+ ethtool_op_get_ts_info
eth_type_trans
eth_validate_addr
event_triggers_call
@@ -480,6 +487,7 @@
extcon_set_state_sync
extcon_unregister_notifier
failure_tracking
+ fasync_helper
fd_install
find_next_bit
find_next_zero_bit
@@ -584,6 +592,9 @@
i2c_smbus_xfer
i2c_transfer
i2c_transfer_buffer_flags
+ ida_alloc_range
+ ida_destroy
+ ida_free
idr_alloc
idr_destroy
idr_find
@@ -661,6 +672,7 @@
kfree_const
kfree_sensitive
kfree_skb
+ kill_fasync
kimage_voffset
__kmalloc
kmalloc_caches
@@ -682,6 +694,10 @@
kstrtouint_from_user
kstrtoull
kthread_create_on_node
+ kthread_create_worker
+ kthread_destroy_worker
+ kthread_flush_worker
+ kthread_queue_work
kthread_should_stop
kthread_stop
ktime_get
@@ -703,7 +719,10 @@
__log_read_mmio
__log_write_mmio
lzo1x_decompress_safe
+ mdiobus_alloc_size
+ mdiobus_free
mdiobus_read
+ mdiobus_unregister
mdiobus_write
media_create_pad_link
media_device_init
@@ -753,10 +772,14 @@
mutex_lock_interruptible
mutex_trylock
mutex_unlock
+ napi_gro_receive
__netdev_alloc_skb
netdev_err
netdev_info
+ netdev_update_features
netdev_warn
+ netif_carrier_off
+ netif_carrier_on
netif_rx
netif_rx_ni
netif_tx_wake_queue
@@ -850,6 +873,7 @@
perf_trace_buf_alloc
perf_trace_run_bpf_submit
pfn_valid
+ phy_attached_info
phy_configure
phy_drivers_register
phy_drivers_unregister
@@ -965,6 +989,7 @@
__register_chrdev
register_chrdev_region
register_inetaddr_notifier
+ register_netdev
register_netdevice
register_netdevice_notifier
register_pm_notifier
@@ -1069,6 +1094,7 @@
simple_strtoul
single_open
single_release
+ skb_add_rx_frag
skb_clone
skb_copy
skb_copy_bits
@@ -1126,6 +1152,7 @@
sscanf
__stack_chk_fail
__stack_chk_guard
+ strcasecmp
strchr
strcmp
strcpy
@@ -1147,6 +1174,7 @@
sync_file_create
sync_file_get_fence
synchronize_irq
+ synchronize_net
synchronize_rcu
syscon_node_to_regmap
syscon_regmap_lookup_by_phandle
@@ -1194,6 +1222,7 @@
__unregister_chrdev
unregister_chrdev_region
unregister_inetaddr_notifier
+ unregister_netdev
unregister_netdevice_notifier
unregister_netdevice_queue
unregister_reboot_notifier
@@ -1389,7 +1418,6 @@
# required by bcmdhd.ko
alloc_etherdev_mqs
complete_and_exit
- dev_open
down_interruptible
down_timeout
iwe_stream_add_event
@@ -1400,7 +1428,6 @@
mmc_set_data_timeout
mmc_sw_reset
mmc_wait_for_req
- netdev_update_features
netif_napi_add
__netif_napi_del
netif_set_xps_queue
@@ -1411,7 +1438,6 @@
__nlmsg_put
_raw_read_lock_bh
_raw_read_unlock_bh
- register_netdev
sched_set_fifo_low
sdio_claim_host
sdio_disable_func
@@ -1445,13 +1471,11 @@
strcat
strspn
sys_tz
- unregister_netdev
unregister_pm_notifier
wireless_send_event
# required by bifrost_kbase.ko
__arch_clear_user
- __bitmap_andnot
__bitmap_equal
__bitmap_or
__bitmap_weight
@@ -1537,7 +1561,6 @@
# required by cfg80211.ko
bpf_trace_run10
_ctype
- debugfs_rename
dev_change_net_namespace
__dev_get_by_index
dev_get_by_index
@@ -1570,7 +1593,6 @@
rfkill_blocked
rfkill_pause_polling
rfkill_resume_polling
- skb_add_rx_frag
__sock_create
sock_release
unregister_pernet_device
@@ -1759,6 +1781,11 @@
usb_speed_string
usb_wakeup_enabled_descendants
+# required by dwmac-rockchip.ko
+ csum_tcpudp_nofold
+ ip_send_check
+ of_get_phy_mode
+
# required by fusb302.ko
extcon_get_extcon_dev
fwnode_create_software_node
@@ -1881,7 +1908,6 @@
dev_fetch_sw_netstats
dev_queue_xmit
ether_setup
- ethtool_op_get_link
get_random_u32
__hw_addr_init
__hw_addr_sync
@@ -1890,10 +1916,7 @@
kernel_param_unlock
kfree_skb_list
ktime_get_seconds
- napi_gro_receive
netdev_set_default_ethtool_ops
- netif_carrier_off
- netif_carrier_on
netif_receive_skb
netif_receive_skb_list
netif_tx_stop_all_queues
@@ -1919,7 +1942,6 @@
skb_queue_head
skb_queue_purge
skb_queue_tail
- synchronize_net
unregister_inet6addr_notifier
unregister_netdevice_many
@@ -1956,9 +1978,6 @@
dev_pm_qos_expose_latency_tolerance
dev_pm_qos_hide_latency_tolerance
dev_pm_qos_update_user_latency_tolerance
- ida_alloc_range
- ida_destroy
- ida_free
init_srcu_struct
memchr_inv
param_ops_ulong
@@ -2107,7 +2126,6 @@
extcon_sync
# required by phy-rockchip-inno-usb3.ko
- strcasecmp
usb_add_phy
# required by phy-rockchip-samsung-hdptx-hdmi.ko
@@ -2159,6 +2177,18 @@
pm_genpd_init
pm_genpd_remove
+# required by pps_core.ko
+ kobject_get
+
+# required by ptp.ko
+ kthread_cancel_delayed_work_sync
+ kthread_delayed_work_timer_fn
+ kthread_mod_delayed_work
+ kthread_queue_delayed_work
+ ktime_get_snapshot
+ posix_clock_register
+ posix_clock_unregister
+
# required by pwm-regulator.ko
regulator_map_voltage_iterate
@@ -2562,10 +2592,8 @@
blk_verify_command
cdev_alloc
class_interface_unregister
- fasync_helper
get_sg_io_hdr
import_iovec
- kill_fasync
put_sg_io_hdr
_raw_read_lock_irqsave
_raw_read_unlock_irqrestore
@@ -2593,12 +2621,7 @@
# required by smsc95xx.ko
csum_partial
- ethtool_op_get_ts_info
- mdiobus_alloc_size
- mdiobus_free
__mdiobus_register
- mdiobus_unregister
- phy_attached_info
phy_connect_direct
phy_disconnect
phy_ethtool_get_link_ksettings
@@ -2677,6 +2700,71 @@
spi_setup
stream_open
+# required by stmmac-platform.ko
+ device_get_phy_mode
+ of_get_mac_address
+ of_phy_is_fixed_link
+ platform_get_irq_byname_optional
+
+# required by stmmac.ko
+ devm_alloc_etherdev_mqs
+ dql_completed
+ dql_reset
+ ethtool_convert_legacy_u32_to_link_mode
+ ethtool_convert_link_mode_to_legacy_u32
+ flow_block_cb_setup_simple
+ flow_rule_match_basic
+ flow_rule_match_ipv4_addrs
+ flow_rule_match_ports
+ mdiobus_get_phy
+ __napi_alloc_skb
+ napi_complete_done
+ napi_disable
+ __napi_schedule
+ napi_schedule_prep
+ netdev_alert
+ netdev_pick_tx
+ netdev_rss_key_fill
+ netif_device_attach
+ netif_device_detach
+ netif_napi_add
+ __netif_napi_del
+ netif_schedule_queue
+ netif_set_real_num_rx_queues
+ netif_set_real_num_tx_queues
+ of_mdiobus_register
+ page_pool_alloc_pages
+ page_pool_create
+ page_pool_destroy
+ page_pool_put_page
+ page_pool_release_page
+ phy_init_eee
+ phylink_connect_phy
+ phylink_create
+ phylink_destroy
+ phylink_disconnect_phy
+ phylink_ethtool_get_eee
+ phylink_ethtool_get_pauseparam
+ phylink_ethtool_get_wol
+ phylink_ethtool_ksettings_get
+ phylink_ethtool_ksettings_set
+ phylink_ethtool_nway_reset
+ phylink_ethtool_set_eee
+ phylink_ethtool_set_pauseparam
+ phylink_ethtool_set_wol
+ phylink_get_eee_err
+ phylink_mac_change
+ phylink_mii_ioctl
+ phylink_of_phy_connect
+ phylink_set_port_modes
+ phylink_speed_down
+ phylink_speed_up
+ phylink_start
+ phylink_stop
+ pm_wakeup_dev_event
+ reset_control_reset
+ skb_tstamp_tx
+
# required by sw_sync.ko
dma_fence_free
dma_fence_signal_locked