Commit Graph

10726 Commits

Author SHA1 Message Date
Jianqun Xu
1d7ef69052 soc: rockchip: add iomux device for uapi support
Add a new driver to create a device named /dev/iomux, which allows
userland to set or get iomux by bank index and pin index.

For now the /dev/iomux supports two commands:
 - IOMUX_IOC_MUX_SET
 - IOMUX_IOC_MUX_GET

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I0467af6885863f5dc69d513601f597fca2cc6948
2022-03-19 18:23:04 +08:00
Cai YiWei
33a3879e8e media: rockchip: isp: isp32 remove bls2_val
useless at struct isp32_bls_cfg

Change-Id: If8659818c04581336577ee28435be604fbc28c8f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-03-18 15:47:43 +08:00
Cai YiWei
bee058dcef media: rockchip: isp: wrap mode for dvbm
Change-Id: I8d20364c03c057465c390107e33ced3e5eb4dcbf
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-03-15 17:52:48 +08:00
Lin Jinhan
def4274701 crypto: rockchip: cryptodev_linux: move user header to uapi/linux
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: Ie2cb4600a109fd2830b81ddae99b3182ae91f780
2022-03-15 16:42:25 +08:00
Cai YiWei
f6cafa7cbd media: rockchip: isp: isp32 add vsm
Change-Id: I456f06ef23c54196ddb4904675696a82dc74864c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-03-11 14:18:01 +08:00
Cai YiWei
3549b11f93 media: rockchip: isp: add get isp information api
Change-Id: I774cc2d215e1b57a427fbf9f3f7bdcf0ea7a0391
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-03-10 19:54:46 +08:00
Cai YiWei
6b70848540 media: rockchip: isp: add cgc config
Change-Id: I235207147a7c4bd14c195d5bb53dec5992a1c3c3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-03-10 19:54:46 +08:00
Cai YiWei
8a1aeac9b2 media: rockchip: isp: isp32 support raw data compression
Change-Id: I62b7a39982ba661034856cce79fb873104f2c4ba
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-03-10 19:54:46 +08:00
Cai YiWei
c76be98cdc media: rockchip: isp: isp32 support mirror and flip
Change-Id: I8e067cddee9bb314d97e2fd09b62886e8f9b222d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-03-10 19:54:46 +08:00
Cai YiWei
5409c91052 media: rockchip: isp: isp32 bls2 remove to awb
Change-Id: Ieea6a4fd4ee796c5a02a46dbf9e7650d2a345170
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-03-10 19:54:46 +08:00
Cai YiWei
8bffb2d344 media: rockchip: isp: add isp32 for rv1106
Change-Id: I3f02927df17cb04868d868f8c3a72079a99fea77
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-03-10 19:54:46 +08:00
Simon Xue
b1cec75764 dma-buf: heaps: add rockchip heaps
Change-Id: If7dad5ace1164ff09bc5bc5bbc4589b63b7ac2f6
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2022-03-03 15:13:36 +08:00
Zhen Chen
643f7908a0 MALI: rockchip: upgrade bifrost DDK to g11p0-01eac0, from g10p0-01eac0
Change-Id: I0642ec37f151711b8b19c3206488d3301422971d
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2022-03-01 19:53:20 +08:00
Cai YiWei
cad4034955 media: rockchip: isp: add API to get stream information
Change-Id: I709f82411fc7bc9533eacd0d88fd7192cd9c0981
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-02-15 17:25:08 +08:00
Zefa Chen
6c91957756 include: rk-camera-module: add control for sensor adapter driver
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I2d434a4b608bf6e6168237280e75c933fc192df3
2022-01-27 18:05:46 +08:00
Zhen Chen
3f89b26931 MALI: rockchip: upgrade bifrost DDK to g10p0-01eac0, from g9p0-01eac0
Change-Id: If5e4683a1da37e00eeaa5a16463206f6f45ecfb4
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2022-01-07 11:05:37 +08:00
Cai YiWei
f6f8dba33e media: rockchip: isp/ispp to version v1.8.0
Change-Id: Ibabaa8c0f7dfb9f6ad6e75a0f556d8d28a1a13aa
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-01-06 14:28:57 +08:00
Cai YiWei
9f5cb077de media: rockchip: isp: add csm params config for isp3
Change-Id: I87732e4f6ce0bcc936e919ed82b2dad62ec25639
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-01-04 14:45:47 +08:00
Zhen Chen
757826e997 MALI: rockchip: upgrade bifrost DDK to g9p0-01eac0, from g7p1-01bet0
In addition, fix a bug of calling KBASE_KTRACE_ADD() too early.

