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

Sync up with android12-5.10 for the following commits:

d0782c9411 Merge tag 'android12-5.10.160_r00' into android12-5.10
e12e360999 ANDROID: usb: f_accessory: Check buffer size when initialised via composite
ca53b8f1b4 BACKPORT: mm: make minimum slab alignment a runtime property
b10e8ec405 BACKPORT: printk: stop including cache.h from printk.h
ce6cc743ca UPSTREAM: kasan: fix a missing header include of static_keys.h
3519fc246d BACKPORT: kasan: split kasan_*enabled() functions into a separate header
56583c9472 UPSTREAM: usb: gadget: f_fs: Ensure ep0req is dequeued before free_request
b44330f50c UPSTREAM: usb: gadget: f_fs: Prevent race during ffs_ep0_queue_wait
d53fb78733 UPSTREAM: usb: dwc3: gadget: conditionally remove requests
75a4f0b5e1 UPSTREAM: usb: dwc3: ep0: Properly handle setup_packet_pending scenario in data stage
767a360826 UPSTREAM: usb: dwc3: gadget: Fix IN endpoint max packet size allocation
7b90f7b05e UPSTREAM: usb: dwc3: gadget: Delay issuing End Transfer
4678fabb6e UPSTREAM: usb: dwc3: gadget: Only End Transfer for ep0 data phase
a79e848e52 UPSTREAM: usb: dwc3: ep0: Don't prepare beyond Setup stage
802b4745f7 UPSTREAM: usb: dwc3: gadget: move cmd_endtransfer to extra function
33b5613a43 UPSTREAM: usb: dwc3: gadget: ep_queue simplify isoc start condition
d099b9a70e UPSTREAM: usb: dwc3: gadget: Skip reading GEVNTSIZn
15b61c98d6 UPSTREAM: usb: dwc3: gadget: Ignore Update Transfer cmd params
0761373d2f UPSTREAM: usb: dwc3: gadget: Skip checking Update Transfer status
7d1d982f57 UPSTREAM: pstore: Properly assign mem_type property
c83ab50b6e BACKPORT: ext4: fix use-after-free in ext4_rename_dir_prepare
ab89185ddb ANDROID: GKI: rockchip: Update symbols
6e50bbff17 BACKPORT: f2fs: let's avoid panic if extent_tree is not created
39b8fee3c0 BACKPORT: f2fs: should use a temp extent_info for lookup
937ed4edda BACKPORT: f2fs: don't mix to use union values in extent_info
073b997b02 BACKPORT: f2fs: initialize extent_cache parameter
aa064914fd BACKPORT: f2fs: add block_age-based extent cache
d6ba4dceab BACKPORT: f2fs: allocate the extent_cache by default
72e9dd90cf BACKPORT: f2fs: refactor extent_cache to support for read and more
561e9febb3 BACKPORT: f2fs: remove unnecessary __init_extent_tree
bf3cafe7f1 BACKPORT: f2fs: move internal functions into extent_cache.c
b29b3bd7e1 BACKPORT: f2fs: specify extent cache for read explicitly
02cb04cb05 BACKPORT: f2fs: add "c_len" into trace_f2fs_update_extent_tree_range for compressed file
f6b4d18df0 BACKPORT: f2fs: fix race condition on setting FI_NO_EXTENT flag
3112d6f502 BACKPORT: f2fs: extent cache: support unaligned extent
25280f263d UPSTREAM: io_uring: kill goto error handling in io_sqpoll_wait_sq()
7c31ae524c ANDROID: allmodconfig: disable WERROR
824c55581d UPSTREAM: Enable '-Werror' by default for all kernel builds
447ba7ae75 ANDROID: GKI: VIVO: Add a symbol to symbol list
91e4675508 ANDROID: fips140: add crypto_memneq() back to the module
b460d3c09a ANDROID: GKI: rockchip: Update module fragment and symbol list
91e760f1f2 ANDROID: GKI: rockchip: Enable symbols for HDMIRX
1960d4cfad ANDROID: GKI: rockchip: Enable symbols for Ethernet
529351c4c8 ANDROID: Re-enable fast mremap and fix UAF with SPF
c67f268c84 Revert "ANDROID: Make SPF aware of fast mremaps"
1351459097 ANDROID: GKI: Update symbols to symbol list
fe60669d03 ANDROID: fips140: add dump_jitterentropy command to fips140_lab_util
6d015667ce UPSTREAM: io_uring: add missing item types for splice request
ad1f2eebad ANDROID: GKI: update xiaomi symbol list
f677efbea1 Revert "Revert "ANDROID: vendor_hooks:vendor hook for mmput""
a43cd1f2bb Revert "Revert "ANDROID: vendor_hooks:vendor hook for __alloc_pages_slowpath.""
9e6fb5ac72 ANDROID: GKI: rockchip: Add symbol clk_hw_set_parent
7bc2b8c400 UPSTREAM: usb: dwc3: core: Add error log when core soft reset failed
05a8f2c4d2 FROMLIST: fuse: give wakeup hints to the scheduler
134c1aae43 ANDROID: Make SPF aware of fast mremaps
16c03440df ANDROID: GKI: enable mulitcolor-led
4aa3cab588 UPSTREAM: HID: playstation: support updated DualSense rumble mode.
63b2567f9d UPSTREAM: HID: playstation: add initial DualSense Edge controller support
a3ea8fbc1f UPSTREAM: HID: playstation: stop DualSense output work on remove.
a301358cb5 UPSTREAM: HID: playstation: convert to use dev_groups
62964653b7 UPSTREAM: HID: playstation: fix return from dualsense_player_led_set_brightness()
f7901b46a2 UPSTREAM: HID: playstation: expose DualSense player LEDs through LED class.
a70e598cef UPSTREAM: leds: add new LED_FUNCTION_PLAYER for player LEDs for game controllers.
e1cd3ffe47 UPSTREAM: HID: playstation: expose DualSense lightbar through a multi-color LED.
65654da06d UPSTREAM: Documentation: leds: standartizing LED names
d37e563bff ANDROID: usb: gadget: uvc: remove duplicate code in unbind
8ad88eae4b ANDROID: dma-buf: Fix build breakage with !CONFIG_DMABUF_SYSFS_STATS
ce18af9b5d ANDROID: dma-buf: don't re-purpose kobject as work_struct
eddb2f39cd UPSTREAM: drm/amdgpu: temporarily disable broken Clang builds due to blown stack-frame
e2a4080d04 BACKPORT: Kconfig.debug: provide a little extra FRAME_WARN leeway when KASAN is enabled
98671fcc32 UPSTREAM: bpf: Ensure correct locking around vulnerable function find_vpid()
01b3d953ac BACKPORT: UPSTREAM: usb: typec: ucsi: Wait for the USB role switches
37725ca62e UPSTREAM: HID: roccat: Fix use-after-free in roccat_read()
8f0752d06e ANDROID: arm64: mm: perform clean & invalidation in __dma_map_area
d55aeb4029 BACKPORT: ANDROID: dma-buf: heaps: replace mutex lock with spinlock
9ef4727680 Merge tag 'android12-5.10.149_r00' into android12-5.10
ac30bb6084 UPSTREAM: binder: Gracefully handle BINDER_TYPE_FDA objects with num_fds=0
befa134c53 UPSTREAM: binder: Address corner cases in deferred copy and fixup
8494d73eeb UPSTREAM: binder: fix pointer cast warning
3e7e7f4b10 UPSTREAM: binder: defer copies of pre-patched txn data
58fd89db0d UPSTREAM: binder: read pre-translated fds from sender buffer
92a864d9db UPSTREAM: binder: avoid potential data leakage when copying txn
d95f5e3da7 ANDROID: khugepaged: fix mixing declarations warning in retract_page_tables
aaf03dd58c ANDROID: mm: fix build issue in spf when CONFIG_USERFAULTFD=n
1c828eb3da ANDROID: mm: disable speculative page faults for CONFIG_NUMA
1900436df5 ANDROID: mm: fix invalid backport in speculative page fault path
0f43357d37 ANDROID: disable page table moves when speculative page faults are enabled
d65d4a0538 ANDROID: mm: assert that mmap_lock is taken exclusively in vm_write_begin
bfdcf47ca3 ANDROID: mm: remove sequence counting when mmap_lock is not exclusively owned
5ed391bd8a ANDROID: mm/khugepaged: add missing vm_write_{begin|end}
59d4d125b7 BACKPORT: FROMLIST: mm: implement speculative handling in filemap_fault()
2bb39b9121 ANDROID: mm: prevent reads of unstable pmd during speculation
4b388752ac ANDROID: mm: prevent speculative page fault handling for in do_swap_page()
0560f5f7b3 ANDROID: mm: prevent speculative page fault handling for userfaults
1169f70f8f ANDROID: mm: skip pte_alloc during speculative page fault
d84fac9795 FROMGIT: mm/madvise: fix madvise_pageout for private file mappings
c7eb32a49f ANDROID: GKI: Update symbols to symbol list
dcdb7eadfd Revert "FROMGIT: mm/vmalloc: Add override for lazy vunmap"
450a37133d Revert "FROMGIT: arm64: Work around Cortex-A510 erratum 2454944"
015859081a UPSTREAM: efi: capsule-loader: Fix use-after-free in efi_capsule_write
02e1387801 FROMGIT: arm64: Work around Cortex-A510 erratum 2454944
abb277d9f1 FROMGIT: mm/vmalloc: Add override for lazy vunmap
68d4b5fef2 BACKPORT: mm/page_alloc: always initialize memory map for the holes
a8997cb185 UPSTREAM: usb: dwc3: gadget: Submit endxfer command if delayed during disconnect
910e9e6049 UPSTREAM: usb: dwc3: Fix ep0 handling when getting reset while doing control transfer
e0243d1991 UPSTREAM: mm/damon/core: initialize damon_target->list in damon_new_target()
82b904105a UPSTREAM: usb: typec: ucsi: Remove incorrect warning
5f1257b5ff UPSTREAM: xhci: Don't show warning for reinit on known broken suspend
2df2e2c084 UPSTREAM: mm/damon: validate if the pmd entry is present before accessing
ed91943b48 UPSTREAM: mm/damon/dbgfs: fix memory leak when using debugfs_lookup()
3093f8b52c UPSTREAM: mm/damon/dbgfs: avoid duplicate context directory creation
3f23bb2255 UPSTREAM: crypto: lib - remove unneeded selection of XOR_BLOCKS
bf4603f495 UPSTREAM: pinctrl: sunxi: Fix name for A100 R_PIO
a0630a0536 UPSTREAM: cgroup: Add missing cpus_read_lock() to cgroup_attach_task_all()
2a11f678f6 BACKPORT: usb: gadget: f_uac2: fix superspeed transfer
347d7198a6 BACKPORT: usb: dwc3: qcom: fix runtime PM wakeup
af723545ed UPSTREAM: KVM: arm64: Reject 32bit user PSTATE on asymmetric systems
8407a5ca14 UPSTREAM: KVM: arm64: Treat PMCR_EL1.LC as RES1 on asymmetric systems
f1bf5340cd UPSTREAM: Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm regression
fdc033d445 UPSTREAM: mm: fix page leak with multiple threads mapping the same page
5b71c43f5c UPSTREAM: PM: domains: Ensure genpd_debugfs_dir exists before remove
0805a01852 UPSTREAM: usb: gadget: uvc: fix changing interface name via configfs
a7ee7101fb BACKPORT: dma-mapping: Fix build error unused-value
c3b65245e6 UPSTREAM: tools/vm/slabinfo: Handle files in debugfs
0b21c99c83 UPSTREAM: mm/damon: use set_huge_pte_at() to make huge pte old
5084953c40 UPSTREAM: usb: gadget: f_mass_storage: Make CD-ROM emulation works with Windows OS
7878f98355 UPSTREAM: blk-mq: don't touch ->tagset in blk_mq_get_sq_hctx
eb8869415a UPSTREAM: PM: domains: Fix initialization of genpd's next_wakeup
4e1bf78ac0 BACKPORT: f2fs: don't use casefolded comparison for "." and ".."
afa5490fba UPSTREAM: regulator: scmi: Fix refcount leak in scmi_regulator_probe
521b2c5661 UPSTREAM: block/mq-deadline: Set the fifo_time member also if inserting at head
e3b4c69c57 BACKPORT: Revert "mm/cma.c: remove redundant cma_mutex lock"
1199a5f80d UPSTREAM: module.h: simplify MODULE_IMPORT_NS
18e0efa7c0 UPSTREAM: iommu/mediatek: Add mutex for m4u_group and m4u_dom in data
adec2c4a36 UPSTREAM: iommu/mediatek: Remove clk_disable in mtk_iommu_remove
f70c5827f9 UPSTREAM: iommu/mediatek: Fix 2 HW sharing pgtable issue
ec3e1bddde UPSTREAM: mm: hugetlb: add missing cache flushing in hugetlb_unshare_all_pmds()
b54d7c828a UPSTREAM: selftests/damon: add damon to selftests root Makefile
250f35d78b FROMGIT: f2fs: allow to read node block after shutdown
da05d408ee BACKPORT: f2fs: do not submit NEW_ADDR to read node block
34c9208c28 BACKPORT: ext4,f2fs: fix readahead of verity data
c5589c7eec ANDROID: dma-buf: Add vendor hook for deferred dmabuf sysfs stats release
425e7c7e0e ANDROID: dm-user: Remove bio recount in I/O path
2f29ec11e3 ANDROID: abi_gki_aarch64_qcom: Add wait_on_page_bit
506e6890de UPSTREAM: drm/meson: Fix overflow implicit truncation warnings
af8a0d5f2f UPSTREAM: irqchip/tegra: Fix overflow implicit truncation warnings
3d129ea9b5 UPSTREAM: video: fbdev: pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write
34055de440 UPSTREAM: irqchip/gic-v4: Wait for GICR_VPENDBASER.Dirty to clear before descheduling
2357d700f8 UPSTREAM: mm: kfence: fix missing objcg housekeeping for SLAB
329b0783c6 UPSTREAM: clk: Fix clk_hw_get_clk() when dev is NULL
3c6f11550b UPSTREAM: arm64: kasan: fix include error in MTE functions
9bb85986aa UPSTREAM: arm64: prevent instrumentation of bp hardening callbacks
ae9da95de3 UPSTREAM: PM: domains: Fix sleep-in-atomic bug caused by genpd_debug_remove()
f55885db0c UPSTREAM: mm: fix use-after-free bug when mm->mmap is reused after being freed
83ed3e2c4a BACKPORT: vsprintf: Fix %pK with kptr_restrict == 0
712eaeb09c UPSTREAM: net: preserve skb_end_offset() in skb_unclone_keeptruesize()
0455741716 BACKPORT: net: add skb_set_end_offset() helper
bbb0dfa377 UPSTREAM: arm64: Correct wrong label in macro __init_el2_gicv3
8318510708 UPSTREAM: KVM: arm64: Stop handle_exit() from handling HVC twice when an SError occurs
62e7b5a95c UPSTREAM: KVM: arm64: Avoid consuming a stale esr value when SError occur
a5642af234 BACKPORT: arm64: Enable Cortex-A510 erratum 2051678 by default
c5027380a1 UPSTREAM: usb: typec: tcpm: Do not disconnect when receiving VSAFE0V
044793f5af UPSTREAM: usb: typec: tcpci: don't touch CC line if it's Vconn source
3630e052b5 UPSTREAM: dt-bindings: memory: mtk-smi: Correct minItems to 2 for the gals clocks
451971e07f BACKPORT: dt-bindings: memory: mtk-smi: No need mediatek,larb-id for mt8167
f120d14123 BACKPORT: dt-bindings: memory: mtk-smi: Rename clock to clocks
64eedcefd4 UPSTREAM: KVM: arm64: Use shadow SPSR_EL1 when injecting exceptions on !VHE
6c2c1020b4 UPSTREAM: block: fix async_depth sysfs interface for mq-deadline
01a7ade4e5 UPSTREAM: dma-buf: cma_heap: Fix mutex locking section
8d34761975 UPSTREAM: scsi: ufs: ufs-mediatek: Fix error checking in ufs_mtk_init_va09_pwr_ctrl()
b3609875ce UPSTREAM: f2fs: include non-compressed blocks in compr_written_block
8599a67e73 UPSTREAM: kasan: fix Kconfig check of CC_HAS_WORKING_NOSANITIZE_ADDRESS
a9370f7ce9 UPSTREAM: dma-buf: DMABUF_SYSFS_STATS should depend on DMA_SHARED_BUFFER
b85a4aed4e UPSTREAM: mmflags.h: add missing __GFP_ZEROTAGS and __GFP_SKIP_KASAN_POISON names
3586ade72b BACKPORT: scsi: ufs: Optimize serialization of setup_xfer_req() calls
ab992b1bb8 UPSTREAM: Kbuild: lto: fix module versionings mismatch in GNU make 3.X
fcc95f9aa8 UPSTREAM: clk: versatile: Depend on HAS_IOMEM
7a81ba1e08 BACKPORT: arm64: meson: select COMMON_CLK
0e74b64011 UPSTREAM: kbuild: do not include include/config/auto.conf from adjust_autoksyms.sh
a2afe6cc0f UPSTREAM: inet: fully convert sk->sk_rx_dst to RCU rules
bbba68efda ANDROID: Update symbol list for mtk
30f7ef6517 FROMLIST: binder: fix UAF of alloc->vma in race with munmap()
b1f03eefb3 ANDROID: GKI: Update symbol list for mtk tablet projects
3813ca3253 UPSTREAM: af_key: Do not call xfrm_probe_algs in parallel
4e5c3aad56 UPSTREAM: mm: Fix TLB flush for not-first PFNMAP mappings in unmap_region()
89fc774058 UPSTREAM: mm: Force TLB flush for PFNMAP mappings before unlink_file_vma()
af70ef5bfd FROMGIT: f2fs: let's avoid to get cp_rwsem twice by f2fs_evict_inode by d_invalidate
356801e2ff ANDROID: abi_gki_aarch64_qcom: whitelist some vm symbols

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

