Commit Graph

1064502 Commits

Author SHA1 Message Date
Herman Chen
aba99662aa video: rockchip: mpp: rkvenc2: Fix slab-out-of-bounds on reboot
When the device is ccu device nothing should be done on shutdown.

[  231.948040][    T1] ==================================================================
[  231.948818][    T1] BUG: KASAN: slab-out-of-bounds in rkvenc_shutdown+0x44/0x138
[  231.949531][    T1] Read of size 8 at addr ffffff840424dd28 by task init/1
[  231.950178][    T1]
[  231.950443][    T1] CPU: 3 PID: 1 Comm: init Not tainted 5.10.66 #21
[  231.951053][    T1] Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
[  231.951706][    T1] Call trace:
[  231.952048][    T1]  dump_backtrace+0x0/0x278
[  231.952498][    T1]  show_stack+0x1c/0x2c
[  231.952928][    T1]  dump_stack_lvl+0xf0/0x140
[  231.953389][    T1]  print_address_description+0x88/0x38c
[  231.953934][    T1]  __kasan_report+0x144/0x2ac
[  231.954398][    T1]  kasan_report+0x54/0x84
[  231.954831][    T1]  __asan_load8+0xc8/0xcc
[  231.955264][    T1]  rkvenc_shutdown+0x44/0x138    还是 drivers/video/rockchip/mpp/mpp_rkvenc2.c:1689
[  231.955736][    T1]  platform_drv_shutdown+0x3c/0x50
[  231.956242][    T1]  device_shutdown+0x264/0x308
[  231.956719][    T1]  kernel_restart+0x54/0x13c
[  231.957174][    T1]  __arm64_sys_reboot+0x19c/0x264
[  231.957674][    T1]  el0_svc_common+0x100/0x248
[  231.958136][    T1]  do_el0_svc+0x3c/0xb8
[  231.958551][    T1]  el0_svc+0x14/0x24
[  231.958946][    T1]  el0_sync_handler+0x88/0xec
[  231.959407][    T1]  el0_sync+0x1a8/0x1c0
[  231.959805][    T1]
[  231.960051][    T1] Allocated by task 0:
[  231.960439][    T1] (stack is not available)

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I0c12d663d74c640d9f2686252fc8544b29a2c4f9
2021-12-15 10:41:03 +08:00
Jianqun Xu
425c2660c5 arm64: dts: rockchip: rk3588-linux: add reserved-memory
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I7fa015774b60286cf8ed3be64c47bbacd5fccba0
2021-12-14 20:05:36 +08:00
Wyon Bi
54821e8d85 drm/rockchip: dw-dp: Fix aux timeout at boot
Use the HPD state machine state in detect instead of HPD_STATUS.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I9e6b14c819fa29dd38101340e40334f050832524
2021-12-14 18:44:28 +08:00
Tao Huang
f6909c028f Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common
https://source.android.com/security/bulletin/2021-12-01
CVE-2021-33909
CVE-2021-38204
CVE-2021-0961

* tag 'ASB-2021-12-05_12-5.10': (3010 commits)
  ANDROID: workqueue: export symbol of the function wq_worker_comm()
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: vendor_hooks: Add hooks for binder proc transaction
  ANDROID: GKI: Add symbols abi for USB IP kernel modules.
  ANDROID: GKI: Fix file mode on mtk abi file
  UPSTREAM: erofs: fix deadlock when shrink erofs slab
  ANDROID: init_task: Init android vendor and oem data
  UPSTREAM: sched/core: Mitigate race cpus_share_cache()/update_top_cache_domain()
  ANDROID: Update symbol list for mtk
  UPSTREAM: erofs: fix unsafe pagevec reuse of hooked pclusters
  UPSTREAM: erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()
  UPSTREAM: usb: dwc3: gadget: Fix null pointer exception
  ANDROID: fips140: support "evaluation testing" builds via build.sh
  FROMGIT: sched/scs: Reset task stack state in bringup_cpu()
  ANDROID: dma-buf: heaps: fix dma-buf heap pool pages stat
  ANDROID: ABI: Add several spi_mem related symbols
  UPSTREAM: spi: spi-mem: add spi_mem_dtr_supports_op()
  ANDROID: gki_defconfig: enable CONFIG_SPI_MEM
  ANDROID: ABI: Add several iio related symbols
  ANDROID: ABI: Update symbol list for IMX
  ...

