Merge branch 'android12-5.10' into android12-5.10-lts

Sync up with android12-5.10 for the following commits:

49a70f3362 ANDROID: GKI: Add usb/mmc/v4l2 related symbols for i.MX
e18d6a73b9 ANDROID: GKI: Add clk/pinctrl/irq related symbols for i.MX
7652f868f4 ANDROID: GKI: Add phy/net/pci related symbols for i.MX
d587a4f210 ANDROID: GKI: Add audio/rproc related symbols for i.MX
e8ab8b22f1 ANDROID: GKI: Add display related symbols for i.MX
8cfe4f1f9e FROMLIST: usb: dwc3: gadget: Stop EP0 transfers during pullup disable
f90feddc7e ANDROID: abi_gki_aarch64_qcom: Add mmc clk scaling functions
072eded7ca FROMLIST: mmc: core: Export core functions required for clk scaling
bef08a94ff ANDROID: GKI: Update symbols to symbol list
ffa937b6db ANDROID: abi_gki_aarch64_qcom: Add irq_domain_disconnect_hierarchy symbol
34f60eead2 FROMGIT: irqchip/qcom-pdc: Trim unused levels of the interrupt hierarchy
4c9aa4c6f0 FROMGIT: irqdomain: Export irq_domain_disconnect_hierarchy()
d6f6a6cd65 ANDROID: GKI: Add devcoredump API to symbol list
db490c7269 ANDROID: Update the exynos symbol list
228d32e2d0 UPSTREAM: kfence: fix is_kfence_address() for addresses below KFENCE_POOL_SIZE
e113eb454e ANDROID: xt_quota2: set usersize in xt_match registration object
60a4c35570 ANDROID: xt_quota2: clear quota2_log message before sending
4b05a506bd ANDROID: xt_quota2: remove trailing junk which might have a digit in it
9f19de4e29 ANDROID: GKI: Update symbols to abi_gki_aarch64_oplus
5cd4b1ce23 UPSTREAM: cfi: Use rcu_read_{un}lock_sched_notrace
580b7fa7d9 ANDROID: Update symbol list for mtk
70f3f9db21 UPSTREAM: af_unix: fix garbage collect vs MSG_PEEK
4ff1a38f8d ANDROID: GKI: Add initial symbol list for i.MX
51b382a231 ANDROID: GKI: Update abi_gki_aarch64_qcom for balance reclaim symbols
d734d9dc3b ANDROID: ABI: update symbols to A12-K5.10 unisoc whitelist for the first time
205686b558 FROMGIT: rcu: Fix stall-warning deadlock due to non-release of rcu_node ->lock
2493757f88 BACKPORT: ALSA: usb-audio: fix incorrect clock source setting
d0331b15e6 ANDROID: scsi: ufs: Add more logging
62a5f8e3ac ANDROID: Update symbol list for mtk
fdc8f778e2 ANDROID: scheduler: export task_sched_runtime
3425d6179e FROMLIST: mm: slub: fix slub_debug disabling for list of slabs
2e06e5e6f8 FROMLIST: mm/madvise: add MADV_WILLNEED to process_madvise()
ff7eccee30 ANDROID: Update the exynos symbol list
e9844a46c9 FROMGIT: firmware: arm_scmi: Free mailbox channels if probe fails
c72ca115a2 ANDROID: GKI: gki_defconfig: Enable CONFIG_NFC
0ad91fe432 ANDROID: sched: Make uclamp changes depend on CAP_SYS_NICE
2950b81ead ANDROID: GKI: update xiaomi symbol list and ABI XML
8b76fc436b ANDROID: ABI: update generic symbol list

Change-Id: I89b7ccf2c98f61e2775c4b79f16342b00ec480b1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

android/abi_gki_aarch64_exynos

@@ -207,6 +207,8 @@
   cpu_hwcap_keys
   cpu_hwcaps
   cpuidle_get_cpu_driver
+  cpuidle_pause_and_lock
+  cpuidle_resume_and_unlock
   cpumask_next
   cpumask_next_and
   cpu_number
@@ -334,6 +336,7 @@
   devm_gpio_request_one
   devm_hwrng_register
   devm_i2c_new_dummy_device
+  devm_iio_channel_get
   devm_iio_device_alloc
   __devm_iio_device_register
   devm_input_allocate_device
@@ -759,7 +762,11 @@
   enable_percpu_irq
   end_buffer_read_sync
   ether_setup
+  eth_platform_get_mac_address
+  ethtool_op_get_link
+  ethtool_op_get_ts_info
   eth_type_trans
+  eth_validate_addr
   event_triggers_call
   extcon_get_state
   extcon_set_state_sync
@@ -796,6 +803,7 @@
   gcd
   generic_file_llseek
   generic_handle_irq
+  generic_mii_ioctl
   genlmsg_multicast_allns
   genlmsg_put
   genl_register_family
@@ -923,11 +931,14 @@
   ignore_console_lock_warning
   iio_channel_get
   iio_channel_release
+  iio_convert_raw_to_processed
   iio_device_alloc
   iio_device_free
   __iio_device_register
   iio_device_unregister
+  iio_get_channel_type
   iio_read_channel_processed
+  iio_read_channel_raw
   inc_zone_page_state
   inet_csk_get_port
   init_dummy_netdev
@@ -1142,6 +1153,10 @@
   memunmap
   mfd_add_devices
   mfd_remove_devices
+  mii_ethtool_get_link_ksettings
+  mii_ethtool_gset
+  mii_ethtool_set_link_ksettings
+  mii_nway_restart
   mipi_dsi_attach
   mipi_dsi_compression_mode
   mipi_dsi_dcs_read
@@ -1202,6 +1217,8 @@
   napi_schedule_prep
   __netdev_alloc_skb
   netdev_err
+  netdev_info
+  netdev_warn
   netif_carrier_off
   netif_carrier_on
   netif_napi_add
@@ -1261,6 +1278,7 @@
   of_find_device_by_node
   of_find_matching_node_and_match
   of_find_node_by_name
+  of_find_node_by_phandle
   of_find_node_by_type
   of_find_node_opts_by_path
   of_find_node_with_property
@@ -1467,11 +1485,13 @@
   proc_create_data
   proc_create_seq_private
   proc_mkdir
+  proc_mkdir_data
   proc_remove
   proc_set_size
   proc_set_user
   proc_symlink
   __pskb_copy_fclone
+  pskb_expand_head
   __pskb_pull_tail
   put_device
   put_disk
@@ -1897,6 +1917,7 @@
   time64_to_tm
   topology_set_thermal_pressure
   _totalram_pages
+  __trace_bprintk
   trace_event_buffer_commit
   trace_event_buffer_reserve
   trace_event_ignore_this_pid
@@ -1921,8 +1942,10 @@
   __traceiter_android_rvh_select_task_rq_rt
   __traceiter_android_vh_cpu_idle_enter
   __traceiter_android_vh_cpu_idle_exit
+  __traceiter_android_vh_do_wake_up_sync
   __traceiter_android_vh_ipi_stop
   __traceiter_android_vh_scheduler_tick
+  __traceiter_android_vh_set_wake_flags
   __traceiter_android_vh_show_mem
   __traceiter_android_vh_ufs_compl_command
   __traceiter_android_vh_ufs_prepare_command
@@ -1970,8 +1993,10 @@
   __tracepoint_android_rvh_select_task_rq_rt
   __tracepoint_android_vh_cpu_idle_enter
   __tracepoint_android_vh_cpu_idle_exit
+  __tracepoint_android_vh_do_wake_up_sync
   __tracepoint_android_vh_ipi_stop
   __tracepoint_android_vh_scheduler_tick
+  __tracepoint_android_vh_set_wake_flags
   __tracepoint_android_vh_show_mem
   __tracepoint_android_vh_ufs_compl_command
   __tracepoint_android_vh_ufs_prepare_command
@@ -2077,6 +2102,7 @@
   __udelay
   ufshcd_auto_hibern8_update
   ufshcd_dme_get_attr
+  ufshcd_dme_set_attr
   ufshcd_hold
   ufshcd_pltfrm_init
   ufshcd_query_flag_retry
@@ -2110,6 +2136,7 @@
   usb_choose_configuration
   usb_copy_descriptors
   __usb_create_hcd
+  usb_deregister
   usb_disabled
   usb_enable_autosuspend
   usb_ep_alloc_request
@@ -2123,9 +2150,31 @@
   usb_hcd_platform_shutdown
   usb_hub_find_child
   usb_interface_id
+  usbnet_disconnect
+  usbnet_get_endpoints
+  usbnet_get_msglevel
+  usbnet_get_stats64
+  usbnet_link_change
+  usbnet_nway_reset
+  usbnet_open
+  usbnet_probe
+  usbnet_read_cmd
+  usbnet_read_cmd_nopm
+  usbnet_resume
+  usbnet_set_msglevel
+  usbnet_skb_return
+  usbnet_start_xmit
+  usbnet_stop
+  usbnet_suspend
+  usbnet_tx_timeout
+  usbnet_update_max_qlen
+  usbnet_write_cmd
+  usbnet_write_cmd_async
+  usbnet_write_cmd_nopm
   usb_otg_state_string
   usb_put_function_instance
   usb_put_hcd
