Merge branch 'android11-5.4' into 'android11-5.4-lts'

Sync up with android11-5.4 for the following commits:

63fec0641a ANDROID: ABI: Update allowed list for QCOM
dca02b19eb ANDROID: GKI: Update abi_gki_aarch64_cuttlefish
b4e51836ce ANDROID: GKI: Update abi_gki_aarch64_exynos

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

android/abi_gki_aarch64.xml

@@ -3316,6 +3316,7 @@
       <elf-symbol name='refcount_dec_not_one' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe441e95a'/>
       <elf-symbol name='refcount_inc_checked' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x1ee8d6d4'/>
       <elf-symbol name='refcount_inc_not_zero_checked' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x957b1fb6'/>
+      <elf-symbol name='refresh_frequency_limits' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x47c92f8'/>
       <elf-symbol name='reg_initiator_name' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xdba126c1'/>
       <elf-symbol name='regcache_cache_bypass' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x791cef53'/>
       <elf-symbol name='regcache_cache_only' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9b4d0605'/>
@@ -3624,6 +3625,7 @@
       <elf-symbol name='sdio_writew' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2c183296'/>
       <elf-symbol name='search_binary_handler' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x10b0c818'/>
       <elf-symbol name='security_sk_classify_flow' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf0875158'/>
+      <elf-symbol name='security_sk_clone' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe06141e9'/>
       <elf-symbol name='security_sock_graft' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xda10ec3'/>
       <elf-symbol name='securityfs_create_dir' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb6174463'/>
       <elf-symbol name='securityfs_create_file' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x41a0ce03'/>
@@ -65928,6 +65930,10 @@
         <parameter type-id='f0981eeb'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <function-decl name='refresh_frequency_limits' mangled-name='refresh_frequency_limits' filepath='drivers/cpufreq/cpufreq.c' line='1135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='refresh_frequency_limits'>
+        <parameter type-id='343c3ae4' name='policy' filepath='drivers/cpufreq/cpufreq.c' line='1135' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='cpufreq_quick_get_max' mangled-name='cpufreq_quick_get_max' filepath='drivers/cpufreq/cpufreq.c' line='1749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cpufreq_quick_get_max'>
         <parameter type-id='f0981eeb' name='cpu' filepath='drivers/cpufreq/cpufreq.c' line='1749' column='1'/>
         <return type-id='f0981eeb'/>
@@ -118723,11 +118729,6 @@
           <var-decl name='triggered_count' type-id='49178f86' visibility='default' filepath='drivers/reset/core.c' line='49' column='1'/>
         </data-member>
       </class-decl>
-      <union-decl name='phy_configure_opts' size-in-bits='896' visibility='default' filepath='include/linux/phy/phy.h' line='50' column='1' id='2c7a2d9f'>
-        <data-member access='public'>
-          <var-decl name='mipi_dphy' type-id='b277cad4' visibility='default' filepath='include/linux/phy/phy.h' line='51' column='1'/>
-        </data-member>
-      </union-decl>
       <enum-decl name='gpiod_flags' filepath='include/linux/gpio/consumer.h' line='48' column='1' id='38d4936d'>
         <underlying-type type-id='9cac1fee'/>
         <enumerator name='GPIOD_ASIS' value='0'/>
@@ -118896,6 +118897,11 @@
           <var-decl name='lanes' type-id='002ac4a6' visibility='default' filepath='include/linux/phy/phy-mipi-dphy.h' line='275' column='1'/>
         </data-member>
       </class-decl>
+      <union-decl name='phy_configure_opts' size-in-bits='896' visibility='default' filepath='include/linux/phy/phy.h' line='50' column='1' id='2c7a2d9f'>
+        <data-member access='public'>
+          <var-decl name='mipi_dphy' type-id='b277cad4' visibility='default' filepath='include/linux/phy/phy.h' line='51' column='1'/>
+        </data-member>
+      </union-decl>
       <class-decl name='phy_attrs' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/phy/phy.h' line='114' column='1' id='2bd806af'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='bus_width' type-id='19c2251e' visibility='default' filepath='include/linux/phy/phy.h' line='115' column='1'/>
@@ -184844,6 +184850,11 @@
       </function-decl>
     </abi-instr>
     <abi-instr address-size='64' path='security/security.c' language='LANG_C89'>
+      <function-decl name='security_sk_clone' mangled-name='security_sk_clone' filepath='security/security.c' line='2077' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='security_sk_clone'>
+        <parameter type-id='78e7cf52' name='sk' filepath='security/security.c' line='2077' column='1'/>
+        <parameter type-id='f772df6d' name='newsk' filepath='security/security.c' line='2077' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='security_sock_graft' mangled-name='security_sock_graft' filepath='security/security.c' line='2095' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='security_sock_graft'>
         <parameter type-id='f772df6d' name='sk' filepath='security/security.c' line='2095' column='1'/>
         <parameter type-id='13103032' name='parent' filepath='security/security.c' line='2095' column='1'/>