Change-Id: I09cddc92fa34553b944e62cc5cbbba94a84e5437

Conflicts:
	arch/arm/boot/dts/rk322x.dtsi
	arch/arm64/boot/dts/rockchip/rk3399.dtsi
	drivers/dma-buf/heaps/system_heap.c
	drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/gpu/drm/rockchip/rockchip_lvds.c
	drivers/gpu/drm/rockchip/rockchip_vop_reg.c
	drivers/mtd/nand/spi/core.c
	drivers/pci/controller/pcie-rockchip-host.c
	drivers/soc/rockchip/Kconfig
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/core.h
2021-12-14 17:09:02 +08:00
Jianqun Xu
da7b445d87 Revert "dma-buf: dma-heap set device max_segment_size to DMA_BIT_MASK(32)"
This reverts commit 146b4dc1de.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I976eab106bf18eb18be3ae861c2b2f46c6a4869e
2021-12-14 16:53:56 +08:00
shengfei Xu
516e6f7a0e arm64: dts: rockchip: adjust the power supply based on the hardware for rk3588 boards
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I2f0bd82ac41313ba2a09fb91ce595824a47d0957
2021-12-14 16:52:42 +08:00
Jon Lin
4e7395fe28 arm64: dts: rockchip: rk3588: Fix FSPI io to ds level 2
55ohm is the recommended value after hardware signal test.

Change-Id: Iddb2d9eabfc5abb79662e25f40f5b332864aed15
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-12-14 16:20:51 +08:00
Tao Huang
e895d63eb4 video: rockchip: rga3: Add missing sentinel to rga2_dt_ids
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I9d748d1104e79477e63d685f2e636d5c7358bc6d
2021-12-14 15:54:19 +08:00
Wang Jie
7b2bc9c4c0 usb: typec: tcpm: register partner altmodes only when the data role is in host mode
Insert the self-powered Type-C device(support specification Revision 3.0),
after the Type-C PD chip cc detection is completed, the power role and
data role on the port side are sink and device(ufp)respectively.
After the power supply negotiation is completed, before the self-powered
Type-C device initiates the DR_swap request, the port side initiates VDM
Message communication. The process is as follows:
(1) The port side sends Discover Identity, Discover SVIDs, Discover Modes
    Command in turn, and receives the ACK corresponding to the command on
    the device side. The tcpm framework calls tcpm_register_partner_altmodes()
    to register the partner altmode;
(2) After registering partner altmode, dp driver will start dp->work, and
    call the tcpm framework callback function in this work to initiate Enter
    Modes Command;
(3) After the port side receives the DR_swap request initiated by the Type-C
    device and processes it, the port side data role switches to host (dfp),
    then the tcpm framework initiates vdm message communication again, that is,
    the restart process (1) Repeat registration of partner altmode, Then print
    stack information:
    [   31.786238][  T193] Call trace:
    [   31.786251][  T193]  dump_backtrace+0x0/0x1d0
    [   31.786257][  T193]  show_stack+0x14/0x20
    [   31.786266][  T193]  dump_stack_lvl+0xcc/0xf0
    [   31.786272][  T193]  dump_stack+0x14/0x50
    [   31.786280][  T193]  sysfs_warn_dup+0x60/0x78
    [   31.786286][  T193]  sysfs_do_create_link_sd.isra.2+0xe0/0xe8
    [   31.786292][  T193]  sysfs_create_link+0x20/0x40
    [   31.786300][  T193]  typec_probe+0x90/0x100
    [   31.786308][  T193]  really_probe+0x20c/0x3e8
    [   31.786315][  T193]  driver_probe_device+0x54/0xb8
    [   31.786324][  T193]  __device_attach_driver+0x90/0xc0
    [   31.786334][  T193]  bus_for_each_drv+0x70/0xc8
    [   31.786347][  T193]  __device_attach+0xec/0x150
    [   31.786357][  T193]  device_initial_probe+0x10/0x18
    [   31.786369][  T193]  bus_probe_device+0x94/0xa0
    [   31.786381][  T193]  device_add+0x45c/0x750
    [   31.786388][  T193]  device_register+0x1c/0x28
    [   31.786394][  T193]  typec_register_altmode+0x1ec/0x308
    [   31.786400][  T193]  typec_partner_register_altmode+0xc/0x18
    [   31.786406][  T193]  tcpm_pd_rx_handler+0x16f8/0x1748
    [   31.786413][  T193]  kthread_worker_fn+0xd8/0x190
    [   31.786418][  T193]  kthread+0x124/0x150
    [   31.786424][  T193]  ret_from_fork+0x10/0x18
    [   31.786434][  T193] typec_displayport port0-partner.1: failed to create symlinks
    [   31.786443][  T193] typec_displayport: probe of port0-partner.1 failed with error -17