+  usb_register_driver
   usb_register_notify
   usb_remove_hcd
   usb_speed_string
@@ -2254,6 +2303,7 @@
   wakeup_source_register
   wakeup_source_unregister
   __wake_up_sync
+  __wake_up_sync_key
   __warn_printk
   watchdog_init_timeout
   watchdog_register_device

android/abi_gki_aarch64_generic

@@ -68,6 +68,7 @@
   blkdev_put
   blk_execute_rq_nowait
   blk_get_request
+  blk_ksm_init_passthrough
   blk_put_request
   blk_queue_flag_clear
   blk_queue_flag_set

android/abi_gki_aarch64_mtk

@@ -190,6 +190,7 @@
   cpufreq_driver_resolve_freq
   __cpufreq_driver_target
   cpufreq_enable_fast_switch
+  cpufreq_frequency_table_get_index
   cpufreq_generic_attr
   cpufreq_generic_frequency_table_verify
   cpufreq_get_policy
@@ -397,6 +398,7 @@
   devm_pinctrl_get
   devm_pinctrl_put
   devm_pinctrl_register_and_init
+  devm_platform_get_and_ioremap_resource
   devm_platform_ioremap_resource
   devm_platform_ioremap_resource_byname
   devm_power_supply_get_by_phandle
@@ -531,6 +533,7 @@
   driver_create_file
   driver_remove_file
   driver_unregister
+  drm_add_edid_modes
   drm_add_modes_noedid
   drm_atomic_add_affected_connectors
   drm_atomic_get_crtc_state
@@ -568,6 +571,7 @@
   drm_connector_attach_encoder
   drm_connector_cleanup
   drm_connector_init
+  drm_connector_update_edid_property
   drm_crtc_cleanup
   drm_crtc_handle_vblank
   drm_crtc_init_with_planes
@@ -581,6 +585,16 @@
   drm_dev_put
   drm_dev_register
   drm_dev_unregister
+  drm_dp_aux_init
+  drm_dp_aux_register
+  drm_dp_channel_eq_ok
+  drm_dp_clock_recovery_ok
+  drm_dp_dpcd_read
+  drm_dp_dpcd_write
+  drm_dp_link_train_channel_eq_delay
+  drm_dp_link_train_clock_recovery_delay
+  drm_edid_duplicate
+  drm_edid_to_sad
   drm_encoder_cleanup
   drm_encoder_init
   __drm_err
@@ -603,8 +617,8 @@
   drm_gem_prime_fd_to_handle
   drm_gem_prime_handle_to_fd
   drm_gem_prime_import
-  drm_gem_private_object_init
   drm_gem_vm_close
+  drm_get_edid
   drm_helper_hpd_irq_event
   drm_helper_mode_fill_fb_struct
   drm_helper_probe_single_connector_modes
@@ -813,6 +827,7 @@
   i2c_add_adapter
   i2c_del_adapter
   i2c_del_driver
+  i2c_get_adapter
   i2c_get_dma_safe_msg_buf
   i2c_put_dma_safe_msg_buf
   i2c_register_driver
@@ -1072,6 +1087,7 @@
   media_entity_pads_init
   media_entity_remote_pad
   media_entity_remove_links
+  __media_entity_setup_link
   media_graph_walk_next
   media_graph_walk_start
   media_pipeline_start
@@ -1421,6 +1437,7 @@
   __put_net
   __put_page
   put_pid
+  put_task_stack
   __put_task_struct
   put_unused_fd
   put_vaddr_frames
@@ -1697,6 +1714,7 @@
   skb_queue_purge
   skb_queue_tail
   skb_trim
+  smp_call_function
   snd_card_add_dev_attr
   snd_ctl_boolean_mono_info
   snd_jack_set_key
@@ -1847,6 +1865,7 @@
   tasklist_lock
   __task_pid_nr_ns
   __task_rq_lock
+  task_sched_runtime
   thermal_cooling_device_unregister
   thermal_of_cooling_device_register
   thermal_zone_get_temp
@@ -1865,6 +1884,7 @@
   trace_event_raw_init
   trace_event_reg
   trace_handle_return
+  __traceiter_android_rvh_after_enqueue_task
   __traceiter_android_rvh_cpu_overutilized
   __traceiter_android_rvh_dequeue_task
   __traceiter_android_rvh_dequeue_task_fair
@@ -1873,6 +1893,8 @@
   __traceiter_android_rvh_find_busiest_group
   __traceiter_android_rvh_find_energy_efficient_cpu
   __traceiter_android_rvh_finish_prio_fork
+  __traceiter_android_rvh_media_device_setup_link
+  __traceiter_android_rvh_new_task_stats
   __traceiter_android_rvh_prepare_prio_fork
   __traceiter_android_rvh_rtmutex_prepare_setprio
   __traceiter_android_rvh_sched_newidle_balance
@@ -1881,6 +1903,9 @@
   __traceiter_android_rvh_set_user_nice
   __traceiter_android_rvh_tick_entry
   __traceiter_android_rvh_uclamp_eff_get
+  __traceiter_android_rvh_v4l2subdev_set_fmt
+  __traceiter_android_rvh_v4l2subdev_set_frame_interval
+  __traceiter_android_rvh_v4l2subdev_set_selection
   __traceiter_android_vh_alter_futex_plist_add
   __traceiter_android_vh_alter_rwsem_list_add
   __traceiter_android_vh_arch_set_freq_scale
@@ -1898,8 +1923,12 @@
   __traceiter_android_vh_exit_creds
   __traceiter_android_vh_fill_ext_fmtdesc
   __traceiter_android_vh_finish_update_load_avg_se
+  __traceiter_android_vh_freq_qos_add_request
+  __traceiter_android_vh_freq_qos_update_request
+  __traceiter_android_vh_freq_qos_remove_request
   __traceiter_android_vh_iommu_alloc_iova
   __traceiter_android_vh_iommu_free_iova
+  __traceiter_android_vh_ipv6_gen_linklocal_addr
   __traceiter_android_vh_logbuf
   __traceiter_android_vh_override_creds
   __traceiter_android_vh_prepare_update_load_avg_se
@@ -1929,6 +1958,9 @@
   __traceiter_rwmmio_read
   __traceiter_rwmmio_write
   __traceiter_sched_update_nr_running_tp
+  __traceiter_task_newtask
+  __traceiter_xhci_urb_giveback
+  __tracepoint_android_rvh_after_enqueue_task
   __tracepoint_android_rvh_cpu_overutilized
   __tracepoint_android_rvh_dequeue_task
   __tracepoint_android_rvh_dequeue_task_fair
@@ -1937,6 +1969,8 @@
   __tracepoint_android_rvh_find_busiest_group
   __tracepoint_android_rvh_find_energy_efficient_cpu
   __tracepoint_android_rvh_finish_prio_fork
+  __tracepoint_android_rvh_media_device_setup_link
+  __tracepoint_android_rvh_new_task_stats
   __tracepoint_android_rvh_prepare_prio_fork
   __tracepoint_android_rvh_rtmutex_prepare_setprio
   __tracepoint_android_rvh_sched_newidle_balance
@@ -1945,6 +1979,9 @@
   __tracepoint_android_rvh_set_user_nice
   __tracepoint_android_rvh_tick_entry
   __tracepoint_android_rvh_uclamp_eff_get
+  __tracepoint_android_rvh_v4l2subdev_set_fmt
+  __tracepoint_android_rvh_v4l2subdev_set_frame_interval
+  __tracepoint_android_rvh_v4l2subdev_set_selection
   __tracepoint_android_vh_alter_futex_plist_add
   __tracepoint_android_vh_alter_rwsem_list_add
   __tracepoint_android_vh_arch_set_freq_scale
@@ -1962,8 +1999,12 @@
   __tracepoint_android_vh_exit_creds
   __tracepoint_android_vh_fill_ext_fmtdesc
   __tracepoint_android_vh_finish_update_load_avg_se
+  __tracepoint_android_vh_freq_qos_add_request
+  __tracepoint_android_vh_freq_qos_update_request
+  __tracepoint_android_vh_freq_qos_remove_request
   __tracepoint_android_vh_iommu_alloc_iova
   __tracepoint_android_vh_iommu_free_iova
+  __tracepoint_android_vh_ipv6_gen_linklocal_addr
   __tracepoint_android_vh_logbuf
   __tracepoint_android_vh_override_creds
   __tracepoint_android_vh_prepare_update_load_avg_se
@@ -1996,6 +2037,8 @@
   __tracepoint_rwmmio_write
   __tracepoint_sched_update_nr_running_tp
   tracepoint_srcu
+  __tracepoint_task_newtask
+  __tracepoint_xhci_urb_giveback
   trace_print_array_seq
   trace_print_hex_seq
   trace_print_symbols_seq
@@ -2385,6 +2428,7 @@
   dma_sync_single_for_device
   downgrade_write
   down_read_trylock
+  drm_gem_private_object_init
   get_user_pages
   get_user_pages_fast
   gpiod_set_raw_value
@@ -2402,7 +2446,6 @@
   kstrtobool_from_user
   ktime_get_raw
   led_classdev_unregister
-  __media_entity_setup_link
   memdup_user
   __mmdrop
   module_put
@@ -2415,7 +2458,6 @@
   param_ops_string
   perf_num_counters
   pin_user_pages_remote
