Commit Graph

1065973 Commits

Author SHA1 Message Date
Jianqun Xu
eb21d6476e video: rockchip: mpp: print err if mpp_task_attach_fd fail
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I0eacd83fb14cc9123a0ab150d93736b11d8f4b67
2022-04-27 16:13:09 +08:00
Jianqun Xu
de3a995b83 scripts/dtc: Support delete unused nodes when CONFIG_ROCKCHIP_MINI_KERNEL=y
Delete nodes in case of:
* node is null, without any property and children node
* node with 'status' property but not "okay" or "ok"

Change-Id: Ic7d2ba1cb60350c21fa6a46222c20870c74359d4
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-04-27 14:47:48 +08:00
Tao Huang
1a11b0aed4 clk: rockchip: rv1106: Support driver probe only when build as module
before:
   text	   data	    bss	    dec	    hex	filename
   6301	  23000	      8	  29309	   727d	drivers/clk/rockchip/clk-rv1106.o
after:
   text	   data	    bss	    dec	    hex	filename
   5483	  22892	      8	  28383	   6edf	drivers/clk/rockchip/clk-rv1106.o

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ibb023c4353fa3bbd85b15d415c46d70774f4fcca
2022-04-27 14:46:48 +08:00
Cai YiWei
94b7ed76f1 media: rockchip: isp: limit bay3d bwsaving config for isp32
Change-Id: Ibf65867506128309076871f682f652021495d641
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-04-27 14:33:27 +08:00
Yu Qiaowei
a29facebc2 video: rockchip: rga3: Fix physical continuous dma_fd not working
Use the driver's mmu configuration to replace the user's mmu configuration.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ib6c535bf0f8d714e6535c27cc0181f5c3a39d7ae
2022-04-27 09:17:53 +08:00
Wang Panzhenzhuan
fd1ab46714 media: i2c: otp_eeprom: fix table_size
1. fix table_size.
2. fix ioctl return value.
3. add version control.

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ie6c77d359c1b6c3308b339d129e719eeeae2ddee
2022-04-27 09:15:25 +08:00
Yandong Lin
4f110adae7 media: rockchip: isp: Refine 1/4 notification msg
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ibf29ecc480458739b6a12a39f7219c81ab3a9db5
2022-04-26 17:33:23 +08:00
Yandong Lin
6c87036e08 video: rockchip: dvbm: Optimize notify frame info to vepu
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ib15aed541efdcc4ff1230c7be9e9fa30d816f706
2022-04-26 17:33:23 +08:00
Yu Qiaowei
dfdd460a14 video: rockchip: rga3: initialize temporary ctx
Update driver version to 1.2.10

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I1132b9d7c7d5fc8817c211dc938a6ca5da7c0cfe
2022-04-26 16:36:26 +08:00
Yu Qiaowei
4214a1b887 video: rockchip: rga3: Remove useless structures
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I28e8843c8fc181bdc5652f226e905edd65ba5e6b
2022-04-26 16:36:19 +08:00
Yu Qiaowei
59483bb7f3 video: rockchip: rga3: Refactor rga2_mmu_info.c
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Iee7c73e388c05079d7713e1575dc34a589a7190a
2022-04-26 16:36:11 +08:00
Yu Qiaowei
9985c89e5f video: rockchip: rga3: Remove duplicate logic code in rga_dma_buf.c
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I02f28d80438564a082c691a4116f4a15f161e0db
2022-04-26 16:36:11 +08:00
Yu Qiaowei
0a016e48a9 video: rockchip: rga3: Added YUV420 10bit support in rga_mm
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I0ae7f1015cecae24492e3719a4772985eee9333b
2022-04-26 16:36:11 +08:00
Yu Qiaowei
66a7f7e972 video: rockchip: rga3: Switching single-task mode memory processing to rga_mm
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I53a405ca5b9a72e3dc34fc9493a7e89c47e62fad
2022-04-26 16:36:11 +08:00
Shaoxing Chen
49ef86deb9 arm64: dts: rockchip: Change i2c0 pinctrl to i2c0m2 for rk3588-evb4
Signed-off-by: Shaoxing Chen <csx@rock-chips.com>
Change-Id: I7c7baa71a0f7588d4d6a1e758b53210166971ee4
2022-04-26 16:17:44 +08:00
Jianqun Xu
6cc665a643 dma-buf: rk_heaps: rk-cma-heap replace orig_alloc by dmabuf->name
For dmabuf, owner has set a name for the buffer, use the dmabuf->name to
replace orig_alloc to save several memory.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Ifad14ed886580d2a9f3000900e1849b0b5a3858e
2022-04-26 15:59:54 +08:00
William Wu
b0cf5382ef usb: gadget: uvc: prepare buffer with data offset for rockchip platform
For some Rockchip platforms (e.g. RV1106 UVC), it needs to
get the offset in the plane which used for the start of data
in the uvc buffer.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I0144709f33b1d3ca955779be487134901468923f
2022-04-26 15:45:19 +08:00
William Wu
f93c20fa43 media: videobuf2: add plane data offset function
Add a new helper function to get the offset in the plane
to the start of data for the usb gadget uvc function.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Id2d2c928a531d0272e6241b967fb0deaf3f3e122
2022-04-26 15:45:01 +08:00
Algea Cao
dbad11d42f drm/bridge: synopsys: dw-hdmi-qp: Support multiple HDMI debugfs nodes
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ib7be546cba2130a84fe4a82194800d143cdb61d9
2022-04-26 15:43:24 +08:00
Zhang Yubing
0e3de5a3c2 drm/rockchip: dw-dp: add hsync limit less than 32
For DPTX controller, It may be work abnormal when hsync less
than 32. Filtering the display mode whose hsyncd is less
than 32.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I857b1f7af51f7c04633526ae9239917e75e3e0d0
2022-04-26 15:19:05 +08:00
Algea Cao
9aeea00e3d phy: rockchip-samsung-hdptx-hdmi: Improve signal quality
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I079521615373b508502e90bf24fea4b7e79815ae
2022-04-26 15:18:11 +08:00
Shawn Lin
3eefc7e584 mmc: dw_mmc: Move FIFO check to other upcoming request for rv1106 sdmmc
We now don't wait FIFO status at the end of request but
at the beginning of upcoming request, which is the same way
we did for unbusy check in the past. By doing that, we can
hand out cpu.