According to the PD2.0 and PD3.0 protocol specifications(see Section 6.4.4.2),
the Enter Mode Command can be started only when the data role is host(DFP) mode.
Therefore, when the port is in device(ufp) mode, the tcpm framework does not
register partner altmode.

Fixes: 2b5787ea0b ("usb: typec: tcpm: Raise vdm_sm_running flag only when VDM SM is running")
Change-Id: I76874be36179391d8008502ba4722f5e4c9eee70
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
2021-12-14 15:36:46 +08:00
Wu Liangqing
85334b4309 arm64: dts: rockchip: bringup rk3588-evb6
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: I91144f51d45edcf0c1159eabed0e42e83fdc2820
2021-12-14 15:36:08 +08:00
Shunqian Zheng
92dc058075 arm64: dts: rockchip add imx415 dtsi for rk3588 evb1
Add dts for imx415 sensor on rk3588 evb1 board.

Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Change-Id: If9d0c579a55e6f8cc6f659c6b62d1c745011ba32
2021-12-14 15:34:47 +08:00
Greg Hackmann
80018840e0 ANDROID: arm64: process: dump memory around registers when displaying regs
A port of 8608d7c441 to ARM64.  Both the
original code and this port are limited to dumping kernel addresses, so
don't bother if the registers are from a userspace process.

Change-Id: Idc76804c54efaaeb70311cbb500c54db6dac4525
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-12-14 15:32:52 +08:00
Li Huang
82db72bb71 video: rockchip: rga3: solve csc register config differences on rga2 & rga3
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I41466c510304bb21db9a24e51fe4b5e717c17525
2021-12-14 15:29:55 +08:00
Li Huang
a85c852d62 video: rockchip: rga3: Fixup wrong uv & rb swap
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I9e99a5fd15dd15d9963fcc44d511e412ff56037e
2021-12-14 15:29:48 +08:00
Lian Xu
0c0743db3c arm64: dts: rockchip: rk3588s: add more clk for fec_mmu
Change-Id: I13f136d4a756db9a5ccb0d0c48cb24a7e0ee3589
Signed-off-by: Lian Xu <xu.lian@rock-chips.com>
2021-12-14 15:26:55 +08:00
Ruslan Bilovol
e29b836b17 UPSTREAM: usb: gadget: f_uac1: validate input parameters
[ Upstream commit a59c68a6a3 ]

Currently user can configure UAC1 function with
parameters that violate UAC1 spec or are not supported
by UAC1 gadget implementation.

This can lead to incorrect behavior if such gadget
is connected to the host - like enumeration failure
or other issues depending on host's UAC1 driver
implementation, bringing user to a long hours
of debugging the issue.

Instead of silently accept these parameters, throw
an error if they are not valid.

Signed-off-by: Ruslan Bilovol <ruslan.bilovol@gmail.com>
Link: https://lore.kernel.org/r/1614599375-8803-5-git-send-email-ruslan.bilovol@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2993c5f99161149ac126d55baf54c954279483ff
2021-12-14 15:23:34 +08:00
Ruslan Bilovol
7be2400013 UPSTREAM: usb: gadget: f_uac2: validate input parameters
[ Upstream commit 3713d5ceb0 ]