-  put_task_stack
   rb_prev
   rb_replace_node
   __release_region
@@ -2445,7 +2487,6 @@
   si_meminfo
   skb_pull_rcsum
   skb_realloc_headroom
-  smp_call_function
   smp_call_function_single
   snd_soc_component_test_bits
   sprint_symbol_no_offset
@@ -2455,31 +2496,17 @@
   syscore_suspend
   system_long_wq
   thermal_zone_device_update
-  __traceiter_android_rvh_after_enqueue_task
-  __traceiter_android_rvh_media_device_setup_link
   __traceiter_android_rvh_sched_rebalance_domains
-  __traceiter_android_rvh_v4l2subdev_set_fmt
-  __traceiter_android_rvh_v4l2subdev_set_frame_interval
-  __traceiter_android_rvh_v4l2subdev_set_selection
   __traceiter_android_vh_cgroup_attach
-  __traceiter_android_vh_ipv6_gen_linklocal_addr
   __traceiter_android_vh_is_fpsimd_save
   __traceiter_android_vh_media_device_setup_link
   __traceiter_android_vh_v4l2subdev_set_fmt
   __traceiter_android_vh_v4l2subdev_set_frame_interval
   __traceiter_android_vh_v4l2subdev_set_selection
   __traceiter_gpu_mem_total
-  __traceiter_task_newtask
-  __traceiter_xhci_urb_giveback
   trace_output_call
-  __tracepoint_android_rvh_after_enqueue_task
-  __tracepoint_android_rvh_media_device_setup_link
   __tracepoint_android_rvh_sched_rebalance_domains
-  __tracepoint_android_rvh_v4l2subdev_set_fmt
-  __tracepoint_android_rvh_v4l2subdev_set_frame_interval
-  __tracepoint_android_rvh_v4l2subdev_set_selection
   __tracepoint_android_vh_cgroup_attach
-  __tracepoint_android_vh_ipv6_gen_linklocal_addr
   __tracepoint_android_vh_is_fpsimd_save
   __tracepoint_android_vh_media_device_setup_link
   __tracepoint_android_vh_ufs_update_sdev
@@ -2487,8 +2514,6 @@
   __tracepoint_android_vh_v4l2subdev_set_frame_interval
   __tracepoint_android_vh_v4l2subdev_set_selection
   __tracepoint_gpu_mem_total
-  __tracepoint_task_newtask
-  __tracepoint_xhci_urb_giveback
   trace_print_flags_seq
   try_module_get
   tty_driver_flush_buffer

android/abi_gki_aarch64_oplus

@@ -35,6 +35,7 @@
   atomic_notifier_call_chain
   atomic_notifier_chain_register
   atomic_notifier_chain_unregister
+  autoremove_wake_function
   available_idle_cpu
   bdget_disk
   bdput
@@ -171,11 +172,13 @@
   config_group_init_type_name
   config_item_get
   config_item_put
+  console_printk
   console_stop
   console_suspend_enabled
   __const_udelay
   consume_skb
   contig_page_data
+  _copy_from_iter
   _copy_from_iter_full
   __cpu_active_mask
   cpu_bit_bitmap
@@ -192,9 +195,11 @@
   cpufreq_freq_attr_scaling_boost_freqs
   cpufreq_generic_frequency_table_verify
   cpufreq_get_policy
+  cpufreq_quick_get
   cpufreq_register_driver
   cpufreq_register_governor
   cpufreq_register_notifier
+  cpufreq_table_index_unsorted
   cpufreq_unregister_driver
   cpufreq_unregister_notifier
   __cpuhp_remove_state
@@ -274,6 +279,7 @@
   _dev_crit
   dev_driver_string
   _dev_err
+  dev_err_probe
   devfreq_add_device
   devfreq_add_governor
   devfreq_cooling_unregister
@@ -500,6 +506,7 @@
   edac_device_free_ctl_info
   edac_device_handle_ce_count
   edac_device_handle_ue_count
+  em_cpu_get
   enable_irq
   enable_percpu_irq
   eventfd_ctx_fdget
@@ -524,6 +531,7 @@
   find_last_bit
   find_next_bit
   find_next_zero_bit
+  find_pid_ns
   find_snd_usb_substream
   find_task_by_vpid
   find_vma
@@ -541,6 +549,7 @@
   free_pages
   free_percpu
   free_percpu_irq
+  freezing_slow_path
   freq_qos_add_request
   freq_qos_remove_request
   freq_qos_update_request
@@ -573,6 +582,8 @@
   gen_pool_virt_to_phys
   getboottime64
   get_cpu_device
+  get_cpu_idle_time_us
+  get_cpu_iowait_time_us
   get_device
   get_each_dmabuf
   get_each_object_track
@@ -761,6 +772,7 @@
   __iowrite32_copy
   ipi_desc_get
   iput
+  ipv6_find_hdr
   irq_chip_ack_parent
   irq_chip_disable_parent
   irq_chip_enable_parent
@@ -811,6 +823,7 @@
   isolate_and_split_free_page
   isolate_anon_lru_page
   is_vmalloc_addr
+  iterate_fd
   jiffies
   jiffies_to_msecs
   jiffies_to_usecs
@@ -818,6 +831,7 @@
   kasprintf
   kernel_bind
   kernel_connect
+  kernel_cpustat
   kernel_getsockname
   kernel_kobj
   kernel_power_off
@@ -848,6 +862,7 @@
   kmem_cache_free
   kmemdup
   kmemdup_nul
+  kmsg_dump_get_line
   kobject_add
   kobject_create_and_add
   kobject_del
@@ -856,6 +871,7 @@
   kobject_put
   kobject_set_name
   kobject_uevent
+  kobject_uevent_env
   kobj_sysfs_ops
   krealloc
   kset_create_and_add
@@ -891,6 +907,7 @@
   kthread_stop
   kthread_worker_fn
   ktime_get
+  ktime_get_coarse_real_ts64
   ktime_get_mono_fast_ns
   ktime_get_real_seconds
   ktime_get_real_ts64
@@ -977,6 +994,9 @@
   __netlink_kernel_create
   netlink_kernel_release
   netlink_unicast
+  net_namespace_list
+  nf_register_net_hooks
+  nf_unregister_net_hooks
   nla_find
   nla_put
   nla_reserve_64bit
@@ -989,6 +1009,8 @@
   nr_cpu_ids
   nr_ipi_get
   nr_irqs
+  nsecs_to_jiffies
+  nsec_to_clock_t
   ns_to_timespec64
   __num_online_cpus
   nvmem_cell_get
@@ -1228,6 +1250,7 @@
   prandom_u32
   preempt_schedule
   preempt_schedule_notrace
+  prepare_to_wait
   prepare_to_wait_event
   print_hex_dump
   printk
@@ -1428,6 +1451,8 @@
   rtc_tm_to_time64
   rtc_update_irq
   rtc_valid_tm
+  rtnl_lock
+  rtnl_unlock
   runqueues
   sched_clock
   sched_feat_keys
@@ -1474,14 +1499,17 @@
   sdhci_set_bus_width
   sdhci_set_power_noreg
   sdhci_setup_host
+  send_sig_info
   seq_buf_printf
   seq_lseek
   seq_open
+  __seq_open_private
   seq_printf
   seq_putc
   seq_puts
   seq_read
   seq_release
+  seq_release_private
   seq_write
   set_cpus_allowed_ptr
   set_normalized_timespec64
@@ -1577,6 +1605,7 @@
   spmi_register_write
   spmi_register_zero_write
   sprintf
+  sprint_symbol
   srcu_init_notifier_head
   srcu_notifier_call_chain
   srcu_notifier_chain_register
@@ -1645,6 +1674,7 @@
   sysfs_streq
   sysrq_mask
   system_freezable_wq
+  system_freezing_cnt
   system_highpri_wq
   system_power_efficient_wq
   system_unbound_wq
@@ -1677,6 +1707,7 @@
   time64_to_tm
   topology_set_thermal_pressure
   topology_update_done
+  _totalram_pages
   total_swapcache_pages
   trace_array_get_by_name
   trace_array_put
@@ -1722,6 +1753,7 @@
   __traceiter_android_rvh_set_readahead_gfp_mask
   __traceiter_android_rvh_set_skip_swapcache_flags
   __traceiter_android_rvh_set_task_cpu
+  __traceiter_android_rvh_show_max_freq
   __traceiter_android_rvh_tick_entry
   __traceiter_android_rvh_try_to_wake_up
   __traceiter_android_rvh_try_to_wake_up_success
@@ -1730,11 +1762,17 @@
   __traceiter_android_rvh_update_cpus_allowed
   __traceiter_android_rvh_update_misfit_status
   __traceiter_android_rvh_wake_up_new_task
+  __traceiter_android_vh_account_task_time
   __traceiter_android_vh_allow_domain_state
   __traceiter_android_vh_alter_mutex_list_add
   __traceiter_android_vh_alter_rwsem_list_add
+  __traceiter_android_vh_binder_alloc_new_buf_locked
+  __traceiter_android_vh_binder_preset
+  __traceiter_android_vh_binder_priority_skip
+  __traceiter_android_vh_binder_reply
   __traceiter_android_vh_binder_restore_priority
   __traceiter_android_vh_binder_set_priority