Change-Id: I843f340526275b50ae7d1ec6a7a68963e081e219
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2021-12-23 19:33:49 +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
Lian Xu
014edf4b88 media: rockchip: ispp: add the stream_v20
Change-Id: I0952cf0d226e07f7e760e74b2a248d89bf016472
Signed-off-by: Lian Xu <xu.lian@rock-chips.com>
2021-12-07 19:26:34 +08:00
Zefa Chen
40c21f3337 include: rk_vcm_head: add t_div config
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iad35fbc12ec18d24198ee48be88dc9315ac9b312
2021-12-01 14:57:25 +08:00
Zefa Chen
342bda4075 include: rk_vcm_head.h fixed compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Icf9094d096347bae974718a9be31c5137ba127a3
2021-12-01 14:56:43 +08:00
Zefa Chen
f7b8afb8b4 include: uapi: rk-camera-module.h: struct channel_info add data type
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I64ca7e16e0048c88938ce4cc77e96c81d14b7601
2021-11-30 21:02:19 +08:00
Tao Huang
7ce7cb6b20 include/uapi/linux/rk_vcm_head.h: do not leak CONFIG_COMPAT to userspace
error: include/uapi/linux/rk_vcm_head.h: leak CONFIG_COMPAT to user-space

Fixes: 3c60ce2725 ("media: move rk_vcm_head.h from drivers/media/i2c/ to include/uapi/linux/")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I64a4ef35c25fd11997689575059ae0b7ee90369a
2021-11-22 17:43:53 +08:00
Zefa Chen
249c2f83a6 include: uapi/linux/rk_vcm_head.h update to v0.2.0
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I07fbfd6f0c18845ae6d3557a5746b95aa7c96dbd
2021-11-18 16:29:07 +08:00
Hu Kejun
6ae690bfe7 media: spi: ms41908: zoom/focus use different reback value
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I62ad6560bfd5aeb672aed2e5352bdacc68fd75f7
2021-11-18 16:26:51 +08:00
Zefa Chen
cb725a0f14 include: update uapi/linux/rk_vcm_head.h
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I3c2f9b6d0bcc59945af3d1383ffc56604b4276e1
2021-11-18 16:24:36 +08:00
Zefa Chen
3c60ce2725 media: move rk_vcm_head.h from drivers/media/i2c/ to include/uapi/linux/
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I1774f05820df31468db8df196dccc7475730b1b5
2021-11-18 14:24:25 +08:00
Anton Yakovlev
5dac28a174 BACKPORT: uapi: virtio_ids: add a sound device type ID from OASIS spec
The OASIS virtio spec defines a sound device type ID that is not
present in the header yet.

Signed-off-by: Anton Yakovlev <anton.yakovlev@opensynergy.com>
Link: https://lore.kernel.org/r/20210302164709.3142702-2-anton.yakovlev@opensynergy.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

