Commit Graph

1060811 Commits

Author SHA1 Message Date
Yandong Lin
aadb82e121 video: rockchip: mpp: Fix out-of-bounds err
Rootcause: fmt_reg.class not initial

Error notes:

[  172.540549][ T4535] BUG: KFENCE: out-of-bounds read in rkvenc_alloc_task+0x494/0x6d8 [rk_vcodec]
[  172.540549][ T4535]
[  172.540565][ T4535] Out-of-bounds read at 0x000000002927f5b0 (768B right of kfence-#30):
[  172.540671][ T4535]  rkvenc_alloc_task+0x494/0x6d8 [rk_vcodec]
[  172.540775][ T4535]  mpp_process_task_default+0x38/0x210 [rk_vcodec]
[  172.540877][ T4535]  mpp_dev_ioctl+0x1e4/0x368 [rk_vcodec]
[  172.540895][ T4535]  __arm64_compat_sys_ioctl+0x10c/0x160
[  172.540912][ T4535]  el0_svc_common+0xa4/0x180
[  172.540925][ T4535]  do_el0_svc_compat+0x20/0x50
[  172.540941][ T4535]  el0_svc_compat+0x14/0x24
[  172.540955][ T4535]  el0_sync_compat_handler+0x7c/0xbc
[  172.540966][ T4535]  el0_sync_compat+0x1ac/0x1c0
[  172.540974][ T4535]
[  172.540987][ T4535] kfence-#30 [0x0000000027db494f-0x00000000574dca5f, size=92,cache=kmalloc-128] allocated by task 4535:
[  172.541100][ T4535]  kzalloc+0x18/0x28 [rk_vcodec]
[  172.541201][ T4535]  rkvenc_alloc_task+0x260/0x6d8 [rk_vcodec]
[  172.541301][ T4535]  mpp_process_task_default+0x38/0x210 [rk_vcodec]
[  172.541401][ T4535]  mpp_dev_ioctl+0x1e4/0x368 [rk_vcodec]
[  172.541414][ T4535]  __arm64_compat_sys_ioctl+0x10c/0x160
[  172.541428][ T4535]  el0_svc_common+0xa4/0x180
[  172.541441][ T4535]  do_el0_svc_compat+0x20/0x50
[  172.541455][ T4535]  el0_svc_compat+0x14/0x24
[  172.541468][ T4535]  el0_sync_compat_handler+0x7c/0xbc
[  172.541479][ T4535]  el0_sync_compat+0x1ac/0x1c0
[  172.541486][ T4535]
[  172.541499][ T4535] CPU: 5 PID: 4535 Comm: mpp_h264e_4534 Not tainted 5.10.43 #264
[  172.541509][ T4535] Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
[  172.541524][ T4535]

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ic1ffce5d5c4f5b65115f4a530e76383f6aa8f8d7
2021-11-15 08:54:42 +08:00
Huang zhibao
84b44e0ae3 arm64: dts: rockchip: rk3588-nvr: Add supply regulators for cpu
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I33b5c114dc3be4e3224d8319ec5fa58c6b34bfad
2021-11-14 20:27:27 +08:00
Zhen Chen
d4c297429a arm64: dts: rockchip: rk3588-evb: enable gpu
Change-Id: I5c8eeae28415c439530ebc4aca39a43cf934a552
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2021-11-14 19:53:20 +08:00
Zhixiong Lin
cec8f849bf arm64: rockchip_defconfig: Enable CONFIG_MALI_CSF_SUPPORT
Enable this to support RK3588 GPU.
But RK3568 GPU should disable this config.

Signed-off-by: Zhixiong Lin <zhixiong.lin@rock-chips.com>
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: I78c165329c9cbc8565af26494c6034dcc704ad66
2021-11-14 19:49:49 +08:00
Zhen Chen
44194e5f13 MALI: bifrost: Kconfig: make MALI_CSF_SUPPORT selectable
remove depends on MALI_BIFROST=m

Change-Id: I3296839dd0f40e8fdfc6c66aa0d6f8f7155cdf68
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2021-11-14 19:39:22 +08:00
Jianhui Wang
6851609376 arm64: rockchip_defconfig: enable CONFIG_TOUCHSCREEN_ELAN5515
Enable the ELAN touch panel used on Rockchip RK3588s tablet.

Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
Change-Id: I4a5f116cd8bfd9e6cb232af9f4eabe9289978372
2021-11-14 17:54:24 +08:00
Guochun Huang
e23da6e8c9 phy: rockchip: mipi-dcphy: delay more time for pll and lane lock
Change-Id: Ic2e60cad56107c4096ded5571e8a89f1d557a496
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2021-11-14 17:47:19 +08:00
Guochun Huang
127485c33e drm/rockchip: dsi2: make send or receive cmd packet more robust
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I013803d14730132c13bdca2bcced829aaf3b5112
2021-11-14 17:46:47 +08:00
Guochun Huang
a4527a60bf drm/rockchip: dsi2: add support dual channel dsi
Display Pipeline:
                   ---> dsi0 --> dcphy_tx0 --->
                  /                  |         \
                 /              dcphy0_pll      \
      vp2/vp3 -->                                --->dual channel panel
                 \              dcphy1_pll      /
                  \                  |         /
                   ---> dsi1 --> dcphy_tx1 --->

Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I5a87aa940510f803479318c66535024d5ce2c8d6
2021-11-14 17:01:43 +08:00
Guochun Huang
4c3fbbcd22 drm/panel: simple: add support dsc/pps sequence transfer for dsi
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I7a828c34c13c201694bd5e3fcaeab47508b58ed8
2021-11-14 17:01:11 +08:00
Hu Kejun
75c63df7c5 media: rockchip: isp: add constraint to gaus_en/viir_en/v1_fir_sel of rawaf
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I9ef5bf7caa4e1ceab78a6b0c62e0fbb173de7ece
2021-11-14 16:56:41 +08:00
Andy Yan
6d75cc0dc6 drm/rockchip: vop2: Delete mipi_dclk_pol on rk3588
This bit has a hide founction for height/low bit swap,
And should not be touched.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I8ce2caddebdf87edbd75cc1fe4460699e7d9ca89
2021-11-14 15:17:12 +08:00
Andy Yan
57ff9f2f3a drm/rockchip: vop2: Set K = 2 for eDP DUAL_CHANNEL_LEFT_RIGHT_MODE
Video_Pixclk = edp_pixclk x K = edp_dclk x K = dclk_core x 4;

K = 2 for SPLIT, other condition is 1.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I8e6f3e32bd1c214bfe46cc3f37dd813af8901839
2021-11-14 15:17:08 +08:00
Cai YiWei
caf502507b media: rockchip: isp: fix NULL Pointer for stats v3x
Change-Id: Id21bcc88fb644bb2fd159dd7dd5ce652cac54ab1
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-14 15:16:23 +08:00
Huang zhibao
e835762a6d arm64: dts: rockchip: rk3588-nvr: Enable tsadc
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: Ic85ef02eb9c5abccdf8777f57fa9f9dae415047f
2021-11-14 15:15:36 +08:00
Huang zhibao
30f8750b79 arm64: dts: rockchip: rk3588-nvr: Enabld rkvdec
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I97fbc66bcb3f8e572264ed4398b1ef7cc09915e2
2021-11-14 15:15:16 +08:00
Jianhui Wang
d4f4e5cea6 arm64: dts: rockchip: rk3588s-tablet: bring up tablet
Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
Change-Id: I6601901251c535240b4a2cad6f4ea4bc22494ff8
2021-11-14 15:13:44 +08:00
Wyon Bi
5ee51da6f2 arm64: dts: rockchip: Add RK3588 EVB3 LP5 V10 eDP Board
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I629312c9dccda589aea157c488d838e12aedc45d
2021-11-14 15:09:33 +08:00
Wyon Bi
93faefa6fe arm64: rockchip_defconfig: enable CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX
Enable the HDPTX PHY driver used on Rockchip RK3588 SoC.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ib96cd35d7bda166900afc4b0650f922a21f1c0d5
2021-11-14 15:05:33 +08:00
Wyon Bi
4e5e956026 phy/rockchip: Add support for Samsung HDMI/DP Combo PHY
Add a new driver for Samsung HDPTX Combo transmit-PHY IP used
in Rockchip RK3588 SoC. The HDPTX is a PHY hardmacro to
support HDMI and DP interfaces.

Currently, it supports only DP mode.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ie70017969ee59dfc53f9e319591aa3f998a86b0c
2021-11-14 15:04:58 +08:00
Sugar Zhang
53a3ef7353 ASoC: rockchip: Add support for multicodecs machine driver
This patch adds support for sound which link multiple codecs
to the same cpu dai.

Change-Id: I77d3e9c10d03c2b8809c6d82b5268dba279ee6f0
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-11-14 14:27:56 +08:00
Sugar Zhang
513946019c ASoC: rockchip: Add support for Voice Activity Detection
- Drop duplicated PCM_RUNTIME_CHECK
- Replace rtd->x to macro asoc_rtd_to_x

Change-Id: I6ae63b4d36f2f9b24f0fdf352fdc385ec425b330
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-11-14 14:24:43 +08:00
Sugar Zhang
4d0c0e0a07 ASoC: dt-bindings: rockchip: Add compatible for rk3588 vad
This patch adds compatible string for rk3588 vad.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I69672704997a9344faa6b53b050e82d6259afdfd
2021-11-14 14:16:32 +08:00
Sugar Zhang
e811780873 ASoC: rockchip: vad: Add support for rk3588 SoC
This patch adds support for rk3588 SoC.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ic5488967f7147c84700849d2d38e419ab707327a
2021-11-14 14:16:15 +08:00
Caesar Wang
94d7910211 arm64/configs: update configs for rockchip_linux_defconfig
1) make ARCH=arm64 savedefconfig

