Commit Graph

854214 Commits

Author SHA1 Message Date
Ding Wei
a496199ca4 video: rockchip: mpp: fix issue for px30 switch grf workaround
if iommu had paged, then skip the enable process.

Change-Id: I07ae8ca8e0836472f79dcabf7b14f5fbba4b8870
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-06-19 18:52:06 +08:00
Ding Wei
2d16c73564 video: rockchip: mpp: refresh pm_runtime for shared iommu
when iommu shared, such as px30 rk3368, each device power on affect
iommu usage_count add once. in this case, it should pm_runtime_put/get
by usage_count times,then hardware will really suspend/resume.

Change-Id: I7e57818e4eaf8af84e52c2d77030791329721c2e
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-06-19 18:48:45 +08:00
Finley Xiao
2b78ae6654 ARM: dts: rockchip: rv1126: Add cooling devices
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I6e6728be799899dac60e975759fe7ae7f68a9fbc
2020-06-19 18:46:42 +08:00
Wang Panzhenzhuan
6769034d02 arm64: rockchip_defconfig: enable CONFIG_VIDEO_ROCKCHIP_CIF
for cif controller

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ibf69d373a539f10d6144311c3bb1e4bc1e42e662
2020-06-19 17:09:38 +08:00
Wang Panzhenzhuan
4537f70e26 drivers: media: platform: rockchip: cif: support rk3368 cif
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I95a48292196f78152387a08da0f5253b1478d063
2020-06-19 17:09:06 +08:00
Wang Panzhenzhuan
3c962262c9 arm64: dts: rockchip: add a new cif node for rk3368
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I747f1b15dc5ae27e43cb1e97736bdc5434c6f355
2020-06-19 17:08:48 +08:00
Finley Xiao
befc9caa81 FROMLIST: thermal: cpu_cooling: Fix wrong frequency converted from power
The function cpu_power_to_freq is used to find a frequency and set the
cooling device to consume at most the power to be converted. For example,
if the power to be converted is 80mW, and the em table is as follow.
struct em_cap_state table[] = {
	/* KHz     mW */
	{ 1008000, 36, 0 },
	{ 1200000, 49, 0 },
	{ 1296000, 59, 0 },
	{ 1416000, 72, 0 },
	{ 1512000, 86, 0 },
};
The target frequency should be 1416000KHz, not 1512000KHz.

Fixes: 349d39dc57 ("thermal: cpu_cooling: merge frequency and power tables")

Link: https://patchwork.kernel.org/patch/11613103/
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ia9d407787834f10190c8ba1e77ea1c23ed2bb25b
2020-06-19 16:42:59 +08:00
Finley Xiao
d603a61ded ARM: configs: rv1126_defconfig: Enable ENERGY_MODEL for CPU cooling
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ide2c79f8e7e94cba30e8404465196a125303b76b
2020-06-19 16:42:37 +08:00
Zhenke Fan
23e78f669f media: i2c: gc4c33: add set dpcc cfg
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I3216c75987d8fa2046668cb47adba72826e1dca6
2020-06-19 16:36:50 +08:00
Finley Xiao
656c0d90f6 ARM: dts: rockchip: rv1109: Delete NPU 700MHz, 800MHz and 934MHz
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I969d529595bc607dee3c9722a0ea98236442acc3
2020-06-19 16:34:41 +08:00
Jianqun Xu
67b64a1fdd net: wireless: rockchip_wlan: fix missing MODULE_LICENSE warning
WARNING: modpost: missing MODULE_LICENSE() in drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.o
see include/linux/module.h for more information

Change-Id: Ie683a00a1d0c66633fa7c169179298b08ef95452
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-06-19 16:30:23 +08:00
William Wu
124b7feb0e usb: gadget: uvc: allow zero bytesused for rockchip uvc
For rockchip platforms, the userspace uvc application use
bytesused == 0 as a way to indicate that the data is all
zero and unused. In that case, the uvc driver should use
the allow_zero_bytesused flag to keep bytesused 0 rather
than use the buf actual size instead. This can help to
preview 1080P@MJPG faster.

