Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge tag 'linux-6.1-stan-rkr5' into khadas-edges-6.1.y #151

Open
wants to merge 2,416 commits into
base: khadas-edges-6.1.y
Choose a base branch
from

Conversation

JacobZang
Copy link

No description provided.

wuliangfeng and others added 30 commits November 27, 2024 09:22
…efined

Fix the modpost error "device_is_dependent" undefined by
adding device_link in ehci_platform_priv.

Fixes: 6885066 ("usb: host: ehci-platform: Add device_link between the ehci and companion")
Signed-off-by: William Wu <[email protected]>
Change-Id: I0552eab4cc45750e0c4ea494880667a29998f6b0
Signed-off-by: Jianwei Fan <[email protected]>
Change-Id: I57955e93c2441e62593c18e8aa5f538ad68f4ee9
If dynamic dptx power domain ctrl is enabled and dptx power
domain not enabled when init dptx controller, the dptx power
domain will be disabled though the uboot logo is enable. this
will cause display issue. To avoid this issue, it need enable
dptx power domain when enable uboot logo.

Change-Id: I3105556de3dee5e592242150935133cce0971551
Signed-off-by: Zhang Yubing <[email protected]>
Signed-off-by: Elaine Zhang <[email protected]>
Change-Id: I1f4fadd5e106bdbd450976e360bcf99be2d2e6b8
Signed-off-by: Elaine Zhang <[email protected]>
Change-Id: I994058973c028ba06d8621c39f3fbc76b83ab9f2
Signed-off-by: Elaine Zhang <[email protected]>
Change-Id: Ie5e2aab61d94d1269fc7a5c369379f3682d092d7
Signed-off-by: Elaine Zhang <[email protected]>
Change-Id: I2cee7f522c4c0cfef3d9e62c88d74706e573c0e2
Signed-off-by: Elaine Zhang <[email protected]>
Change-Id: I3166b72d94bcb0758bd22ee5dd63419597786606
Signed-off-by: Elaine Zhang <[email protected]>
Change-Id: I0e54805bf287f57879b0d1fd13c8f111db94b9b8
This property is used to prevent RC from calling devices to enter
D3cold if they need to keep working when system is suspended. The classic
user is wireless device and computing cards which need to work standalone
when system is suspened. Currently wireless devices deal with it by
controlling power and #PERST by themselves because they have rfkill driver
which could did it in front of the wireless driver. But computing cards couldn't.

In ACPI point of view, we could allow users to configure the D3Cold state for
each PCI device through the sysfs attribute 'sys/bus/pci/devices.../d3cold_allowed'.
Then the PCIe driver and firmware could work together to meet the requirement. But
in DT way, we have to invent a new property to cover both of these.

Signed-off-by: Shawn Lin <[email protected]>
Change-Id: Ia755f48d11f84f292a4aede38d2653b73f8d11b8
Only support panels which all parameters from device tree.

Save boot time about 2ms on rk3126-bnd-d708 board.

Before:
   text	   data	    bss	    dec	    hex	filename
  59767	    296	     84	  60147	   eaf3	drivers/gpu/drm/panel/panel-simple.o
After:
   text	   data	    bss	    dec	    hex	filename
   7547	    296	     84	   7927	   1ef7	drivers/gpu/drm/panel/panel-simple.o

Change-Id: Ie075ff5c84c1807029873555f58bd13d41350abf
Signed-off-by: Tao Huang <[email protected]>
…F_ONLY

Before:
   text	   data	    bss	    dec	    hex	filename
5227569	2360752	 112328	7700649	 7580a9	vmlinux
After:
   text	   data	    bss	    dec	    hex	filename
5227569	2308528	 112328	7648425	 74b4a9	vmlinux