2) Enable CONFIG_PRINTK_TIME_FROM_ARM_ARCH_TIMER
   For get boot time better

3) Enable CONFIG_RFKILL_RK

4) Enable CONFIG_SND_SOC_ES8323
   This patch enable CONFIG_SND_SOC_ES8323 default for rk3588 evb boards.

5) Enable CONFIG_PHY_ROCKCHIP_SAMSUNG_DCPHY
   The driver is used by RK3588.

6) Enable type-c support
   Select Type-C related configs for Rockchip SoCs.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I42144dcb9ffbaced8ca58acc786c7319e6116a7b
2021-11-14 14:12:25 +08:00
William Wu
0e63394c58 arm64: dts: rockchip: rk3588s-evb2-lp5: add u3 phy for u3 host_2
This patch add usb3 combphy for usb3 host_2, with this
patch, the rk3588s evb2 board can support usb3 host.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Ia8fdf5921218a554bb29ab4a8cc10fbd1b37827d
2021-11-14 11:48:17 +08:00
William Wu
3712121527 arm64: dts: rockchip: rk3588-nvr-demo: add u3 phy for u3 host_2
This patch add usb3 combphy for usb3 host_2, with this
patch, the rk3588 nvr demo v10 board can support usb3 host.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I72301e14fc6b428722f171795377b1cbae9d2aa4
2021-11-14 11:48:17 +08:00
William Wu
d37e72f33b arm64: dts: rockchip: rk3588: add u3 phy for u3 host_2
This patch add usb3 combphy for usb3 host_2.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I38fb63446a285d791cd0466e112ad33df1f3254e
2021-11-14 11:48:17 +08:00
Elaine Zhang
2f510ebc1f clk: rockchip: rk3588: fix up the cpu setting high freq crash
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ia5b825a3c8013a51973c37d45c91c7c36280e634
2021-11-14 11:38:01 +08:00
Tao Huang
3f948b3493 arm64: rockchip_gki.config: Enable CONFIG_PHY_ROCKCHIP_USBDP
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I66435f558679eee5afbd5ea8ff683c67dcd775cd
2021-11-14 10:46:12 +08:00
Tao Huang
61c1c97f4d arm64: rockchip_defconfig: Enable CONFIG_PHY_ROCKCHIP_USBDP
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I223c4d8ef5ce53132c0345ec4fe1ba4dc0dff0d7
2021-11-14 10:46:12 +08:00
Tao Huang
2bd5dfcad9 arm64: rockchip_gki.config: Enable CONFIG_RTC_DRV_HYM8563
Rockchip EVB use this feature.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia5a9ebb76a9c7e7a5b7d5342f645ec156d18c9a8
2021-11-14 10:46:12 +08:00
Huang zhibao
4ae183cc46 arm64: rockchip_linux_defconfig: Enable RK860X
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I3c7aa0eb256d1d8bea17912c2690a6d5455a0887
2021-11-14 10:34:20 +08:00
Frank Wang
ab40e563be phy: rockchip: add usbdp combo phy driver
This adds a new USBDP combo PHY with Samsung IP block driver.

