shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,079,520 Commits 55 Branches 2,486 Tags
ee1d33de8b79096f5f407ee6762b6be63eb30fcd
Commit Graph

1079520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Huang
ee1d33de8b ARM: rv1106_defconfig: Disable CONFIG_RANDOM_TRUST_BOOTLOADER 
Fixes: 4603a37f6e ("random: credit cpu and bootloader seeds by default")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I911f729cb469cba0438524ea49ccf11f96a5b941
 2023-03-14 16:19:59 +08:00
Tao Huang
9f9f111a7f arm64: rockchip_linux_defconfig: Disable A510 ERRATUM 2051678 
-CONFIG_ARM64_ERRATUM_2051678

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Icffee7d1855f0feb142905dfec39b1413a1f8e8d
 2023-03-14 09:46:40 +08:00
Tao Huang
4843d38fe8 arm64: rockchip_defconfig: Disable A510 ERRATUM 2051678 
-CONFIG_ARM64_ERRATUM_2051678

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I95fd2c9007c1e14cd90f5df16eb655b72fced901
 2023-03-14 09:46:36 +08:00
Tao Huang
cc17504307 Merge tag 'android12-5.10-2023-02_r1' of https://android.googlesource.com/kernel/common 
android12-5.10 February 2023 release 1

Artifacts:
  https://ci.android.com/builds/submitted/9611440/kernel_aarch64/latest

* tag 'android12-5.10-2023-02_r1': (5560 commits)
  ANDROID: GKI: Enable ARM64_ERRATUM_2454944
  ANDROID: dma-ops: Add restricted vendor hook
  ANDROID: arm64: Work around Cortex-A510 erratum 2454944
  ANDROID: mm/vmalloc: Add override for lazy vunmap
  ANDROID: cpuidle-psci: Fix suspicious RCU usage
  ANDROID: ABI: update allowed list for galaxy
  FROMGIT: f2fs: add sysfs nodes to set last_age_weight
  FROMGIT: f2fs: fix wrong calculation of block age
  ANDROID: struct io_uring ABI preservation hack for 5.10.162 changes
  ANDROID: fix up struct task_struct ABI change in 5.10.162
  ANDROID: add flags variable back to struct proto_ops
  UPSTREAM: io_uring: pass in EPOLL_URING_WAKE for eventfd signaling and wakeups
  UPSTREAM: eventfd: provide a eventfd_signal_mask() helper
  UPSTREAM: eventpoll: add EPOLL_URING_WAKE poll wakeup flag
  UPSTREAM: Revert "proc: don't allow async path resolution of /proc/self components"
  UPSTREAM: Revert "proc: don't allow async path resolution of /proc/thread-self components"
  UPSTREAM: net: remove cmsg restriction from io_uring based send/recvmsg calls
  UPSTREAM: task_work: unconditionally run task_work from get_signal()
  UPSTREAM: signal: kill JOBCTL_TASK_WORK
  UPSTREAM: io_uring: import 5.15-stable io_uring
  ...

Change-Id: I2b16474d6e3a91f1d702486ec6d1565a7bc310e3

Conflicts:
	Documentation/ABI/testing/configfs-usb-gadget-uac2
	Documentation/usb/gadget-testing.rst
	Makefile
	arch/arm/boot/dts/rk3288-evb-act8846.dts
	arch/arm64/mm/Makefile
	drivers/dma-buf/dma-buf.c
	drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
	drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
	drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/mmc/core/mmc.c
	drivers/pci/controller/dwc/pcie-designware-host.c
	drivers/pinctrl/pinctrl-rockchip.c
	drivers/regulator/core.c
	drivers/usb/dwc3/ep0.c
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/function/f_hid.c
	drivers/usb/gadget/function/f_uac1.c
	drivers/usb/gadget/function/f_uac2.c
	drivers/usb/gadget/function/u_audio.c
	drivers/usb/gadget/function/u_audio.h
	drivers/usb/gadget/function/u_uac2.h
	drivers/usb/host/xhci.h
	drivers/usb/storage/unusual_uas.h
	drivers/usb/typec/altmodes/displayport.c
	include/linux/page_ext.h
	mm/cma.c
	mm/page_ext.c
	sound/core/pcm_dmaengine.c
	sound/soc/codecs/hdmi-codec.c
	include/linux/stmmac.h
	sound/drivers/aloop.c
	drivers/pci/controller/dwc/pcie-designware.h
 2023-03-14 09:44:51 +08:00