Documentation/ABI/testing/sysfs-fs-f2fs

@@ -514,3 +514,17 @@ Date:		July 2021
 Contact:	"Daeho Jeong" <daehojeong@google.com>
 Description:	You can control for which gc mode the "gc_reclaimed_segments" node shows.
 		Refer to the description of the modes in "gc_reclaimed_segments".
+
+What:		/sys/fs/f2fs/<disk>/hot_data_age_threshold
+Date:		November 2022
+Contact:	"Ping Xiong" <xiongping1@xiaomi.com>
+Description:	When DATA SEPARATION is on, it controls the age threshold to indicate
+		the data blocks as hot. By default it was initialized as 262144 blocks
+		(equals to 1GB).
+
+What:		/sys/fs/f2fs/<disk>/warm_data_age_threshold
+Date:		November 2022
+Contact:	"Ping Xiong" <xiongping1@xiaomi.com>
+Description:	When DATA SEPARATION is on, it controls the age threshold to indicate
+		the data blocks as warm. By default it was initialized as 2621440 blocks
+		(equals to 10GB).

Documentation/admin-guide/kernel-parameters.txt

@@ -3416,8 +3416,7 @@
 			difficult since unequal pointers can no longer be
 			compared.  However, if this command-line option is
 			specified, then all normal pointers will have their true