The driver get lane mux and mapping info in 2 ways, supporting
DisplayPort alternate mode or parsing from DT. When parsing from DT,
the property "rockchip,dp-lane-mux" provide the DP mux and mapping info.

When do DP link training, need to set lane number, link rate, swing, and
pre-emphasis via PHY configure interface.

Change-Id: I84256746c28d98efcadff5998bfb35a28c959410
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
2021-11-14 10:26:12 +08:00
Frank Wang
c995f093fc dt-bindings: phy: add rockchip usbdp combo phy document
Add device tree binding document for Rockchip USBDP Combo PHY
with Samsung IP block.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: Id9924e8061881ada6d5d2c2a36feb5009a85487b
2021-11-14 10:26:12 +08:00
Wyon Bi
332551a8c2 drm/rockchip: analogix_dp: Add support for rk3588
This patch adds support for Analogix eDP TX IP used on RK3588 SoC.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I362489fb294673512b6de1913aa2e0b855a98926
2021-11-14 10:24:44 +08:00
David Wu
72bb4cf4a2 net: ethernet: stmmac: dwmac-rk: Fix delayline control for RK3588
The wrong choice is at GMAC1 RGMII delayline control.

Fixes: 2627dcd2c9e9("net: ethernet: stmmac: dwmac-rk: Add gmac support for rk3588")
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ibc31f4f8b0f8c23c7ca3b290f3d95ba34f03c05f
2021-11-14 10:20:10 +08:00
David Wu
4a5684c1b1 arm64: boot: dts: rockchip: Enable gmac nodes for rk3588-nvr-demo
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I8f26369b54b35f7627acaffaf3b77e9e2c9a9c2c
2021-11-14 10:19:49 +08:00
Shawn Lin
9ff4dae907 arm64: dts: rockchip: rk806: support 1.8v for PLDO5
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Ib7301e4a4308fd5e5882219b48b145d66a503b03
2021-11-14 10:18:48 +08:00
Andy Yan
fd6591c08d drm/rockchip: vop2: Fix Cluster2/3 MIX offset
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ibc9b82b7c1c531b7ac062a8ead6f9e162f6fa0fb
2021-11-14 10:18:31 +08:00
Sandy Huang
b8a6f5f211 drm/rockchip: add DRM_RENDER_ALLOW
This is required by android hwc for dev/dri/card128.

