Merge tag 'android12-5.10-2024-05_r1' of https://android.googlesource.com/kernel/common

android12-5.10 May 2024 release 1

Artifacts:
  https://ci.android.com/builds/submitted/11788327/kernel_aarch64/latest

* commit 'android12-5.10-2024-05_r1': (1483 commits)
  ANDROID: GKI: Update symbols to symbol list
  UPSTREAM: netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
  UPSTREAM: netfilter: nf_tables: release batch on table validation from abort path
  UPSTREAM: netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
  UPSTREAM: netfilter: nft_chain_filter: handle NETDEV_UNREGISTER for inet/ingress basechain
  BACKPORT: mm: update mark_victim tracepoints fields
  Revert "FROMGIT: BACKPORT: mm: update mark_victim tracepoints fields"
  UPSTREAM: usb: gadget: uvc: decrease the interrupt load to a quarter
  UPSTREAM: netfilter: nft_set_pipapo: release elements in clone only from destroy path
  FROMLIST: binder: check offset alignment in binder_get_object()
  ANDROID: enable CONFIG_USB_XHCI_PCI_RENESAS in gki_defconfig
  UPSTREAM: usb: dwc3: core: set force_gen1 bit in USB31 devices if max speed is SS
  ANDROID: userfaultfd: abort uffdio ops if mmap_lock is contended
  ANDROID: userfaultfd: add MMAP_TRYLOCK mode for COPY/ZEROPAGE
  UPSTREAM: coresight: etm4x: Remove bogous __exit annotation for some functions
  UPSTREAM: ASoC: hdmi-codec: register hpd callback on component probe
  UPSTREAM: usb: typec: tcpm: Fix NULL pointer dereference in tcpm_pd_svdm()
  UPSTREAM: mm/damon/vaddr-test: fix memory leak in damon_do_test_apply_three_regions()
  UPSTREAM: task_work: add kerneldoc annotation for 'data' argument
  UPSTREAM: x86/purgatory: Remove LTO flags
  ...

Change-Id: I538b6b23028db93a915277c46cb5a7f498f71ca1

Conflicts:
	drivers/devfreq/event/rockchip-dfi.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/i2c/busses/i2c-rk3x.c
	drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/function/uvc_video.c

Documentation/ABI/testing/sysfs-bus-optee-devices

@@ -6,3 +6,12 @@ Description:
 		OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
 		matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
 		are free to create needed API under optee-ta-<uuid> directory.
+
+What:		/sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant
+Date:		November 2023
+KernelVersion:	6.7
+Contact:	op-tee@lists.trustedfirmware.org
+Description:
+		Allows to distinguish whether an OP-TEE based TA/device requires user-space
+		tee-supplicant to function properly or not. This attribute will be present for
+		devices which depend on tee-supplicant to be running.

Documentation/ABI/testing/sysfs-platform-asus-wmi

@@ -57,3 +57,12 @@ Description:
 			* 0 - default,
 			* 1 - overboost,
 			* 2 - silent
+
+What:		/sys/devices/platform/<platform>/dgpu_disable
+Date:		Aug 2022
+KernelVersion:	5.17
+Contact:	"Luke Jones" <luke@ljones.dev>
+Description:
+		Disable discrete GPU:
+			* 0 - Enable dGPU,
+			* 1 - Disable dGPU

Documentation/admin-guide/sysctl/net.rst

@@ -31,18 +31,18 @@ see only some of them, depending on your kernel's configuration.
 
 Table : Subdirectories in /proc/sys/net
 
- ========= =================== = ========== ==================
+ ========= =================== = ========== ===================
  Directory Content               Directory  Content
- ========= =================== = ========== ==================
- 802       E802 protocol         mptcp     Multipath TCP
- appletalk Appletalk protocol    netfilter Network Filter
+ ========= =================== = ========== ===================
+ 802       E802 protocol         mptcp      Multipath TCP
+ appletalk Appletalk protocol    netfilter  Network Filter
  ax25      AX25                  netrom     NET/ROM
- bridge    Bridging              rose      X.25 PLP layer
- core      General parameter     tipc      TIPC
- ethernet  Ethernet protocol     unix      Unix domain sockets
- ipv4      IP version 4          x25       X.25 protocol
+ bridge    Bridging              rose       X.25 PLP layer
+ core      General parameter     tipc       TIPC
+ ethernet  Ethernet protocol     unix       Unix domain sockets
+ ipv4      IP version 4          x25        X.25 protocol
  ipv6      IP version 6