+  __traceiter_android_vh_binder_trans
   __traceiter_android_vh_binder_wait_for_work
   __traceiter_android_vh_binder_wakeup_ilocked
   __traceiter_android_vh_build_sched_domains
@@ -1742,6 +1780,7 @@
   __traceiter_android_vh_check_uninterruptible_tasks_dn
   __traceiter_android_vh_cpu_idle_enter
   __traceiter_android_vh_cpu_idle_exit
+  __traceiter_android_vh_do_send_sig_info
   __traceiter_android_vh_ftrace_dump_buffer
   __traceiter_android_vh_ftrace_format_check
   __traceiter_android_vh_ftrace_oops_enter
@@ -1756,17 +1795,20 @@
   __traceiter_android_vh_mutex_wait_finish
   __traceiter_android_vh_mutex_wait_start
   __traceiter_android_vh_printk_hotplug
+  __traceiter_android_vh_process_killed
   __traceiter_android_vh_rwsem_wake
   __traceiter_android_vh_rwsem_wake_finish
   __traceiter_android_vh_scheduler_tick
-  __traceiter_android_vh_show_max_freq
   __traceiter_android_vh_show_resume_epoch_val
   __traceiter_android_vh_show_suspend_epoch_val
   __traceiter_android_vh_sync_txn_recvd
   __traceiter_android_vh_timer_calc_index
+  __traceiter_android_vh_tune_inactive_ratio
+  __traceiter_android_vh_tune_swappiness
   __traceiter_android_vh_update_topology_flags_workfn
   __traceiter_binder_transaction_received
   __traceiter_cpu_frequency_limits
+  __traceiter_dma_fence_emit
   __traceiter_gpu_mem_total
   __traceiter_ipi_entry
   __traceiter_ipi_raise
@@ -1775,8 +1817,12 @@
   __traceiter_rwmmio_read
   __traceiter_rwmmio_write
   __traceiter_sched_overutilized_tp
+  __traceiter_sched_stat_blocked
+  __traceiter_sched_stat_iowait
+  __traceiter_sched_stat_wait
   __traceiter_sched_switch
   __traceiter_suspend_resume
+  __traceiter_task_rename
   __tracepoint_android_rvh_account_irq
   __tracepoint_android_rvh_build_perf_domains
   __tracepoint_android_rvh_can_migrate_task
@@ -1812,6 +1858,7 @@
   __tracepoint_android_rvh_set_readahead_gfp_mask
   __tracepoint_android_rvh_set_skip_swapcache_flags
   __tracepoint_android_rvh_set_task_cpu
+  __tracepoint_android_rvh_show_max_freq
   __tracepoint_android_rvh_tick_entry
   __tracepoint_android_rvh_try_to_wake_up
   __tracepoint_android_rvh_try_to_wake_up_success
@@ -1820,11 +1867,17 @@
   __tracepoint_android_rvh_update_cpus_allowed
   __tracepoint_android_rvh_update_misfit_status
   __tracepoint_android_rvh_wake_up_new_task
+  __tracepoint_android_vh_account_task_time
   __tracepoint_android_vh_allow_domain_state
   __tracepoint_android_vh_alter_mutex_list_add
   __tracepoint_android_vh_alter_rwsem_list_add
+  __tracepoint_android_vh_binder_alloc_new_buf_locked
+  __tracepoint_android_vh_binder_preset
+  __tracepoint_android_vh_binder_priority_skip
+  __tracepoint_android_vh_binder_reply
   __tracepoint_android_vh_binder_restore_priority
   __tracepoint_android_vh_binder_set_priority
+  __tracepoint_android_vh_binder_trans
   __tracepoint_android_vh_binder_wait_for_work
   __tracepoint_android_vh_binder_wakeup_ilocked
   __tracepoint_android_vh_build_sched_domains
@@ -1832,6 +1885,7 @@
   __tracepoint_android_vh_check_uninterruptible_tasks_dn
   __tracepoint_android_vh_cpu_idle_enter
   __tracepoint_android_vh_cpu_idle_exit
+  __tracepoint_android_vh_do_send_sig_info
   __tracepoint_android_vh_ftrace_dump_buffer
   __tracepoint_android_vh_ftrace_format_check
   __tracepoint_android_vh_ftrace_oops_enter
@@ -1846,17 +1900,20 @@
   __tracepoint_android_vh_mutex_wait_finish
   __tracepoint_android_vh_mutex_wait_start
   __tracepoint_android_vh_printk_hotplug
+  __tracepoint_android_vh_process_killed
   __tracepoint_android_vh_rwsem_wake
   __tracepoint_android_vh_rwsem_wake_finish
   __tracepoint_android_vh_scheduler_tick
-  __tracepoint_android_vh_show_max_freq
   __tracepoint_android_vh_show_resume_epoch_val
   __tracepoint_android_vh_show_suspend_epoch_val
   __tracepoint_android_vh_sync_txn_recvd
   __tracepoint_android_vh_timer_calc_index
+  __tracepoint_android_vh_tune_inactive_ratio
+  __tracepoint_android_vh_tune_swappiness
   __tracepoint_android_vh_update_topology_flags_workfn
   __tracepoint_binder_transaction_received
   __tracepoint_cpu_frequency_limits
+  __tracepoint_dma_fence_emit
   __tracepoint_gpu_mem_total
   __tracepoint_ipi_entry
   __tracepoint_ipi_raise
@@ -1868,8 +1925,12 @@
   __tracepoint_rwmmio_read
   __tracepoint_rwmmio_write
   __tracepoint_sched_overutilized_tp
+  __tracepoint_sched_stat_blocked
+  __tracepoint_sched_stat_iowait
+  __tracepoint_sched_stat_wait
   __tracepoint_sched_switch
   __tracepoint_suspend_resume
+  __tracepoint_task_rename
   trace_print_array_seq
   trace_print_flags_seq
   trace_print_symbols_seq

android/abi_gki_aarch64_qcom

@@ -359,6 +359,7 @@
   dev_alloc_name
   dev_change_net_namespace
   dev_close
+  dev_coredumpm
   dev_coredumpv
   _dev_crit
   __dev_direct_xmit
@@ -1216,6 +1217,7 @@
   __irq_domain_add
   irq_domain_alloc_irqs_parent
   irq_domain_create_hierarchy
+  irq_domain_disconnect_hierarchy
   irq_domain_free_irqs_common
   irq_domain_free_irqs_parent
   irq_domain_get_irq_data
@@ -1438,11 +1440,21 @@
   misc_deregister
   misc_register
   mmc_cqe_request_done
+  mmc_hs200_tuning
+  mmc_issue_type
   mmc_of_parse
   mmc_regulator_get_supply
   mmc_regulator_set_ocr
   mmc_regulator_set_vqmmc
+  mmc_select_bus_width
+  mmc_select_hs
+  mmc_select_hs400
+  mmc_select_hs_ddr
+  mmc_select_timing
   mmc_send_tuning
+  mmc_set_clock
+  mmc_set_initial_state
+  mmc_set_timing
   mmput
   mod_delayed_work_on
   __mod_node_page_state
@@ -2512,6 +2524,7 @@
   __traceiter_android_rvh_schedule_bug
   __traceiter_android_rvh_select_task_rq_fair
   __traceiter_android_rvh_select_task_rq_rt
+  __traceiter_android_rvh_set_balance_anon_file_reclaim
   __traceiter_android_rvh_set_gfp_zone_flags
   __traceiter_android_rvh_set_readahead_gfp_mask
   __traceiter_android_rvh_set_skip_swapcache_flags
@@ -2621,6 +2634,7 @@
   __tracepoint_android_rvh_schedule_bug
   __tracepoint_android_rvh_select_task_rq_fair
   __tracepoint_android_rvh_select_task_rq_rt
+  __tracepoint_android_rvh_set_balance_anon_file_reclaim
   __tracepoint_android_rvh_set_gfp_zone_flags
   __tracepoint_android_rvh_set_readahead_gfp_mask
   __tracepoint_android_rvh_set_skip_swapcache_flags

android/abi_gki_aarch64_unisoc