Change-Id: I55e5190b4410c80f8c40deeb631650eaab28f23b
Signed-off-by: Tao Huang <[email protected]>
$ ./scripts/bloat-o-meter pm_domains_old.o pm_domains.o
dd/remove: 0/22 grow/shrink: 0/1 up/down: 0/-9328 (-9328)
Function                                     old     new   delta
rk3568_pmu                                    44       -     -44
rk3399_pmu                                    44       -     -44
rk3368_pmu                                    44       -     -44
rk3366_pmu                                    44       -     -44
rk3328_pmu                                    44       -     -44
rk3288_pmu                                    44       -     -44
rk3228_pmu                                    44       -     -44
rk3128_pmu                                    44       -     -44
rk3036_pmu                                    44       -     -44
rk1808_pmu                                    44       -     -44
px30_pmu                                      44       -     -44
rk3128_pm_domains                            220       -    -220
rk3036_pm_domains                            308       -    -308
rk1808_pm_domains                            396       -    -396
rk3328_pm_domains                            440       -    -440
rk3228_pm_domains                            484       -    -484
rk3366_pm_domains                            528       -    -528
rk3288_pm_domains                            616       -    -616
px30_pm_domains                              660       -    -660
rk3568_pm_domains                            704       -    -704
rk3368_pm_domains                            748       -    -748
rk3399_pm_domains                           1584       -   -1584
rockchip_pm_domain_dt_match                 2548     392   -2156
Total: Before=17357, After=8029, chg -53.74%

Signed-off-by: Elaine Zhang <[email protected]>
Change-Id: I1b8b307736edc9c02720c11460041e54fc6b98dd
…: fix max96745 bridge port error

The remote end point ports should be at bridge node.

Fixes: 5781678 ("arm64: dts: rockchip: rk3576-vehicle-evb: init v20 dts files")
Signed-off-by: Sandy Huang <[email protected]>
Change-Id: I6d01f68e5e5a5a3239d006f60fe97a0014918301
Separate the process of device matching by the different SoC macro
definitions, which can reduce memory usage.

Signed-off-by: Guochun Huang <[email protected]>
Change-Id: Ice50f15e64f7d1ae353ecfe462f7ba3fab017817
Separate the process of device matching by the different SoC macro
definitions, which can reduce memory usage.

Signed-off-by: Guochun Huang <[email protected]>
Change-Id: Ic0f02bee51a6520e48568aecce92acf5d0ae31e4
Signed-off-by: Guochun Huang <[email protected]>
Change-Id: Ie2f712cb1aea522004e84c7d0f4d66fe94427d57
Change-Id: I65e03dd7cc70d1ab279c5bdea0ef8969666d7469
Signed-off-by: Jon Lin <[email protected]>
add vcm config for ov5695 & gc8034 module

Signed-off-by: Wang Panzhenzhuan <[email protected]>
Change-Id: I904cfbf90b5b2aa9ece56df2832a5ef382bfa308
Change-Id: I3b35faaea4fad132be18940328e7df88ebdb0dbd
Signed-off-by: Jon Lin <[email protected]>
…_is_signaled()

To address the issue in kernel 6.1 that 'dma_fence_ops::signaled'
is NULL for certain signaled fence instances.

Change-Id: Ie5e03e849947a9cd2b02fd057ebb44878aa2d0b0
Signed-off-by: Zhen Chen <[email protected]>
ld.lld: error: undefined symbol: __udivdi3
>>> referenced by rockchip_drm_vop2.c
>>>
drivers/gpu/drm/rockchip/rockchip_drm_vop2.o:(vop2_plane_atomic_check)
in archive vmlinux.a
>>> did you mean: __udivsi3
>>> defined in: vmlinux.a(arch/arm/lib/lib1funcs.o)

arm-none-linux-gnueabihf-ld: drivers/gpu/drm/rockchip/rockchip_drm_vop2.o: in function
`vop2_calc_dsc_clk':
rockchip_drm_vop2.c:(.text+0x239c): undefined reference to `__aeabi_uldivmod'

Signed-off-by: Sandy Huang <[email protected]>
Change-Id: Iac0b61444cd4d33c62bd8994d0ce7ca1bab7bfa4
Signed-off-by: Ye Zhang <[email protected]>
Change-Id: I584b1d26ad38eff38f2c72ed8d58c4b15c604e7e
Signed-off-by: Sugar Zhang <[email protected]>
Change-Id: I2d0ed26188932e01342ced7791551bff6ac3bc06
Signed-off-by: Sugar Zhang <[email protected]>
Change-Id: Ibdb38886942e979919d7b1f3eed138379357cb9c
Change-Id: I305828159da0c5a1bffc6ee832b3c6c71dbd6354
Signed-off-by: Jiajian Wu <[email protected]>
…for multicodecs