Change-Id: Ic4d561f18e85d759b5a2405db4f6fb48533e1781
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-06-19 16:27:12 +08:00
Finley Xiao
c7dc380f57 ARM: dts: rockchip: rv1126: Add 934MHz for NPU
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I84c644c0c85b8fdc16a9e6b8091c32fd1763f00b
2020-06-19 16:24:19 +08:00
Wu Liangqing
f149693cee arm64: rockchip_defconfig: add sensors for rk3368a tablet
+CONFIG_TOUCHSCREEN_GSL3676=y
+CONFIG_GS_SC7660=y
+CONFIG_GS_SC7A20=y
+CONFIG_GS_DA223=y
+CONFIG_VIDEO_OV2680=y
+CONFIG_VIDEO_GC032A=y

Change-Id: Ifb6eac8e1f36fad84a911efb09e23b8ec9bd5c57
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-06-19 16:21:21 +08:00
Wang Panzhenzhuan
5da20c9b79 media: i2c: add gc032a sensor driver
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Idb24a891f8ef9a3987a153844d0d8c641b0c1134
2020-06-19 16:15:31 +08:00
Wu Liangqing
e634183e78 driver: input: sensor: add sc7660 sc7a20 da223
Change-Id: I4206f328ed2245fdfe1f7d2955603b0bb5a5e0e3
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-06-19 15:58:40 +08:00
Wu Liangqing
549e092cc4 driver: input: touchsrceen: add gsl3676
Change-Id: Ic6d5ca1e76ce35d69c7d5ce2f8326d9e7f830c0b
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-06-19 14:21:30 +08:00
Jianqun Xu
468f9d08f5 ARM: dts: rv1126-iotest-v10: sync to rv11xx-evb.dtsi
Change-Id: I95a32ef8d42a64bc52b1d471cb3ba981604e3e28
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-06-18 19:48:49 +08:00
Cai YiWei
5c4c228eec dt-bindings: media: add rx dphy for rv1126
rv1126 rx dphy support mipi or lvds

Change-Id: I70d0c53b7a3c97e87f1fadcfb6cccf66e7958403
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-18 19:24:31 +08:00
Cai YiWei
5fda33fe2e include: rk-camera-module: add ioctl lvds mode
Change-Id: I3baa26f3257a84f43bb29cc563f27cfc742a5ce8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-18 19:21:53 +08:00
Cai YiWei
08192186ef phy: rockchip: mipi-dphy-rx: rv1126 support lvds
config bus-type in dts to distinguish between mipi and lvds.
bus-type = <3> for lvds interface.

Change-Id: I5c043bd238522768280e6e117c79476f27118c65
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-18 19:20:13 +08:00
Nickey Yang
6fd5088470 ARM: dts: rockchip: use ports to link DSI node and panel
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I86c3c28578bca973bed5a2df595f35b86fa03129
2020-06-18 19:12:39 +08:00
Nickey Yang
d3d4f3e92d arm64: dts: rockchip: use ports to link DSI node and panel
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I35f699d231fa75c8c261ad9b248d80ee80c3bbc9
2020-06-18 19:11:47 +08:00
Nickey Yang
201b73078f drm/rockchip: dsi: support dsi bridge
This patch supports bridge driver which convert DSI to other display interfaces.
At the same time,it uses port method to complete the analysis of panel or bridge in dts.
After this patch, the exampl of dsi node in dts:

&dsi {
	status = "okay";

	panel@0 {
		compatible = "xxx", "simple-panel-dsi";
		reg = <0>;

		ports {
			#address-cells = <1>;
			#size-cells = <0>;

			port@0 {
				reg = <0>;
				panel_in_dsi: endpoint {
					remote-endpoint = <&dsi_out_panel>;
				};
			};
		};
	};

	ports {
		#address-cells = <1>;
		#size-cells = <0>;

		port@1 {
			reg = <1>;
			dsi_out_panel: endpoint {
				remote-endpoint = <&panel_in_dsi>;
			};
		};
	};
};

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: Ic4ad8ac66f479189d7193a69a02337e1cac3dcb8
2020-06-18 19:09:58 +08:00
Ding Wei
bd1bd4072a video: rockchip: mpp: rkvdec issue for rk3399 that 264 switch vp9
in rk3399 rkvdec, after 264 task run, 264 hardware may remain state,
and it cannot clear completely. Case this, when last task is 264
and current is vp9, vp9 affect decode error. Thus, it should reset
hardware before task run, when 264 switch vp9.