@@ -0,0 +1,272 @@
+[abi_symbol_list]
+# commonly used symbols
+  __arch_copy_from_user
+  arm64_const_caps_ready
+  atomic_notifier_chain_register
+  atomic_notifier_chain_unregister
+  __cfi_slowpath
+  __check_object_size
+  clk_bulk_disable
+  clk_bulk_enable
+  clk_bulk_prepare
+  clk_bulk_unprepare
+  clk_disable
+  clk_enable
+  clk_fixed_factor_ops
+  clk_get_rate
+  clk_hw_get_num_parents
+  clk_hw_get_parent
+  clk_hw_is_enabled
+  __clk_mux_determine_rate
+  clk_prepare
+  clk_round_rate
+  clk_set_parent
+  clk_unprepare
+  complete
+  __const_udelay
+  cpu_hwcap_keys
+  cpu_hwcaps
+  _dev_emerg
+  _dev_err
+  dev_err_probe
+  dev_get_regmap
+  device_get_match_data
+  device_init_wakeup
+  device_node_to_regmap
+  device_property_read_u32_array
+  _dev_info
+  devm_add_action
+  devm_clk_bulk_get
+  devm_clk_get
+  devm_clk_hw_register
+  devm_free_irq
+  devm_gpiochip_add_data_with_key
+  devm_gpiod_get
+  devm_hwspin_lock_register
+  devm_hwspin_lock_request_specific
+  devm_iio_channel_get
+  devm_iio_device_alloc
+  __devm_iio_device_register
+  devm_ioremap_resource
+  devm_kfree
+  devm_kmalloc
+  devm_kmemdup
+  devm_mbox_controller_register
+  devm_nvmem_register
+  devm_of_clk_add_hw_provider
+  devm_of_platform_populate
+  devm_pinctrl_get
+  devm_platform_ioremap_resource
+  devm_power_supply_register
+  devm_regmap_add_irq_chip
+  __devm_regmap_init
+  __devm_regmap_init_mmio_clk
+  devm_regulator_register
+  devm_request_threaded_irq
+  devm_snd_soc_register_component
+  devm_spi_register_controller
+  devm_thermal_zone_of_sensor_register
+  devm_thermal_zone_of_sensor_unregister
+  devm_usb_get_phy_by_phandle
+  devm_watchdog_register_device
+  _dev_warn
+  divider_get_val
+  divider_recalc_rate
+  divider_round_rate_parent
+  dma_async_device_register
+  dma_async_device_unregister
+  dma_async_tx_descriptor_init
+  dmam_alloc_attrs
+  dmam_free_coherent
+  dma_release_channel
+  dma_request_chan
+  dma_set_coherent_mask
+  dma_set_mask
+  driver_unregister
+  __dynamic_dev_dbg
+  find_next_bit
+  finish_wait
+  generic_handle_irq
+  gic_nonsecure_priorities
+  gpiochip_find
+  gpiochip_get_data
+  gpiod_get_value_cansleep
+  gpiod_to_irq
+  handle_bad_irq
+  handle_edge_irq
+  handle_level_irq
+  handle_nested_irq
+  __hwspin_lock_timeout
+  __hwspin_unlock
+  i2c_add_numbered_adapter
+  i2c_del_adapter
+  iio_read_channel_processed
+  __init_swait_queue_head
+  init_wait_entry
+  __init_waitqueue_head
+  irq_find_mapping
+  irq_get_irq_data
+  irq_set_irq_wake
+  jiffies
+  kfree
+  __kmalloc
+  kmalloc_caches
+  kmem_cache_alloc_trace
+  ktime_get
+  ktime_get_mono_fast_ns
+  __list_add_valid
+  __list_del_entry_valid
+  __log_post_read_mmio
+  __log_read_mmio
+  __log_write_mmio
+  mbox_chan_received_data
+  mbox_chan_txdone
+  memcpy
+  memset
+  mmc_cqe_request_done
+  mmc_of_parse
+  mmc_regulator_set_vqmmc
+  mmc_request_done
+  __msecs_to_jiffies
+  __mutex_init
+  mutex_lock
+  mutex_unlock
+  nvmem_cell_get
+  nvmem_cell_put
+  nvmem_cell_read
+  of_alias_get_id
+  of_clk_hw_onecell_get
+  of_device_get_match_data
+  of_device_is_compatible
+  of_dma_controller_free
+  of_dma_controller_register
+  of_dma_simple_xlate
+  of_find_property
+  of_get_next_child
+  of_get_parent
+  of_get_property
+  of_hwspin_lock_get_id
+  of_match_node
+  of_nvmem_cell_get
+  of_property_read_string
+  of_property_read_string_helper
+  of_property_read_variable_u32_array
+  of_prop_next_string
+  of_reserved_mem_device_init_by_idx
+  pinconf_generic_parse_dt_config
+  pinctrl_dev_get_drvdata
+  pinctrl_lookup_state
+  pinctrl_register
+  pinctrl_select_state
+  pinctrl_unregister
+  pinctrl_utils_add_map_configs
+  pinctrl_utils_add_map_mux
+  pinctrl_utils_free_map
+  pinctrl_utils_reserve_map
+  pin_get_name
+  __platform_driver_probe
+  __platform_driver_register
+  platform_driver_unregister
+  platform_get_irq
+  platform_get_resource
+  __pm_runtime_disable
+  pm_runtime_enable
+  pm_runtime_force_resume
+  pm_runtime_force_suspend
+  __pm_runtime_idle
+  __pm_runtime_resume
+  pm_runtime_set_autosuspend_delay
+  __pm_runtime_set_status
+  __pm_runtime_suspend
+  __pm_runtime_use_autosuspend
+  power_supply_changed
+  power_supply_find_ocv2cap_table
+  power_supply_get_battery_info
+  power_supply_get_by_name
+  power_supply_get_drvdata
+  power_supply_get_property
+  power_supply_ocv2cap_simple
+  power_supply_put
+  power_supply_put_battery_info
+  power_supply_temp2resist_simple
+  prepare_to_wait_event
+  printk
+  put_device
+  pwmchip_add
+  pwmchip_remove
+  queue_work_on
+  ___ratelimit
+  _raw_spin_lock
+  _raw_spin_lock_irq
+  _raw_spin_lock_irqsave
+  _raw_spin_unlock
+  _raw_spin_unlock_irq
+  _raw_spin_unlock_irqrestore
+  register_restart_handler
+  regmap_read
+  regmap_update_bits_base
+  regmap_write
+  regulator_disable_regmap
+  regulator_enable_regmap
+  regulator_get_voltage_sel_regmap
+  regulator_is_enabled_regmap
+  regulator_list_voltage_linear
+  regulator_set_voltage_sel_regmap
+  remap_pfn_range
+  schedule
+  schedule_timeout
+  __sdhci_add_host
+  sdhci_cleanup_host
+  sdhci_enable_clk
+  sdhci_enable_v4_mode
+  sdhci_pltfm_free
+  sdhci_pltfm_init
+  sdhci_remove_host
+  sdhci_request
+  sdhci_request_atomic
+  sdhci_reset
+  sdhci_runtime_resume_host
+  sdhci_runtime_suspend_host
+  sdhci_set_bus_width
+  sdhci_setup_host
+  seq_printf
+  seq_putc
+  sg_init_table
+  sg_next
+  snd_dma_alloc_pages
+  snd_dma_free_pages
+  snd_pcm_hw_constraint_integer
+  snd_pcm_hw_constraint_step
+  snd_pcm_period_elapsed
+  snd_soc_set_runtime_hwparams
+  __spi_alloc_controller
+  spi_controller_suspend
+  spi_finalize_current_transfer
+  __spi_register_driver
+  spi_sync
+  __stack_chk_fail
+  __stack_chk_guard
+  strcmp
+  strncmp
+  syscon_regmap_lookup_by_phandle
+  system_wq
+  tasklet_kill
+  __tasklet_schedule
+  thermal_zone_device_disable
+  thermal_zone_device_enable
+  __tracepoint_rwmmio_post_read
+  __tracepoint_rwmmio_read
+  __tracepoint_rwmmio_write
+  __udelay
+  unregister_restart_handler
+  usb_phy_get_charger_current
+  usleep_range
+  vchan_dma_desc_free_list
+  vchan_find_desc
+  vchan_init
+  vchan_tx_desc_free
+  vchan_tx_submit
+  wait_for_completion
+  wait_for_completion_timeout
+  __wake_up
+  watchdog_init_timeout

android/abi_gki_aarch64_xiaomi

@@ -1,10 +1,9 @@
 [abi_symbol_list]
 # commonly used symbols
 
-# required by xxx.ko
-
 # required by touch module
   proc_mkdir_data
+  proc_create_seq_private
 
 # required by aw8697-haptic.ko
   devm_gpio_free
@@ -37,6 +36,10 @@
   scsi_report_bus_reset
   scsi_scan_host
   scsi_unblock_requests
+  scsi_change_queue_depth
+  scsi_print_command
+  scsi_dma_map
+  scsi_host_alloc
   sg_copy_from_buffer
   sg_copy_to_buffer
   ufshcd_alloc_host
@@ -47,10 +50,14 @@
   ufshcd_map_desc_id_to_length
   ufshcd_query_attr_retry
   ufshcd_query_flag_retry
+  ufshcd_update_evt_hist
   wait_for_completion_io_timeout
   __scsi_add_device
   __scsi_execute
   blk_mq_free_tag_set
+  blk_queue_update_dma_alignment
+  blk_queue_update_dma_pad
+  blk_ksm_get_slot_idx
 
 #required by cs35l41 module
   regmap_raw_write_async
@@ -112,3 +119,39 @@
   simple_strtoul
   sync_blockdev
   wait_for_device_probe
+
+#required by millet.ko
+  freezer_cgrp_subsys
+  __traceiter_android_vh_do_send_sig_info
+  __traceiter_android_vh_binder_preset
+  __traceiter_android_vh_binder_wait_for_work
+  __traceiter_android_vh_binder_trans
+  __traceiter_android_vh_binder_reply
+  __traceiter_android_vh_binder_alloc_new_buf_locked
+  __tracepoint_android_vh_do_send_sig_info
+  __tracepoint_android_vh_binder_preset
+  __tracepoint_android_vh_binder_wait_for_work
+  __tracepoint_android_vh_binder_trans
+  __tracepoint_android_vh_binder_reply
+  __tracepoint_android_vh_binder_alloc_new_buf_locked
+
+#required by mi_sched.ko
+  __traceiter_android_vh_free_task
+  __tracepoint_android_vh_free_task
+  jiffies_64
+
+#required by pm8941-pwrkey.ko module
+  console_printk
+
+#required by binderinfo.ko module
+  __traceiter_android_vh_binder_transaction_init
+  __traceiter_android_vh_binder_print_transaction_info
+  __tracepoint_android_vh_binder_transaction_init
+  __tracepoint_android_vh_binder_print_transaction_info
+
+#required by reclaim module
+  __traceiter_android_vh_tune_scan_type
+  __tracepoint_android_vh_tune_scan_type
+  __traceiter_android_vh_tune_swappiness
+  __tracepoint_android_vh_tune_swappiness
+