-			value printed.  Pointers printed via %pK may still be
-			hashed.  This option should only be specified when
+			value printed. This option should only be specified when
 			debugging the kernel.  Please do not use on production
 			kernels.
 

Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.yaml

@@ -82,10 +82,9 @@ allOf:
               - mediatek,mt2701-smi-common
     then:
       properties:
-        clock:
-          items:
-            minItems: 3
-            maxItems: 3
+        clocks:
+          minItems: 3
+          maxItems: 3
         clock-names:
           items:
             - const: apb
@@ -101,10 +100,9 @@ allOf:
 
     then:
       properties:
-        clock:
-          items:
-            minItems: 4
-            maxItems: 4
+        clocks:
+          minItems: 4
+          maxItems: 4
         clock-names:
           items:
             - const: apb
@@ -114,10 +112,9 @@ allOf:
 
     else:  # for gen2 HW that don't have gals
       properties:
-        clock:
-          items:
-            minItems: 2
-            maxItems: 2
+        clocks:
+          minItems: 2
+          maxItems: 2
         clock-names:
           items:
             - const: apb

Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml

@@ -77,11 +77,11 @@ allOf:
 
     then:
       properties:
-        clock:
-          items:
-            minItems: 3
-            maxItems: 3
+        clocks:
+          minItems: 2
+          maxItems: 3
         clock-names:
+          minItems: 2
           items:
             - const: apb
             - const: smi
@@ -89,10 +89,9 @@ allOf:
 
     else:
       properties:
-        clock:
-          items:
-            minItems: 2
-            maxItems: 2
+        clocks:
+          minItems: 2
+          maxItems: 2
         clock-names:
           items:
             - const: apb
@@ -106,7 +105,6 @@ allOf:
               - mediatek,mt2701-smi-larb
               - mediatek,mt2712-smi-larb
               - mediatek,mt6779-smi-larb
-              - mediatek,mt8167-smi-larb
 
     then:
       required:

Documentation/filesystems/f2fs.rst

@@ -300,6 +300,10 @@ inlinecrypt		 When possible, encrypt/decrypt the contents of encrypted
 			 Documentation/block/inline-encryption.rst.
 atgc			 Enable age-threshold garbage collection, it provides high
 			 effectiveness and efficiency on background GC.
+age_extent_cache	 Enable an age extent cache based on rb-tree. It records
+			 data block update frequency of the extent per inode, in
+			 order to provide better temperature hints for data block
+			 allocation.
 ======================== ============================================================
 
 Debugfs Entries

Documentation/leds/well-known-leds.txt

@@ -0,0 +1,72 @@
+-*- org -*-
+
+It is somehow important to provide consistent interface to the
+userland. LED devices have one problem there, and that is naming of
+directories in /sys/class/leds. It would be nice if userland would
+just know right "name" for given LED function, but situation got more
+complex.
+
+Anyway, if backwards compatibility is not an issue, new code should
+use one of the "good" names from this list, and you should extend the
+list where applicable.
+
+Legacy names are listed, too; in case you are writing application that
+wants to use particular feature, you should probe for good name, first,
+but then try the legacy ones, too.
+
+Notice there's a list of functions in include/dt-bindings/leds/common.h .
+
+* Gamepads and joysticks
+
+Game controllers may feature LEDs to indicate a player number. This is commonly
+used on game consoles in which multiple controllers can be connected to a system.
+The "player LEDs" are then programmed with a pattern to indicate a particular
+player. For example, a game controller with 4 LEDs, may be programmed with "x---"
+to indicate player 1, "-x--" to indicate player 2 etcetera where "x" means on.
+Input drivers can utilize the LED class to expose the individual player LEDs
+of a game controller using the function "player".
+Note: tracking and management of Player IDs is the responsibility of user space,
+though drivers may pick a default value.
+
+Good: "input*:*:player-{1,2,3,4,5}
+
+* Keyboards
+  
+Good: "input*:*:capslock"
+Good: "input*:*:scrolllock"
+Good: "input*:*:numlock"
+Legacy: "shift-key-light" (Motorola Droid 4, capslock)
+
+Set of common keyboard LEDs, going back to PC AT or so.
+
+Legacy: "tpacpi::thinklight" (IBM/Lenovo Thinkpads)
+Legacy: "lp5523:kb{1,2,3,4,5,6}" (Nokia N900)
+
+Frontlight/backlight of main keyboard.
+
+Legacy: "button-backlight" (Motorola Droid 4)
+
+Some phones have touch buttons below screen; it is different from main
+keyboard. And this is their backlight.
+
+* Sound subsystem
+
+Good: "platform:*:mute"
+Good: "platform:*:micmute"
+
+LEDs on notebook body, indicating that sound input / output is muted.
+
+* System notification
+
+Legacy: "status-led:{red,green,blue}" (Motorola Droid 4)
+Legacy: "lp5523:{r,g,b}" (Nokia N900)
+
+Phones usually have multi-color status LED.
+
+* Power management
+
+Good: "platform:*:charging" (allwinner sun50i)
+
+* Screen
+
+Good: ":backlight" (Motorola Droid 4)

