Commit Graph

10682 Commits

Author SHA1 Message Date
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
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
Sandy Huang
2bc4f70d30 drm/rockchip: vop2: add CRTC feature interaction with userspace
move alpha scale to crtc feature and add hdr10/dolby hdr info to feature
to interaction with userspace.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I492647a22b41bf43c3127bd56b2ed0b3b95284a2
2021-09-30 10:11:49 +08:00
Sandy Huang
110feb525a drm/rockchip: vop: add and remove some property
add and remove some property to compatibility with hwc 2.0

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I8239ce40e30da6e2be55e0ccfa6748816c0fcf2a
2021-09-24 17:27:27 +08:00
Zefa Chen
d6c2a1cabb media: uapi: rk-camera-module: add cmd to get channel info
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I1a82d1ecce860abd0098404bdee015ced527f5cc
2021-09-18 15:12:52 +08:00
Zefa Chen
7c143edefb include: uapi/linux/rk-camera-module.h add RKMODULE_GET_SONY_BRL command
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I55bbf4c5e5163286e1f8c68b1a1734bcefcf2b22
2021-09-08 19:29:32 +08:00
Zefa Chen
6a81bb7794 media: i2c: support get dcg ratio from sensor
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I47e07dc1bb282e0fb24db87f3802dd3ef93907a8
2021-09-08 12:37:54 +08:00
Allon Huang
f5cc594e92 media: platform: rockchip: cif: do reset when mipi fs & fe are not paired
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: If22316faffcdeb5a619d214eb8b650f300d1c41c
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:35:11 +08:00
Allon Huang
82cb10f7bc media: platform: rockchip: cif: support bt656/bt1120 multi channels function
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I0eb7c4d2a9d5d99eb69627741febedc09133ff21
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:33:59 +08:00
Cai YiWei
206bd78433 media: rockchip: add rockchip isp format
Change-Id: I0dd89290f23c412d4656583f554e220af66f9704
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-09-01 19:29:38 +08:00
Cai YiWei
d600ace1e2 media: rockchip: isp/ispp to version v1.6.2
Change-Id: I3959939530392f71313a3e30132d9746533f2d36
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:18 +08:00
Cai YiWei
a8b0239607 media: rockchip: isp/ispp to version v1.6.1
Change-Id: I6a9cdac4874a02cb0465c87aa23d7180d2109d3d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:01 +08:00
Cai YiWei
6f4298adbc media: rockchip: isp/ispp to version v1.6.0
Change-Id: I21b36b5f4738e912ee6409b045c00198ef016c42
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:38 +08:00
Cai YiWei
155e064aa9 media: rockchip: isp/ispp to version v1.5.2
Change-Id: I75d545c76ca4e59392211db9dbafd379141bbf19
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:35 +08:00
Cai YiWei
f4445a70c0 media: rockchip: ispp: add uvnr sd32 self en control
Change-Id: I57c0ed94b7916a9ea2a17c0ab761bad3d0af27a4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:34 +08:00
Tao Huang
8a8168e343 Merge remote branch 'android12-5.10-2021-08' of https://android.googlesource.com/kernel/common
* android12-5.10-2021-08: (429 commits)
  ANDROID: Update symbol list for mtk
  ANDROID: scheduler: export task_sched_runtime
  FROMLIST: mm: slub: fix slub_debug disabling for list of slabs
  FROMLIST: mm/madvise: add MADV_WILLNEED to process_madvise()
  ANDROID: Update the exynos symbol list
  FROMGIT: firmware: arm_scmi: Free mailbox channels if probe fails
  ANDROID: GKI: gki_defconfig: Enable CONFIG_NFC
  ANDROID: sched: Make uclamp changes depend on CAP_SYS_NICE
  ANDROID: GKI: update xiaomi symbol list and ABI XML
  ANDROID: ABI: update generic symbol list
  ANDROID: scsi: ufs: Enable CONFIG_SCSI_UFS_HPB
  ANDROID: scsi: ufs: Make CONFIG_SCSI_UFS_HPB compatible with the GKI
  UPSTREAM: arm64: vdso: Avoid ISB after reading from cntvct_el0
  ANDROID: GKI: Disable X86_MCE drivers
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: ABI: update allowed list for exynos
  FROMGIT: sched: Skip priority checks with SCHED_FLAG_KEEP_PARAMS
  FROMGIT: sched: Don't report SCHED_FLAG_SUGOV in sched_getattr()
  FROMGIT: sched/deadline: Fix reset_on_fork reporting of DL tasks
  BACKPORT: FROMGIT: sched: Fix UCLAMP_FLAG_IDLE setting
  ...

Change-Id: I5e0600bb4ccd0333366b016b42332e1e79e56b61

Conflicts:
	drivers/usb/gadget/configfs.c
	include/linux/usb/gadget.h
2021-08-24 20:07:38 +08:00
Sandy Huang
2563d569fe drm/rockchip: gem: add flag ROCKCHIP_BO_ALLOC_KMAP to assign kmap
RGA need to access CMA buffer at kernel space, so add this flag to keep kernel
line mapping for RGA.

