Commit Graph

1292967 Commits

Author SHA1 Message Date
Cai YiWei
6b34f8dc13 media: rockchip: isp: boottime for isp35
Change-Id: Idc2edacee2f8bb745e010efb8d849a659cfaaecb
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2025-06-11 10:22:14 +08:00
Jianqun Xu
3b93344b48 arm64: dts: rockchip: rk3576-iotest: fix property from 'gpio' to 'gpios'
The property 'gpios = ' is a fixed rule.

Change-Id: Ie7954834cb60216b8580d3d59147f8e3747e7bd6
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2025-06-11 01:44:16 +00:00
Tiffany Y. Yang
5b2e204a7b BACKPORT: binder: Create safe versions of binder log files
Binder defines several seq_files that can be accessed via debugfs or
binderfs. Some of these files (e.g., 'state' and 'transactions')
contain more granular information about binder's internal state that
is helpful for debugging, but they also leak userspace address data
through user-defined 'cookie' or 'ptr' values. Consequently, access
to these files must be heavily restricted.

Add two new files, 'state_hashed' and 'transactions_hashed', that
reproduce the information in the original files but use the kernel's
raw pointer obfuscation to hash any potential user addresses. This
approach allows systems to grant broader access to the new files
without having to change the security policy around the existing ones.

In practice, userspace populates these fields with user addresses, but
within the driver, these values only serve as unique identifiers for
their associated binder objects. Consequently, binder logs can
obfuscate these values and still retain meaning. While this strategy
prevents leaking information about the userspace memory layout in the
existing log files, it also decouples log messages about binder
objects from their user-defined identifiers.

Acked-by: Carlos Llamas <cmllamas@google.com>
Tested-by: Carlos Llamas <cmllamas@google.com>
Signed-off-by: "Tiffany Y. Yang" <ynaffit@google.com>
Link: https://lore.kernel.org/r/20250510013435.1520671-7-ynaffit@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 316970771
(cherry picked from commit 57483a362741e4f0f3f4d2fc82d48f82fd0986d9)
[Resolve conflicts from node prio]
Change-Id: I6a01048c0105a1d6061e95f386e7ee55e2fdc898
Signed-off-by: "Tiffany Yang" <ynaffit@google.com>
2025-06-10 17:56:56 -07:00
Tiffany Y. Yang
1fee46d076 UPSTREAM: binder: Refactor binder_node print synchronization
The binder driver outputs information about each dead binder node by
iterating over the dead nodes list, and it prints the state of each live
node in the system by traversing each binder_proc's proc->nodes tree.
Both cases require similar logic to maintain the global lock ordering
while accessing each node.

Create a helper function to synchronize around printing binder nodes in
a list. Opportunistically make minor cosmetic changes to binder print
functions.

Acked-by: Carlos Llamas <cmllamas@google.com>
Signed-off-by: "Tiffany Y. Yang" <ynaffit@google.com>
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Link: https://lore.kernel.org/r/20250510013435.1520671-5-ynaffit@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 316970771
(cherry picked from commit 91f1bbaa783d26b379d65ef7b4b2b947c338c749)
Change-Id: Iae546a847ca138ddfffcdc24faf075b325a54640
Signed-off-by: "Tiffany Yang" <ynaffit@google.com>
2025-06-10 17:51:01 -07:00
Sanjeev Yadav
47e5d7e917 FROMGIT: scsi: core: ufs: Fix a hang in the error handler
ufshcd_err_handling_prepare() calls ufshcd_rpm_get_sync(). The latter
function can only succeed if UFSHCD_EH_IN_PROGRESS is not set because
resuming involves submitting a SCSI command and ufshcd_queuecommand()
returns SCSI_MLQUEUE_HOST_BUSY if UFSHCD_EH_IN_PROGRESS is set. Fix this
hang by setting UFSHCD_EH_IN_PROGRESS after ufshcd_rpm_get_sync() has
been called instead of before.

Backtrace:
__switch_to+0x174/0x338
__schedule+0x600/0x9e4
schedule+0x7c/0xe8
schedule_timeout+0xa4/0x1c8
io_schedule_timeout+0x48/0x70
wait_for_common_io+0xa8/0x160 //waiting on START_STOP
wait_for_completion_io_timeout+0x10/0x20
blk_execute_rq+0xe4/0x1e4
scsi_execute_cmd+0x108/0x244
ufshcd_set_dev_pwr_mode+0xe8/0x250
__ufshcd_wl_resume+0x94/0x354
ufshcd_wl_runtime_resume+0x3c/0x174
scsi_runtime_resume+0x64/0xa4
rpm_resume+0x15c/0xa1c
__pm_runtime_resume+0x4c/0x90 // Runtime resume ongoing
ufshcd_err_handler+0x1a0/0xd08
process_one_work+0x174/0x808
worker_thread+0x15c/0x490
kthread+0xf4/0x1ec
ret_from_fork+0x10/0x20

Signed-off-by: Sanjeev Yadav <sanjeev.y@mediatek.com>
[ bvanassche: rewrote patch description ]
Fixes: 62694735ca ("[SCSI] ufs: Add runtime PM support for UFS host controller driver")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20250523201409.1676055-1-bvanassche@acm.org
Reviewed-by: Peter Wang <peter.wang@mediatek.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Bug: 415545051
Bug: 416266861
Change-Id: I25f116a84b999f2ea57c93fe5802c0d95b6e5014
(cherry picked from commit 8a3514d348de87a9d5e2ac00fbac4faae0b97996 https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git)
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2025-06-10 10:36:39 -07:00
Jon Lin
2920b6bde8 ubi: Change to fill ec_hdr and vid_hdr redundant space with ff data on rockchip
These hdr data is place in first two pages in the front of flash block,
most of the data is filled with 0 which may result in 0/1 data unbalance
and finally accelerate the data bit flip process. So using ff redundant
data pattern for data balancing is more stable for nand devices.