Makefile

@@ -796,6 +796,9 @@ stackp-flags-$(CONFIG_STACKPROTECTOR_STRONG)      := -fstack-protector-strong
 
 KBUILD_CFLAGS += $(stackp-flags-y)
 
+KBUILD_CFLAGS-$(CONFIG_WERROR) += -Werror
+KBUILD_CFLAGS += $(KBUILD_CFLAGS-y)
+
 ifdef CONFIG_CC_IS_CLANG
 KBUILD_CPPFLAGS += -Qunused-arguments
 KBUILD_CFLAGS += -Wno-format-invalid-specifier

android/abi_gki_aarch64_mtk

@@ -412,6 +412,7 @@
   devm_kasprintf
   devm_kfree
   devm_kmalloc
+  devm_led_classdev_flash_register_ext
   devm_led_classdev_register_ext
   devm_led_classdev_unregister
   devm_mbox_controller_register
@@ -1149,7 +1150,9 @@
   kvmalloc_node
   led_classdev_flash_register_ext
   led_classdev_flash_unregister
+  led_colors
   led_get_flash_fault
+  led_set_brightness
   led_set_brightness_sync
   led_set_flash_brightness
   led_set_flash_timeout
@@ -1159,6 +1162,7 @@
   led_update_brightness
   led_update_flash_brightness
   linear_range_get_max_value