Change-Id: Ia59acee3c904a495792229a80c42f74ae34200e3
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-07-28 15:15:28 +08:00
Mark Yao
51ca868e05 drm/rockchip: gem: support force alloc cma buffer with flags
Change-Id: I4749eac53609f865d0d4230364b1cbaf39ee0955
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-07-28 15:14:17 +08:00
Huibin Hong
44b8b0f5f2 serial: 8250: enable programmable transmit interrupt mode
Enable programmable transmit interrupt mode in order to increase
system performance.

Change-Id: Ic1ef9ecae0c6feb00170ad97ee3c6245ca3bf068
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2021-07-27 17:47:21 +08:00
Matthias Maennich
d0a88ae479 ANDROID: Enable GKI Dr. No Enforcement
This effectively locks down OWNERS approval to a small group to guard
the code base against unintentional breakages.

Bug: 194314089
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: Ifd1ea97639a622320ea83f901f6451e2e52b38d4
2021-07-21 20:51:47 +01:00
Sandy Huang
c0b956d7c7 drm/rockchip: drv: Add vcnt event
The vcnt event is similar to vblank event, but userspace can set the
time(which scan line) when the event occur.

This add a new event type: DRM_EVENT_ROCKCHIP_CRTC_VCNT userspace create
this event by ioctl DRM_IOCTL_ROCKCHIP_GET_VCNT_EVENT

Change-Id: If3da4bb29469ac7dc379e9462994aeda3202d3d2
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-07-20 16:22:24 +08:00
Peter Collingbourne
6c08feaa27 FROMLIST: arm64: mte: change ASYNC and SYNC TCF settings into bitfields
Allow the user program to specify both ASYNC and SYNC TCF modes by
repurposing the existing constants as bitfields. This will allow the
kernel to select one of the modes on behalf of the user program. With
this patch the kernel will always select async mode, but a subsequent
patch will make this configurable.

Link: https://linux-review.googlesource.com/id/Icc5923c85a8ea284588cc399ae74fd19ec291230
Signed-off-by: Peter Collingbourne <pcc@google.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/linux-arm-kernel/20210702194110.2045282-3-pcc@google.com/
Bug: 189966263
Change-Id: Icc5923c85a8ea284588cc399ae74fd19ec291230
2021-07-14 20:52:05 -07:00
Peter Collingbourne
50829b8901 BACKPORT: arm64: Introduce prctl(PR_PAC_{SET,GET}_ENABLED_KEYS)
This change introduces a prctl that allows the user program to control
which PAC keys are enabled in a particular task. The main reason
why this is useful is to enable a userspace ABI that uses PAC to
sign and authenticate function pointers and other pointers exposed
outside of the function, while still allowing binaries conforming
to the ABI to interoperate with legacy binaries that do not sign or
authenticate pointers.

The idea is that a dynamic loader or early startup code would issue
this prctl very early after establishing that a process may load legacy
binaries, but before executing any PAC instructions.

This change adds a small amount of overhead to kernel entry and exit
due to additional required instruction sequences.

On a DragonBoard 845c (Cortex-A75) with the powersave governor, the
overhead of similar instruction sequences was measured as 4.9ns when
simulating the common case where IA is left enabled, or 43.7ns when
simulating the uncommon case where IA is disabled. These numbers can
be seen as the worst case scenario, since in more realistic scenarios
a better performing governor would be used and a newer chip would be
used that would support PAC unlike Cortex-A75 and would be expected
to be faster than Cortex-A75.

On an Apple M1 under a hypervisor, the overhead of the entry/exit
instruction sequences introduced by this patch was measured as 0.3ns
in the case where IA is left enabled, and 33.0ns in the case where
IA is disabled.

Signed-off-by: Peter Collingbourne <pcc@google.com>
Reviewed-by: Dave Martin <Dave.Martin@arm.com>
Link: https://linux-review.googlesource.com/id/Ibc41a5e6a76b275efbaa126b31119dc197b927a5
Link: https://lore.kernel.org/r/d6609065f8f40397a4124654eb68c9f490b4d477.1616123271.git.pcc@google.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

Bug: 192536783
(cherry picked from commit 201698626f)
Change-Id: Ic0a21c92a22575f9ec3599fb67bd2931a50b9f04
[quic_eberman@quicinc.com: Resolved merge conflict in
 arch/arm64/kernel/process.c]
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
Signed-off-by: Peter Collingbourne <pcc@google.com>
2021-07-14 20:52:05 -07:00
Sandy Huang
9fad8c5fa8 drm: drm_fourcc: add NV20 and NV30 format
DRM_FORMAT_NV20 and DRM_FORMAT_NV30 is a 2 plane format suitable for
linear layouts, this two format is similar to NV15 has no padding
between component, but NV15 is 4:2:0 sub-sampling, NV20 is 4:2:2
sub-sampling and NV30 is no-sampling.