Change-Id: I77a9116a4575b94bc6e4da5334db4eaf3d8bcb83
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2025-06-10 20:11:10 +08:00
Finley Xiao
db89a88fcc arm64: dts: rockchip: rv1126b: Use cpu-thermal for npu opp table
Fixes: 7a4d6cb92d ("arm64: dts: rockchip: rv1126b: Remove npu thermal")
Change-Id: I7c2c31a6be1d9b13ff59eb227a034b851976112e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2025-06-10 10:30:52 +00:00
Ziyuan Xu
f18d276227 mmc: core: Skip the first CMD1 when CONFIG_ROCKCHIP_THUNDER_BOOT_MMC=y
Assume the capacity greater than 2GB, and skip the first CMD1
transmission to speed up eMMC initialization.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ic8553873c6d610390db3f031a0a30cdf5df306b6
2025-06-10 09:58:50 +00:00
Chunhai Guo
13ff1300ee BACKPORT: erofs: allocate more short-lived pages from reserved pool first
This patch aims to allocate bvpages and short-lived compressed pages
from the reserved pool first.

After applying this patch, there are three benefits.

1. It reduces the page allocation time.
 The bvpages and short-lived compressed pages account for about 4% of
the pages allocated from the system in the multi-app launch benchmarks
[1]. It reduces the page allocation time accordingly and lowers the
likelihood of blockage by page allocation in low memory scenarios.

2. The pages in the reserved pool will be allocated on demand.
 Currently, bvpages and short-lived compressed pages are short-lived
pages allocated from the system, and the pages in the reserved pool all
originate from short-lived pages. Consequently, the number of reserved
pool pages will increase to z_erofs_rsv_nrpages over time.
 With this patch, all short-lived pages are allocated from the reserved
pool first, so the number of reserved pool pages will only increase when
there are not enough pages. Thus, even if z_erofs_rsv_nrpages is set to
a large number for specific reasons, the actual number of reserved pool
pages may remain low as per demand. In the multi-app launch benchmarks
[1], z_erofs_rsv_nrpages is set at 256, while the number of reserved
pool pages remains below 64.

3. When erofs cache decompression is disabled
   (EROFS_ZIP_CACHE_DISABLED), all pages will *only* be allocated from
the reserved pool for erofs. This will significantly reduce the memory
pressure from erofs.