Change-Id: Iffc566092dec8b9fd0391b6ce4327829c67e78c2
Signed-off-by: Jiajian Wu <[email protected]>
…DSI2

This feature is not available for rk3506.

Change-Id: Ic74e03ee687b91f4fe306e8b57689284dbd73d83
Signed-off-by: Tao Huang <[email protected]>
We get the same IOVA from DRM mm framework at different times which
finally cause iommu map failed. So let's try other IOVA if iommu map
failed time exceeds the limitation to map as a workaround.

Change-Id: Ic539f4a64d5ed0c9d3f5ac01acf3f0922a2fdc1f
Signed-off-by: Simon Xue <[email protected]>
Change-Id: I15d8be7980252fa7ac70ff73170c5ae9b812eb63
Signed-off-by: Jiajian Wu <[email protected]>
finley1226 and others added 30 commits December 20, 2024 11:58
Change-Id: Ifecc210da1687ae3f85e1c11a2082f125cb61fdb
Signed-off-by: Finley Xiao <[email protected]>
Change-Id: I3195579b8c1d597f25e0a9711cd3edc5a6599ab4
Signed-off-by: Zhihuan He <[email protected]>
The io_width in diff cs should set the same value at the same time.

Change-Id: I2a872ba487bde9aa56f0a3490acbb526a1521475
Signed-off-by: Zhihuan He <[email protected]>
Change-Id: I097abc26413ea50d1e3c56ae57a7d014a8bfcf46
Signed-off-by: Zhihuan He <[email protected]>
…TERN_80BIT

According to the DP PHY CTS v1.2b 3.2.3 and 3.3.3 chapters, the
PreEmphasis Level Test Pattern(PLTPAT), which also was called
80-bit custom pattern, should be:

1111100000 1111100000 1111100000 1111100000
1111100000 1111100000 1111100000 1111100000

It is used to verify the HBR2 in "Non Pre-Emphasis Level Verification
Testing" and "Pre-Emphasis Level Verification and Maximum Pk-Pk
Differential Voltage Testing".

Without this patch, the PLTPAT pattern is incorrect.

Fixes: 304dbb1 ("drm/bridge: analogix_dp: Add DP Test Automation")
Change-Id: I4b00acd0a360a8ba3f3eaf32fb30e0a18a451f5c
Signed-off-by: Damon Ding <[email protected]>
The gpio hpd state will be mismatch the real state if the cable
plug before init the dp controller. So it need updage the gpio
hpd state when dp controller init.

Fixes: 601aff2 ("drm/rockchip: dw-dp: optimize the logic to deal with hpd")

Change-Id: I6b7a3d88e2ef70e54ad9465859c1a55205f10c4f
Signed-off-by: Zhang Yubing <[email protected]>
The dp_out_en is config as take effect by vsync signal. When disable
the output, it will do some thing as follow:
1. clean dp_out_en bit in vop.
2. disable dp video stream;
3. disable dp link clk.
If it not wait clean dp_out_en bit take effect, the link clk may
disable before clean dp_out_en bit, which will cause dp fifo overflow
issue.
When enable the output, though it not has this issue, it's better to
wait set dp_out_en bit take effect to avoid the similar issue in the
future.

Change-Id: Ie088a0265e5bdef349cdd3e0dc3daebb6d9eeeff
Signed-off-by: Zhang Yubing <[email protected]>
Signed-off-by: Tao Huang <[email protected]>
Change-Id: If4996bba54ba14fc09a25eab93882bcc2a7a2876
Signed-off-by: Tao Huang <[email protected]>
Change-Id: Ife97e80bb3161b5cb3083d68aaa5098bf7df33df
Signed-off-by: Tao Huang <[email protected]>
Change-Id: I9140e17cf732b9c0d95509a661592fad2810b362
Signed-off-by: Tao Huang <[email protected]>
Change-Id: Ifda4695da966586a409ac4069aa232df43863551
Signed-off-by: Tao Huang <[email protected]>
Change-Id: Iab2fb03e9db190a8456d0bca5df0b1653c56fcf0
Signed-off-by: Tao Huang <[email protected]>
Change-Id: I33e9cc6a988e96bd37a446bd02c2657688ede13f
Signed-off-by: Tao Huang <[email protected]>
Change-Id: I789d8239c08ef8b2086477b40164a2007470a1fb
…tly,Only the sdcard can be used."