Change-Id: Ie038f9de8533d15cd828f5fdde7634f278fbd061
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-06-18 17:47:54 +08:00
Zhen Chen
25bb952677 MALI: rockchip: remove drivers/gpu/arm/midgard_for_linux/
rk3399/rk3288 Android and Linux devices are all using drivers/gpu/arm/midgard,
which is Midgard device driver on DDK r18.

Change-Id: Iac8484edf91d57c7b74d5b952c96e0bb03159791
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2020-06-18 17:26:44 +08:00
Tao Huang
229fb55fc6 mmc: host: rk_sdmmc_ops: Add missing MODULE_LICENSE()
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Idec9c516a328bf4eb94d8e3c53003b6b0eb1b824
2020-06-18 09:02:18 +08:00
Tao Huang
f6baf55324 soc: rockchip: sdmmc_vendor_storage: Add missing MODULE_LICENSE()
Change-Id: I61549dd857602a157e1f08c3b67fd954759f2f37
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-17 17:19:14 +08:00
Ding Wei
4069463cd0 iommu: Export iommu_group_default_domain()
ERROR: "iommu_group_default_domain"
[drivers/video/rockchip/mpp/rk_vcodec.ko] undefined!

Change-Id: Ic6dc4a8c182f58963011bc9c4f7cbcddacdf315a
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-06-17 16:40:50 +08:00
Ding Wei
543f8470a9 video: rockchip: mpp: fix issue iommu_release twice
arm_iommu_release_mapping will auto trigger when driver unregister,
so it should not manual release.

dump stack:
[   31.493866 ] ------------[ cut here  ]------------
[   31.493889 ] WARNING: CPU: 0 PID: 605 at lib/refcount.c:187
refcount_sub_and_test_checked+0x9c/0xb4
[   31.493898 ] refcount_t: underflow; use-after-free.
[   31.493907 ] Modules linked in: rk_vcodec(-)
[   31.493924 ] CPU: 0 PID: 605 Comm: rmmod Not tainted 4.19.111 #2047
[   31.493932 ] Hardware name: Generic DT based system
[   31.493957 ] [<b010f408>] (unwind_backtrace) from [<b010b96c>]
(show_stack+0x10/0x14)
[   31.493975 ] [<b010b96c>] (show_stack) from [<b07ed264>]
(dump_stack+0x90/0xa4)
[   31.493992 ] [<b07ed264>] (dump_stack) from [<b0125f64>]
(__warn+0xfc/0x114)
[   31.494006 ] [<b0125f64>] (__warn) from [<b0125fc0>]
(warn_slowpath_fmt+0x44/0x68)
[   31.494020 ] [<b0125fc0>] (warn_slowpath_fmt) from [<b0398f40>]
(refcount_sub_and_test_checked+0x9c/0xb4)
[   31.494036 ] [<b0398f40>] (refcount_sub_and_test_checked) from
[<b0116730>] (arm_iommu_release_mapping.part.5+0x20/0x48)
[   31.494050 ] [<b0116730>] (arm_iommu_release_mapping.part.5) from
[<b0117408>] (arch_teardown_dma_ops+0x2c/0x38)
[   31.494065 ] [<b0117408>] (arch_teardown_dma_ops) from [<b047a87c>]
(device_release_driver_internal+0xf4/0x19c)
[   31.494081 ] [<b047a87c>] (device_release_driver_internal) from
[<b047a980>] (driver_detach+0x44/0x80)
[   31.494094 ] [<b047a980>] (driver_detach) from [<b04796b4>]
(bus_remove_driver+0x4c/0xa0)
[   31.494120 ] [<b04796b4>] (bus_remove_driver) from [<af005ff8>]
(mpp_service_exit+0x3c/0x1044 [rk_vcodec])
[   31.494140 ] [<af005ff8>] (mpp_service_exit [rk_vcodec]) from
[<b019c97c>] (sys_delete_module+0x190/0x1f0)
[   31.494154 ] [<b019c97c>] (sys_delete_module) from [<b0101000>]
(ret_fast_syscall+0x0/0x4c)
[   31.494162 ] Exception stack(0xed62ffa8 to 0xed62fff0)
[   31.494172 ] ffa0:                   00025a04 765f6b72 ae982c08
00000880 00000000 ae982e88
[   31.494183 ] ffc0: 00025a04 765f6b72 65646f63 00000081 000c46a4
00000000 a6f49000 00000000
[   31.494191 ] ffe0: ae982c00 ae982bf0 000258f8 a6ea31b0
[   31.494288 ] ---[ end trace 6bdf082e7c4aa12d  ]---