Fixes: 6eca689b99 ("mmc: dw_mmc: Workaround for RV1106/1103 sdmmc")
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Ie5934b49d2babada81cc447763bb8f980b4884ec
2022-04-26 14:39:48 +08:00
William Wu
9d8c6e4254 usb: dwc2: hcd: only allow to write packet into TxFIFO in slave mode
The dwc2_queue_transaction() do data transfer for DMA
mode if both the params.host_dma and chan->qh are true.
In a test-case with an otg cable hot plug stress test
in DMA mode, if the chan->qh is NULL, it is possible to
do dwc2_hc_write_packet() which should only be called
in Slave mode and cause a crash:

[  633.852937] usb 1-1: reset high-speed USB device number 71 using dwc2
[  633.853115] Unable to handle kernel read from unreadable memory at virtual address 0000000000000000
...
[  633.974040] Call trace:
[  633.974289]  dwc2_hc_write_packet.isra.6+0xfc/0x128
[  633.974734]  dwc2_queue_transaction+0xc4/0x1f0
[  633.975142]  dwc2_hcd_queue_transactions+0x10c/0x4b8
[  633.975595]  dwc2_release_channel+0x12c/0x2a8
[  633.975992]  dwc2_complete_non_periodic_xfer.isra.5+0x2c/0x48
[  633.976514]  dwc2_hc_xfercomp_intr+0x370/0x488
[  633.976921]  dwc2_hc_n_intr+0x2c8/0x840
[  633.977282]  dwc2_handle_hcd_intr+0x424/0x7e0
[  633.977677]  _dwc2_hcd_irq+0x10/0x18
[  633.978018]  usb_hcd_irq+0x2c/0x48