(cherry picked from commit 0ae0337f92
https://github.com/torvalds/linux.git master)

Change-Id: I486371e1ec8d25d42f85f710ce82e866367df4da
Signed-off-by: Hao Chen <chenhaosjtuacm@google.com>
2021-11-17 21:09:54 +00:00
Dongbo Yang
0b27ae1db5 misc: add driver for rk803.
Signed-off-by: Dongbo Yang <db.yang@rock-chips.com>
Change-Id: Ieba56551c48ed42f7f24c631b117d40a6e14a8f4
2021-11-17 16:14:04 +08:00
Jianqun Xu
1aef8d5550 dma-buf: add DMA_BUF_IOCTL_SYNC_PARTIAL support
Add DMA_BUF_IOCTL_SYNC_PARTIAL support for user to sync dma-buf with
offset and len.

Change-Id: I03d2d2e10e48d32aa83c31abade57e0931e1be49
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-11-15 16:24:13 +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
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
Cai YiWei
e8b2b58cee media: rockchip: isp: params and stats for dual isp unite
Change-Id: I8d950102877ea37423baced71b1fec50aa9a92f6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-10 21:14:00 +08:00
Cai YiWei
da2794bb29 media: rockchip: isp: dual isp unite process image
Change-Id: Ia85adab95cce029ea0967c00bd7d0d51863d7d76
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-10 21:14:00 +08:00
Cai YiWei
7faaa53254 media: rockchip: isp: add cmsk config for isp30
Change-Id: Iad86abb3127973b3ac3d8f743f27ffe49466f3ee
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-10 21:14:00 +08:00
Zefa Chen
9aa1b6cb5d include: uapi/linux/rk-camera-module.h add exposure sync control
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I2429ea5ced06cd799795ca3edd8d3a7894015565
2021-11-07 18:06:27 +08:00
Zefa Chen
5c9a0d04e7 include: uapi/linux/rk-camera-module.h modify otp struct
1. modify af inf
2. add module info

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I455e649c1ffe471e1b5239d95ae929ad85113248
2021-11-05 18:13:10 +08:00
Zefa Chen
9b16ff2988 include: uapi/linux/rk-camera-module.h otp support pdaf
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I4bcd2d1ff866059821ef1ddc7248530cd37a9062
2021-11-05 17:57:42 +08:00
Zhenke Fan
3463b91879 include: uapi/linux/rk-camera-module.h modify the rkmodule_lsc_inf
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I89403b779bcd6191e6fe76e1412275ad1752d414
2021-11-05 17:57:29 +08:00
Jianwei Fan
c03082ee6e media: i2c: tc35874x: adapt the driver to kernel-5.10
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I1eca2b49113a0ce55d8bbd76301a1bf884a9dd13
2021-11-03 21:08:48 +08:00
Cai YiWei
8b9c3e10f2 media: rockchip: isp: params and stats for isp3.0
Change-Id: Ie3cf39d9551b920e022f9024fee5a82a81acb966
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-03 18:08:33 +08:00
Cai YiWei
0c424187cd media: rockchip: isp: adjust params common api
Change-Id: I5d2961496ec445bea3c3592050d9ef0bd35778c1
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-03 18:08:33 +08:00
Zhen Chen
a42b57181b MALI: rockchip: upgrade bifrost DDK to g7p1-01bet0, from g6p0-01eac0
Including modifications under drivers/base/ from the new DDK.

Resolve lots of conflicts.

Fix compilation errors when CONFIG_DEBUG_FS is disabled.

Change-Id: I69f9ac87d927441d0b92b8dac8b704922aeb6a0a
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2021-10-29 18:44:22 +08:00
Zhen Chen
404110b7de MALI: rockchip: upgrade bifrost DDK to g6p0-01eac0, from g2p0-01eac0
Include a new directory include/uapi/gpu/arm/bifrost/,
which includes some header files of bifrost device driver.
In the original part of g6, the path is include/uapi/gpu/arm/midgard/.
I changed the "midgard" to "bifrost", and modified the paths of the header files in .c files.

I resolved some conflicts between modifications form ARM and RK, manually.

In addition, introduce source files of protected_memory_allocator
that might be needed by bifrost_device_driver into build system.

Further more, to avoid errors when building in GKI mode,
add "WITH Linux-syscall-note" to SPDX tag of uapi headers.

Change-Id: I09d500a0fdbc5da352c81dc4fcfbffb5b7f907f5
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2021-10-29 18:44:22 +08:00
Sandy Huang
dd32d33d69 drm/rocckhip: vop: rename to NEXT_HDR feature
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I148ecf0f400c98e8c5e79716a6c69add3b21b6e5
2021-10-29 15:29:05 +08:00
Cai YiWei
97ca039661 media: rockchip: isp/ispp to version v1.7.0
Change-Id: I3c07a83f9e5a4e7b2bfee30cc5e36c252ecc429f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-10-26 14:58:10 +08:00
Cai YiWei
96a592ab5e media: rockchip: isp: rawwr and rawrd memory mode
Three mode:
0: raw12/raw10/raw8 8bit memory compact
1: raw12/raw10 16bit memory one pixel
   big endian for rv1126/rv1109
   |15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0|
   | 3| 2| 1| 0| -| -| -| -|11|10| 9| 8| 7| 6| 5| 4|
   little align for rk356x
   |15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0|
   | -| -| -| -|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0|
2: raw12/raw10 16bit memory one pixel
   big align for rv1126/rv1109/rk356x
   |15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0|
   |11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| -| -| -| -|

Change-Id: Iabd5600d1a880057f0a20e187b15d337079a14c6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-10-26 14:58:10 +08:00
Zefa Chen
e6f02e7287 media: rockchip: cif support config memory mode
cif memory mode
 0: raw12/raw10/raw8 8bit memory compact
 1: raw12/raw10 16bit memory one pixel
    low align for rv1126/rv1109/rk356x
    |15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0|
    | -| -| -| -|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0|
 2: raw12/raw10 16bit memory one pixel
    high align for rv1126/rv1109/rk356x
    |15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0|
    |11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| -| -| -| -|

 note: rv1109/rv1126/rk356x dvp only support uncompact mode,
       and can be set low align or high align

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I59d619645650dfa10c9b2c168d8c741292f9f90f
2021-10-26 14:58:10 +08:00