Currently user can configure UAC2 function with
parameters that violate UAC2 spec or are not supported
by UAC2 gadget implementation.

This can lead to incorrect behavior if such gadget
is connected to the host - like enumeration failure
or other issues depending on host's UAC2 driver
implementation, bringing user to a long hours
of debugging the issue.

Instead of silently accept these parameters, throw
an error if they are not valid.

Signed-off-by: Ruslan Bilovol <ruslan.bilovol@gmail.com>
Link: https://lore.kernel.org/r/1614599375-8803-4-git-send-email-ruslan.bilovol@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Change-Id: Ic6b7e292b60e838c53aab989d1f8b16798dc15e7
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-12-14 15:23:34 +08:00
Pawel Laszczak
5c12b3fe97 UPSTREAM: usb: f_uac2: adds support for SS and SSP
Patch adds support of SS and SSP speed.

Signed-off-by: Pawel Laszczak <pawell@cadence.com>
Link: https://lore.kernel.org/r/20210310105216.38202-1-pawell@gli-login.cadence.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 187332233
(cherry picked from commit f8cb3d556b)
Change-Id: I6689c8df4a17fcf561a65dc16d509e26f088c142
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-12-14 15:23:34 +08:00
Tao Huang
30d7263f53 Revert "usb: gadget: f_uac2: fix some issues for Windows recognized"
This reverts commit 60767d93e5.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iad20e1a9fc04a7d32106450d24fc222da9e0ac9b
2021-12-14 15:23:34 +08:00
Tao Huang
7326f04ea1 Revert "usb: gadget: f_uac1: add iad descriptor"
This reverts commit 2ae1313983.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2d38a7647a4523eeabbebc1aa7782b8204b752b4
2021-12-14 15:23:34 +08:00
Tao Huang
f6bf4fa1ed Revert "FROMLIST: usb: gadget: f_uac1: Fix endpoint reading"
This reverts commit d390fcf2f7.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I96f63c724254ac46dab01360341e71587e9bb2ea
2021-12-14 15:23:34 +08:00
Tao Huang
e12828d267 Revert "FROMLIST: usb: gadget: f_uac*: Reduce code duplication"
This reverts commit 70267887d6.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4487188e9b1d19332c041b6a4385854fd6b05f14
2021-12-14 15:23:34 +08:00
Tao Huang
1e50aec536 Revert "FROMLIST: usb: gadget: f_uac*: Support multiple sampling rates"
This reverts commit 37ed8f4607.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id61128a4036dbc8384bc60da8f8a586b9b697800
2021-12-14 15:23:34 +08:00
Tao Huang
1b310c9a83 Revert "usb: gadget: u_audio: add uevent for set_alt and set_srate"
This reverts commit ac1ed698c3.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I55f6981af82caa899d0029d177586d1172cc7d26
2021-12-14 15:23:34 +08:00
Tao Huang
b257b2f8eb Revert "usb: gadget: f_uac: add volume and mute feature unit"
This reverts commit c55a0ab282.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I95029eaf2894edaa63f03ac59d41a4bd1173581f
2021-12-14 15:23:34 +08:00
Tao Huang
a657331532 Revert "usb: gadget: f_uac: add pktsize calculating at setting playback srate"
This reverts commit be3429e9b2.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If5b42dc3390f919306b7f3aeb9d2f93125d09c2c
2021-12-14 15:23:34 +08:00
Tao Huang
7303e5112d Revert "usb: gadget: u_audio: add uevent for ppm compensation"
This reverts commit be7c4cf14b.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I0516a0b4c36b4808e86adf152d7faa44af60c077
2021-12-14 15:23:34 +08:00
Tao Huang
eeb4eec9a5 Revert "usb: gadget: f_uac1: finalize wMaxPacketSize according to bandwidth"
This reverts commit 71a43ff15c.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Idf2a548afd303d97a14310792492d93931259a79
2021-12-14 15:23:34 +08:00
Tao Huang
f2795d3dcf Revert "UPSTREAM: usb: f_uac2: adds support for SS and SSP"
This reverts commit c3fa37174e.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I565f8a0120ef89adb906ea1556f2668b89d58710
2021-12-14 15:23:34 +08:00
Tao Huang
6ddbc288b9 Revert "usb: gadget: f_uac2: make compatible for windows os"
This reverts commit e360c65d23.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic9643aba5addbc8cd83d205825fa19e51f3770d9
2021-12-14 15:23:34 +08:00
Tao Huang
cb7c9a7464 Revert "usb: gadget: f_uac1: adds support for SS and SSP"
This reverts commit 306637c8e1.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4850614d227c8be0f8cac4e3364317e14cb4cf53
2021-12-14 15:23:34 +08:00
William Wu
9aa2f569c9 arm64: dts: rockchip: rk3588-evb: Only add u2 phy node for hs boards
The rk3588-evb5-lp4 and rk3588s-evb2-lp5 only support Type-C
usb 2.0 high speed device, and their usb 3.0 phys are disabled
by default. So these boards can only use usb 2.0 phy node.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I7f76774001445d0c5470c10f65995be489b62db6
2021-12-14 15:17:05 +08:00
William Wu
308ccc03e3 phy: rockchip: inno-usb2: Improve the functions for rk3588
This patch aims to improve the functions of rk3588 usb2
phys for otg0 and otg1 port.