+  linear_range_get_selector_high
   linear_range_get_value
   __list_add_valid
   __list_del_entry_valid
@@ -1704,6 +1708,7 @@
   regulator_enable
   regulator_enable_regmap
   regulator_get
+  regulator_get_bypass_regmap
   regulator_get_current_limit_regmap
   regulator_get_mode
   regulator_get_optional
@@ -1721,6 +1726,7 @@
   regulator_notifier_call_chain
   regulator_put
   regulator_set_active_discharge_regmap
+  regulator_set_bypass_regmap
   regulator_set_current_limit
   regulator_set_current_limit_regmap
   regulator_set_load
@@ -2973,6 +2979,7 @@
   platform_find_device_by_driver
   pm_wq
   power_supply_is_system_supplied
+  power_supply_register_no_ws
   power_supply_unreg_notifier
   prepare_to_wait
   printk_deferred

android/abi_gki_aarch64_oplus

@@ -5,6 +5,7 @@
   add_device_randomness
   add_memory
   add_memory_subsection
+  address_space_init_once
   add_swap_extent
   add_taint
   add_timer
@@ -64,6 +65,8 @@
   bio_add_pc_page
   bio_alloc_bioset
   bio_associate_blkg_from_css
+  __bio_crypt_clone
+  bio_crypt_set_ctx
   bio_endio
   bio_put
   bio_reset
@@ -89,6 +92,7 @@
   blk_execute_rq_nowait
   blk_get_request
   blk_mq_free_request
+  blk_mq_queue_inflight
   blk_mq_rq_cpu
   blk_mq_sched_mark_restart_hctx
   blk_mq_start_request
@@ -2006,6 +2010,7 @@
   preempt_schedule_notrace
   prepare_to_wait
   prepare_to_wait_event
+  prepare_to_wait_exclusive
   print_hex_dump
   printk
   printk_deferred
@@ -2047,11 +2052,14 @@
   qcom_smem_state_update_bits
   queue_delayed_work_on
   queue_work_on
+  radix_tree_delete_item
   radix_tree_gang_lookup
   radix_tree_insert
   radix_tree_iter_delete
   radix_tree_lookup
+  radix_tree_lookup_slot
   radix_tree_next_chunk
+  radix_tree_replace_slot
   radix_tree_preload
   ___ratelimit
   rational_best_approximation