This reverts commit 3afdc6a.
This driver is unused since linux 4.4, drop it.

Signed-off-by: Tao Huang <[email protected]>
Change-Id: I2f2260816aaf3637713b811c292673158ab4a981
Signed-off-by: Tao Huang <[email protected]>
Change-Id: I21009e40bbd55b24ad0960098eb3d147f6b40c74
Signed-off-by: Tao Huang <[email protected]>
Change-Id: I795db4c3bceea87036f0ca7ac8185d301e65dd73
Signed-off-by: Tao Huang <[email protected]>
Change-Id: Ief54e322b8cd2f428810de46a3bda31588f23520
Signed-off-by: Tao Huang <[email protected]>
Change-Id: I1850434be596a5f78ff01f985d5677ee606f8882
Signed-off-by: Tao Huang <[email protected]>
Change-Id: Ie778a88d9246e7d81a830ec2a55cd13de7e490e3
Signed-off-by: Tao Huang <[email protected]>
Change-Id: I492d3d9503e2de8cc0f9b23a388d94ecd135cbbe
Signed-off-by: Tao Huang <[email protected]>
Change-Id: Icd7563b320deba47960ce571e8780c17a323e5b8
Type: Fix
Redmine ID: #525434
Associated modifications: N/A
Test: self-test

Signed-off-by: Jake Wu <[email protected]>
Change-Id: I4271ad161c1a80250629ad133704bfe837cf0150
Change-Id: Ic52e1748c80aed6feea17aa5dbeab262c7b55f0a
Signed-off-by: Jon Lin <[email protected]>
Change-Id: I99a39fc0cf86477aa97e4eb555856d8f6a0e9e77
Signed-off-by: Jon Lin <[email protected]>
Change-Id: Ia670d98504a9bb1a2a9be5481b2186ecdabe1cce
Signed-off-by: Jon Lin <[email protected]>
Checked with kasan, the buggy stacktrace:

BUG: KASAN: global-out-of-bounds in serdes_bridge_probe+0x2bc/0x568
Read of size 20 at addr ffffffc009a87240 by task swapper/0/1

CPU: 3 PID: 1 Comm: swapper/0 Tainted: G    B              6.1.84 khadas#7
Hardware name: Rockchip RK3576 VEHICLE EVB V20 MOS LINUX Board (DT)
Call trace:
 dump_backtrace+0x11c/0x128
 show_stack+0x1c/0x28
 dump_stack_lvl+0x64/0x7c
 print_report+0x150/0x498
 kasan_report+0x80/0xf0
 kasan_check_range+0xe8/0x198
 __asan_loadN+0x20/0x28
 serdes_bridge_probe+0x2bc/0x568
 platform_probe+0x90/0x108
 really_probe+0x118/0x548
 __driver_probe_device+0xc0/0x1f0
 driver_probe_device+0x60/0x168

Fixes: 563845b ("mfd: display-serdes: add serdes display driver support base on mfd arch")

Change-Id: Ib0f6a674d75e0f9861163b0803f327963c3a85e5
Signed-off-by: Cody Xie <[email protected]>
Type: Function
Redmine ID: #N/A
Associated modifications: N/A
Test: N/A

Signed-off-by: Zhibin Huang <[email protected]>
Change-Id: I79c7571100e2d547548e243e455b17e7609590fc
Change-Id: I3e844247e03767e55a7ff82608eafb75158c3d81
Signed-off-by: Jianlong Wang <[email protected]>
Linux 6.1 Standard release rkr5

Signed-off-by: Jacobe Zang <[email protected]>

 Conflicts:
	arch/arm64/boot/dts/rockchip/Makefile
	drivers/media/i2c/Kconfig
	scripts/clang-wrapper.py
	scripts/gcc-wrapper.py

Change-Id: I432fd8d645e943dba5be5b3a91537ff05ece1824
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.