1. Add bvalid and id configuration registers to support
   switch device/host mode by phy.

2. Add charger detection function for otg1.

3. Fix charger detection fail on DCD stage.

Change-Id: I3922123ad0c75f88ab3c9be117b9c92c3ea7dfaf
Signed-off-by: William Wu <william.wu@rock-chips.com>
2021-12-14 15:16:24 +08:00
William Wu
2cbfa1f019 usb: dwc3: debugfs: Fix mode switch for rockchip
When switch dwc3 mode to device on rockchip platform,
it may fails to connect to usb host because the auto
suspend delay is only 100ms. This patch sets the switch
mode to desired_role_sw_mode, and it can avoid to enter
runtime suspend.

Fixes: 5ac62b80f7 ("usb: dwc3: fix runtime pm for rockchip")
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: If3f7faee1e9550322a80f297136b8faf1ebed301
2021-12-14 15:16:12 +08:00
Shawn Lin
e6ae079436 phy: rockchip: naneng-combphy: Force detect Rx for RK356X and RK3588 SoCs
Follow internal design requirement.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I1b304cfab4a65c88cfdab6f59922f297fa35e742
2021-12-14 15:13:01 +08:00
Algea Cao
6767e3819f drm/rockchip: dw_hdmi: Don't create hdmi property hdmi_quant_range
RK3588 does not currently support this property.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Iddb898bc044a3f2aa07b27506593b2c56f096e16
2021-12-14 14:59:09 +08:00
Wyon Bi
fd70e6d353 drm/rockchip: dw-dp: Fix connectors changed in clone mode
When a new connector is added to current routing in clone mode,
the new connector doesn't have mode_changed=true set. This
incorrect programming sequence causes .mode_set call mismatches
to occur in the new stream.

So move the mode_set code to other callback.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I90f50882057c63f702cf390fb7bfeed088575324
2021-12-14 14:50:21 +08:00
David Wu
aada4c37d2 net: stmmac: Add GFP_DMA32 for rx buffers if no 64 capability
Use page_pool_alloc_pages instead of page_pool_dev_alloc_pages, which
can give the gfp parameter, in the case of not supporting 64-bit width,
using 32-bit address memory can reduce a copy from swiotlb.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Change-Id: I62bff35850cf62db1be7067f3050b27039ae5d75
2021-12-14 14:47:00 +08:00
Jianwei Fan
a72739e96e media: i2c: tc35874x: fix driver probe level
It will cause this sensor to fail to link to the vicap controller if
used late_initcall_sync. Because the probe level of vicap controller is
late_initcall.

Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I74a4606f0af16d860d7b28ba311b14efeda0c225
2021-12-14 11:01:47 +08:00
Wu Liangqing
42aecd6060 arm64: dts: rockchip: rk3588s-evb1: enabled sdmmc
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: Ica4ae16241aa7b57848940043d55fb7b624bdfca
2021-12-14 09:59:06 +08:00
Damon Ding
56102c8698 drm/bridge: sii902x: modify the check of bus-format
Use the definition of MEDIA_BUS_FMT_XXX instead of the
definition of sii902x_bus_format.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I72b4d92a1704f98f437a80d2a8afe16d9f6b003f
2021-12-14 09:58:24 +08:00
Herman Chen
e026e105c8 video: rockchip: mpp: rkvdec2: fix pagefault on start
Fix pagefault on decoder first task.

