There are many isp driver in 4.4 kernel, let's add a dtsi
to help switch between them.
Change-Id: Ida1af575b6c64ffec56ad695933dfdf22cdd72c1
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
We now trap accesses to CNTVCT_EL0 when the counter is broken
enough to require the kernel to mediate the access. But it
turns out that some existing userspace (such as OpenMPI) do
probe for the counter frequency, leading to an UNDEF exception
as CNTVCT_EL0 and CNTFRQ_EL0 share the same control bit.
The fix is to handle the exception the same way we do for CNTVCT_EL0.
Fixes: a86bd139f2 ("arm64: arch_timer: Enable CNTVCT_EL0 trap if workaround is enabled")
Reported-by: Hanjun Guo <guohanjun@huawei.com>
Tested-by: Hanjun Guo <guohanjun@huawei.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 9842119a23)
CVE-2017-13218
Change-Id: I2f163e2511bab6225f319c0a9e732735cbd108a0
Since people seem to make a point in breaking the userspace visible
counter, we have no choice but to trap the access. Add the required
handler.
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
(cherry picked from commit 6126ce0588)
CVE-2017-13218
Change-Id: I0705f47c85a78040df38df18f51a4a22500b904d
In current code, the driver attributes of DWC2 controller is
created during driver initialization, if we get or set them
before finish probe device, the device's pointer in attribute
function will be NULL and this will crash the system. So this
patch make the function return directly if the pointer is NULL.
The attributes mention above:
/sys/bus/platform/drivers/usb20_otg/dwc_otg_conn_en
/sys/bus/platform/drivers/usb20_otg/force_usb_mode
/sys/bus/platform/drivers/usb20_otg/vbus_status
Change-Id: If063a884249afa7172bf28719b8c2b8a5641ac4b
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
A lock-unlock is missing in ASHMEM_SET_SIZE ioctl which can result in a
race condition when mmap is called. After the !asma->file check, before
setting asma->size, asma->file can be set in mmap. That would result in
having different asma->size than the mapped memory size. Combined with
ASHMEM_UNPIN ioctl and shrinker invocation, this can result in memory
corruption.
Bug: 66954097
Signed-off-by: Viktor Slavkovic <viktors@google.com>
Change-Id: I268225133f96fde0fadd1ec621aafef27d392d65
Even "rockchip,system-power-controller" is not found,
rk808_i2c_client is needed for suspend/resume and the
other.
Change-Id: I17ebb3a1d1e7ec8dc9f4a3ee2dbdcd9ae4c1648b
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Android8.0 CTS needs to get max charging current,
max charging voltage and battery charge counter.
Change-Id: I83371d5b9f126ee17979f56e92d78b7887c316c6
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Rockchip 4.4 kernel don't support of_iommu,
so we have to manage it manualy
Change-Id: I38e784e97f1df336837c5ded2b47932f6add180f
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Fixup for differences of the previous FROMLIST patches for
rockchip isp1 driver as following,
- regression of UPSTREAM commits
+ d6dd645eae: ("[media] media: videobuf2: Move timestamp to vb2_buffer")
+ 36c0f8b32c: ("[media] vb2: replace void *alloc_ctxs by struct device *alloc_devs")
+ df9ecb0cad: ("[media] vb2: drop v4l2_format argument from queue_setup")
- API changes of (4.4 v.s. UPSTREAM)
+ media_entity_pipeline_start/stop() v.s. media_pipeline_start/stop()
+ media_entity_init() v.s. media_entity_pads_init()
+ media_entity_create_link() v.s. media_create_pad_link()
+ media_device_init()
+ entity function flags: MEDIA_ENT_F_IO_V4L and MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN
BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
Change-Id: I4d9c9f784210fda2165ac5372baea09a9c01a30d
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Add the Rockchip ISP1 specific processing parameter format
V4L2_META_FMT_RK_ISP1_PARAMS and metadata format
V4L2_META_FMT_RK_ISP1_STAT_3A for 3A.
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46247/)
Conflicts:
drivers/media/v4l2-core/v4l2-ioctl.c
Change-Id: I9ede55b68c075e54cefb11edecf5ef68b5452ec4
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
This patch adds driver for Omnivision's ov2685 sensor.
Though the ov2685 can output yuv data, this driver only
supports the raw bayer format, including the following features:
- output 1600x1200 at 30fps
- test patterns
- manual exposure/gain control
- vblank and hblank
- media controller
- runtime pm
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46251/)
Conflicts:
drivers/media/i2c/Kconfig
drivers/media/i2c/Makefile
Change-Id: Ia73ea2ff1d01226824f98bf4a45b98303223eed8
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
This patch adds driver for Omnivision's ov5695 sensor,
the driver supports following features:
- supported resolutions
+ 2592x1944 at 30fps
+ 1920x1080 at 30fps
+ 1296x972 at 60fps
+ 1280x720 at 30fps
+ 640x480 at 120fps
- test patterns
- manual exposure/gain(analog and digital) control
- vblank and hblank
- media controller
- runtime pm
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46248/)
Conflicts:
drivers/media/i2c/Makefile
Change-Id: Iaeb971c609d4a6d62fb23ae3b5c7881d4d3481f7
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
