* commit '8c9c0c25d5bdbb8720caa726c810e340f9e86a01': (133 commits)
arm64/configs: add rk3308bs_mipi_display.config for support mipi display
arm64: dts: rockchip: rk3399-evb: use multicodecs instead simple card
media: rockchip: vicap: fixes create dummuy buffer fail with size 0
drm/bridge/synopsys: dw-hdmi-qp: Add support for external bridge
video: rockchip: vehicle: remove vehicle dev when exit
PCIe: dw: rockchip: rework compliance test settings
drm/rockchip: direct_show: add cached buf cpu access begin & end
media: rockchip: isp: add api get isp work mode for rockit
media: i2c: rk628: fix 5V detect event report
media: rockchip: isp: fix refer to sram info for multi sensor
media: rockchip: isp: fix stream init pause state
mtd: spinand: xtx: Fix XT26G11C ecc status ops
net: can: rockchip: support rk3568 can v2
drm/rockchip: dsi: set vop2 standby before command mode in rk3566/rk3568
phy: rockchip: csi2-dphy: fixes hw_dev num error for rk3562
video: rockchip: mpp: fix share reset_group do not take effect
arm64: dts: rockchip: update rk3399-sapphire-excavator-lp4-linux.dts
ARM: dts: rockchip: fix timing configs of panel k350c4516t for rv1103/rv1106 evb
drm/rockchip: rgb: add mcu_max_dclk_rate for mode_valid check
drm/rockchip: drv: fix the dclk calculation of mcu interface
...
Change-Id: I5e119fe1707975aa9d2859d02f4c7ac9462f91c4
* commit 'eefc3b7404f9d5bd38cd265240a4d1ca7340f2d6': (162 commits)
ARM: dts: rockchip: add rv1106g-evb1-v11-facial-gate for spi-nor flash
rtc: rk808: fix the rtc alarm status clean
usb: gadget: uvc: fix error return in bulk mode
ARM: configs: rv1106-tee.config: enable ROCKCHIP_SIP
firmware: rockchip_sip: support the MCU config
arm64: dts: rockchip: rk3562: modify the default drive strength of lcdc pins
drm/rockchip: vop2: Fix plane parameter check error at interlace mode
mtd: spinand: skyhigh: The vendor requires the devices to be patched
mtd: spinand: foresee: Support new device F35UQA001G-WWT
mtd: spinand: foresee: Support new device F35UQA002G-WWT
mtd: spinand: fmsh: Support new device FM25S01BI3
mtd: spinand: fmsh: Modify incorrect information despite not used
drm/bridge: analogix_dp: add support split area prop
drm/rockchip: dsi2: add support split area prop
drm/rockchip: analogix_dp: support split mode with other display interface
drm/bridge: analogix_dp: support dual connector with other display interface
drm/rockchip: dsi2: support split mode with other display interface
drm/rockchip: drv: Add crtc_clock convert in drm_mode_convert_to_{split,origin}_mode()
drm/bridge: analogix_dp: mv mode_set to bridge .atomic_pre_enable
drm/rockchip: dsi2: mv mode set to encoder .atomic_enable
...
Change-Id: I09e6af0610634963b21ea688209326362abb9fd2
Conflicts:
arch/arm64/kernel/smp.c
* commit '73b5dde370957bcfddb30e2ac5a3cd4f56197824': (223 commits)
MALI: bifrost: Not to call kbase_ipa_reset_data() if rockchip simple-power-model is used
arm64: dts: rockchip: add camera dtsi on rk3562-evb2-ddr4-v10-linux.dts
arm64: dts: rockchip: Assign VOP_ACLK to 750MHZ for rk3588-linux.dtsi
pwm: rockchip: enable dclk scale function in oneshot mode
soc: rockchip_system_monitor: Fix TPYE -> TYPE typo
media: i2c: max96712: version 1.05.00
drm/panel: maxim-max96752f: Fix pin assignment
soc: rockchip: tb_service: unmask mcu_done after all registered cb were finished
arm64: dts: rockchip: rk3588s: Fix low-volt-mem-read-margin
arm64: dts: rockchip: rk3588: Fixed the rkvenc1 init frequency
phy: rockchip: samsung-dcphy: restart rx after apb reset when rx is streaming
fiq_debugger: tty write to tty fifo
ARM: dts: rockchip: rv1106 boards: Add sdmmc idle state support
ARM: dts: rockchip: rv1126: Add sdmmc idle state support
ARM: dts: rockchip: add idle state for sdmmc of rv1106-pinctrl
ARM: dts: rockchip: add idle state for sdmmc of rv1126-pinctrl
media: i2c: max96712: version 1.04.00
media: rockchip: vicap: fixes s_selection, support to set crop area
media: rockchip: vicap: only enum outout formats that terminal sensor support to use
media: rockchip: vicap: add security testing for output format
...
Change-Id: Ie80fc4f1a5e335dccf6aa564515adfd78f69d62f
Add the rkep device mode definition and sync with SPL.
Signed-off-by: Xiao Ya peng <yp.xiao@rock-chips.com>
Change-Id: I60e4809119cf60ddcafe45f6b5ccb11a19aa56e6
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
./usr/include/linux/fec-config.h:14:2: error: unknown type name 'u32'
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I14edf55fe45b52f21bc18fba90f9d434a8882cfa
./usr/include/linux/rk_vcm_head.h:88:2: error: unknown type name 's32'
./usr/include/linux/rk_vcm_head.h:111:30: error: field has incomplete type 'struct __kernel_old_timeval'
./usr/include/linux/rk_vcm_head.h:116:23: error: field has incomplete type 'struct old_timeval32'
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I603502aaac87c71de8ae6ad027652de23cdcf73d
./usr/include/linux/rk-camera-module.h:180:2: error: unknown type name 'u8'
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I388d47ea658b5829df148c8b10eb5c466160a0e7
./usr/include/linux/rk-preisp.h:65:2: error: unknown type name 's32'
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib1812da340c745600b4e2286ca299db2c1922bce
./usr/include/linux/rk-ispp-config.h:21:43: warning: // comments are not allowed in this language [-Wcomment]
./usr/include/linux/rk-ispp-config.h:132:2: error: unknown type name 'u32'
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5d9a79af6c1f72a8e969b0664e6b48fbf9e0199f
./usr/include/linux/rk-isp2-config.h:277:21: error: implicit declaration of function 'BIT' [-Werror,-Wimplicit-function-declaration]
./usr/include/linux/rk-isp2-config.h:288:2: error: unknown type name 'u32'
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2f98bdcf50638cbe328b310d17d9417b382ab551
./usr/include/linux/rkcif-config.h:63:2: error: unknown type name 'u8'
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic1c8f6c71c7fcaffd3f44ea8c88fcbeba19f3f7d
usr/include/linux/rk-video-format.h:10: found __[us]{8,16,32,64} type without #include <linux/types.h>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I3071683240e04039186c3a1d506835bd732c6716
./usr/include/drm/rockchip_drm.h:19:10: fatal error: 'drm/drm_file.h' file not found
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I987b8bb26023e9e7b652962e54b45c24a0231d57
./usr/include/misc/dw_hdcp2.h:15:1: warning: // comments are not allowed in this language [-Wcomment]
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib68c8b37acdc7e7cb11abeae15d1bfd27ec945b3
./usr/include/misc/rkflash_vendor_storage.h:11:2: error: unknown type name '__u32'
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia912e65b2f87d2c6bd57eb76019431c4084f6549
* commit '006505ca766963bee10937a6546a070cca722cba': (207 commits)
misc: add rockchip standard EP function driver
PCI: add rockchip vendor id
drm/rockchip: dw-dp: use vsc sdp only output yuv420 or hdr
drm/rockchip: dw_hdmi: Fix hdmi2.0 mode no signal when plug out before hdmi bind
drm/rockchip: dw_hdmi: hdmi plug out don't check mode valid when play hdr video
media: rockchip: hdmirx: enhance compatibility and stability
media: rockchip: vicap: hdr buffer sync detect by fe timestamp
media: rockchip: vicap: fixes dvp capture not config buffer in rockit mode
arm64: configs: rockchip_gki: support PX30 RK3399
arm64: dts: rockchip: add px30 ddr4 v10 evb for linux
arm64: dts: rockchip: rk3588-android: add reserved memory for vendor storage
arm64: dts: rockchip: rk3568-android: add reserved memory for vendor storage
arm64: dts: rockchip: rk3399-android: add reserved memory for vendor storage
arm64: dts: rockchip: px30-android: add reserved memory for vendor storage
arm64: dts: rockchip: rk3562: add reserved memory for vendor storage
rtc: rockchip: fix the rtc compensation wait time
rtc: rockchip: Add timeout judgment for update rtc status
soc: rockchip: vendor_storage: add ram buffer for gki
soc: rockchip: vendor_storage: move some defines to common header file
drm/rockchip: vop3: add rb_swap check for serial rgb format
...
Change-Id: I30b3981c0e62de8aa933e7b9aca9094732741a80
Definition rockchip ep device information, like drivers version
and devices dma status. These information will be store in BAR0
in default.
Change-Id: I33dcc00e9923d10ad63d706ce16ba646f0049480
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
In addition, add some more modifications, according to
commit ccf3f0670c ("MALI: bifrost: from ARM: Remove references to PageMovable()").
Note, the corresponding mali_csffw.bin for DDK g15 MUST be used.
Change-Id: Ie233cd29d8d169202d5b80b00a97ccb90e6bd3f2
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
[ Upstream commit caf1aeaffc ]
We can have dependencies between epoll and io_uring. Consider an epoll
context, identified by the epfd file descriptor, and an io_uring file
descriptor identified by iofd. If we add iofd to the epfd context, and
arm a multishot poll request for epfd with iofd, then the multishot
poll request will repeatedly trigger and generate events until terminated
by CQ ring overflow. This isn't a desired behavior.
Add EPOLL_URING so that io_uring can pass it in as part of the poll wakeup
key, and io_uring can check for that to detect a potential recursive
invocation.
Cc: stable@vger.kernel.org # 6.0
Change-Id: Ifafcb236b2cfe3ca3e7254a0155625fce00fd038
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 2f09377502)
Bug: 268174392
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
No upstream commit exists.
This imports the io_uring codebase from 5.15.85, wholesale. Changes
from that code base:
- Drop IOCB_ALLOC_CACHE, we don't have that in 5.10.
- Drop MKDIRAT/SYMLINKAT/LINKAT. Would require further VFS backports,
and we don't support these in 5.10 to begin with.
- sock_from_file() old style calling convention.
- Use compat_get_bitmap() only for CONFIG_COMPAT=y
Change-Id: I7ce5226d6b39763ffc246fd6357cece9aafd4b59
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 788d082426)
Bug: 268174392
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
[ Upstream commit 99668f6180 ]
Now that we support non-blocking path resolution internally, expose it
via openat2() in the struct open_how ->resolve flags. This allows
applications using openat2() to limit path resolution to the extent that
it is already cached.
If the lookup cannot be satisfied in a non-blocking manner, openat2(2)
will return -1/-EAGAIN.
Cc: Al Viro <viro@zeniv.linux.org.uk>
Change-Id: Iddb58268e0a2b8adfc54e56192da43dda1868d8c
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 5683caa735)
Bug: 268174392
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
[ Upstream commit caf1aeaffc ]
We can have dependencies between epoll and io_uring. Consider an epoll
context, identified by the epfd file descriptor, and an io_uring file
descriptor identified by iofd. If we add iofd to the epfd context, and
arm a multishot poll request for epfd with iofd, then the multishot
poll request will repeatedly trigger and generate events until terminated
by CQ ring overflow. This isn't a desired behavior.
Add EPOLL_URING so that io_uring can pass it in as part of the poll wakeup
key, and io_uring can check for that to detect a potential recursive
invocation.
Cc: stable@vger.kernel.org # 6.0
Change-Id: Ifafcb236b2cfe3ca3e7254a0155625fce00fd038
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 2f09377502)
Bug: 268174392
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
No upstream commit exists.
This imports the io_uring codebase from 5.15.85, wholesale. Changes
from that code base:
- Drop IOCB_ALLOC_CACHE, we don't have that in 5.10.
- Drop MKDIRAT/SYMLINKAT/LINKAT. Would require further VFS backports,
and we don't support these in 5.10 to begin with.
- sock_from_file() old style calling convention.
- Use compat_get_bitmap() only for CONFIG_COMPAT=y
Change-Id: I7ce5226d6b39763ffc246fd6357cece9aafd4b59
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 788d082426)
Bug: 268174392
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
[ Upstream commit 99668f6180 ]
Now that we support non-blocking path resolution internally, expose it
via openat2() in the struct open_how ->resolve flags. This allows
applications using openat2() to limit path resolution to the extent that
it is already cached.
If the lookup cannot be satisfied in a non-blocking manner, openat2(2)
will return -1/-EAGAIN.
Cc: Al Viro <viro@zeniv.linux.org.uk>
Change-Id: Iddb58268e0a2b8adfc54e56192da43dda1868d8c
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 5683caa735)
Bug: 268174392
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