Change-Id: Ia0159b877f7d8b2bb5cecf3b352b67d9c76c7c97
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-11-14 10:18:31 +08:00
Yandong Lin
35e4ee2855 arm64: dts: rockchip: Fix jpege resets cfg wrong issue for rk3588
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ifd1191c05bdcbbbd8487f47e391f9529ba72f6b0
2021-11-14 10:09:50 +08:00
Zefa Chen
4b69a0b94a arm64: dts: rockchip: rk3588: Add vicap node
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib3c7f7283fa0858e2273a1823e02dfce076df58a
2021-11-13 18:05:10 +08:00
Zefa Chen
2d1d48e930 media: rockchip: cif support rk3588
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I4398f9163b858c8f7dd32c88f2f2d37a9f464bcc
2021-11-13 17:55:58 +08:00
Zefa Chen
ac5a379e10 arm64: configs: rockchip_linux: add sensor imx464
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I2a850cdb64dcbfaf0c0ae5030ea518f169417aba
2021-11-13 17:50:33 +08:00
Andy Yan
d9ba95a38e drm/rockchip: vop2: Fix win_dly register definition
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I49bf658d1e6447a34d2af18d9aea574d1636f054
2021-11-13 16:35:18 +08:00
Simon Xue
13230c090c pcie-dma-trx: update to version 0x2
1. support buffer_size set by user
2. support assigned chn
3. support udma read
4. support buffer address set by userspace

Need to update test_pcie and test-pcie-ep-new.

New test command:

1. run ./test-pcie-ep-new 500 1024 chn_num buffer_address both on RC and EP first
   Release buffer use dma channel number = chn_num.

   if buffer_address = 0
	   pcie_dma_buffer_address get from DT reserved memory
   else
	   pcie_dma_buffer_address = buffer_address

2. run ./test-pcie 1 1000 1024 1 chn_num on RC
   The last "1" means enable PCIe udma read, "0" means write.
   RC read from EP use dma channel number = chn_num.

3. run ./test-pcie 2 1000 1024 1 chn_num on EP
   EP read from RC with offset = buffer count * buffer size.

4. check version by:
   cat /sys/kernel/debug/pcie/pcie_trx | grep version

5. 1024 means set buffer size to 1MB.

Change-Id: I7613037924659c75014d19b6c4845e096a56d295
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-11-13 16:14:34 +08:00
Huang zhibao
aac2ef1f0a arm64: dts: rockchip: add rk3588 nvr demo V10 Board
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: Iebafff8398966758ed9500656f5af2bf6f86d047
2021-11-13 15:56:46 +08:00
Sugar Zhang
11e33efe53 arm64: dts: rockchip: rk3588-evb: Add hdmi sound for evb
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ia8f538a1dc8c18aa9bcc7adb4fe9d182e2eb19eb
2021-11-13 15:42:35 +08:00
Sugar Zhang
0bd9ec6285 arm64: dts: rockchip: rk3588: Add snd property for hdmi nodes
This patch adds property '#sound-dai-cells' for hdmi nodes.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I0a785dda12fe57e1632021b12b3a8efc1044ee9f
2021-11-13 15:41:13 +08:00