arch/arm64/configs/gki_defconfig

@@ -271,6 +271,7 @@ CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
 CONFIG_RFKILL=y
+CONFIG_NFC=y
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y

arch/x86/configs/gki_defconfig

@@ -248,6 +248,7 @@ CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
 CONFIG_RFKILL=y
+CONFIG_NFC=y
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y

build.config.gki.aarch64

@@ -18,10 +18,12 @@ android/abi_gki_aarch64_fips140
 android/abi_gki_aarch64_galaxy
 android/abi_gki_aarch64_generic
 android/abi_gki_aarch64_hikey960
+android/abi_gki_aarch64_imx
 android/abi_gki_aarch64_mtk
 android/abi_gki_aarch64_oplus
 android/abi_gki_aarch64_qcom
 android/abi_gki_aarch64_rockchip
+android/abi_gki_aarch64_unisoc
 android/abi_gki_aarch64_virtual_device
 android/abi_gki_aarch64_vivo
 android/abi_gki_aarch64_xiaomi

drivers/firmware/arm_scmi/driver.c

@@ -1395,6 +1395,21 @@ void scmi_unrequest_protocol_device(const struct scmi_device_id *id_table)
 	mutex_unlock(&scmi_requested_devices_mtx);
 }
 
+static int scmi_cleanup_txrx_channels(struct scmi_info *info)
+{
+	int ret;
+	struct idr *idr = &info->tx_idr;
+
+	ret = idr_for_each(idr, info->desc->ops->chan_free, idr);
+	idr_destroy(&info->tx_idr);
+
+	idr = &info->rx_idr;
+	ret = idr_for_each(idr, info->desc->ops->chan_free, idr);
+	idr_destroy(&info->rx_idr);
+
+	return ret;
+}
+
 static int scmi_probe(struct platform_device *pdev)
 {
 	int ret;
@@ -1436,7 +1451,7 @@ static int scmi_probe(struct platform_device *pdev)
 
 	ret = scmi_xfer_info_init(info);
 	if (ret)
-		return ret;
+		goto clear_txrx_setup;
 
 	if (scmi_notification_init(handle))
 		dev_err(dev, "SCMI Notifications NOT available.\n");
@@ -1449,7 +1464,7 @@ static int scmi_probe(struct platform_device *pdev)
 	ret = scmi_acquire_protocol(handle, SCMI_PROTOCOL_BASE);
 	if (ret) {
 		dev_err(dev, "unable to communicate with SCMI\n");
-		return ret;
+		goto notification_exit;
 	}
 
 	mutex_lock(&scmi_list_mutex);
@@ -1488,6 +1503,12 @@ static int scmi_probe(struct platform_device *pdev)
 	}
 
 	return 0;
+
+notification_exit:
+	scmi_notification_exit(&info->handle);
+clear_txrx_setup:
+	scmi_cleanup_txrx_channels(info);
+	return ret;
 }
 
 void scmi_free_channel(struct scmi_chan_info *cinfo, struct idr *idr, int id)
@@ -1499,7 +1520,6 @@ static int scmi_remove(struct platform_device *pdev)
 {
 	int ret = 0, id;
 	struct scmi_info *info = platform_get_drvdata(pdev);
-	struct idr *idr = &info->tx_idr;
 	struct device_node *child;
 
 	mutex_lock(&scmi_list_mutex);
@@ -1523,14 +1543,7 @@ static int scmi_remove(struct platform_device *pdev)
 	idr_destroy(&info->active_protocols);
 
 	/* Safe to free channels since no more users */
-	ret = idr_for_each(idr, info->desc->ops->chan_free, idr);
+	return scmi_cleanup_txrx_channels(info);
-	idr_destroy(&info->tx_idr);
-
-	idr = &info->rx_idr;
-	ret = idr_for_each(idr, info->desc->ops->chan_free, idr);
-	idr_destroy(&info->rx_idr);
-
-	return ret;
 }
 
 static ssize_t protocol_version_show(struct device *dev,

drivers/irqchip/qcom-pdc.c

@@ -65,26 +65,6 @@ static u32 pdc_reg_read(int reg, u32 i)
 	return readl_relaxed(pdc_base + reg + i * sizeof(u32));
 }
 