android/abi_gki_aarch64_cuttlefish

@@ -614,6 +614,7 @@
   kmalloc_order_trace
   kvfree
   kvmalloc_node
+  memdup_user
   mutex_trylock
   sg_alloc_table
   __sg_alloc_table_from_pages
@@ -790,6 +791,7 @@
   net_ratelimit
   nf_conntrack_destroy
   __num_online_cpus
+  __pskb_pull_tail
   _raw_spin_trylock
   sched_clock
   skb_add_rx_frag
@@ -857,6 +859,7 @@
   proto_unregister
   _raw_write_lock_bh
   _raw_write_unlock_bh
+  security_sk_clone
   security_sock_graft
   sk_alloc
   sock_init_data

android/abi_gki_aarch64_exynos

@@ -28,6 +28,7 @@
   arm64_const_caps_ready
   __arm_smccc_hvc
   __arm_smccc_smc
+  async_schedule_node
   atomic_notifier_call_chain
   atomic_notifier_chain_register
   atomic_notifier_chain_unregister
@@ -48,6 +49,9 @@
   blkdev_get_by_path
   blkdev_put
   blk_lookup_devt
+  blk_pm_runtime_init
+  blk_queue_update_dma_alignment
+  blk_queue_update_dma_pad
   blocking_notifier_call_chain
   blocking_notifier_chain_register
   blocking_notifier_chain_unregister
@@ -58,8 +62,12 @@
   bpf_trace_run5
   bpf_trace_run6
   bpf_trace_run7
+  bpf_trace_run8
   bpf_trace_run9
   __break_lease
+  bsg_job_done
+  bsg_remove_queue
+  bsg_setup_queue
   build_skb
   bus_find_device
   bus_for_each_dev
@@ -149,6 +157,7 @@
   clk_register_fixed_factor
   clk_register_fixed_rate
   clk_register_gate
+  clk_round_rate
   clk_set_parent
   clk_set_rate
   clk_unprepare
@@ -242,6 +251,8 @@
   devfreq_recommended_opp
   devfreq_register_opp_notifier
   devfreq_remove_device
+  devfreq_resume_device
+  devfreq_suspend_device
   devfreq_unregister_opp_notifier
   devfreq_update_status
   dev_fwnode
@@ -349,6 +360,7 @@
   dev_pm_opp_of_remove_table
   dev_pm_opp_put
   dev_pm_opp_put_regulators
+  dev_pm_opp_remove
   dev_pm_opp_set_regulators
   dev_printk
   dev_queue_xmit
@@ -432,6 +444,7 @@
   downgrade_write
   down_interruptible
   down_read
+  down_read_trylock
   down_trylock
   down_write
   d_path
@@ -464,6 +477,7 @@
   filp_close
   filp_open
   find_get_pid
+  find_last_bit
   find_next_bit
   find_next_zero_bit
   find_vma
@@ -716,8 +730,11 @@
   kernel_restart
   kernel_write
   kern_path
+  keyslot_manager_create
   keyslot_manager_create_passthrough
+  keyslot_manager_destroy
   keyslot_manager_private
+  keyslot_manager_reprogram_all_keys
   __kfifo_alloc
   __kfifo_free
   __kfifo_in
@@ -741,6 +758,7 @@
   kmemdup
   kobject_add
   kobject_create_and_add
+  kobject_del
   kobject_get
   kobject_init
   kobject_init_and_add
@@ -881,6 +899,7 @@
   netlink_register_notifier
   netlink_unicast
   netlink_unregister_notifier
+  net_ratelimit
   nla_memcpy
   __nla_parse
   nla_put
@@ -892,6 +911,7 @@
   notify_change
   nr_cpu_ids
   nr_irqs
+  ns_capable
   nsecs_to_jiffies
   ns_to_timespec
   ns_to_timespec64
@@ -965,6 +985,7 @@
   of_usb_get_phy_mode
   of_usb_host_tpl_support
   oops_in_progress
+  override_creds
   pagecache_get_page
   panic
   panic_notifier_list
@@ -1164,6 +1185,7 @@
   refcount_dec_checked
   refcount_inc_checked
   refcount_inc_not_zero_checked
+  refresh_frequency_limits
   __refrigerator
   regcache_cache_bypass
   regcache_cache_only
@@ -1198,6 +1220,7 @@
   regmap_write
   regulator_bulk_disable
   regulator_bulk_enable
+  regulator_count_voltages
   regulator_disable
   regulator_enable
   regulator_force_disable
@@ -1208,6 +1231,7 @@
   regulator_list_voltage_linear
   regulator_map_voltage_linear
   regulator_put
+  regulator_set_load
   regulator_set_mode
   regulator_set_voltage
   release_firmware