[  151.797045][    C0] rk_iommu fdc38700.iommu: Page fault at 0x00000000fefc0000 of type write
[  151.797071][    C0] rk_iommu fdc38700.iommu: iova = 0x00000000fefc0000: dte_index: 0x3fb pte_index: 0x3c0 page_offset: 0x0
[  151.797080][    C0] rk_iommu fdc38700.iommu: mmu_dte_addr: 0x0000000000305000 dte@0x0000000000305fec: 0x34f001 valid: 1 pte@0x000000000034ff00: 0x77aec407 valid: 1 page@0x0000000477aec000 flags: 0x6
[  151.797088][    C0] mpp_rkvdec2 fdc38100.rkvdec: fault addr 0xfefc0000 status 6b
[  151.797094][    C0] rk_vcodec: mpp_task_dump_mem_region:1654: --- dump mem region ---

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I991d86c931cdd07df85a6458cf1351c68ce87007
2021-12-14 09:54:27 +08:00
Herman Chen
99582ba73a video: rockchip: mpp: rkvenc2: Fix dual core issue
The rkvenc2 dual core mode will split one large frame into two tile as
task 0 and 1. The task 0 must be started before task 1 otherwise
hardware will generate error.

So we need some changes:

1. Bind two core into one taskqueue. If each core is binded to one
thread then the real hardware config and start timing is not certain.
NOTE: current mode still has case that one extra task is insert between
task 0 and 1.

2. Record core info and core id when multi-core is attached to the same
taskqueue.

3. Add prepare stage to decide which core is used to run the task and
set the struce mpp_dev *mpp in struct mpp_task.

4. Correspondingly the free task should use the mpp_task->mpp if it is a
multi-core mode task.

5. Remove mpp_iommu_attach in mpp_task_run. The mpp_iommu_attach is for
switching different devices which has shared resource like vpu and
rkhevc in rk3568 and rk312x. These chipsets are not supported on 5.10
kernel.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: Ide52d59cca3adec44e05ab4bfc5bac7d713ad628
2021-12-14 09:31:06 +08:00
XiaoTan Luo
76c84e0979 ASoC: dt-bindings: rockchip: Document: add headset/headphone jack && keys detect for multicodecs
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: I4f31d009b3890a886d225eab8aa8717e76333ad9
2021-12-13 15:51:53 +08:00
XiaoTan Luo
524cac67f9 arm64: dts: rockchip: rk3588-evb1-lp4: add headset play/pause key
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: Iaf7f179f19175d2956de2975b8893993ed9c30ba
2021-12-13 15:51:45 +08:00
XiaoTan Luo
f08221c208 ASoC: rockchip: multicodecs: add headset key button detect
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: I320546bbb0c9c47695e9614aba4e222ce305299e
2021-12-13 15:51:45 +08:00
Zefa Chen
0e4ca9abc1 media: rockchip: cif support config compact mode during the frame end
in the case of dma capture enable by vicap

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I675580350005fba9567a19666843452c523f9773
2021-12-13 15:22:04 +08:00
Zefa Chen
4ab7d291f9 arm64: dts: rockchip: rk3588 mipi_csi2 remove power-domains
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I71b36f15e4c2583097d3a13c15d8274c7ba0065b
2021-12-13 15:21:08 +08:00
Zefa Chen
7b9b409079 media: rockchip: cif: add pm ctrl in video node open function
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ide54139fabfe7a70d33b14b56b6524ca639a41de
2021-12-13 15:20:58 +08:00
shengfei Xu
52d9400791 mfd: rk806: update rk806 IRQ table
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Ib00435e710946c6b510c76122ed43ce0b134fe32
2021-12-13 15:02:53 +08:00