Change-Id: Ib4a057087b1521a5591c12909b6d78b5f90f3882
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-06-17 15:39:09 +08:00
Tao Huang
5b716e2ac1 rfkill: RFKILL_RK depends on ARCH_ROCKCHIP
This driver depends on rockchip vendor storage.

Change-Id: I1b56a60037d7a214c228d528fabf3f651c5597cf
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-16 14:12:24 +08:00
Jianhui Wang
b2d25cfc6a input: touch: gslx680a: fix irq bug
Change-Id: I2753cd8fcde902687db2080c79f6b9d22b706c76
Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
2020-06-16 09:16:44 +08:00
Jianhui Wang
c3b17f4580 ARM: rockchip_defconfig: enable CONFIG_VIDEO_OV8858 for th804 tablet
Change-Id: Ic2ba92d4e7d79f1373e03ba08e8c09559f2a54fd
Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
2020-06-16 09:15:14 +08:00
Jianhui Wang
74a6f9de67 ARM: dts: rk3288: bring up th804 tablet
Change-Id: I6b6c8258ca4cbb2513ab40f93770f6bae802e3e1
Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
2020-06-16 09:14:50 +08:00
Tao Huang
8f348c29eb ARM: configs: enable CONFIG_ROCKCHIP_THUNDER_BOOT_MMC for rv1126-evb-ddr3-v10-tb.config
Change-Id: I90f9c824d5f991748a8d2c5912c91f6144a781c5
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-15 21:56:21 +08:00
Tao Huang
76951c36f0 soc: rockchip: decompress: Wait decom init done when call rk_decom_start()
Change-Id: I8b13cf2895e06642a61137ea04b977f076736548
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-15 21:56:21 +08:00
Shawn Lin
62d1f48b38 soc: rockchip: Add rockchip thunder boot mmc driver
This driver aimed at starting decompression as soon as
possible.

Change-Id: Ie29f43935f0642ae8c9c605d3ebc40292d4d1781
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-06-15 21:56:21 +08:00
Shawn Lin
c22dbadc53 mmc: dw_mmc: remove partial thunder boot
In preparation for adding new driver to support starting
decompress ramdisk.

Change-Id: Icbd51f2798367430443bae9af5656891b93ac3bd
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-06-15 21:46:40 +08:00
Shawn Lin
5bc99a1b1f ARM: dts: rockchip: Add rockchip_tb node for rv1126-evb-ddr3-v10-tb
Change-Id: Ia27b7f77674a46f41f2d12b1656b57f71ada7c5d
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-06-15 21:46:40 +08:00
Tao Huang
1e74b7eebe ARM: dts: rockchip: fix trust shared memory mapping for rv1126-evb-ddr3-v10-tb
Allow kernel access 0x00200000~0x00208000, because the first usable region
must be PMD aligned. Otherwise rampoops would not work.

Fixes: 9e109a2600 ("ARM: dts: rockchip: reserve 32KB shared memory for rv1126-evb-ddr3-v10-tb")
Change-Id: I170a6d946695dbace8064eafa57986787d8cab86
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-15 14:30:09 +08:00
Tao Huang
9777ac0333 firmware: rockchip_sip: Introduce sip_map()
For map memory, we should call vmap other than ioremap when pfn_valid().
Otherwise we would get the following warning:
WARNING: CPU: 3 PID: 35 at arch/arm/mm/ioremap.c:303 __arm_ioremap_pfn_caller+0x7c/0x1b4
Modules linked in:
CPU: 3 PID: 35 Comm: init/3 Not tainted 4.19.111 #348
Hardware name: Generic DT based system
[<b070efe8>] (unwind_backtrace) from [<b070b560>] (show_stack+0x10/0x14)
[<b070b560>] (show_stack) from [<b0c5cd44>] (dump_stack+0x90/0xa4)
[<b0c5cd44>] (dump_stack) from [<b07229b8>] (__warn+0xfc/0x114)
[<b07229b8>] (__warn) from [<b0722ae4>] (warn_slowpath_null+0x40/0x48)
[<b0722ae4>] (warn_slowpath_null) from [<b07145ec>] (__arm_ioremap_pfn_caller+0x7c/0x1b4)
[<b07145ec>] (__arm_ioremap_pfn_caller) from [<b0714770>] (__arm_ioremap_caller+0x4c/0x54)
[<b0714770>] (__arm_ioremap_caller) from [<b0b5a7d0>] (sip_smc_request_share_mem+0x54/0x7c)