[1] For additional details on the multi-app launch benchmarks, please
refer to commit 0f6273ab4637 ("erofs: add a reserved buffer pool for lz4
decompression").

Signed-off-by: Chunhai Guo <guochunhai@vivo.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Link: https://lore.kernel.org/r/20240906121110.3701889-1-guochunhai@vivo.com
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>

Bug: 422867180
Bug: 387202250
Change-Id: Ife45adcb4c22c9d73952db1de956e1b9cda1b8c2
(cherry picked from commit 79f504a2cd3c0b7d953d0015618a2a41559a2cfd)
Signed-off-by: liujinbao1 <liujinbao1@xiaomi.corp-partner.google.com>
(cherry picked from commit 6e7af99d68e309a0a1a14e7674406d9462e1b0bb)
2025-06-09 11:31:29 -07:00
rs6987
753068e2ae ANDROID: GKI: Add zebra KMI symbol list
These symbols are required scanner driver

INFO:
1 function symbol(s) added
  'void vb2_video_unregister_device(struct video_device*)'

Bug: 423519221
Change-Id: I9826d7ca5b1e8d286fad1ec80efc674cc676540e
Signed-off-by: rajat.suri <rajat.suri@zebra.com>
2025-06-09 04:48:35 -07:00
Jiahang Zheng
db2b5394f0 arm64: configs: Add rockchip_amp.config
Change-Id: I6f4ebad2b83fc6eb69f08d9ade15dce88849e706
Signed-off-by: Jiahang Zheng <jiahang.zheng@rock-chips.com>
2025-06-09 10:58:21 +00:00
Jiahang Zheng
dcb117ae9b arm64: dts: rockchip: Add RV1126B amp dtsi
Change-Id: I48c3fdbae620196abeef769f0b217be4ade0a6dc
Signed-off-by: Jiahang Zheng <jiahang.zheng@rock-chips.com>
2025-06-09 10:58:21 +00:00
David Wu
de6ded9f6a i2c: rk3x: Fix DMA clean for Controllers without DMA
If supports DMA, make sure clean DMA states for current transfer,
but if not, don't clean it.
Fixes: 37f373979d ("i2c: rk3x: Add dma feature")

Change-Id: Iad8f999c074cb8710f14c7c0ed782b5df690d6ab
Signed-off-by: David Wu <david.wu@rock-chips.com>
2025-06-09 10:49:05 +00:00
Elaine Zhang
dc6b7b1715 arm64: dts: rockchip: rv1126b: add clk_cpll_div10 assigned clk rate
Change-Id: I2fdedc4ebd266082ac09514c5749f509f5a9cb2b
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2025-06-09 10:48:50 +00:00
Elaine Zhang
d804f23988 clk: rockchip: rv1126b: fix clk_cpll_div10 parent clk
v0:

gpll ----|
         |--DIV--clk_cpll_div10
cpll ----|

v1:

gpll ----------|
               |--DIV--clk_cpll_div10
clk_asip_pll --|

Change-Id: I6cf2e4127c1272169abcea1a3ef380fd0be44606
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2025-06-09 10:48:23 +00:00
Zorro Liu
28e91e1e2a drm/rockchip: ebc_dev: release version v8.00
adjust and improve fast mode:

bw_enable_repair 0: disable fast mode, no ghost remove
bw_enable_repair 1: ghost remove level 1
bw_enable_repair 2: ghost remove level 2
.
.
.
bw_enable_repair 7: ghost remove level max
bw_balance_ctl 0: disable balance ctl under fast mode, default 0, can
update by userspace ioctl
bw_balance_ctl 1: enable balance ctl, limited pixel imbalance

Change-Id: I23ff5df578311d672f8a988614494989ca11426c
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2025-06-09 17:14:34 +08:00
Sugar Zhang
ab3bd32f21 soc: rockchip: cpuinfo: Add support for rv1126b
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I9b8b73e78ff5e3ee36fd1fb6c415a04b6acf311b
2025-06-09 16:58:11 +08:00
Shunqian Zheng
2772aabf84 arm64: config: rv1126b: Enable CONFIG_RTC_DRV_ROCKCHIP
fix suspend resume

Change-Id: Ib90ae42a45690e3ae43698814ba0ea2283bd67f2
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2025-06-09 07:09:56 +00:00
Chaoyi Chen
ceea326d94 drm/rockchip: drv: Only set clk loader protect when route node exist
rockchip_clocks_loader_protect() always call in arch_initcall_sync().
However, rockchip_clocks_loader_unprotect() is not called when the
DRM driver is not loaded, which assumes that these clocks will always
be enabled.

This may cause the clock to be turned on accidentally. In the case of
ebc, for example, when the ebc driver is enabled and the DRM driver
is not loaded, rockchip_clocks_loader_protect() will enable ebc clk.
In addition, rockchip_clocks_loader_unprotect() will not be called,
meaning that the ebc clock will always be on. However, the ebc driver
will also control the ebc clk, but it will not be able to actually
turn off the clk. The dmc driver will check the status of the clk in
the CRU while working, and it will always find that the clk is on.
This will cause a wrong judgment on the working status of the ebc.

This patch adds constraints to rockchip_clocks_loader_protect() to
protect clocks only when route nodes are available, which means that
the logo is already enabled during the u-boot stage, so it makes
sense to perform clock loader protect.

Change-Id: Ib9efbade547181e86516d19637995569a751fade
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
2025-06-09 06:33:55 +00:00
Caesar Wang
5b24af833e arm64: configs: add rv1126b.config
Enable Rockchip RKNPU procfs interface and DMA heap support.

This commit enables two key configurations for Rockchip RKNPU support
on RV1126B platform.

Change-Id: I792b4e9223984d0d2e28639281585f615a015d50
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2025-06-09 06:26:00 +00:00
Liang Chen
309927bbcb arm64: dts: rockchip: rv1126b: add opp-supported-hw for npu
Change-Id: I3ae282d0b2059ae9e8b3f81c3402d05e2300ad23
Signed-off-by: Liang Chen <cl@rock-chips.com>
2025-06-09 06:23:59 +00:00
Liang Chen
86ea348e9b driver: rknpu: rv1126b: add support for get_soc_info/set_soc_info
Change-Id: I3c4a0f6561f80231009f4947094a8c2823c61656
Signed-off-by: Liang Chen <cl@rock-chips.com>
2025-06-09 06:23:54 +00:00
Liang Chen
0566ececb0 arm64: dts: rockchip: add RK3566PRO evaluation board devicetree
Signed-off-by: Liang Chen <cl@rock-chips.com>
Change-Id: Ie60d07d86193c195ba31798f24776a8573e8a797
2025-06-09 06:23:00 +00:00
Liang Chen
512465e0c0 arm64: dts: rockchip: add core dtsi for RK3566RPO Soc
Signed-off-by: Liang Chen <cl@rock-chips.com>
Change-Id: I81430bfcce410ddf9205e1b37482b7b869e4f556
2025-06-09 06:23:00 +00:00
Liang Chen
a3995931b6 arm64: dts: rockchip: rk3568: add specification_serial_number for cpuinfo
Signed-off-by: Liang Chen <cl@rock-chips.com>
Change-Id: If1c1a23631734c95185591aa3ada1d1879bc0e66
2025-06-09 06:23:00 +00:00
Liang Chen
a2422fd88f soc: rockchip: cpuinfo: Add support for rk3566pro
Signed-off-by: Liang Chen <cl@rock-chips.com>
Change-Id: I0369c883a3025aad3764b695c8a10dd32b34c83f
2025-06-09 06:23:00 +00:00
Jkand Huang
cd9358989d ARM: configs: rockchip: update rv1126b-wakeup.config
1. enable CONFIG_VIDEO_CAM_SLEEP_WAKEUP
2. enable CONFIG_SND_SOC_RK_DSM
3. enable CONFIG_SND_SOC_ROCKCHIP_MULTICODECS

Signed-off-by: Jkand Huang <jkand.huang@rock-chips.com>
Change-Id: I162f9727cd8800ed6e82cc4f3da4115dc225c0af
2025-06-07 10:09:33 +08:00
Tao Huang
b10eb9ea4e Merge commit '1337cd6a19dc8f7fe0d355334d43b0ef1ba87d0f'
* commit '1337cd6a19dc8f7fe0d355334d43b0ef1ba87d0f':
  arm64: dts: rockchip: rv1126b-evb1-v10: rockchip_suspend: sleep-debug-en = 1
  arm64: dts: rockchip: rv1126b: rockchip_suspend: sleep-debug-en = 0
  arm64: dts: rockchip: Add rv1126b-thunder-boot for SPI Nor/eMMC
  media: rockchip: sc850sl: Support for 40 frame rates
  arm64: dts: rockchip: rv1126b-evb2-v10: sc485sl enable hw_standby
  media: rockchip: isp: fix sequence error correction
  drm/rockchip: vop2: Fix the abnormal brightness when post-csc is enabled
  media: rockchip: vpss: reset sw_vi2enc_sel on dvbm deinit
  arm64: dts: rockchip: rk3588-evb: Use the hdmi phy pll dynamic allocation mode
  media: rockchip: vpss: fix ch5 output issue
  media: rockchip: vpss: reduce rockit buf vmap
  video: rockchip: mpp: rkvdec2: Fix reg reading
  misc: rockchip: pcie-rkep: Fix mutex lock not released in pcie_rkep_release
  phy: rockchip-snps-pcie3: RK3588 phy lock determines compatibility with all bifurcation situations
  video: rockchip: rga3: adapt to kernel-6.12
  net: r8168: update r8168 driver to v8.055.00

Change-Id: I0670788cb1339561587f40a9825461b1bbae20ae
2025-06-06 18:38:03 +08:00
XiaoDong Huang
1337cd6a19 arm64: dts: rockchip: rv1126b-evb1-v10: rockchip_suspend: sleep-debug-en = 1
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I57d48102e35a9b693c19c13121625cd7777183ae
2025-06-06 18:32:29 +08:00
XiaoDong Huang
4153da4ba0 arm64: dts: rockchip: rv1126b: rockchip_suspend: sleep-debug-en = 0
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: Ifa0c6165272c10771bb25db588354802ead26308
2025-06-06 18:32:18 +08:00
Ziyuan Xu
9d3d119972 arm64: dts: rockchip: Add rv1126b-thunder-boot for SPI Nor/eMMC
rv1126b thunderboot reserved memory layout:

  H
		 _______________________
		|			|
		|	ramdisk_c	|
		|_______________________|
		|			|
		|	ramdisk_r	|
 0x48c40000	|_______________________|
		|			|
		|        mcu_log	|
 0x48c3c000	|_______________________|
		|			|
		|         mcu		|
 0x48c00000	|_______________________|
		|			|
		|     [TEEOS+TA+SHM]	|
 0x48400000	|_______________________|
		|			|
		|	mmc_escd	|
 0x48000000	|_______________________|
		|			|
		|	mmc_idmac	|
 0x47fffe00	|_______________________|
		|			|
		|    isp[0..1]_tb_rmem	|
		|_______________________|
		|			|
		|         meta		|
 0x41240000	|_______________________|
		|			|
		|	   fdt		|
 0x41200000	|_______________________|
		|			|
		|	kernel_r	|
 0x40208000	|_______________________|
		|			|
		|	   bl31		|
 L		|_______________________|

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I69f4dcbf94d6a646794e993ad7dac0e94028ed47
2025-06-06 09:06:11 +00:00
Leo Sun
7cd68dc911 media: rockchip: sc850sl: Support for 40 frame rates
Change-Id: Idbaef7b7b9a1286b08733dc20e3200ae9266265f
Signed-off-by: Leo Sun <leo.sun@rock-chips.com>
2025-06-06 07:51:04 +00:00
Jkand Huang
04054a0ea7 arm64: dts: rockchip: rv1126b-evb2-v10: sc485sl enable hw_standby
Signed-off-by: Jkand Huang <jkand.huang@rock-chips.com>
Change-Id: Ie12fe2c2abacafcd54ead55a0b543fa028e08fa2
2025-06-06 07:49:47 +00:00
Cai YiWei
58b5fd106b media: rockchip: isp: fix sequence error correction
Change-Id: I35ea43335f3475a8ddb2dafb25201a7523d9457e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2025-06-06 09:55:04 +08:00
Chao Yu
7af56ffc91 UPSTREAM: f2fs: compress: fix error path of inc_valid_block_count()
If inc_valid_block_count() can not allocate all requested blocks,
it needs to release block count in .total_valid_block_count and
resevation blocks in inode.

Bug: 419862398
Change-Id: I3d05f5ced5a8e9e4af6879d8e35ef9aef148dd95
(cherry picked from commit 043c832371cd9023fbd725138ddc6c7f288dc469)
Fixes: 54607494875e ("f2fs: compress: fix to avoid inconsistence bewteen i_blocks and dnode")
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Chao Yu <chao@kernel.org>
2025-06-05 09:19:38 -07:00
Arnd Bergmann
d8780220fd UPSTREAM: scripts/unifdef: avoid constexpr keyword
Starting with c23, 'constexpr' is a keyword in C like in C++ and cannot
be used as an identifier:

scripts/unifdef.c:206:25: error: 'constexpr' can only be used in variable declarations
  206 | static bool             constexpr;              /* constant #if expression */
      |                         ^
scripts/unifdef.c:880:13: error: expected identifier or '('
  880 |                 constexpr = false;
      |                           ^

Rename this instance to allow changing to C23 at some point in the future.

Bug: 401172689
Bug: 422603167
Change-Id: I19e1c13f5dcffe98b8189d3317100f20774f1d4c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-By: Tony Finch <dot@dotat.at>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
(cherry picked from commit 10f94d8fcc0880c93d7697184fe199022792a61c)
Signed-off-by: Srinivasarao Pathipati <quic_c_spathi@quicinc.com>
(cherry picked from commit b7fd55a297a77e72154def86b46c3d1cf1ffa1e1)
2025-06-05 08:48:52 -07:00
Greg Kroah-Hartman
18282059e0 Revert "espintcp: remove encap socket caching to avoid reference leak"
This reverts commit e4cde54b46 which is
commit 028363685bd0b7a19b4a820f82dd905b1dc83999 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I05ba7cd52d70dad7ccd570cfad6daec79c5ca791
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-06-05 14:30:18 +00:00
Greg Kroah-Hartman
eb47017bf9 Revert "genirq/msi: Store the IOMMU IOVA directly in msi_desc instead of iommu_cookie"
This reverts commit e4d3763223 which is
commit 1f7df3a691740a7736bbc99dc4ed536120eb4746 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: Ib0d3d22614baadb6bd1a924fb46a905e05f4b23b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-06-05 14:27:53 +00:00
Greg Kroah-Hartman
22d163151d Revert "perf: Avoid the read if the count is already updated"
This reverts commit e1c3bfe365 which is
commit 8ce939a0fa194939cc1f92dbd8bc1a7806e7d40a upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I9c672a97df39e7381e10c7cf113a5a36f76c90e4
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-06-05 14:27:22 +00:00
Greg Kroah-Hartman
f4b979262f Revert "coredump: hand a pidfd to the usermode coredump helper"
This reverts commit ac19091288 which is
commit b5325b2a270fcaf7b2a9a0f23d422ca8a5a8bdea upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I79cda13392f475443cb9b0aa701b9224df1fa39e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-06-05 14:26:30 +00:00
Greg Kroah-Hartman
f23dc8c566 Revert "ipv6: save dontfrag in cork"
This reverts commit 4f809be95d which is
commit a18dfa9925b9ef6107ea3aa5814ca3c704d34a8a upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I92d1731431ba8fdf5be8df5457bc73cd5ae4ffaf
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-06-05 14:25:58 +00:00
Greg Kroah-Hartman
b572d7f4f2 Revert "serial: mctrl_gpio: split disable_ms into sync and no_sync APIs"
This reverts commit 68435c1fa3 which is
commit 1bd2aad57da95f7f2d2bb52f7ad15c0f4993a685 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I5a1f6ecb6b0139b48d9cbfeff2efde4362d6f3b0
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-06-05 13:19:46 +00:00
Greg Kroah-Hartman
7f0c46ade6 Revert "hrtimers: Force migrate away hrtimers queued after CPUHP_AP_HRTIMERS_DYING"
This reverts commit 82ac6adbbb which is
commit 53dac345395c0d2493cbc2f4c85fe38aef5b63f5 upstream.

It breaks the Android kernel build and can be brought back in the future
in an safe way if it is really needed.

Bug: 161946584
Change-Id: Ic3951674e27076bd9867102f525af9adc5c2a43c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-06-05 11:12:03 +00:00
Mark Huang
fafe53dcac ARM: rockchip_defconfig: Enable LRU_GEN config
Signed-off-by: Mark Huang <huangjc@rock-chips.com>
Change-Id: I6846878b6c50555f80b5d65ef1c813b675fec5e7
2025-06-05 16:02:45 +08:00
Algea Cao
1de9a23c54 drm/rockchip: vop2: Fix the abnormal brightness when post-csc is enabled
If all planes are in rgb format and are in yuv overlay, r2y
conversion is all carried out in bt601. In this scenario, the
input colorspace of post-csc needs to be selected as bt601.

Fixes: 2e4cd35f06 ("drm/rockchip: vop2: update color-encoding selection policy for post-csc")
Change-Id: I2311fe8b0edb3ad44fe98231e723e895df1a3d69
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2025-06-05 07:39:13 +00:00
Wei Dun
9adbfafceb media: rockchip: vpss: reset sw_vi2enc_sel on dvbm deinit
Signed-off-by: Wei Dun <willam.wei@rock-chips.com>
Change-Id: Ia74755db4cba45f74d2108240f8054856ed29d38
2025-06-05 07:18:49 +00:00
Greg Kroah-Hartman
ef60b4555d Merge 6.1.141 into android14-6.1-lts
Changes in 6.1.141
	gpio: pca953x: Add missing header(s)
	gpio: pca953x: Split pca953x_restore_context() and pca953x_save_context()
	gpio: pca953x: Simplify code with cleanup helpers
	gpio: pca953x: fix IRQ storm on system wake up
	phy: renesas: rcar-gen3-usb2: Add support to initialize the bus
	phy: renesas: rcar-gen3-usb2: Move IRQ request in probe
	phy: renesas: rcar-gen3-usb2: Lock around hardware registers and driver data
	phy: renesas: rcar-gen3-usb2: Assert PLL reset on PHY power off
	scsi: target: iscsi: Fix timeout on deleted connection
	virtio_ring: Fix data race by tagging event_triggered as racy for KCSAN
	dma-mapping: avoid potential unused data compilation warning
	cgroup: Fix compilation issue due to cgroup_mutex not being exported
	scsi: mpi3mr: Add level check to control event logging
	net: enetc: refactor bulk flipping of RX buffers to separate function
	drm/amdgpu: Allow P2P access through XGMI
	selftests/bpf: Mitigate sockmap_ktls disconnect_after_delete failure
	bpf: fix possible endless loop in BPF map iteration
	samples/bpf: Fix compilation failure for samples/bpf on LoongArch Fedora
	kconfig: merge_config: use an empty file as initfile
	s390/vfio-ap: Fix no AP queue sharing allowed message written to kernel log
	cifs: Add fallback for SMB2 CREATE without FILE_READ_ATTRIBUTES
	cifs: Fix querying and creating MF symlinks over SMB1
	cifs: Fix negotiate retry functionality
	fuse: Return EPERM rather than ENOSYS from link()
	NFSv4: Check for delegation validity in nfs_start_delegation_return_locked()
	NFS: Don't allow waiting for exiting tasks
	SUNRPC: Don't allow waiting for exiting tasks
	arm64: Add support for HIP09 Spectre-BHB mitigation
	tracing: Mark binary printing functions with __printf() attribute
	mailbox: use error ret code of of_parse_phandle_with_args()
	fbdev: fsl-diu-fb: add missing device_remove_file()
	fbcon: Use correct erase colour for clearing in fbcon
	fbdev: core: tileblit: Implement missing margin clearing for tileblit
	cifs: Fix establishing NetBIOS session for SMB2+ connection
	NFSv4: Treat ENETUNREACH errors as fatal for state recovery
	SUNRPC: rpc_clnt_set_transport() must not change the autobind setting
	SUNRPC: rpcbind should never reset the port to the value '0'
	thermal/drivers/qoriq: Power down TMU on system suspend
	dql: Fix dql->limit value when reset.
	lockdep: Fix wait context check on softirq for PREEMPT_RT
	objtool: Properly disable uaccess validation
	PCI: dwc: ep: Ensure proper iteration over outbound map windows
	tools/build: Don't pass test log files to linker
	pNFS/flexfiles: Report ENETDOWN as a connection error
	PCI: vmd: Disable MSI remapping bypass under Xen
	libnvdimm/labels: Fix divide error in nd_label_data_init()
	mmc: host: Wait for Vdd to settle on card power off
	x86/mm: Check return value from memblock_phys_alloc_range()
	i2c: qup: Vote for interconnect bandwidth to DRAM
	i2c: pxa: fix call balance of i2c->clk handling routines
	btrfs: make btrfs_discard_workfn() block_group ref explicit
	btrfs: avoid linker error in btrfs_find_create_tree_block()
	btrfs: run btrfs_error_commit_super() early
	btrfs: fix non-empty delayed iputs list on unmount due to async workers
	btrfs: get zone unusable bytes while holding lock at btrfs_reclaim_bgs_work()
	btrfs: send: return -ENAMETOOLONG when attempting a path that is too long
	drm/amd/display: Guard against setting dispclk low for dcn31x
	i3c: master: svc: Fix missing STOP for master request
	dlm: make tcp still work in multi-link env
	um: Store full CSGSFS and SS register from mcontext
	um: Update min_low_pfn to match changes in uml_reserved
	ext4: reorder capability check last
	scsi: st: Tighten the page format heuristics with MODE SELECT
	scsi: st: ERASE does not change tape location
	vfio/pci: Handle INTx IRQ_NOTCONNECTED
	bpf: Return prog btf_id without capable check
	tcp: reorganize tcp_in_ack_event() and tcp_count_delivered()
	rtc: rv3032: fix EERD location
	thunderbolt: Do not add non-active NVM if NVM upgrade is disabled for retimer
	ASoC: mediatek: mt6359: Add stub for mt6359_accdet_enable_jack_detect
	kbuild: fix argument parsing in scripts/config
	crypto: octeontx2 - suppress auth failure screaming due to negative tests
	dm: restrict dm device size to 2^63-512 bytes
	net/smc: use the correct ndev to find pnetid by pnetid table
	xen: Add support for XenServer 6.1 platform device
	pinctrl-tegra: Restore SFSEL bit when freeing pins
	ASoC: sun4i-codec: support hp-det-gpios property
	ext4: reject the 'data_err=abort' option in nojournal mode
	RDMA/uverbs: Propagate errors from rdma_lookup_get_uobject()
	posix-timers: Add cond_resched() to posix_timer_add() search loop
	timer_list: Don't use %pK through printk()
	netfilter: conntrack: Bound nf_conntrack sysctl writes
	arm64/mm: Check PUD_TYPE_TABLE in pud_bad()
	mmc: dw_mmc: add exynos7870 DW MMC support
	mmc: sdhci: Disable SD card clock before changing parameters
	hwmon: (dell-smm) Increment the number of fans
	ipv6: save dontfrag in cork
	drm/amd/display: calculate the remain segments for all pipes
	gfs2: Check for empty queue in run_queue
	auxdisplay: charlcd: Partially revert "Move hwidth and bwidth to struct hd44780_common"
	ASoC: qcom: sm8250: explicitly set format in sm8250_be_hw_params_fixup()
	iommu/amd/pgtbl_v2: Improve error handling
	cpufreq: tegra186: Share policy per cluster
	crypto: lzo - Fix compression buffer overrun
	arm64: tegra: p2597: Fix gpio for vdd-1v8-dis regulator
	powerpc/prom_init: Fixup missing #size-cells on PowerBook6,7
	ALSA: seq: Improve data consistency at polling
	tcp: bring back NUMA dispersion in inet_ehash_locks_alloc()
	rtc: ds1307: stop disabling alarms on probe
	ieee802154: ca8210: Use proper setters and getters for bitwise types
	ARM: tegra: Switch DSI-B clock parent to PLLD on Tegra114
	media: c8sectpfe: Call of_node_put(i2c_bus) only once in c8sectpfe_probe()
	dm cache: prevent BUG_ON by blocking retries on failed device resumes
	orangefs: Do not truncate file size
	net: phylink: use pl->link_interface in phylink_expects_phy()
	remoteproc: qcom_wcnss: Handle platforms with only single power domain
	drm/amdgpu: Do not program AGP BAR regs under SRIOV in gfxhub_v1_0.c
	media: cx231xx: set device_caps for 417
	pinctrl: bcm281xx: Use "unsigned int" instead of bare "unsigned"
	net: ethernet: ti: cpsw_new: populate netdev of_node
	net: pktgen: fix mpls maximum labels list parsing
	perf/hw_breakpoint: Return EOPNOTSUPP for unsupported breakpoint type
	ALSA: hda/realtek: Enable PC beep passthrough for HP EliteBook 855 G7
	ipv4: fib: Move fib_valid_key_len() to rtm_to_fib_config().
	drm/rockchip: vop2: Add uv swap for cluster window
	media: uvcvideo: Add sanity check to uvc_ioctl_xu_ctrl_map
	clk: imx8mp: inform CCF of maximum frequency of clocks
	x86/bugs: Make spectre user default depend on MITIGATION_SPECTRE_V2
	hwmon: (gpio-fan) Add missing mutex locks
	ARM: at91: pm: fix at91_suspend_finish for ZQ calibration
	drm/mediatek: mtk_dpi: Add checks for reg_h_fre_con existence
	fpga: altera-cvp: Increase credit timeout
	soc: apple: rtkit: Use high prio work queue
	soc: apple: rtkit: Implement OSLog buffers properly
	PCI: brcmstb: Expand inbound window size up to 64GB
	PCI: brcmstb: Add a softdep to MIP MSI-X driver
	firmware: arm_ffa: Set dma_mask for ffa devices
	net/mlx5: Avoid report two health errors on same syndrome
	selftests/net: have `gro.sh -t` return a correct exit code
	drm/amdkfd: KFD release_work possible circular locking
	leds: pwm-multicolor: Add check for fwnode_property_read_u32
	net: ethernet: mtk_ppe_offload: Allow QinQ, double ETH_P_8021Q only
	net: xgene-v2: remove incorrect ACPI_PTR annotation
	bonding: report duplicate MAC address in all situations
	soc: ti: k3-socinfo: Do not use syscon helper to build regmap
	x86/build: Fix broken copy command in genimage.sh when making isoimage
	drm/amd/display: handle max_downscale_src_width fail check
	x86/nmi: Add an emergency handler in nmi_desc & use it in nmi_shootdown_cpus()
	cpuidle: menu: Avoid discarding useful information
	media: adv7180: Disable test-pattern control on adv7180
	libbpf: Fix out-of-bound read
	dm: fix unconditional IO throttle caused by REQ_PREFLUSH
	x86/kaslr: Reduce KASLR entropy on most x86 systems
	MIPS: Use arch specific syscall name match function
	genirq/msi: Store the IOMMU IOVA directly in msi_desc instead of iommu_cookie
	MIPS: pm-cps: Use per-CPU variables as per-CPU, not per-core
	clocksource: mips-gic-timer: Enable counter when CPUs start
	scsi: mpt3sas: Send a diag reset if target reset fails
	wifi: rtw88: Fix rtw_init_vht_cap() for RTL8814AU
	wifi: rtw88: Fix rtw_init_ht_cap() for RTL8814AU
	wifi: rtw88: Fix rtw_desc_to_mcsrate() to handle MCS16-31
	wifi: rtw89: fw: propagate error code from rtw89_h2c_tx()
	net: pktgen: fix access outside of user given buffer in pktgen_thread_write()
	EDAC/ie31200: work around false positive build warning
	i3c: master: svc: Flush FIFO before sending Dynamic Address Assignment(DAA)
	serial: mctrl_gpio: split disable_ms into sync and no_sync APIs
	RDMA/core: Fix best page size finding when it can cross SG entries
	pmdomain: imx: gpcv2: use proper helper for property detection
	can: c_can: Use of_property_present() to test existence of DT property
	eth: mlx4: don't try to complete XDP frames in netpoll
	PCI: Fix old_size lower bound in calculate_iosize() too
	ACPI: HED: Always initialize before evged
	vxlan: Join / leave MC group after remote changes
	media: test-drivers: vivid: don't call schedule in loop
	net/mlx5: Modify LSB bitmask in temperature event to include only the first bit
	net/mlx5: Apply rate-limiting to high temperature warning
	ASoC: ops: Enforce platform maximum on initial value
	ASoC: tas2764: Add reg defaults for TAS2764_INT_CLK_CFG
	ASoC: tas2764: Mark SW_RESET as volatile
	ASoC: tas2764: Power up/down amp on mute ops
	ASoC: soc-dai: check return value at snd_soc_dai_set_tdm_slot()
	pinctrl: devicetree: do not goto err when probing hogs in pinctrl_dt_to_map
	smack: recognize ipv4 CIPSO w/o categories
	kunit: tool: Use qboot on QEMU x86_64
	net/mlx4_core: Avoid impossible mlx4_db_alloc() order value
	clk: qcom: clk-alpha-pll: Do not use random stack value for recalc rate
	serial: sh-sci: Update the suspend/resume support
	phy: core: don't require set_mode() callback for phy_get_mode() to work
	drm/amdgpu: reset psp->cmd to NULL after releasing the buffer
	drm/amd/display: Initial psr_version with correct setting
	drm/amdgpu: enlarge the VBIOS binary size limit
	drm/amd/display/dm: drop hw_support check in amdgpu_dm_i2c_xfer()
	net/mlx5: Extend Ethtool loopback selftest to support non-linear SKB
	net/mlx5e: set the tx_queue_len for pfifo_fast
	net/mlx5e: reduce rep rxq depth to 256 for ECPF
	wifi: mac80211: don't unconditionally call drv_mgd_complete_tx()
	wifi: mac80211: remove misplaced drv_mgd_complete_tx() call
	arch/powerpc/perf: Check the instruction type before creating sample with perf_mem_data_src
	ip: fib_rules: Fetch net from fib_rule in fib[46]_rule_configure().
	r8152: add vendor/device ID pair for Dell Alienware AW1022z
	wifi: rtw88: Fix download_firmware_validate() for RTL8814AU
	clk: qcom: camcc-sm8250: Use clk_rcg2_shared_ops for some RCGs
	hwmon: (xgene-hwmon) use appropriate type for the latency value
	media: qcom: camss: csid: Only add TPG v4l2 ctrl if TPG hardware is available
	vxlan: Annotate FDB data races
	r8169: don't scan PHY addresses > 0
	rcu: handle quiescent states for PREEMPT_RCU=n, PREEMPT_COUNT=y
	rcu: handle unstable rdp in rcu_read_unlock_strict()
	rcu: fix header guard for rcu_all_qs()
	perf: Avoid the read if the count is already updated
	ice: count combined queues using Rx/Tx count
	net/mana: fix warning in the writer of client oob
	scsi: lpfc: Handle duplicate D_IDs in ndlp search-by D_ID routine
	scsi: lpfc: Free phba irq in lpfc_sli4_enable_msi() when pci_irq_vector() fails
	scsi: st: Restore some drive settings after reset
	HID: usbkbd: Fix the bit shift number for LED_KANA
	ASoC: codecs: pcm3168a: Allow for 24-bit in provider mode
	drm/ast: Find VBIOS mode from regular display size
	bpftool: Fix readlink usage in get_fd_type
	perf/amd/ibs: Fix perf_ibs_op.cnt_mask for CurCnt
	wifi: rtl8xxxu: retry firmware download on error
	wifi: rtw88: Don't use static local variable in rtw8822b_set_tx_power_index_by_rate
	wifi: rtw89: add wiphy_lock() to work that isn't held wiphy_lock() yet
	spi: zynqmp-gqspi: Always acknowledge interrupts
	regulator: ad5398: Add device tree support
	wifi: ath9k: return by of_get_mac_address
	drm/atomic: clarify the rules around drm_atomic_state->allow_modeset
	drm/panel-edp: Add Starry 116KHD024006
	drm: Add valid clones check
	ASoC: imx-card: Adjust over allocation of memory in imx_card_parse_of()
	pinctrl: meson: define the pull up/down resistor value as 60 kOhm
	ASoC: Intel: bytcr_rt5640: Add DMI quirk for Acer Aspire SW3-013
	ALSA: hda/realtek: Add quirk for HP Spectre x360 15-df1xxx
	nvmet-tcp: don't restore null sk_state_change
	io_uring/fdinfo: annotate racy sq/cq head/tail reads
	btrfs: correct the order of prelim_ref arguments in btrfs__prelim_ref
	wifi: iwlwifi: add support for Killer on MTL
	xenbus: Allow PVH dom0 a non-local xenstore
	__legitimize_mnt(): check for MNT_SYNC_UMOUNT should be under mount_lock
	espintcp: remove encap socket caching to avoid reference leak
	dmaengine: idxd: add per DSA wq workqueue for processing cr faults
	dmaengine: idxd: add idxd_copy_cr() to copy user completion record during page fault handling
	dmaengine: idxd: Fix allowing write() from different address spaces
	remoteproc: qcom_wcnss: Fix on platforms without fallback regulators
	clk: sunxi-ng: d1: Add missing divider for MMC mod clocks
	xfrm: Sanitize marks before insert
	dmaengine: idxd: Fix ->poll() return value
	Bluetooth: L2CAP: Fix not checking l2cap_chan security level
	bridge: netfilter: Fix forwarding of fragmented packets
	ice: fix vf->num_mac count with port representors
	net: dwmac-sun8i: Use parsed internal PHY address instead of 1
	net: lan743x: Restore SGMII CTRL register on resume
	io_uring: fix overflow resched cqe reordering
	sch_hfsc: Fix qlen accounting bug when using peek in hfsc_enqueue()
	octeontx2-pf: Add support for page pool
	octeontx2-pf: Add AF_XDP non-zero copy support
	net/tipc: fix slab-use-after-free Read in tipc_aead_encrypt_done
	octeontx2-af: Set LMT_ENA bit for APR table entries
	octeontx2-af: Fix APR entry mapping based on APR_LMT_CFG
	crypto: algif_hash - fix double free in hash_accept
	padata: do not leak refcount in reorder_work
	can: slcan: allow reception of short error messages
	can: bcm: add locking for bcm_op runtime updates
	can: bcm: add missing rcu read protection for procfs content
	ALSA: pcm: Fix race of buffer access at PCM OSS layer
	ALSA: hda/realtek: Add quirk for Lenovo Yoga Pro 7 14ASP10
	llc: fix data loss when reading from a socket in llc_ui_recvmsg()
	platform/x86: dell-wmi-sysman: Avoid buffer overflow in current_password_store()
	drm/edid: fixed the bug that hdr metadata was not reset
	smb: client: Fix use-after-free in cifs_fill_dirent
	smb: client: Reset all search buffer pointers when releasing buffer
	Revert "drm/amd: Keep display off while going into S4"
	memcg: always call cond_resched() after fn()
	mm/page_alloc.c: avoid infinite retries caused by cpuset race
	Revert "arm64: dts: allwinner: h6: Use RSB for AXP805 PMIC connection"
	ksmbd: fix stream write failure
	spi: spi-fsl-dspi: restrict register range for regmap access
	spi: spi-fsl-dspi: Halt the module after a new message transfer
	spi: spi-fsl-dspi: Reset SR flags before sending a new message
	kbuild: Disable -Wdefault-const-init-unsafe
	serial: sh-sci: Save and restore more registers
	pinctrl: tegra: Fix off by one in tegra_pinctrl_get_group()
	i3c: master: svc: Fix implicit fallthrough in svc_i3c_master_ibi_work()
	x86/mm/init: Handle the special case of device private pages in add_pages(), to not increase max_pfn and trigger dma_addressing_limited() bounce buffers bounce buffers
	dmaengine: idxd: Fix passing freed memory in idxd_cdev_open()
	octeontx2-pf: fix page_pool creation fail for rings > 32k
	octeontx2-pf: Fix page pool cache index corruption.
	octeontx2-pf: Fix page pool frag allocation warning
	hrtimers: Force migrate away hrtimers queued after CPUHP_AP_HRTIMERS_DYING
	btrfs: check folio mapping after unlock in relocate_one_folio()
	af_unix: Kconfig: make CONFIG_UNIX bool
	af_unix: Return struct unix_sock from unix_get_socket().
	af_unix: Run GC on only one CPU.
	af_unix: Try to run GC async.
	af_unix: Replace BUG_ON() with WARN_ON_ONCE().
	af_unix: Remove io_uring code for GC.
	af_unix: Remove CONFIG_UNIX_SCM.
	af_unix: Allocate struct unix_vertex for each inflight AF_UNIX fd.
	af_unix: Allocate struct unix_edge for each inflight AF_UNIX fd.
	af_unix: Link struct unix_edge when queuing skb.
	af_unix: Bulk update unix_tot_inflight/unix_inflight when queuing skb.
	af_unix: Iterate all vertices by DFS.
	af_unix: Detect Strongly Connected Components.
	af_unix: Save listener for embryo socket.
	af_unix: Fix up unix_edge.successor for embryo socket.
	af_unix: Save O(n) setup of Tarjan's algo.
	af_unix: Skip GC if no cycle exists.
	af_unix: Avoid Tarjan's algorithm if unnecessary.
	af_unix: Assign a unique index to SCC.
	af_unix: Detect dead SCC.
	af_unix: Replace garbage collection algorithm.
	af_unix: Remove lock dance in unix_peek_fds().
	af_unix: Try not to hold unix_gc_lock during accept().
	af_unix: Don't access successor in unix_del_edges() during GC.
	af_unix: Add dead flag to struct scm_fp_list.
	af_unix: Fix garbage collection of embryos carrying OOB with SCM_RIGHTS
	af_unix: Fix uninit-value in __unix_walk_scc()
	arm64: dts: qcom: sm8350: Fix typo in pil_camera_mem node
	net_sched: hfsc: Address reentrant enqueue adding class to eltree twice
	perf/arm-cmn: Fix REQ2/SNP2 mixup
	perf/arm-cmn: Initialise cmn->cpu earlier
	coredump: fix error handling for replace_fd()
	pid: add pidfd_prepare()
	fork: use pidfd_prepare()
	coredump: hand a pidfd to the usermode coredump helper
	HID: quirks: Add ADATA XPG alpha wireless mouse support
	nfs: don't share pNFS DS connections between net namespaces
	platform/x86: thinkpad_acpi: Support also NEC Lavie X1475JAS
	um: let 'make clean' properly clean underlying SUBARCH as well
	spi: spi-sun4i: fix early activation
	nvme-pci: add NVME_QUIRK_NO_DEEPEST_PS quirk for SOLIDIGM P44 Pro
	NFS: Avoid flushing data while holding directory locks in nfs_rename()
	platform/x86: fujitsu-laptop: Support Lifebook S2110 hotkeys
	platform/x86: thinkpad_acpi: Ignore battery threshold change event notification
	net: ethernet: ti: am65-cpsw: Lower random mac address error print to info
	Linux 6.1.141

Change-Id: I4b93f8e69385f2087bf71545f58ae6f5cee1c5ba
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-06-05 07:17:16 +00:00
jianhua hao
3048ff6925 ANDROID: GKI: Update symbol list file for xiaomi
INFO: 3 function symbol(s) added
  'struct page* read_swap_cache_async(swp_entry_t, gfp_t, struct vm_area_struct*, unsigned long, struct swap_iocb**)'
  'int unuse_swap_pte(struct vm_area_struct*, pmd_t*, unsigned long, swp_entry_t, struct folio*)'
  'int vfs_fadvise(struct file*, loff_t, loff_t, int)'

Bug: 415852480

Change-Id: I5c4d50e042dd8dc8ba4df430614b0ac79ffb41cd
Signed-off-by: jianhua hao <haojianhua1@xiaomi.com>
2025-06-04 08:49:15 -07:00
jianhua hao
7f2f532bd0 ANDROID: mm: export __pte_offset_map/unuse_swap_pte/read_swap_cache_async
Export __pte_offset_map facilitate retrieving the corresponding PTE using PMD and an address.
Add and export unuse_swap_pte to facilitate releasing the PTE resources corresponding to pages preloaded via swapin.
Export read_swap_cache_async to facilitate asynchronously reading pages from the swap partition using PTE-prefetch scanning.

Bug: 415852480

Change-Id: Ie200656ec97b087936ca98c06b0a370f547d5d0a
Signed-off-by: jianhua hao <haojianhua1@xiaomi.com>
(cherry picked from commit 88cb3505ebf4d9eb1dd0d3c63403727eb4b239bd)
(cherry picked from commit c5defcb638906800d4ab6b50e79e9f25538aefbd)
2025-06-04 08:49:15 -07:00
Greg Kroah-Hartman
58485ff1a7 Linux 6.1.141
Link: https://lore.kernel.org/r/20250602134319.723650984@linuxfoundation.org
Tested-by: Peter Schneider <pschneider1968@googlemail.com>
Tested-by: Florian Fainelli <florian.fainelli@broadcom.com>
Tested-by: Ron Economos <re@w6rz.net>
Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
Tested-by: Shuah Khan <skhan@linuxfoundation.org>
Tested-by: Mark Brown <broonie@kernel.org>
Tested-by: Miguel Ojeda <ojeda@kernel.org>
Tested-by: Hardik Garg <hargar@linux.microsoft.com>
Tested-by: Salvatore Bonaccorso <carnil@debian.org>
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2025-06-04 14:40:26 +02:00