@@ -1230,6 +1254,7 @@
   reset_control_put
   reset_control_reset
   return_address
+  revert_creds
   rfkill_alloc
   rfkill_blocked
   rfkill_destroy
@@ -1257,11 +1282,29 @@
   schedule_timeout
   schedule_timeout_uninterruptible
   scnprintf
+  __scsi_add_device
+  scsi_add_host_with_dma
+  scsi_autopm_get_device
+  scsi_autopm_put_device
+  scsi_block_requests
   scsi_block_when_processing_errors
+  scsi_change_queue_depth
   scsi_device_get
   __scsi_device_lookup_by_target
+  scsi_device_put
+  scsi_dma_map
+  scsi_dma_unmap
   __scsi_execute
+  scsi_host_alloc
+  scsi_host_put
+  scsi_is_host_device
+  scsi_print_command
   scsi_print_sense_hdr
+  scsi_remove_device
+  scsi_remove_host
+  scsi_report_bus_reset
+  scsi_scan_host
+  scsi_unblock_requests
   sdev_prefix_printk
   sdio_signal_irq
   security_sock_graft
@@ -1276,6 +1319,7 @@
   setup_irq
   sg_alloc_table
   sg_alloc_table_from_pages
+  sg_copy_from_buffer
   sg_copy_to_buffer
   sget
   sg_free_table
@@ -1307,6 +1351,7 @@
   skb_copy_datagram_iter
   skb_copy_expand
   skb_dequeue
+  skb_dequeue_tail
   skb_free_datagram
   skb_pull
   skb_push
@@ -1510,6 +1555,7 @@
   sysfs_remove_bin_file
   sysfs_remove_file_ns
   sysfs_remove_group
+  sysfs_remove_groups
   sysfs_remove_link
   sysfs_streq
   system_freezable_wq
@@ -1557,6 +1603,7 @@
   __tracepoint_suspend_resume
   trace_print_array_seq
   trace_print_flags_seq
+  trace_print_hex_seq
   trace_print_symbols_seq
   __trace_puts
   trace_raw_output_prep
@@ -1722,6 +1769,7 @@
   __usecs_to_jiffies
   user_path_at_empty
   usleep_range
+  utf16s_to_utf8s
   v4l2_ctrl_handler_free
   v4l2_ctrl_handler_init_class
   v4l2_ctrl_handler_setup

android/abi_gki_aarch64_qcom

@@ -407,6 +407,8 @@
   devm_extcon_register_notifier
   devm_free_irq
   devm_fwnode_get_index_gpiod_from_child
+  devm_gpiochip_add_data
+  devm_gpiod_get
   devm_gpiod_get_index
   devm_gpiod_get_optional
   devm_gpio_request
@@ -441,6 +443,7 @@
   devm_pinctrl_get
   devm_pinctrl_put
   devm_pinctrl_register
+  devm_pinctrl_register_and_init
   devm_platform_ioremap_resource
   devm_power_supply_get_by_phandle
   devm_power_supply_register
@@ -657,12 +660,14 @@
   drm_atomic_state_default_release
   __drm_atomic_state_free
   drm_atomic_state_init
+  drm_bridge_add
   drm_bridge_attach
   drm_bridge_disable
   drm_bridge_enable
   drm_bridge_mode_set
   drm_bridge_post_disable
   drm_bridge_pre_enable
+  drm_bridge_remove
   drm_class_device_register
   drm_class_device_unregister
   drm_clflush_pages
@@ -1014,9 +1019,12 @@
   gnss_register_device
   gpiochip_add_data_with_key
   gpiochip_add_pin_range
+  gpiochip_generic_config
   gpiochip_generic_free
   gpiochip_generic_request
   gpiochip_get_data
+  gpiochip_irqchip_add_key
+  gpiochip_line_is_irq
   gpiochip_line_is_valid
   gpiochip_remove
   gpiod_cansleep
@@ -1030,6 +1038,7 @@
   gpiod_get_value_cansleep
   gpiod_is_active_low
   gpiod_set_debounce
+  gpiochip_set_nested_irqchip
   gpiod_set_raw_value
   gpiod_set_raw_value_cansleep
   gpiod_set_value
@@ -1090,6 +1099,10 @@
   __i2c_smbus_xfer
   i2c_smbus_xfer
   __i2c_transfer
+  i2c_smbus_read_i2c_block_data
+  i2c_smbus_read_byte_data
+  i2c_smbus_write_i2c_block_data
+  i2c_smbus_write_byte_data
   i2c_transfer
   i2c_transfer_buffer_flags
   icc_get
@@ -1739,6 +1752,7 @@
   pid_task
   pinconf_generic_dt_node_to_map
   pinctrl_dev_get_drvdata
+  pinctrl_enable
   pinctrl_force_default
   pinctrl_force_sleep
   pinctrl_get