Jason Zhu
8fcc8f437c arm64: dts: rockchip: rk3528-evb: support es7243 sound 
Use es7243e to record sound. This support in evb1 and evb4.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Iecb118a1b4030c3e2973047455914c81d209625b
 2023-03-13 19:53:48 +08:00
Algea Cao
221a84e78a drm: bridge: dw-hdmi: Support ddc io pull down when hdmi disconnected 
KONKA TV have the problem that hdmi hpd pin leakage leads to hpd
interrupt and trigger incorrectly. When the hdmi cable is not securely
connected, the hdmitx ddc pin will leak electricity back to hdmitx
through the TV's hpd pin and pull up hpd pin voltage to 1.8v.

Because rk3528 hdmi hpd interrupt trigger voltage is 1.5v,
hpd irq will be triggered by mistake, resulting in
edid reading error. Therefore, hdmi ddc io needs to be pull down
before the hpd pin is actually contacted and stabilized.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Id5f859e1de0dde751cf1d522a8d7647558f0b7f8
 2023-03-13 17:18:39 +08:00
Algea Cao
fda0a52443 arm64: dts: rockchip: rk3528: Add hdmi ddc io idle state 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I91a4a4f882dd34da939929ebe3c4170c33cdcac7
 2023-03-13 17:00:22 +08:00
Zhang Yubing
2cd758d07c drm/rockchip: vop3: acquire vop private blob property reference 
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ibdc05a43dd9670741b6583f090d95d7cbfb2ec32
 2023-03-13 16:39:48 +08:00
Sandy Huang
4b781ee022 drm/rockchip: dsi2: let te_irq_handle be called as soon as possible 
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I747e2cbc6f945a292cd63399cd4ef87578234efa
 2023-03-13 16:13:40 +08:00
Sandy Huang
6fad88d436 drm/rockchip: vop2: Don't crash for invalid duplicate_state() 
upstream commit for vop: https://patchwork.freedesktop.org/patch/490114/

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Iefb0180bc0010379b9c5c86d1e4d4bbe22e5053e
 2023-03-13 16:13:24 +08:00
Brian Norris
0e161311b2 UPSTREAM: drm/rockchip: vop: Don't crash for invalid duplicate_state() 
It's possible for users to try to duplicate the CRTC state even when the
state doesn't exist. drm_atomic_helper_crtc_duplicate_state() (and other
users of __drm_atomic_helper_crtc_duplicate_state()) already guard this
with a WARN_ON() instead of crashing, so let's do that here too.

Fixes: 4e257d9eee ("drm/rockchip: get rid of rockchip_drm_crtc_mode_config")
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220617172623.1.I62db228170b1559ada60b8d3e1637e1688424926@changeid
Change-Id: I21349e20d235fc0ffd41eed54b1668d29b034a49
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
 2023-03-13 16:13:24 +08:00
Damon Ding
03cd98a921 arm64: dts: rockchip: rk3562: modify driver strength for pwm pins 
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Ic7dc93a36964f39c3e159993f5195e4488b40f5e
 2023-03-13 16:05:33 +08:00
Finley Xiao
38dabca338 arm64: dts: rockchip: rk3588 boards: Add supply for rkvenc 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I33a45881ef143803bb0482cc86b5f838e38f1e98
 2023-03-13 14:52:06 +08:00
Finley Xiao
712abc0a65 arm64: dts: rockchip: rk3588: Add opp table for rkvenc 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I4e2ab02ae3747e26bf93f0b9c029c7e59efae9f7
 2023-03-13 14:51:12 +08:00
Finley Xiao
c62aea0596 video: rockchip: mpp: rkvenc2: Add devfreq support 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Id2bee52f4c92afb7e14fb44c5f2b7687c3a6de9f
 2023-03-13 14:51:12 +08:00
ZiHan Huang
5d45a6a045 arm64: dts: rockchip: rk3528-linux.dtsi enable route-hdmi and route-tve 
Change-Id: I424b2669b0256caae0368b06e7e97b0967c59eda
Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com>
 2023-03-13 14:34:20 +08:00
ZiHan Huang
55fdcfe8b1 arm64/config: rockchip_linux_defconfig add CONFIG_CPU_RK3528 
Change-Id: Iebce03f5ee397617b434beaa743dcafa4d6a4f5d
Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com>
 2023-03-13 14:33:10 +08:00