- ========= =================== = ========== ==================
+ ========= =================== = ========== ===================
 
 1. /proc/sys/net/core - Network core options
 ============================================

Documentation/devicetree/bindings/nvmem/mxs-ocotp.yaml

@@ -14,9 +14,11 @@ allOf:
 
 properties:
   compatible:
-    enum:
-      - fsl,imx23-ocotp
-      - fsl,imx28-ocotp
+    items:
+      - enum:
+          - fsl,imx23-ocotp
+          - fsl,imx28-ocotp
+      - const: fsl,ocotp
 
   "#address-cells":
     const: 1
@@ -40,7 +42,7 @@ additionalProperties: false
 examples:
   - |
     ocotp: efuse@8002c000 {
-        compatible = "fsl,imx28-ocotp";
+        compatible = "fsl,imx28-ocotp", "fsl,ocotp";
         #address-cells = <1>;
         #size-cells = <1>;
         reg = <0x8002c000 0x2000>;

Documentation/networking/ip-sysctl.rst

@@ -1902,6 +1902,14 @@ accept_ra_min_hop_limit - INTEGER
 
 	Default: 1
 
+accept_ra_min_lft - INTEGER
+	Minimum acceptable lifetime value in Router Advertisement.
+
+	RA sections with a lifetime less than this value shall be
+	ignored. Zero lifetimes stay unaffected.
+
+	Default: 0
+
 accept_ra_pinfo - BOOLEAN
 	Learn Prefix Information in Router Advertisement.
 

Documentation/process/deprecated.rst

@@ -70,6 +70,9 @@ Instead, the 2-factor form of the allocator should be used::
 
 	foo = kmalloc_array(count, size, GFP_KERNEL);
 
+Specifically, kmalloc() can be replaced with kmalloc_array(), and
+kzalloc() can be replaced with kcalloc().
+
 If no 2-factor form is available, the saturate-on-overflow helpers should
 be used::
 
@@ -90,9 +93,20 @@ Instead, use the helper::
         array usage and switch to a `flexible array member
         <#zero-length-and-one-element-arrays>`_ instead.
 
-See array_size(), array3_size(), and struct_size(),
-for more details as well as the related check_add_overflow() and
-check_mul_overflow() family of functions.
+For other calculations, please compose the use of the size_mul(),
+size_add(), and size_sub() helpers. For example, in the case of::
+
+	foo = krealloc(current_size + chunk_size * (count - 3), GFP_KERNEL);
+
+Instead, use the helpers::
+
+	foo = krealloc(size_add(current_size,
+				size_mul(chunk_size,
+					 size_sub(count, 3))), GFP_KERNEL);
+
+For more details, also see array3_size() and flex_array_size(),
+as well as the related check_mul_overflow(), check_add_overflow(),
+check_sub_overflow(), and check_shl_overflow() family of functions.
 
 simple_strtol(), simple_strtoll(), simple_strtoul(), simple_strtoull()
 ----------------------------------------------------------------------

Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 10
-SUBLEVEL = 198
+SUBLEVEL = 209
 EXTRAVERSION =
 NAME = Dare mighty things
 

android/abi_gki_aarch64_db845c

@@ -1086,6 +1086,7 @@
   devfreq_suspend_device
   devm_clk_register
   devm_devfreq_add_device
+  devm_pm_runtime_enable
   devm_regulator_get_exclusive
   dev_pm_opp_find_freq_floor
   dev_pm_opp_get_freq
@@ -1177,7 +1178,6 @@
   drm_dp_link_rate_to_bw_code
   drm_dp_link_train_channel_eq_delay
   drm_dp_link_train_clock_recovery_delay
-  drm_edid_block_valid
   drm_encoder_cleanup
   drm_encoder_init
   drm_flip_work_cleanup
@@ -1812,6 +1812,7 @@
 
 # preserved by --additions-only
   drm_connector_init_with_ddc
+  drm_edid_block_valid
   gpiod_direction_input
   idr_alloc_u32
   of_clk_get_by_name

android/abi_gki_aarch64_galaxy

@@ -3316,6 +3316,7 @@
   snd_card_disconnect
   snd_card_free
   snd_card_new
+  snd_card_ref
   snd_card_register
   snd_card_rw_proc_new
   snd_component_add

android/abi_gki_aarch64_mtk

@@ -2381,10 +2381,13 @@
   uart_update_timeout
   uclamp_eff_value
   __udelay
+  ufshcd_complete_requests
   ufshcd_delay_us
   ufshcd_dme_get_attr
   ufshcd_dme_set_attr
   ufshcd_dump_regs
+  ufshcd_err_handling_prepare
+  ufshcd_err_handling_unprepare
   ufshcd_fixup_dev_quirks
   ufshcd_get_pwr_dev_param
   ufshcd_hba_enable

android/abi_gki_aarch64_oplus

@@ -2565,6 +2565,7 @@
   __stack_chk_guard
   stack_depot_fetch
   stack_trace_save
+  static_key_enable
   static_key_disable
   static_key_slow_dec
   static_key_slow_inc
@@ -2761,6 +2762,7 @@
   __traceiter_android_rvh_wake_up_new_task
   __traceiter_android_vh_account_task_time
   __traceiter_android_vh_add_page_to_lrulist
+  __traceiter_android_vh_adjust_alloc_flags
   __traceiter_android_vh_alloc_pages_slowpath_begin
   __traceiter_android_vh_alloc_pages_slowpath_end
   __traceiter_android_vh_allow_domain_state
@@ -2937,6 +2939,7 @@
   __traceiter_android_vh_ufs_send_tm_command
   __traceiter_android_vh_update_page_mapcount
   __traceiter_android_vh_update_topology_flags_workfn
+  __traceiter_android_vh_vmscan_kswapd_done
   __traceiter_binder_transaction_received
   __traceiter_cpu_frequency
   __traceiter_cpu_frequency_limits
@@ -2945,6 +2948,7 @@
   __traceiter_ipi_entry
   __traceiter_ipi_raise
   __traceiter_irq_handler_entry
+  __traceiter_mm_vmscan_kswapd_wake
   __traceiter_net_dev_queue
   __traceiter_net_dev_xmit
   __traceiter_netif_receive_skb
@@ -2972,6 +2976,7 @@
   __traceiter_android_vh_free_oem_binder_struct
   __traceiter_android_vh_binder_special_task
   __traceiter_android_vh_binder_free_buf
+  __traceiter_android_vh_binder_buffer_release
   __tracepoint_android_rvh_account_irq
   __tracepoint_android_rvh_after_enqueue_task
   __tracepoint_android_rvh_build_perf_domains
@@ -3035,6 +3040,7 @@
   __tracepoint_android_rvh_wake_up_new_task
   __tracepoint_android_vh_account_task_time
   __tracepoint_android_vh_add_page_to_lrulist
+  __tracepoint_android_vh_adjust_alloc_flags
   __tracepoint_android_vh_alloc_pages_slowpath_begin
   __tracepoint_android_vh_alloc_pages_slowpath_end
   __tracepoint_android_vh_allow_domain_state
@@ -3211,6 +3217,7 @@
   __tracepoint_android_vh_ufs_send_tm_command
   __tracepoint_android_vh_update_page_mapcount
   __tracepoint_android_vh_update_topology_flags_workfn
+  __tracepoint_android_vh_vmscan_kswapd_done
   __tracepoint_binder_transaction_received
   __tracepoint_cpu_frequency
   __tracepoint_cpu_frequency_limits
@@ -3219,6 +3226,7 @@
   __tracepoint_ipi_entry
   __tracepoint_ipi_raise
   __tracepoint_irq_handler_entry
+  __tracepoint_mm_vmscan_kswapd_wake
   __tracepoint_net_dev_queue
   __tracepoint_net_dev_xmit
   __tracepoint_netif_receive_skb
@@ -3250,6 +3258,7 @@
   __tracepoint_android_vh_free_oem_binder_struct
   __tracepoint_android_vh_binder_special_task
   __tracepoint_android_vh_binder_free_buf
+  __tracepoint_android_vh_binder_buffer_release
   trace_print_array_seq
   trace_print_flags_seq
   trace_print_hex_seq
@@ -3714,4 +3723,6 @@
   xhci_ring_cmd_db
   xhci_ring_free
   xhci_trb_virt_to_dma
+  xt_register_match
+  xt_unregister_match
   zero_pfn

android/abi_gki_aarch64_qcom

@@ -2607,6 +2607,7 @@
   __traceiter_android_vh_show_suspend_epoch_val
   __traceiter_android_vh_subpage_dma_contig_alloc
   __traceiter_android_vh_timer_calc_index
+  __traceiter_android_vh_try_fixup_sea
   __traceiter_android_vh_ufs_check_int_errors
   __traceiter_android_vh_ufs_clock_scaling
   __traceiter_android_vh_ufs_compl_command
@@ -2735,6 +2736,7 @@
   __tracepoint_android_vh_show_suspend_epoch_val
   __tracepoint_android_vh_subpage_dma_contig_alloc
   __tracepoint_android_vh_timer_calc_index
+  __tracepoint_android_vh_try_fixup_sea
   __tracepoint_android_vh_ufs_check_int_errors
   __tracepoint_android_vh_ufs_clock_scaling
   __tracepoint_android_vh_ufs_compl_command

android/abi_gki_aarch64_transsion

@@ -10,6 +10,17 @@
   swapcache_free_entries
   swap_type_to_swap_info
   blkcg_schedule_throttle
+  _atomic_dec_and_lock_irqsave
+  bio_uninit
+  blk_mq_kick_requeue_list
+  blk_rq_init
+  errno_to_blk_status
+  ioc_lookup_icq
+  sbitmap_finish_wait
+  sbitmap_prepare_to_wait
+  sbitmap_queue_wake_all
+  scsi_command_normalize_sense
+  ufshcd_release_scsi_cmd
   __traceiter_android_rvh_alloc_si
   __traceiter_android_rvh_alloc_swap_slot_cache
   __traceiter_android_rvh_drain_slots_cache_cpu
@@ -46,6 +57,26 @@
   __traceiter_android_vh_unuse_swap_page
   __traceiter_android_vh_waiting_for_page_migration
   __traceiter_android_vh_should_end_madvise
+  __traceiter_android_vh_exit_check
+  __traceiter_android_vh_bio_free
+  __traceiter_android_rvh_internal_blk_mq_alloc_request
+  __traceiter_android_vh_internal_blk_mq_free_request
+  __traceiter_android_vh_blk_mq_complete_request
+  __traceiter_android_vh_blk_mq_add_to_requeue_list
+  __traceiter_android_rvh_blk_mq_delay_run_hw_queue
+  __traceiter_android_vh_blk_mq_run_hw_queue
+  __traceiter_android_vh_blk_mq_insert_request
+  __traceiter_android_rvh_blk_mq_alloc_rq_map
+  __traceiter_android_rvh_blk_mq_init_allocated_queue
+  __traceiter_android_vh_blk_mq_exit_queue
+  __traceiter_android_vh_blk_mq_alloc_tag_set
+  __traceiter_android_rvh_blk_allocated_queue_init
+  __traceiter_android_rvh_blk_flush_plug_list
+  __traceiter_android_vh_blk_alloc_flush_queue
+  __traceiter_android_vh_blk_mq_all_tag_iter
+  __traceiter_android_vh_blk_mq_queue_tag_busy_iter
+  __traceiter_android_vh_blk_mq_free_tags
+  __traceiter_android_vh_blk_mq_sched_insert_request
   __tracepoint_android_rvh_alloc_si
   __tracepoint_android_rvh_alloc_swap_slot_cache
   __tracepoint_android_rvh_drain_slots_cache_cpu
@@ -82,4 +113,24 @@
   __tracepoint_android_vh_unuse_swap_page
   __tracepoint_android_vh_waiting_for_page_migration
   __tracepoint_android_vh_should_end_madvise
+  __tracepoint_android_vh_exit_check
+  __tracepoint_android_vh_bio_free
+  __tracepoint_android_rvh_internal_blk_mq_alloc_request
+  __tracepoint_android_vh_internal_blk_mq_free_request
+  __tracepoint_android_vh_blk_mq_complete_request
+  __tracepoint_android_vh_blk_mq_add_to_requeue_list
+  __tracepoint_android_rvh_blk_mq_delay_run_hw_queue
+  __tracepoint_android_vh_blk_mq_run_hw_queue
+  __tracepoint_android_vh_blk_mq_insert_request
+  __tracepoint_android_rvh_blk_mq_alloc_rq_map
+  __tracepoint_android_rvh_blk_mq_init_allocated_queue
+  __tracepoint_android_vh_blk_mq_exit_queue
+  __tracepoint_android_vh_blk_mq_alloc_tag_set
+  __tracepoint_android_rvh_blk_allocated_queue_init
+  __tracepoint_android_rvh_blk_flush_plug_list
+  __tracepoint_android_vh_blk_alloc_flush_queue
+  __tracepoint_android_vh_blk_mq_all_tag_iter
+  __tracepoint_android_vh_blk_mq_queue_tag_busy_iter
+  __tracepoint_android_vh_blk_mq_free_tags
+  __tracepoint_android_vh_blk_mq_sched_insert_request
   zero_pfn

arch/arc/kernel/signal.c

@@ -61,7 +61,7 @@ struct rt_sigframe {
 	unsigned int sigret_magic;
 };
 
-static int save_arcv2_regs(struct sigcontext *mctx, struct pt_regs *regs)
+static int save_arcv2_regs(struct sigcontext __user *mctx, struct pt_regs *regs)
 {
 	int err = 0;
 #ifndef CONFIG_ISA_ARCOMPACT
@@ -74,12 +74,12 @@ static int save_arcv2_regs(struct sigcontext *mctx, struct pt_regs *regs)
 #else
 	v2abi.r58 = v2abi.r59 = 0;
 #endif
-	err = __copy_to_user(&mctx->v2abi, &v2abi, sizeof(v2abi));
+	err = __copy_to_user(&mctx->v2abi, (void const *)&v2abi, sizeof(v2abi));
 #endif
 	return err;
 }
 
-static int restore_arcv2_regs(struct sigcontext *mctx, struct pt_regs *regs)
+static int restore_arcv2_regs(struct sigcontext __user *mctx, struct pt_regs *regs)
 {
 	int err = 0;
 #ifndef CONFIG_ISA_ARCOMPACT

arch/arm/boot/dts/am33xx.dtsi

@@ -347,6 +347,7 @@
 					<SYSC_IDLE_NO>,
 					<SYSC_IDLE_SMART>,
 					<SYSC_IDLE_SMART_WKUP>;
+			ti,sysc-delay-us = <2>;
 			clocks = <&l3s_clkctrl AM3_L3S_USB_OTG_HS_CLKCTRL 0>;
 			clock-names = "fck";
 			#address-cells = <1>;

arch/arm/boot/dts/imx7s.dtsi

@@ -437,7 +437,7 @@
 			};
 
 			gpt1: timer@302d0000 {
-				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
+				compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
 				reg = <0x302d0000 0x10000>;
 				interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX7D_GPT1_ROOT_CLK>,
@@ -446,7 +446,7 @@
 			};
 
 			gpt2: timer@302e0000 {
-				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
+				compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
 				reg = <0x302e0000 0x10000>;
 				interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX7D_GPT2_ROOT_CLK>,
@@ -456,7 +456,7 @@
 			};
 
 			gpt3: timer@302f0000 {
-				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
+				compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
 				reg = <0x302f0000 0x10000>;
 				interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX7D_GPT3_ROOT_CLK>,
@@ -466,7 +466,7 @@
 			};
 
 			gpt4: timer@30300000 {
-				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
+				compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
 				reg = <0x30300000 0x10000>;
 				interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX7D_GPT4_ROOT_CLK>,

arch/arm/boot/dts/motorola-mapphone-common.dtsi

@@ -765,6 +765,7 @@
 &uart3 {
 	interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH
 			       &omap4_pmx_core 0x17c>;
+	overrun-throttle-ms = <500>;
 };
 
 &uart4 {

arch/arm/boot/dts/qcom-apq8064.dtsi

@@ -760,7 +760,7 @@
 
 				xoadc: xoadc@197 {
 					compatible = "qcom,pm8921-adc";
-					reg = <197>;
+					reg = <0x197>;
 					interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>;
 					#address-cells = <2>;
 					#size-cells = <0>;

arch/arm/boot/dts/qcom-mdm9615.dtsi

@@ -82,14 +82,12 @@
 		};
 	};
 
-	regulators {
-		vsdcc_fixed: vsdcc-regulator {
-			compatible = "regulator-fixed";
-			regulator-name = "SDCC Power";
-			regulator-min-microvolt = <2700000>;
-			regulator-max-microvolt = <2700000>;
-			regulator-always-on;
-		};
+	vsdcc_fixed: vsdcc-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "SDCC Power";
+		regulator-min-microvolt = <2700000>;
+		regulator-max-microvolt = <2700000>;
+		regulator-always-on;
 	};
 
 	soc: soc {