@@ -2289,6 +2297,7 @@
   rtc_update_irq
   rtc_valid_tm
   rtnl_is_locked
+  __rtnl_link_register
   __rtnl_link_unregister
   rtnl_lock
   rtnl_unlock

android/abi_gki_aarch64_qcom

@@ -129,6 +129,7 @@
   cgroup_path_ns
   cgroup_taskset_first
   cgroup_taskset_next
+  check_move_unevictable_pages
   __check_object_size
   check_preempt_curr
   check_zeroed_user
@@ -1659,6 +1660,7 @@
   page_endio
   page_mapping
   __page_pinner_migration_failed
+  __pagevec_release
   panic
   panic_notifier_list
   panic_timeout
@@ -2581,7 +2583,6 @@
   __traceiter_android_vh_jiffies_update
   __traceiter_android_vh_logbuf
   __traceiter_android_vh_logbuf_pr_cont
-  __tracepoint_android_vh_madvise_cold_or_pageout
   __traceiter_android_vh_printk_hotplug
   __traceiter_android_vh_rproc_recovery
   __traceiter_android_vh_rproc_recovery_set
@@ -2703,6 +2704,7 @@
   __tracepoint_android_vh_jiffies_update
   __tracepoint_android_vh_logbuf
   __tracepoint_android_vh_logbuf_pr_cont
+  __tracepoint_android_vh_madvise_cold_or_pageout
   __tracepoint_android_vh_oom_check_panic
   __tracepoint_android_vh_printk_hotplug
   __tracepoint_android_vh_process_killed
@@ -3026,6 +3028,7 @@
   wait_for_completion_interruptible_timeout
   wait_for_completion_killable
   wait_for_completion_timeout
+  wait_on_page_bit
   __wait_rcu_gp
   wait_woken
   __wake_up

android/abi_gki_aarch64_vivo

@@ -277,6 +277,7 @@
   del_gendisk
   del_timer
   del_timer_sync
+  dentry_path_raw
   desc_to_gpio
   destroy_workqueue
   dev_coredumpv

android/abi_gki_aarch64_xiaomi

@@ -200,3 +200,11 @@
   wakeup_sources_read_unlock
   wakeup_sources_walk_start
   wakeup_sources_walk_next
+
+#required by mi_mempool.ko module
+  __traceiter_android_vh_mmput
+  __tracepoint_android_vh_mmput
+  __traceiter_android_vh_alloc_pages_reclaim_bypass
+  __tracepoint_android_vh_alloc_pages_reclaim_bypass
+  __traceiter_android_vh_alloc_pages_failure_bypass
+  __tracepoint_android_vh_alloc_pages_failure_bypass

arch/arm64/Kconfig

@@ -687,6 +687,7 @@ config ARM64_ERRATUM_1508412
 
 config ARM64_ERRATUM_2051678
 	bool "Cortex-A510: 2051678: disable Hardware Update of the page table's dirty bit"
+	default y
 	help
 	  This options adds the workaround for ARM Cortex-A510 erratum ARM64_ERRATUM_2051678.
 	  Affected Coretex-A510 might not respect the ordering rules for

arch/arm64/Kconfig.platforms

@@ -152,6 +152,7 @@ config ARCH_MEDIATEK
 
 config ARCH_MESON
 	bool "Amlogic Platforms"
+	select COMMON_CLK
 	help
 	  This enables support for the arm64 based Amlogic SoCs
 	  such as the s905, S905X/D, S912, A113X/D or S905X/D2

arch/arm64/configs/gki_defconfig

@@ -513,6 +513,7 @@ CONFIG_MMC_CRYPTO=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_LEDS_CLASS_FLASH=y
+CONFIG_LEDS_CLASS_MULTICOLOR=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_TRANSIENT=y
 CONFIG_EDAC=y

arch/arm64/configs/rockchip_gki.fragment

@@ -50,10 +50,16 @@ CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_RK1000_TVE=m
 CONFIG_DRM_RK630_TVE=m
 CONFIG_DRM_ROCKCHIP=m
+CONFIG_DRM_ROCKCHIP_RK618=m
 CONFIG_DRM_ROCKCHIP_RK628=m
 CONFIG_DRM_ROHM_BU18XL82=m
 CONFIG_DRM_SII902X=m
 CONFIG_DTC_SYMBOLS=y
+# CONFIG_DWMAC_GENERIC is not set
+# CONFIG_DWMAC_IPQ806X is not set
+# CONFIG_DWMAC_QCOM_ETHQOS is not set
+# CONFIG_DWMAC_SUN8I is not set
+# CONFIG_DWMAC_SUNXI is not set
 CONFIG_DW_WATCHDOG=m
 CONFIG_GPIO_ROCKCHIP=m
 CONFIG_GREENASIA_FF=y