Change-Id: I51dd47ed9dc7210fd3192b0c970c31e10d79c0a6
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-15 14:12:34 +08:00
Zefa Chen
44013207b1 media: i2c: os04a10 support color test pattern
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I5fd94636225a6f338d0982103d0e6d0031e75a3d
2020-06-15 10:56:14 +08:00
Jon Lin
70c79c0523 drivers: rkflash: Add cast for function min input
warning: comparison of distinct pointer types lacks a cast
error, forbidden warning:kernel.h:733
  (void) (&_min1 == &_min2);  \

Change-Id: I2311d0bbb32be9b44cc262808d9e2df12b9627b9
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-15 10:53:06 +08:00
Jon Lin
57d30184ca drivers: rkflash: Fix error in counting BITS_PER_LONG
Change-Id: I3a76a3a5003fcfcd7c079fd83d67f7161a85708a
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-15 10:53:06 +08:00
Algea Cao
56fe1c4cfe drm/rockchip: Fix crash when find connector from bridge
The function drm_connector_list_iter_end() will be called
twice when connector is found, that will cause crash.

crash:

[    1.201561] Unable to handle kernel read from unreadable memory at virtual address 0000000000000318
[    2.886426] Mem abort info:
[    2.889222]   ESR = 0x96000005
[    2.892276]   Exception class = DABT (current EL), IL = 32 bits
[    2.898189]   SET = 0, FnV = 0
[    2.901244]   EA = 0, S1PTW = 0
[    2.904379] Data abort info:
[    2.907256]   ISV = 0, ISS = 0x00000005
[    2.911086]   CM = 0, WnR = 0
[    2.914058] [0000000000000318] user address but active_mm is swapper
[    2.920410] Internal error: Oops: 96000005 [#1] PREEMPT SMP
[    2.925983] Modules linked in:
[    2.929041] Process kworker/5:1 (pid: 60, stack limit = 0x00000000e4da41d3)
[    2.935997] CPU: 5 PID: 60 Comm: kworker/5:1 Not tainted 4.19.111 #200
[    2.942522] Hardware name: Rockchip RK3368 R88 AVB (DT)
[    2.947753] Workqueue: events deferred_probe_work_func
[    2.952895] pstate: 60400085 (nZCv daIf +PAN -UAO)
[    2.957686] pc : __ll_sc___cmpxchg_case_acq_4+0x4/0x20
[    2.962828] lr : _raw_spin_lock_irqsave+0x34/0x70
[    2.967529] sp : ffffff8009cc38e0
[    2.970843] x29: ffffff8009cc38e0 x28: ffffffc03dedb8b8
[    2.976158] x27: ffffffc03ded4480 x26: ffffff8009cc3a28
[    2.981465] x25: ffffffc03decbdd8 x24: ffffffc03dedcd90
[    2.986780] x23: ffffff80096ed000 x22: ffffffc00a2dd890
[    2.992095] x21: ffffff80091fbe20 x20: 0000000000000318
[    2.997410] x19: 0000000000000000 x18: ffffffffffffffff
[    3.002726] x17: 0000000000000000 x16: 0000000000000000
[    3.008042] x15: ffffff80096eda48 x14: ffffff80898b7e37
[    3.013357] x13: ffffff80098b7e45 x12: ffffff80098b8280
[    3.018673] x11: ffffff800970e000 x10: 0000000005f5e0ff
[    3.023989] x9 : 00000000ffffffd0 x8 : 625f79625f726f74
[    3.029296] x7 : 0000000000000030 x6 : 000000000000024a
[    3.034602] x5 : 0000000000000000 x4 : 0000000000000000
[    3.039907] x3 : 0000000000000318 x2 : 0000000000000001
[    3.045222] x1 : 0000000000000000 x0 : 0000000000000318
[    4.266041] Call trace:
[    4.268489]  __ll_sc___cmpxchg_case_acq_4+0x4/0x20
[    4.273279]  drm_connector_list_iter_end+0x2c/0x58
[    4.278068]  rockchip_drm_bind+0x1c20/0x1c38
[    4.282338]  try_to_bring_up_master+0x144/0x1a8
[    4.286867]  component_master_add_with_match+0xd4/0x130
[    4.292090]  rockchip_drm_platform_probe+0x178/0x2e8
[    4.297054]  platform_drv_probe+0x50/0xa8
[    4.301065]  really_probe+0x200/0x2b0
[    4.304734]  driver_probe_device+0x58/0x100
[    4.308921]  __device_attach_driver+0x90/0xc0
[    4.313274]  bus_for_each_drv+0x70/0xc8
[    4.317110]  __device_attach+0xdc/0x138
[    4.320944]  device_initial_probe+0x10/0x18
[    4.325131]  bus_probe_device+0x94/0xa0
[    4.328965]  deferred_probe_work_func+0x80/0xb8
[    4.333497]  process_one_work+0x1a0/0x418
[    4.337508]  worker_thread+0x1e4/0x3e0
[    4.341260]  kthread+0x12c/0x158
[    4.344493]  ret_from_fork+0x10/0x18
[    4.348072]  Code: 35ffff91 aa1003e0 d65f03c0 f9800011 (885ffc10)

Change-Id: I0a3c9e038b4ffe31feaa8356a0ce3e62f6f3c374
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2020-06-15 09:55:23 +08:00
Cai YiWei
0ca7fea89e media: rockchip: ispp: fix first frame error for sharp output
Change-Id: Ic18c2b9c028ac5e4304da65c1d0dee1fb4c70c0f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-12 18:09:56 +08:00
Yifeng Zhao
616a213d3d drivers: soc: rockchip: support mtd vendor storage
This patch is used to support vendor storage for SPI NAND
and SLC NAND via mtd interface.

Change-Id: I6f011cb9052a014845629e103976b36adb5fa589
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
2020-06-12 14:59:54 +08:00
Will Deacon
6cea1391d2 BACKPORT: arm64: entry: Place an SB sequence following an ERET instruction
Some CPUs can speculate past an ERET instruction and potentially perform
speculative accesses to memory before processing the exception return.
Since the register state is often controlled by a lower privilege level
at the point of an ERET, this could potentially be used as part of a
side-channel attack.

This patch emits an SB sequence after each ERET so that speculation is
held up on exception return.

Change-Id: I8bdcc2d9ff9d4d344c0e7a4aad809fbca52db116
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 679db70801)
2020-06-12 10:19:04 +08:00
Cai YiWei
14b8fb9e28 media: rockchip: isp: version to v00.01.00
Change-Id: I983129509b6c2c3b5c27bfe53f272981b10e845d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-11 22:17:11 +08:00
Tao Huang
624cb7b196 media: rockchip: cif: Fix clang warning
drivers/media/platform/rockchip/cif/dev.c:290:93: warning: operator '?:' has lower precedence than '|'; '|' will be evaluated first [-Wbitwise-conditional-parentheses]
                                        (dev->chip_id != CHIP_RK1808_CIF && dev->chip_id != CHIP_RV1126_CIF) | (id == pad - 1) ?
                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
drivers/media/platform/rockchip/cif/dev.c:290:93: note: place parentheses around the '|' expression to silence this warning
                                        (dev->chip_id != CHIP_RK1808_CIF && dev->chip_id != CHIP_RV1126_CIF) | (id == pad - 1) ?
                                                                                                                               ^
                                        (                                                                                     )
drivers/media/platform/rockchip/cif/dev.c:290:93: note: place parentheses around the '?:' expression to evaluate it first
                                        (dev->chip_id != CHIP_RK1808_CIF && dev->chip_id != CHIP_RV1126_CIF) | (id == pad - 1) ?
                                                                                                                               ^
                                                                                                               (

Change-Id: I7ed9acf76afeed128ccfa70f94b81e143c08e327
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-11 16:31:36 +08:00