The '20' and '30' suffix refers to the optimum effective bits per
pixel which is achieved.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I84da7e03125e675f274c6307128b4b7b307767cc
2021-07-12 15:01:19 +08:00
Sandy Huang
3fe5bb89c5 media-bus: Add SRGB888 media bus format
The output timing described at [1], focus at s888 mode and
s888 dummy mode:

[1] https://patchwork.kernel.org/patch/9992241/

Note:
old kernel                   upstream
MEDIA_BUS_FMT_SRGB888_3X8 => MEDIA_BUS_FMT_RGB888_3X8
MEDIA_BUS_FMT_SBGR888_3X8 => MEDIA_BUS_FMT_BGR888_3X8

To align the same naming style:
old kernel                         upstream

MEDIA_BUS_FMT_SRGB888_DUMMY_4X8 => MEDIA_BUS_FMT_RGB888_DUMMY_4X8
MEDIA_BUS_FMT_SBGR888_DUMMY_4X8 => MEDIA_BUS_FMT_BGR888_DUMMY_4X8

Change-Id: I1bcc6d64ede243d89807acc7e842bcc7fd120c26
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-06-28 19:06:42 +08:00
Guochun Huang
9ca3b5d5ab media: Add MEDIA_BUS_FMT_RGB101010_1X7X5_SPWG/JEIDA media bus code definitions
This patch adds a new RGB media bus formats that describe
30-bit samples transferred over an LVDS bus with five
differential data pairs, serialized into 7 time slots,
using standard VESA/JEIDA data ordering.

Change-Id: I922a48c70f96727f0292004bb38dabab99f6a918
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2021-06-28 19:06:42 +08:00
Tao Huang
582f79266f Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common
* android12-5.10: (2274 commits)
  FROMGIT: mm: slub: move sysfs slab alloc/free interfaces to debugfs
  ANDROID: gki - CONFIG_NET_SCH_FQ=y
  ANDROID: GKI: Kconfig.gki: Add GKI_HIDDEN_ETHERNET_CONFIGS
  FROMLIST: media: Kconfig: Fix DVB_CORE can't be selected as module
  ANDROID: Update ABI and symbol list
  Revert "net: usb: cdc_ncm: don't spew notifications"
  ANDROID: Fips 140: move fips symbols entirely in own list
  ANDROID: core of xt_IDLETIMER send_nl_msg support
  ANDROID: start to re-add xt_IDLETIMER send_nl_msg support
  ANDROID: add fips140.ko symbols to module ABI
  ANDROID: inject correct HMAC digest into fips140.ko at build time
  ANDROID: crypto: fips140 - perform load time integrity check
  FROMLIST: crypto: shash - stop comparing function pointers to avoid breaking CFI
  ANDROID: arm64: module: preserve RELA sections for FIPS140 integrity selfcheck
  ANDROID: arm64: simd: omit capability check in may_use_simd()
  ANDROID: kbuild: lto: permit the use of .a archives in LTO modules
  ANDROID: arm64: only permit certain alternatives in the FIPS140 module
  ANDROID: crypto: lib/aes - add vendor hooks for AES library routines
  ANDROID: crypto: lib/sha256 - add vendor hook for sha256() routine
  UPSTREAM: KVM: arm64: Mark the host stage-2 memory pools static
  ...

Conflicts:
	drivers/mmc/core/mmc_ops.c
	drivers/usb/gadget/function/f_uac1.c
	drivers/usb/gadget/function/f_uac2.c
	drivers/usb/gadget/function/f_uvc.c
2021-06-25 11:32:04 +08:00
William Wu
7bb8939e5c usb: gadget: f_uvc: add suspend and resume function
This patch adds uvc_function_suspend and uvc_function_resume
for uvc function. With this patch, if usb bus enter suspend
or resume state, the usb controller driver will call the
uvc_function_suspend or uvc_function_resume to send event
to uvc app.

Change-Id: I9c584aae25298747c5a287243cb3efd71c8adfe6
Signed-off-by: William Wu <william.wu@rock-chips.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2021-06-16 19:16:52 +08:00
Zeng Tao
02bfaf0477 FROMLIST: usb: gadget: uvc: configfs: add framebased format support
As we know, The framebased format can be used to support a lot of
formats other than YUV and MJPEG, for example: H264 or H265.
And Nowadays, the H264 and H265 is used more and more compared to the
MJPEG, so there is a need to support such usecase, although the new UVC
1.5 and the UVC1.1 extensions already support H264, but they are much
more expensive and most of the time, what we need is just a channel to
stream the video frames.

In this patch, we implement the framebased format and set it to H264 by
default, and the users could change the video format as they need through
the guid configfs attribute node.

Change-Id: Ie1c62f5fb4fa57c24a2878f9992c982e9deb302e
Signed-off-by: Zeng Tao <prime.zeng@hisilicon.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(am from https://patchwork.kernel.org/patch/10722957/)
2021-06-16 18:13:14 +08:00