@@ -146,6 +152,7 @@ CONFIG_MALI_BIFROST_EXPERT=y
 CONFIG_MALI_CSF_SUPPORT=y
 CONFIG_MALI_PLATFORM_NAME="rk"
 CONFIG_MALI_PWRSOFT_765=y
+CONFIG_MFD_RK618=m
 CONFIG_MFD_RK628=m
 CONFIG_MFD_RK630_I2C=m
 CONFIG_MFD_RK806_SPI=m
@@ -186,6 +193,7 @@ CONFIG_PROXIMITY_DEVICE=m
 CONFIG_PS_STK3410=m
 CONFIG_PS_UCS14620=m
 CONFIG_PWM_ROCKCHIP=m
+CONFIG_PWRSEQ_SIMPLE=m
 CONFIG_REGULATOR_ACT8865=m
 CONFIG_REGULATOR_FAN53555=m
 CONFIG_REGULATOR_GPIO=m
@@ -236,6 +244,7 @@ CONFIG_ROCKCHIP_PM_DOMAINS=m
 CONFIG_ROCKCHIP_PVTM=m
 CONFIG_ROCKCHIP_REMOTECTL=m
 CONFIG_ROCKCHIP_REMOTECTL_PWM=m
+CONFIG_ROCKCHIP_MULTI_RGA=m
 CONFIG_ROCKCHIP_RGB=y
 CONFIG_ROCKCHIP_RKNPU=m
 CONFIG_ROCKCHIP_SARADC=m
@@ -278,6 +287,7 @@ CONFIG_SND_SOC_RT5640=m
 CONFIG_SND_SOC_SPDIF=m
 CONFIG_SPI_ROCKCHIP=m
 CONFIG_SPI_SPIDEV=m
+CONFIG_STMMAC_ETH=m
 CONFIG_SW_SYNC=m
 CONFIG_SYSCON_REBOOT_MODE=m
 CONFIG_TEE=m
@@ -328,8 +338,8 @@ CONFIG_VIDEO_RK628_BT1120=m
 CONFIG_VIDEO_RK628_CSI=m
 CONFIG_VIDEO_RK_IRCUT=m
 CONFIG_VIDEO_ROCKCHIP_CIF=m
+CONFIG_VIDEO_ROCKCHIP_HDMIRX=m
 CONFIG_VIDEO_ROCKCHIP_ISP=m
-CONFIG_VIDEO_ROCKCHIP_ISPP=m
 CONFIG_VIDEO_S5K3L6XX=m
 CONFIG_VIDEO_S5KJN1=m
 CONFIG_VIDEO_SGM3784=m

arch/arm64/include/asm/cache.h

@@ -6,6 +6,7 @@
 #define __ASM_CACHE_H
 
 #include <asm/cputype.h>
+#include <asm/mte-def.h>
 
 #define CTR_L1IP_SHIFT		14
 #define CTR_L1IP_MASK		3
@@ -49,15 +50,21 @@
  */
 #define ARCH_DMA_MINALIGN	(128)
 
-#ifdef CONFIG_KASAN_SW_TAGS
-#define ARCH_SLAB_MINALIGN	(1ULL << KASAN_SHADOW_SCALE_SHIFT)
-#elif defined(CONFIG_KASAN_HW_TAGS)
-#define ARCH_SLAB_MINALIGN	MTE_GRANULE_SIZE
-#endif
-
 #ifndef __ASSEMBLY__
 
 #include <linux/bitops.h>
+#include <linux/kasan-enabled.h>
+
+#ifdef CONFIG_KASAN_SW_TAGS
+#define ARCH_SLAB_MINALIGN	(1ULL << KASAN_SHADOW_SCALE_SHIFT)
+#elif defined(CONFIG_KASAN_HW_TAGS)
+static inline unsigned int arch_slab_minalign(void)
+{
+	return kasan_hw_tags_enabled() ? MTE_GRANULE_SIZE :
+					 __alignof__(unsigned long long);
+}
+#define arch_slab_minalign() arch_slab_minalign()
+#endif
 
 #define ICACHEF_ALIASING	0
 #define ICACHEF_VPIPT		1

arch/arm64/include/asm/el2_setup.h

@@ -107,7 +107,7 @@
 	msr_s	SYS_ICC_SRE_EL2, x0
 	isb					// Make sure SRE is now set
 	mrs_s	x0, SYS_ICC_SRE_EL2		// Read SRE back,
-	tbz	x0, #0, 1f			// and check that it sticks
+	tbz	x0, #0, .Lskip_gicv3_\@		// and check that it sticks
 	msr_s	SYS_ICH_HCR_EL2, xzr		// Reset ICC_HCR_EL2 to defaults
 .Lskip_gicv3_\@:
 .endm