ZiHan Huang
c8f437af4f arm64: dts: rockchip: rk3528-linux.dtsi add cmdline root and optee 
Change-Id: I7253057f70f834ffb2d9e60741e5e5473de1696e
Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com>
 2023-03-13 14:21:36 +08:00
ZiHan Huang
b0fdaaa676 arm64: dts: rockchip: rk3528-evb1-ddr4-v10-linux.dts: add sdmmc status 
Change-Id: I6641280bbda0f48a9fb48cbc6f3b6dbfc7ab2e7c
Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com>
 2023-03-13 14:21:25 +08:00
Tao Huang
71573dc8b5 media: rockchip: vicap: make rkcif_vb_done_oneframe() static 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I98511206f1aae711512240a89c97c48fa26e2e5f
 2023-03-13 09:14:38 +08:00
Sugar Zhang
71612ae495 drm/bridge: synopsys: dw_hdmi: Add support for HBR / NLPCM Bitstream 
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Id8ae61602a28182a0288b7c1a6b13ab58f5283f6
 2023-03-13 09:10:15 +08:00
Cai YiWei
7ca7e7ce1f media: rockchip: fix isp no work due to irq_ends_mask error 
Change-Id: I62dc2383720adb03b8ade6affbea7ee50ffa4427
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-10 20:05:25 +08:00
Cai YiWei
acd9ec5a6d media: rockchip: isp: fix warning of vb2 cancel or done 
Change-Id: Icf3cc6392b7741de80487341771c8f40319a6a01
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-10 18:55:45 +08:00
Algea Cao
f71aa96570 drm: bridge: dw-hdmi: DDC retry delay use usleep_range() 
Fixes: da6e7ed538 ("drm: bridge: dw-hdmi: Optimized hdmi ddc retry process")

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I4c27531ea8399f5353eef10b59a60e7331b113e2
 2023-03-10 17:39:55 +08:00
Alex Zhao
44b6eb0138 net: wireless: rockchip_wlan: bcmdhd: fix pno scan deadlock 
03-02 21:18:49.795982    62    62 E         : INFO: task wificond:542 blocked for more than 723 seconds.
03-02 21:18:49.795991    62    62 E         : Not tainted 5.10.66 #1
03-02 21:18:49.796002    62    62 E         : "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
03-02 21:18:49.796013    62    62 I task    : wificond        state:D stack:    0 pid:  542 ppid:     1 flags:0x04000001
03-02 21:18:49.796031    62    62 I Call trace:
03-02 21:18:49.796043    62    62 I         : __switch_to+0x180/0x230
03-02 21:18:49.796057    62    62 I         : __schedule+0x4a0/0x708
03-02 21:18:49.796080    62    62 I         : schedule+0xa0/0xe8
03-02 21:18:49.796093    62    62 I         : schedule_preempt_disabled+0x28/0x48
03-02 21:18:49.796105    62    62 I         : __mutex_lock+0x504/0x7cc
03-02 21:18:49.796117    62    62 I         : __mutex_lock_slowpath+0x18/0x28
03-02 21:18:49.796127    62    62 I         : mutex_lock+0x40/0x64
03-02 21:18:49.796138    62    62 I         : rtnl_lock+0x44/0x68
03-02 21:18:49.796153    62    62 I         : cfg80211_sched_scan_stopped+0x20/0x44
03-02 21:18:49.796353    62    62 I         : wl_notify_escan_complete+0x2c4/0x45c [bcmdhd]
03-02 21:18:49.796546    62    62 I         : _wl_cfgscan_cancel_scan+0x108/0x190 [bcmdhd]
03-02 21:18:49.796736    62    62 I         : wl_cfg80211_sched_scan_stop+0xbc/0x14c [bcmdhd]
03-02 21:18:49.796769    62    62 I         : rdev_sched_scan_stop+0x30/0x17c
03-02 21:18:49.796782    62    62 I         : cfg80211_stop_sched_scan_req+0x4c/0x114
03-02 21:18:49.796796    62    62 I         : nl80211_stop_sched_scan+0xf0/0xf8
03-02 21:18:49.796813    62    62 I         : genl_rcv_msg+0x38c/0x3b8
03-02 21:18:49.796828    62    62 I         : netlink_rcv_skb+0x108/0x124
03-02 21:18:49.796839    62    62 I         : genl_rcv+0x38/0x54
03-02 21:18:49.796854    62    62 I         : netlink_unicast_kernel+0xa0/0x140
03-02 21:18:49.796865    62    62 I         : netlink_unicast+0xfc/0x1a4
03-02 21:18:49.796875    62    62 I         : netlink_sendmsg+0x284/0x318
03-02 21:18:49.796891    62    62 I         : __sys_sendto+0x168/0x1f4
03-02 21:18:49.796902    62    62 I         : __arm64_sys_sendto+0x2c/0x40
03-02 21:18:49.796918    62    62 I         : el0_svc_common+0xc0/0x23c
03-02 21:18:49.796929    62    62 I         : do_el0_svc+0x28/0x88
03-02 21:18:49.796946    62    62 I         : el0_svc+0x14/0x24
03-02 21:18:49.796956    62    62 I         : el0_sync_handler+0x88/0xec
03-02 21:18:49.796969    62    62 I         : el0_sync+0x1a8/0x1c0
03-02 21:18:49.797150    62    62 E         : INFO: task kworker/u17:3:1345 blocked for more than 723 seconds.
03-02 21:18:49.797163    62    62 E         : Not tainted 5.10.66 #1
03-02 21:18:49.797173    62    62 E         : "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.

Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I669e1e0f2cb42ec68fec3404ea2308c953b3317c
 2023-03-10 17:27:05 +08:00