-static int qcom_pdc_gic_get_irqchip_state(struct irq_data *d,
-					  enum irqchip_irq_state which,
-					  bool *state)
-{
-	if (d->hwirq == GPIO_NO_WAKE_IRQ)
-		return 0;
-
-	return irq_chip_get_parent_state(d, which, state);
-}
-
-static int qcom_pdc_gic_set_irqchip_state(struct irq_data *d,
-					  enum irqchip_irq_state which,
-					  bool value)
-{
-	if (d->hwirq == GPIO_NO_WAKE_IRQ)
-		return 0;
-
-	return irq_chip_set_parent_state(d, which, value);
-}
-
 static void pdc_enable_intr(struct irq_data *d, bool on)
 {
 	int pin_out = d->hwirq;
@@ -103,38 +83,16 @@ static void pdc_enable_intr(struct irq_data *d, bool on)
 
 static void qcom_pdc_gic_disable(struct irq_data *d)
 {
-	if (d->hwirq == GPIO_NO_WAKE_IRQ)
-		return;
-
 	pdc_enable_intr(d, false);
 	irq_chip_disable_parent(d);
 }
 
 static void qcom_pdc_gic_enable(struct irq_data *d)
 {
-	if (d->hwirq == GPIO_NO_WAKE_IRQ)
-		return;
-
 	pdc_enable_intr(d, true);
 	irq_chip_enable_parent(d);
 }
 
-static void qcom_pdc_gic_mask(struct irq_data *d)
-{
-	if (d->hwirq == GPIO_NO_WAKE_IRQ)
-		return;
-
-	irq_chip_mask_parent(d);
-}
-
-static void qcom_pdc_gic_unmask(struct irq_data *d)
-{
-	if (d->hwirq == GPIO_NO_WAKE_IRQ)
-		return;
-
-	irq_chip_unmask_parent(d);
-}
-
 static u32 __spi_pin_read(unsigned int pin)
 {
 	void __iomem *cfg_reg = spi_cfg->base + pin * 4;
@@ -222,15 +180,11 @@ enum pdc_irq_config_bits {
  */
 static int qcom_pdc_gic_set_type(struct irq_data *d, unsigned int type)
 {
-	int pin_out = d->hwirq;
 	int parent_hwirq = d->parent_data->hwirq;
 	enum pdc_irq_config_bits pdc_type;
 	enum pdc_irq_config_bits old_pdc_type;
 	int ret;
 
-	if (pin_out == GPIO_NO_WAKE_IRQ)
-		return 0;
-
 	switch (type) {
 	case IRQ_TYPE_EDGE_RISING:
 		pdc_type = PDC_EDGE_RISING;
@@ -255,8 +209,8 @@ static int qcom_pdc_gic_set_type(struct irq_data *d, unsigned int type)
 		return -EINVAL;
 	}
 
-	old_pdc_type = pdc_reg_read(IRQ_i_CFG, pin_out);
+	old_pdc_type = pdc_reg_read(IRQ_i_CFG, d->hwirq);
-	pdc_reg_write(IRQ_i_CFG, pin_out, pdc_type);
+	pdc_reg_write(IRQ_i_CFG, d->hwirq, pdc_type);
 
 	/* Additionally, configure (only) the GPIO in the f/w */
 	ret = spi_configure_type(parent_hwirq, type);
@@ -285,12 +239,12 @@ static int qcom_pdc_gic_set_type(struct irq_data *d, unsigned int type)
 static struct irq_chip qcom_pdc_gic_chip = {
 	.name			= "PDC",
 	.irq_eoi		= irq_chip_eoi_parent,
-	.irq_mask		= qcom_pdc_gic_mask,
+	.irq_mask		= irq_chip_mask_parent,
-	.irq_unmask		= qcom_pdc_gic_unmask,
+	.irq_unmask		= irq_chip_unmask_parent,
 	.irq_disable		= qcom_pdc_gic_disable,
 	.irq_enable		= qcom_pdc_gic_enable,
-	.irq_get_irqchip_state	= qcom_pdc_gic_get_irqchip_state,
+	.irq_get_irqchip_state	= irq_chip_get_parent_state,
-	.irq_set_irqchip_state	= qcom_pdc_gic_set_irqchip_state,
+	.irq_set_irqchip_state	= irq_chip_set_parent_state,
 	.irq_retrigger		= irq_chip_retrigger_hierarchy,
 	.irq_set_type		= qcom_pdc_gic_set_type,
 	.flags			= IRQCHIP_MASK_ON_SUSPEND |
@@ -351,7 +305,7 @@ static int qcom_pdc_alloc(struct irq_domain *domain, unsigned int virq,
 
 	parent_hwirq = get_parent_hwirq(hwirq);
 	if (parent_hwirq == PDC_NO_PARENT_IRQ)
-		return 0;
+		return irq_domain_disconnect_hierarchy(domain->parent, virq);
 
 	if (type & IRQ_TYPE_EDGE_BOTH)
 		type = IRQ_TYPE_EDGE_RISING;
@@ -388,17 +342,17 @@ static int qcom_pdc_gpio_alloc(struct irq_domain *domain, unsigned int virq,
 	if (ret)
 		return ret;
 
+	if (hwirq == GPIO_NO_WAKE_IRQ)
+		return irq_domain_disconnect_hierarchy(domain, virq);
+
 	ret = irq_domain_set_hwirq_and_chip(domain, virq, hwirq,
 					    &qcom_pdc_gic_chip, NULL);
 	if (ret)
 		return ret;
 
-	if (hwirq == GPIO_NO_WAKE_IRQ)
-		return 0;
-
 	parent_hwirq = get_parent_hwirq(hwirq);
 	if (parent_hwirq == PDC_NO_PARENT_IRQ)
-		return 0;
+		return irq_domain_disconnect_hierarchy(domain->parent, virq);
 
 	if (type & IRQ_TYPE_EDGE_BOTH)
 		type = IRQ_TYPE_EDGE_RISING;

drivers/mmc/core/core.c

@@ -917,6 +917,7 @@ void mmc_set_clock(struct mmc_host *host, unsigned int hz)
 	host->ios.clock = hz;
 	mmc_set_ios(host);
 }
+EXPORT_SYMBOL_GPL(mmc_set_clock);
 
 int mmc_execute_tuning(struct mmc_card *card)
 {
@@ -999,6 +1000,7 @@ void mmc_set_initial_state(struct mmc_host *host)
 
 	mmc_crypto_set_initial_state(host);
 }
+EXPORT_SYMBOL_GPL(mmc_set_initial_state);
 
 /**
  * mmc_vdd_to_ocrbitnum - Convert a voltage to the OCR bit number
@@ -1262,6 +1264,7 @@ void mmc_set_timing(struct mmc_host *host, unsigned int timing)
 	host->ios.timing = timing;
 	mmc_set_ios(host);
 }
+EXPORT_SYMBOL_GPL(mmc_set_timing);
 
 /*
  * Select appropriate driver type for host.

drivers/mmc/core/core.h

@@ -43,7 +43,7 @@ struct device_node *mmc_of_find_child_device(struct mmc_host *host,
 void mmc_init_erase(struct mmc_card *card);
 
 void mmc_set_chip_select(struct mmc_host *host, int mode);
-void mmc_set_clock(struct mmc_host *host, unsigned int hz);
+extern void mmc_set_clock(struct mmc_host *host, unsigned int hz);
 void mmc_set_bus_mode(struct mmc_host *host, unsigned int mode);
 void mmc_set_bus_width(struct mmc_host *host, unsigned int width);
 u32 mmc_select_voltage(struct mmc_host *host, u32 ocr);

drivers/mmc/core/mmc.c

@@ -972,7 +972,7 @@ static int mmc_select_powerclass(struct mmc_card *card)
 /*
  * Set the bus speed for the selected speed mode.
  */
-static void mmc_set_bus_speed(struct mmc_card *card)
+void mmc_set_bus_speed(struct mmc_card *card)
 {
 	unsigned int max_dtr = (unsigned int)-1;
 
@@ -992,7 +992,7 @@ static void mmc_set_bus_speed(struct mmc_card *card)
  * If the bus width is changed successfully, return the selected width value.
  * Zero is returned instead of error value if the wide width is not supported.
  */
-static int mmc_select_bus_width(struct mmc_card *card)
+int mmc_select_bus_width(struct mmc_card *card)
 {
 	static unsigned ext_csd_bits[] = {
 		EXT_CSD_BUS_WIDTH_8,
@@ -1057,11 +1057,12 @@ static int mmc_select_bus_width(struct mmc_card *card)
 
 	return err;
 }
+EXPORT_SYMBOL_GPL(mmc_select_bus_width);
 
 /*
  * Switch to the high-speed mode
  */
-static int mmc_select_hs(struct mmc_card *card)
+int mmc_select_hs(struct mmc_card *card)
 {
 	int err;
 
@@ -1075,11 +1076,12 @@ static int mmc_select_hs(struct mmc_card *card)
 
 	return err;
 }
+EXPORT_SYMBOL_GPL(mmc_select_hs);
 
 /*
  * Activate wide bus and DDR if supported.
  */
-static int mmc_select_hs_ddr(struct mmc_card *card)
+int mmc_select_hs_ddr(struct mmc_card *card)
 {
 	struct mmc_host *host = card->host;
 	u32 bus_width, ext_csd_bits;
@@ -1148,8 +1150,9 @@ static int mmc_select_hs_ddr(struct mmc_card *card)
 
 	return err;
 }
+EXPORT_SYMBOL_GPL(mmc_select_hs_ddr);
 
-static int mmc_select_hs400(struct mmc_card *card)
+int mmc_select_hs400(struct mmc_card *card)
 {
 	struct mmc_host *host = card->host;
 	unsigned int max_dtr;
@@ -1235,6 +1238,7 @@ out_err:
 	       __func__, err);
 	return err;
 }
+EXPORT_SYMBOL_GPL(mmc_select_hs400);
 
 int mmc_hs200_to_hs400(struct mmc_card *card)
 {
@@ -1505,7 +1509,7 @@ err:
 /*
  * Activate High Speed, HS200 or HS400ES mode if supported.
  */
-static int mmc_select_timing(struct mmc_card *card)
+int mmc_select_timing(struct mmc_card *card)
 {
 	int err = 0;
 
@@ -1530,12 +1534,13 @@ bus_speed:
 	mmc_set_bus_speed(card);
 	return 0;
 }
+EXPORT_SYMBOL_GPL(mmc_select_timing);
 
 /*
  * Execute tuning sequence to seek the proper bus operating
  * conditions for HS200 and HS400, which sends CMD21 to the device.
  */
-static int mmc_hs200_tuning(struct mmc_card *card)
+int mmc_hs200_tuning(struct mmc_card *card)
 {
 	struct mmc_host *host = card->host;
 
@@ -1550,6 +1555,7 @@ static int mmc_hs200_tuning(struct mmc_card *card)
 
 	return mmc_execute_tuning(card);
 }
+EXPORT_SYMBOL_GPL(mmc_hs200_tuning);
 
 /*
  * Handle the detection and initialisation of a card.

drivers/mmc/core/queue.c

@@ -71,6 +71,7 @@ enum mmc_issue_type mmc_issue_type(struct mmc_queue *mq, struct request *req)
 
 	return MMC_ISSUE_SYNC;
 }
+EXPORT_SYMBOL_GPL(mmc_issue_type);
 
 static void __mmc_cqe_recovery_notifier(struct mmc_queue *mq)
 {

drivers/scsi/ufs/ufshcd.c

@@ -4015,6 +4015,9 @@ out:
 	if (reenable_intr)
 		ufshcd_enable_intr(hba, UIC_COMMAND_COMPL);
 	if (ret) {
+		dev_err(hba->dev,
+			"%s: Changing link power status failed (%d). Scheduling error handler\n",
+			__func__, ret);
 		ufshcd_set_link_broken(hba);
 		ufshcd_schedule_eh_work(hba);
 	}
@@ -5098,6 +5101,10 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
 		result |= DID_ABORT << 16;
 		break;
 	case OCS_INVALID_COMMAND_STATUS:
+		dev_err_ratelimited(hba->dev,
+			"Retrying request with tag %d / cdb %#02x because of invalid command status\n",
+			lrbp->task_tag, lrbp->cmd && lrbp->cmd->cmnd ?
+			lrbp->cmd->cmnd[0] : 0);
 		result |= DID_REQUEUE << 16;
 		break;
 	case OCS_INVALID_CMD_TABLE_ATTR:
@@ -6300,9 +6307,12 @@ static irqreturn_t ufshcd_check_errors(struct ufs_hba *hba, u32 intr_status)
 	if (hba->errors & UIC_ERROR) {
 		hba->uic_error = 0;
 		retval = ufshcd_update_uic_error(hba);
-		if (hba->uic_error)
+		if (hba->uic_error) {
+			dev_err(hba->dev,
+			  "Scheduling error handler because of an UIC error\n");
 			queue_eh_work = true;
 		}
+	}
 
 	if (hba->errors & UFSHCD_UIC_HIBERN8_MASK) {
 		dev_err(hba->dev,

drivers/usb/dwc3/gadget.c

@@ -2425,10 +2425,8 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)
 
 		ret = wait_for_completion_timeout(&dwc->ep0_in_setup,
 				msecs_to_jiffies(DWC3_PULL_UP_TIMEOUT));
-		if (ret == 0) {
+		if (ret == 0)
-			dev_err(dwc->dev, "timed out waiting for SETUP phase\n");
+			dev_warn(dwc->dev, "timed out waiting for SETUP phase\n");
-			return -ETIMEDOUT;
-		}
 	}
 
 	/*
@@ -2640,6 +2638,7 @@ static int __dwc3_gadget_start(struct dwc3 *dwc)
 	/* begin to receive SETUP packets */
 	dwc->ep0state = EP0_SETUP_PHASE;
 	dwc->link_state = DWC3_LINK_STATE_SS_DIS;
+	dwc->delayed_status = false;
 	dwc3_ep0_out_start(dwc);
 
 	dwc3_gadget_enable_irq(dwc);

include/linux/kfence.h

@@ -51,10 +51,11 @@ extern atomic_t kfence_allocation_gate;
 static __always_inline bool is_kfence_address(const void *addr)
 {
 	/*
-	 * The non-NULL check is required in case the __kfence_pool pointer was
+	 * The __kfence_pool != NULL check is required to deal with the case
-	 * never initialized; keep it in the slow-path after the range-check.
+	 * where __kfence_pool == NULL && addr < KFENCE_POOL_SIZE. Keep it in
+	 * the slow-path after the range-check!
 	 */
-	return unlikely((unsigned long)((char *)addr - __kfence_pool) < KFENCE_POOL_SIZE && addr);
+	return unlikely((unsigned long)((char *)addr - __kfence_pool) < KFENCE_POOL_SIZE && __kfence_pool);
 }
 
 /**

include/linux/mmc/mmc.h

@@ -449,4 +449,13 @@ static inline bool mmc_ready_for_data(u32 status)
 
 #define mmc_driver_type_mask(n)		(1 << (n))
 
+struct mmc_card;
+
+extern int mmc_select_bus_width(struct mmc_card *card);
+extern int mmc_select_hs(struct mmc_card *card);
+extern int mmc_select_hs_ddr(struct mmc_card *card);
+extern int mmc_select_hs400(struct mmc_card *card);
+extern int mmc_hs200_tuning(struct mmc_card *card);
+extern int mmc_select_timing(struct mmc_card *card);
+
 #endif /* LINUX_MMC_MMC_H */

kernel/cfi.c

@@ -251,9 +251,9 @@ static inline cfi_check_fn __find_shadow_check_fn(unsigned long ptr)
 {
 	cfi_check_fn fn;
 
-	rcu_read_lock_sched();
+	rcu_read_lock_sched_notrace();
 	fn = ptr_to_check_fn(rcu_dereference_sched(cfi_shadow), ptr);
-	rcu_read_unlock_sched();
+	rcu_read_unlock_sched_notrace();
 
 	return fn;
 }
@@ -272,11 +272,11 @@ static inline cfi_check_fn __find_module_check_fn(unsigned long ptr)
 	cfi_check_fn fn = NULL;
 	struct module *mod;
 
-	rcu_read_lock_sched();
+	rcu_read_lock_sched_notrace();
 	mod = __module_address(ptr);
 	if (mod)
 		fn = mod->cfi_check;
-	rcu_read_unlock_sched();
+	rcu_read_unlock_sched_notrace();
 
 	return fn;
 }

kernel/irq/irqdomain.c

@@ -1192,6 +1192,7 @@ int irq_domain_disconnect_hierarchy(struct irq_domain *domain,
 	irqd->chip = ERR_PTR(-ENOTCONN);
 	return 0;
 }
+EXPORT_SYMBOL_GPL(irq_domain_disconnect_hierarchy);
 
 static int irq_domain_trim_hierarchy(unsigned int virq)
 {

kernel/rcu/tree_stall.h

@@ -260,8 +260,10 @@ static int rcu_print_task_stall(struct rcu_node *rnp, unsigned long flags)
 	struct task_struct *t;
 	struct task_struct *ts[8];
 
-	if (!rcu_preempt_blocked_readers_cgp(rnp))
+	if (!rcu_preempt_blocked_readers_cgp(rnp)) {
+		raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
 		return 0;
+	}
 	pr_err("\tTasks blocked on level-%d rcu_node (CPUs %d-%d):",
 	       rnp->level, rnp->grplo, rnp->grphi);
 	t = list_entry(rnp->gp_tasks->prev,

kernel/sched/core.c

@@ -4214,6 +4214,7 @@ unsigned long long task_sched_runtime(struct task_struct *p)
 
 	return ns;
 }
+EXPORT_SYMBOL_GPL(task_sched_runtime);
 
 /*
  * This function gets called by the timer code, with HZ frequency.
@@ -5527,6 +5528,10 @@ recheck:
 		/* Normal users shall not reset the sched_reset_on_fork flag: */
 		if (p->sched_reset_on_fork && !reset_on_fork)
 			return -EPERM;
+
+		/* Can't change util-clamps */
+		if (attr->sched_flags & SCHED_FLAG_UTIL_CLAMP)
+			return -EPERM;
 	}
 
 	if (user) {

mm/madvise.c

@@ -996,6 +996,7 @@ process_madvise_behavior_valid(int behavior)
 	switch (behavior) {
 	case MADV_COLD:
 	case MADV_PAGEOUT:
+	case MADV_WILLNEED:
 		return true;
 	default:
 		return false;

mm/slub.c

@@ -1379,12 +1379,13 @@ check_slabs:
 static int __init setup_slub_debug(char *str)
 {
 	slab_flags_t flags;
+	slab_flags_t global_flags;
 	char *saved_str;
 	char *slab_list;
 	bool global_slub_debug_changed = false;
 	bool slab_list_specified = false;
 
-	slub_debug = DEBUG_DEFAULT_FLAGS;
+	global_flags = DEBUG_DEFAULT_FLAGS;
 	if (*str++ != '=' || !*str)
 		/*
 		 * No options specified. Switch on full debugging.
@@ -1396,7 +1397,7 @@ static int __init setup_slub_debug(char *str)
 		str = parse_slub_debug_flags(str, &flags, &slab_list, true);
 
 		if (!slab_list) {
-			slub_debug = flags;
+			global_flags = flags;
 			global_slub_debug_changed = true;
 		} else {
 			slab_list_specified = true;
@@ -1405,16 +1406,18 @@ static int __init setup_slub_debug(char *str)
 
 	/*
 	 * For backwards compatibility, a single list of flags with list of
-	 * slabs means debugging is only enabled for those slabs, so the global
+	 * slabs means debugging is only changed for those slabs, so the global
-	 * slub_debug should be 0. We can extended that to multiple lists as
+	 * slub_debug should be unchanged (0 or DEBUG_DEFAULT_FLAGS, depending
+	 * on CONFIG_SLUB_DEBUG_ON). We can extended that to multiple lists as
 	 * long as there is no option specifying flags without a slab list.
 	 */
 	if (slab_list_specified) {
 		if (!global_slub_debug_changed)
-			slub_debug = 0;
+			global_flags = slub_debug;
 		slub_debug_string = saved_str;
 	}
 out:
+	slub_debug = global_flags;
 	if (slub_debug != 0 || slub_debug_string)
 		static_branch_enable(&slub_debug_enabled);
 	if ((static_branch_unlikely(&init_on_alloc) ||

net/netfilter/xt_quota2.c

@@ -106,23 +106,16 @@ static void quota2_log(unsigned int hooknum,
 		return;
 	}
 	pm = nlmsg_data(nlh);
+	memset(pm, 0, sizeof(*pm));
 	if (skb->tstamp == 0)
 		__net_timestamp((struct sk_buff *)skb);
-	pm->data_len = 0;
 	pm->hook = hooknum;
 	if (prefix != NULL)
 		strlcpy(pm->prefix, prefix, sizeof(pm->prefix));
-	else
-		*(pm->prefix) = '\0';
 	if (in)
 		strlcpy(pm->indev_name, in->name, sizeof(pm->indev_name));
-	else
-		pm->indev_name[0] = '\0';
-
 	if (out)
 		strlcpy(pm->outdev_name, out->name, sizeof(pm->outdev_name));
-	else
-		pm->outdev_name[0] = '\0';
 
 	NETLINK_CB(log_skb).dst_group = 1;
 	pr_debug("throwing 1 packets to netlink group 1\n");
@@ -162,6 +155,8 @@ static ssize_t quota_proc_write(struct file *file, const char __user *input,
 	if (copy_from_user(buf, input, size) != 0)
 		return -EFAULT;
 	buf[sizeof(buf)-1] = '\0';
+	if (size < sizeof(buf))
+		buf[size] = '\0';
 
 	spin_lock_bh(&e->lock);
 	e->quota = simple_strtoull(buf, NULL, 0);
@@ -348,6 +343,7 @@ static struct xt_match quota_mt2_reg[] __read_mostly = {
 		.match      = quota_mt2,
 		.destroy    = quota_mt2_destroy,
 		.matchsize  = sizeof(struct xt_quota_mtinfo2),
+		.usersize   = offsetof(struct xt_quota_mtinfo2, master),
 		.me         = THIS_MODULE,
 	},
 	{
@@ -358,6 +354,7 @@ static struct xt_match quota_mt2_reg[] __read_mostly = {
 		.match      = quota_mt2,
 		.destroy    = quota_mt2_destroy,
 		.matchsize  = sizeof(struct xt_quota_mtinfo2),
+		.usersize   = offsetof(struct xt_quota_mtinfo2, master),
 		.me         = THIS_MODULE,
 	},
 };