Change-Id: I33f7976710d6cdceb1b4758655dba7890488585d
Signed-off-by: William Wu <william.wu@rock-chips.com>
2022-04-26 14:15:25 +08:00
Ziyuan Xu
9c7320f123 ARM: dts: rockchip: rv1106g-evb2: change sfc_max_freq to 125MHz
The parent clock of sclk_sfc are 500m_300m_200m_24m, so that can't set
sclk_sfc to 118.8MHz.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I71b60000a465c23e88155ac9da95cf046717a6d8
2022-04-26 14:08:50 +08:00
Zhichao Yu
fc1c261cff ARM: dts: rockchip: rv1103g-38x38-ipc: enable pwm3 for ir led control
Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
Change-Id: Ife211a219f5e2d0f2bd3a289bd60afd776e45999
2022-04-25 21:04:16 +08:00
Zhichao Yu
b13eeab04d ARM: dts: rockchip: rv1103g-38x38 include rv1103.dtsi
Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
Change-Id: Ib853a00d11e30eb622f42da29169f2b5fe422fb0
2022-04-25 21:03:25 +08:00
Ziyuan Xu
4337390cb4 ARM: configs: rockchip: rv1106-tb.config: add CONFIG_INITRD_ASYNC
Guarantee that initramfs been mounted until hardware decompress is
completed.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I58fb197040d0c1880e4dd710e99161e19dee26da
2022-04-25 20:58:53 +08:00
Xing Zheng
e116be010f ASoC: codecs: rv1106_codec: fix some acodec handlings
- Remove disable/enable ADC after put ADC mode
- Makes the unity name for ACODEC_ADC_L(R)_DIG_VOL
- Fixes ACODEC_ADC_L_WORK to ACODEC_ADC_R_WORK for right channel

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I21912c96d9ed6954556983745f94ea0e1dbb6283
2022-04-25 20:27:43 +08:00
David Wu
077402ac2e ethernet: stmmac: Make sure default napi weiget used if dma size is not configured
If dma size is 0, it is considered that there is no configuration
from dts, and the default value is used.

Fixes: bde32557c5 ("ethernet: stmmac: Dynamically change limit to fit dma size")
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I3bc37fe86d972175ffafc9ccf5072938199f849d
2022-04-25 20:22:27 +08:00
Chen Shunqing
4c9ea35ec9 media: rockchip: hdmirx: add hdcp1.4 support
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: I8c6e055b35d8873a6b0d1703591513ada452a0f4
2022-04-25 20:15:23 +08:00
Liang Chen
d9eadb0377 ARM: configs: rv1106-evb.config: enable CONFIG_ROCKCHIP_OPP
Change-Id: I37d2621b270793877c997c189727c949ceec7abf
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-04-25 19:52:56 +08:00
Liang Chen
19b91cdbf5 ARM: dts: rockchip: rv1106: add pvtpll config for calibrate opp-table
Change-Id: I05c2961ffe5a90a5eb0901234009b79dd8328da1
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-04-25 19:52:56 +08:00
Liang Chen
b6c7d8fb46 soc: rockchip: opp_select: calibrate opp-table by pvtpll
Change-Id: I790cd008707fff37bc158bcca8c8255ce13db987
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-04-25 19:52:56 +08:00
Jianqun Xu
a0cc9df97e dma-buf: rk_heaps: default to disable print
Add a config to on/off the driver print, default to be off.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I2f2ec608547bca06d12238d13a8824dc651404c0
2022-04-25 18:57:00 +08:00
Huibin Hong
560564a794 fiq_debugger: tty_write skips console_lock when console thread enable
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I9f6d8f161dbba75efa0a9beb9ea94d26c0c27945
2022-04-25 18:04:32 +08:00
Jianqun Xu
64fd7f2a7a video: rockchip: mpp: return error code
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Ie5953efe044c67cb9b7d352f3297d14c6da7496b
2022-04-25 15:25:44 +08:00
Sugar Zhang
a08bad447d ARM: configs: rv1106: Enable VIDEOBUF2_{CMA_SG|VMALLOC} default
+CONFIG_VIDEOBUF2_CMA_SG=y
+CONFIG_VIDEOBUF2_VMALLOC=y

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I7b8e6c89f5db6791628d0f681dc161a6a2879d01
2022-04-25 15:24:22 +08:00
Sugar Zhang
0a016f0c0e media: common: videobuf2: Kconfig: Export buf type config
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I4bb4aab61e240a6aafecb7c06387ba53f430bab0
2022-04-25 15:18:31 +08:00
Sugar Zhang
1b7d5f592e ARM: configs: rv1106-uvc-spi-nor.config: Update by diffconfig
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I8a5edeff367de158b1be31daca03286abe1f2d5e
2022-04-25 10:52:40 +08:00
Cai YiWei
6c1cb27543 media: rockchip: isp for sdmmc lock
Change-Id: Ia7fe16edae775cd41dadd4ae3681df6365b8c62f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-04-24 17:20:14 +08:00
Zefa Chen
97e6a821bb media: rockchip: rv1106 vicap compatible with sdmmc
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Id8bc9ab9cad17b34b4d0288f10b0eff31854e2e9
2022-04-24 16:15:10 +08:00
Weiwen Chen
2f5b6d4bb7 ARM: configs: rv1106-ipc: Enable mount vfat filesystem
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ic95aa23e983d26fabd6e2159b99ab702e86e7796
2022-04-24 15:19:25 +08:00
Shawn Lin
6eca689b99 mmc: dw_mmc: Workaround for RV1106/1103 sdmmc
1. We always use dma for sdmmc, and it could not be used as SDIO
2. restore affected registers includes ctype and timeout
3. expose API for ISP/VICAP usage
4. remove SD3.0 support which won't affect write throughput
5. limit ffaa0000 controller only be used as sd card before ECO
6. reserve a descriptor for dirty data, in order to let DMA finish
the prior descriptors and the dirty data in the last descriptor will
not be sent at all.
7. use CMD12 + reset to clean the remain dirty data and recovery IP

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Ib1456c8f399cdeda391ba459b22097b0f5820e53
2022-04-24 15:07:16 +08:00
Ziyuan Xu
d2786053e4 driver: rknpu: close pd stuff until iommu disabled
Test on RV1106
Before:
initcall rknpu_init+0x1/0x10 [rknpu] returned 0 after 66724 usecs
After:
initcall rknpu_init+0x1/0x10 [rknpu] returned 0 after 2579 usecs

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I382c55ed7df3aab6974c025a8871fa25905d622e
2022-04-24 14:31:50 +08:00
Jianqun Xu
61756ba5e9 soc: rockchip: rk_dmabuf_procfs fix segment error for dma debug
[  951.963848][ T2104] ------------[ cut here ]------------
[  951.963901][ T2104] DMA-API: platform dmabuf: mapping sg segment longer than device claims to support [len=262144] [max=65536]
[  951.963936][ T2104] WARNING: CPU: 3 PID: 2104 at kernel/dma/debug.c:1174 debug_dma_map_sg+0x1d4/0x3f8
[  951.963944][ T2104] Modules linked in:
[  951.963966][ T2104] CPU: 3 PID: 2104 Comm: cat Not tainted 5.10.66 #264
[  951.963974][ T2104] Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
[  951.963987][ T2104] pstate: 60400009 (nZCv daif +PAN -UAO -TCO BTYPE=--)
[  951.963997][ T2104] pc : debug_dma_map_sg+0x1d4/0x3f8
[  951.964006][ T2104] lr : debug_dma_map_sg+0x1d4/0x3f8
[  951.964013][ T2104] sp : ffffffc0153bbab0
[  951.964023][ T2104] x29: ffffffc0153bbad0 x28: ffffff81013abd80
[  951.964035][ T2104] x27: 000000000000000e x26: 0000000000010000
[  951.964047][ T2104] x25: ffffffffffffffff x24: ffffff81420a2968
[  951.964058][ T2104] x23: ffffff814b13dc00 x22: ffffff8104515810
[  951.964069][ T2104] x21: ffffffc011d7f000 x20: 000000000000000e
[  951.964081][ T2104] x19: ffffffc011b99000 x18: ffffffc01a5e5080
[  951.964091][ T2104] x17: 0000000000000000 x16: 00000000000000d8
[  951.964102][ T2104] x15: 0000000000000004 x14: 0000000000003fff