Sugar Zhang
5c3a32865c ASoC: rockchip: sai: Add support for IEC958 fmt 
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ieb0bdbe2631efa7a440dc2ed835f0fd952263f85
 2023-03-10 17:21:26 +08:00
Binyuan Lan
a41135965c arm64: dts: rockchip: rk3562-rk817: don't set vcc1v8_dvp add vcc2v8_dvp always-on 
Change-Id: I7e20b3769faf07e49e457380ad643ec17f7fa786
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
 2023-03-10 16:49:07 +08:00
Huang zhibao
781a1c7480 arm64: dts: rockchip: add RK3528 Demo board devicetree 
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I1a9c410311d860052656e05d9a6a16e37284e0f5
 2023-03-10 16:48:46 +08:00
Algea Cao
b28b6cd7f9 drm: bridge: dw-hdmi: Fix konka tv yuv420 10bit probabilistic no signal 
konka tv should switch pattern after set to yuv420 10bit or
the TV might not recognize the signal.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ie8fba7e1ec3a4a2f2bff9943723c5862c55273d4
 2023-03-10 16:45:45 +08:00
Algea Cao
abb70c1b99 phy: rockchip: inno-hdmi: Fix rk3528 sink probabilistically fails to recognize signal 
When switching modes, the synchronization reset time
of the four lanes cannot be too long, ldo cannot be
turned off either.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I3b8308bf03e9f5796f93189a009d22100c642894
 2023-03-10 16:45:45 +08:00
Algea Cao
da6e7ed538 drm: bridge: dw-hdmi: Optimized hdmi ddc retry process 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I1a5a50a22040a6a7226498d5dc8275bc160a7689
 2023-03-10 16:45:45 +08:00
Algea Cao
9670838afc drm: bridge: dw-hdmi: Enable hdmi output after ctrl regs config done 
Fix green screen after color format switch in MI/HUAWEI TV.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ic73ca68029fc8ce948e9e731291d4bbd1d9c1ce2
 2023-03-10 16:45:45 +08:00
Sandy Huang
8c52cd4de3 arm64: dts: rockchip: rk3562: remove vop vp1 supported 
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I21cec7ea48db09b3ae64b9d1a9559d50dea8aa91
 2023-03-10 16:45:21 +08:00
Shawn Lin
0b6e89f8ed PCI: rockchip: dw: Remove affinity support for legacy INTX 
This commit revert commit 504bc07b5b ("PCI: rockchip: dw: Add
affinity for legacy INTX") and partial remove related stuff from
commit 0905a4c0bc ("PCI: rockchip: dw: Fix module building")

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I7ec67714a481f9f7ab38b329da985d13c1f174f5
 2023-03-10 16:08:42 +08:00
Zefa Chen
6309778b1f media: rockchip: vicap fixes tools buffer state error 
list_add double add: new=ffffff8074334fa8, prev=ffffff8074334fa8, next=ffffff8004630f30.
Change-Id: Ie2222c73b4af106107a5a4ae0f7c4ef6fde6cce8
------------[ cut here ]------------
kernel BUG at lib/list_debug.c:31!
Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
Modules linked in:
CPU: 2 PID: 1904 Comm: xc:isp_rx_poll Not tainted 5.10.110 #43
Hardware name: Rockchip RK3562 EVB1 LP4X V10 Board (DT)
pstate: 60400085 (nZCv daIf +PAN -UAO -TCO BTYPE=--)
pc : __list_add_valid+0x60/0x90
lr : __list_add_valid+0x60/0x90
sp : ffffffc01bd239c0
x29: ffffffc01bd239c0 x28: 0000000000000001
x27: ffffff8004614080 x26: ffffffc012069000
x25: ffffff8074334fa8 x24: ffffff8074334fa8
x23: ffffff8004630f30 x22: 0000000000000000
x21: ffffff8004630f80 x20: ffffff80046305e0
x19: ffffff8074334c00 x18: ffffffc017d95088
x17: 0000000000000000 x16: 00000000000000ee
x15: 0000000000000004 x14: ffffffc011c2c608
x13: 0000000000003fff x12: 0000000000000000
x11: 0000000000000000 x10: 0000000000000000
x9 : 48479b2270d3d900 x8 : 48479b2270d3d900
x7 : 3030386666666666 x6 : ffffffc011e39170
x5 : ffffffffffffffff x4 : 0000000000000001
x3 : ffffffc0118e7649 x2 : ffffff80fb7408c8
x1 : 0000000000000000 x0 : 0000000000000058
Call trace:
 __list_add_valid+0x60/0x90
 rkcif_buf_queue+0x1ec/0x6f4
 __enqueue_in_driver+0x48/0xe8
 vb2_core_qbuf+0x150/0x4d4
 vb2_ioctl_qbuf+0xd0/0x108
 v4l_qbuf+0x48/0x5c
 __video_do_ioctl+0x2c4/0x3c4

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I8e0843780bae55296209d06a4dd223ad21603f99
 2023-03-10 15:34:25 +08:00
Jianqun Xu
a56b9041a8 pinctrl/rockchip: re-fix rk3308 pinmux error for gpio3b3_sel_plus 
Fixes: 8d29486a15 ("pinctrl/rockchip: fix rk3308 pinmux error")

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I6d99e43a01b433e5027740e5115652166ed2e6b5
 2023-03-10 15:16:39 +08:00
Zefa Chen
8919ab5395 media: rockchip: vicap fixes bug of wake up mode 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie51db5cb7944ce0f979344f4e00f0d75816642e9
 2023-03-10 14:36:41 +08:00
Zefa Chen
20cca8578a media: rockchip: vicap fixes the processing order errors of fs and line intr 
change for earlier chip than rk3588

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ide6815ec488b71e2b7eff9b4b2345eeedbc53b3a
 2023-03-10 14:36:16 +08:00
Wangqiang Guo
36d7213730 input: touchscreen: gt1x: close auto update for GKI. 
Change-Id: I81c7275240e3548b7d0566f53c3be8b6a25da96b
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
 2023-03-10 03:49:48 +00:00
Chen Shunqing
17e2bcaabc media: rockchip: hdmirx: fix alignment fault when memory copy 
The dst is device memory, when accessing dst, it need alignment, use
memcpy_toio instead of memcpy.

Change-Id: I2f0af816c92fdb9871ff4842e10522980e9a1c50
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
 2023-03-10 02:47:53 +00:00
Zefa Chen
eefbce4bf8 media: rockchip: vicap fixes error when used dvp with online mode 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I823dbf7c54176f7a0fed7dcfcc2cd066473cbf33
 2023-03-10 09:52:12 +08:00
Cai YiWei
09137a828c media: rockchip: isp: fix isp32 lite mainpath switch fail 
Change-Id: I90f65bd537721c62508f67f16db85ec6b8751ce7
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-10 09:05:01 +08:00
Cody Xie
dd8a854160 media: rockchip: isp: Return error code for ioctl set_meshbuf_size 
Change-Id: If6d9f73c756343eb6c3c0c1cc6bf1fd09fde0825
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-10 09:04:58 +08:00
Binyuan Lan
71101e9e7c arm64: dts: rockchip: rk3562-test1: fix rk809_codec and route_dsi 
Change-Id: Ief67b7bd233dc075a528f437895374bd45ba7d08
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
 2023-03-09 12:03:16 +00:00
Chen Shunqing
53edaaa977 media: rockchip: hdmirx: reconfig cec after resume 
Change-Id: I5333531f09d26558b023858566b392df0ae284f0
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
 2023-03-09 20:01:20 +08:00
Sandy Huang
a180b8d5c8 arm64: dts: rockchip: rk3528-android: remove rk_gmac-dwmac from driver_async_probe 
otherwise will appear the following warning log:
[    1.584251][    T9] ------------[ cut here ]------------
[    1.584284][    T9] WARNING: CPU: 2 PID: 9 at kernel/kmod.c:136
__request_module+0x10c/0x4a0
[    1.584290][    T9] Modules linked in:
[    1.584306][    T9] CPU: 2 PID: 9 Comm: kworker/u8:1 Not tainted
5.10.110 #3697
[    1.584313][    T9] Hardware name: Rockchip RK3528 EVB1 DDR4 V10
Board (DT)
[    1.584323][    T9] Workqueue: events_unbound async_run_entry_fn
[    1.584332][    T9] pstate: 60400005 (nZCv daif +PAN -UAO -TCO
BTYPE=--)
[    1.584341][    T9] pc : __request_module+0x10c/0x4a0
[    1.584348][    T9] lr : __request_module+0x4c/0x4a0
[    1.584354][    T9] sp : ffffffc0121cb7b0
[    1.584360][    T9] x29: ffffffc0121cb870 x28: 0000000000000000
[    1.584370][    T9] x27: 0000000000000000 x26: 0000000000000000
...
[    1.584503][    T9] Call trace:
[    1.584512][    T9]  __request_module+0x10c/0x4a0
[    1.584523][    T9]  phy_request_driver_module+0x134/0x18c
[    1.584533][    T9]  phy_device_create+0x1b8/0x1e8
[    1.584542][    T9]  of_mdiobus_register_phy+0x1bc/0x1c4
[    1.584550][    T9]  of_mdiobus_register+0xf8/0x314
[    1.584558][    T9]  stmmac_mdio_register+0x198/0x330
[    1.584566][    T9]  stmmac_dvr_probe+0x684/0xc90
[    1.584576][    T9]  rk_gmac_probe+0x2d0/0x820
[    1.584584][    T9]  platform_drv_probe+0x94/0xbc
[    1.584593][    T9]  really_probe+0x200/0x500
[    1.584601][    T9]  driver_probe_device+0x7c/0xb8
[    1.584609][    T9]  __driver_attach_async_helper+0x60/0xe8
[    1.584617][    T9]  async_run_entry_fn+0x48/0x128
[    1.584626][    T9]  process_one_work+0x1f0/0x478
[    1.584634][    T9]  worker_thread+0x270/0x4cc
[    1.584642][    T9]  kthread+0x138/0x340
[    1.584650][    T9]  ret_from_fork+0x10/0x18

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I1890fe9f06e9c92a5f975caf78ebf02b197ee596
 2023-03-09 20:00:32 +08:00
Herman Chen
df2697c026 video: rockchip: mpp: fix slice mode iommu issue 
When encoder slice mode is enabled the slice irq will deactivate iommu
device and get stuck. So only the last slice irq with IRQ_WAKE_THREAD
return can deactivate iommu device.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I9edb8616be56fbc3eace0528407e90f01cd33a5d
 2023-03-09 15:16:01 +08:00
Elon Zhang
87a6c1de72 crypto: rockchip: add async_req NULL check in done task 
If done task receive NULL async_req, return directly.

Change-Id: I4a260399daf44328da2893d0c3308f99b95919ea
Signed-off-by: Elon Zhang <zhangzj@rock-chips.com>
 2023-03-08 17:44:44 +08:00
Jianqun Xu
71d818ec98 FROMLIST: dma-buf: rk_system_heap: avoid reclaim for order 4 
Using order 4 pages would be helpful for IOMMUs mapping, but trying to
get order 4 pages could spend quite much time in the page allocation.
From the perspective of responsiveness, the deterministic memory
allocation speed, I think, is quite important.

The order 4 allocation with __GFP_RECLAIM may spend much time in
reclaim and compation logic. __GFP_NORETRY also may affect. These cause
unpredictable delay.

To get reasonable allocation speed from dma-buf system heap, use
HIGH_ORDER_GFP for order 4 to avoid reclaim. And let me remove
meaningless __GFP_COMP for order 0.

According to my tests, order 4 with MID_ORDER_GFP could get more number
of order 4 pages but the elapsed times could be very slow.

         time	order 8	order 4	order 0
     584 usec	0	160	0
  28,428 usec	0	160	0
 100,701 usec	0	160	0
  76,645 usec	0	160	0
  25,522 usec	0	160	0
  38,798 usec	0	160	0
  89,012 usec	0	160	0
  23,015 usec	0	160	0
  73,360 usec	0	160	0
  76,953 usec	0	160	0
  31,492 usec	0	160	0
  75,889 usec	0	160	0
  84,551 usec	0	160	0
  84,352 usec	0	160	0
  57,103 usec	0	160	0
  93,452 usec	0	160	0

If HIGH_ORDER_GFP is used for order 4, the number of order 4 could be
decreased but the elapsed time results were quite stable and fast
enough.

         time	order 8	order 4	order 0
   1,356 usec	0	155	80
   1,901 usec	0	11	2384
   1,912 usec	0	0	2560
   1,911 usec	0	0	2560
   1,884 usec	0	0	2560
   1,577 usec	0	0	2560
   1,366 usec	0	0	2560
   1,711 usec	0	0	2560
   1,635 usec	0	28	2112
     544 usec	10	0	0
     633 usec	2	128	0
     848 usec	0	160	0
     729 usec	0	160	0
   1,000 usec	0	160	0
   1,358 usec	0	160	0
   2,638 usec	0	31	2064

Signed-off-by: Jaewon Kim <jaewon31.kim@samsung.com>
Reviewed-by: John Stultz <jstultz@google.com>

Link: https://patchwork.kernel.org/project/linux-mm/patch/20230303050332.10138-1-jaewon31.kim@samsung.com/

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I352021b68684ea33e4538a8beda9399fed1d1d79
 2023-03-08 17:44:05 +08:00
Jaewon Kim
fd087b355c FROMLIST: dma-buf: system_heap: avoid reclaim for order 4 
Using order 4 pages would be helpful for IOMMUs mapping, but trying to
get order 4 pages could spend quite much time in the page allocation.
From the perspective of responsiveness, the deterministic memory
allocation speed, I think, is quite important.

The order 4 allocation with __GFP_RECLAIM may spend much time in
reclaim and compation logic. __GFP_NORETRY also may affect. These cause
unpredictable delay.

To get reasonable allocation speed from dma-buf system heap, use
HIGH_ORDER_GFP for order 4 to avoid reclaim. And let me remove
meaningless __GFP_COMP for order 0.

According to my tests, order 4 with MID_ORDER_GFP could get more number
of order 4 pages but the elapsed times could be very slow.

         time	order 8	order 4	order 0
     584 usec	0	160	0
  28,428 usec	0	160	0
 100,701 usec	0	160	0
  76,645 usec	0	160	0
  25,522 usec	0	160	0
  38,798 usec	0	160	0
  89,012 usec	0	160	0
  23,015 usec	0	160	0
  73,360 usec	0	160	0
  76,953 usec	0	160	0
  31,492 usec	0	160	0
  75,889 usec	0	160	0
  84,551 usec	0	160	0
  84,352 usec	0	160	0
  57,103 usec	0	160	0
  93,452 usec	0	160	0

If HIGH_ORDER_GFP is used for order 4, the number of order 4 could be
decreased but the elapsed time results were quite stable and fast
enough.

         time	order 8	order 4	order 0
   1,356 usec	0	155	80
   1,901 usec	0	11	2384
   1,912 usec	0	0	2560
   1,911 usec	0	0	2560
   1,884 usec	0	0	2560
   1,577 usec	0	0	2560
   1,366 usec	0	0	2560
   1,711 usec	0	0	2560
   1,635 usec	0	28	2112
     544 usec	10	0	0
     633 usec	2	128	0
     848 usec	0	160	0
     729 usec	0	160	0
   1,000 usec	0	160	0
   1,358 usec	0	160	0
   2,638 usec	0	31	2064

Signed-off-by: Jaewon Kim <jaewon31.kim@samsung.com>
Reviewed-by: John Stultz <jstultz@google.com>

Link: https://patchwork.kernel.org/project/linux-mm/patch/20230303050332.10138-1-jaewon31.kim@samsung.com/

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Ib9386a5450b57d711d100c36c75d38a033f7bcc3
 2023-03-08 17:44:05 +08:00