Fixes: 61a59410bf ("soc: rockchip: Add a dmabuf procfs for rockchip")

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I9eec7b5a1ccefed5a4d7e485cbb2e263ce7da970
2022-04-24 14:27:27 +08:00
William Wu
8f245236c4 usb: gadget: f_fs: kmalloc size align to cache line for ROCKCHIP_MINI_KERNEL
For ROCKCHIP_MINI_KERNEL, it set the kmalloc min size lower than
arch dma min alignment. So the f_fs driver needs a guaranteed
cache line alignment for DMA buffer.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I5bbf9a099f2c03bbcfc50af6949b185502ce9be9
2022-04-24 14:16:18 +08:00
Zefa Chen
c43d84d921 media: rockchip: vicap optimize interrupt of toisp
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I260f092e7c78d4ff36bb8eca17072840461de0a5
2022-04-24 14:13:54 +08:00
Simon Xue
18762023bb iommu/rockchip: add rockchip_iommu_is_enabled api
Change-Id: I07ee2a1998322acec525868552c5626081bd8137
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2022-04-24 11:44:37 +08:00
Kever Yang
c231916b68 arm64: dts: rockchip: rk3588s: Init PPLL to 1.1G
PPLL 1.1G with pcie2 comboPHY TS3 can get better signal.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: I6af09906be88e7568b474b806161c3e1d6cd936e
2022-04-24 10:30:44 +08:00
Kever Yang
de7d060208 clk: rockchip: rk3588: add PLL 1.1G parameter
1.1G may used for PPLL.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: I77b539ca94a5a51efa34ad2ea4b355b27b21ed0b
2022-04-24 10:30:44 +08:00