https://source.android.com/security/bulletin/2022-01-01
CVE-2022-24958
CVE-2022-20136
CVE-2022-23960
CVE-2022-20141
CVE-2021-4154
CVE-2022-20132
* tag 'ASB-2022-06-05_12-5.10': (1188 commits)
BACKPORT: net/sched: cls_u32: fix netns refcount changes in u32_change()
UPSTREAM: io_uring: always use original task when preparing req identity
FROMLIST: remoteproc: Fix dma_mem leak after rproc_shutdown
FROMLIST: dma-mapping: Add dma_release_coherent_memory to DMA API
ANDROID: Update QCOM symbol list for __reset_control_get
ANDROID: vendor_hooks: Add hooks for mutex
BACKPORT: can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error path
BACKPORT: can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path
ANDROID: GKI: Update symbols to symbol list
ANDROID: oplus: Update the ABI xml and symbol list
UPSTREAM: remoteproc: Fix count check in rproc_coredump_write()
BACKPORT: esp: Fix possible buffer overflow in ESP transformation
ANDROID: Fix the drain_all_pages default condition broken by a hook
UPSTREAM: Revert "xfrm: xfrm_state_mtu should return at least 1280 for ipv6"
UPSTREAM: xfrm: fix MTU regression
ANDROID: signal: Add vendor hook for memory reaping
FROMGIT: usb: gadget: uvc: allow for application to cleanly shutdown
FROMGIT: usb: dwc3: gadget: increase tx fifo size for ss isoc endpoints
UPSTREAM: usb: gadget: configfs: clear deactivation flag in configfs_composite_unbind()
FROMGIT: usb: gadget: uvc: remove pause flag use
...
Change-Id: Idf3eea3b21dc69c8189161c0e24744336431913a
Conflicts:
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
drivers/spi/spi-rockchip.c
drivers/usb/gadget/function/f_uvc.c
drivers/usb/gadget/function/uvc.h
drivers/usb/gadget/function/uvc_configfs.c
drivers/usb/gadget/function/uvc_queue.c
drivers/usb/gadget/function/uvc_video.c
sound/soc/rockchip/rockchip_i2s.c
https://source.android.com/security/bulletin/2022-05-01
CVE-2022-0847
CVE-2022-20009
CVE-2022-20008
CVE-2021-22600
* tag 'ASB-2022-05-05_12-5.10': (116 commits)
UPSTREAM: usb: dwc3: gadget: Replace list_for_each_entry_safe() if using giveback
UPSTREAM: usb: dwc3: Issue core soft reset before enabling run/stop
UPSTREAM: usb: dwc3: gadget: Wait for ep0 xfers to complete during dequeue
ANDROID: Update QCOM symbol list for trace_map/unmap
ANDROID: fix KCFLAGS override by __ANDROID_COMMON_KERNEL__
ANDROID: vendor_hooks: tune reclaim scan type for specified mem_cgroup
ANDROID: vendor_hooks: Add hooks for rwsem
ANDROID: Add flag to indicate compiling against ACK
ANDROID: GKI: build damon reclaim
FROMLIST: mm/damon/reclaim: Fix the timer always stays active
BACKPORT: treewide: Add missing includes masked by cgroup -> bpf dependency
UPSTREAM: mm/damon: modify damon_rand() macro to static inline function
UPSTREAM: mm/damon: add 'age' of region tracepoint support
UPSTREAM: mm/damon: hide kernel pointer from tracepoint event
UPSTREAM: mm/damon/vaddr: hide kernel pointer from damon_va_three_regions() failure log
UPSTREAM: mm/damon/vaddr: use pr_debug() for damon_va_three_regions() failure logging
UPSTREAM: mm/damon/dbgfs: remove an unnecessary variable
UPSTREAM: mm/damon: move the implementation of damon_insert_region to damon.h
UPSTREAM: mm/damon: add access checking for hugetlb pages
UPSTREAM: mm/damon/dbgfs: support all DAMOS stats
...
Change-Id: I3498d4868ff86bec30e74dab9e541d787c2bd5ac
Conflicts:
drivers/android/Kconfig
drivers/usb/dwc3/gadget.c
https://source.android.com/security/bulletin/2022-04-01
CVE-2021-0707
CVE-2021-39800
CVE-2021-39801 (4.9 only)
CVE-2021-39802
* tag 'ASB-2022-04-05_12-5.10': (3832 commits)
ANDROID: GKI: Update symbols to abi_gki_aarch64_oplus
ANDROID: vendor_hooks: Reduce pointless modversions CRC churn
UPSTREAM: locking/lockdep: Avoid potential access of invalid memory in lock_class
ANDROID: mm: Fix implicit declaration of function 'isolate_lru_page'
ANDROID: GKI: Update symbols to symbol list
ANDROID: GKI: Update symbols to symbol list
ANDROID: GKI: Add hook symbol to symbol list
Revert "ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree"
ANDROID: vendor_hooks: Add hooks to for free_unref_page_commit
ANDROID: vendor_hooks: Add hooks to for alloc_contig_range
ANDROID: GKI: Update symbols to symbol list
ANDROID: vendor_hooks: Add hook in shrink_node_memcgs
ANDROID: GKI: Add symbols to symbol list
FROMGIT: iommu/iova: Improve 32-bit free space estimate
ANDROID: export walk_page_range and swp_swap_info
ANDROID: vendor_hooks: export shrink_slab
ANDROID: usb: gadget: f_accessory: add compat_ioctl support
UPSTREAM: sr9700: sanity check for packet length
UPSTREAM: io_uring: return back safer resurrect
UPSTREAM: Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0"
...
Change-Id: Ic61ead530b99b10ffd535a358a48fe9bb8c33fd4
Conflicts:
drivers/android/Kconfig
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
drivers/gpu/drm/rockchip/rockchip_vop_reg.c
drivers/i2c/busses/i2c-rk3x.c
drivers/media/i2c/imx258.c
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
drivers/usb/dwc2/gadget.c
drivers/usb/gadget/function/uvc.h
lib/Kconfig.debug
This reverts commit 94dab507e0.
Replaced by commit 00f1038c72 ("usb: typec: fusb302: Fix masking of comparator and bc_lvl interrupts")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
This reverts commit 88970bdcdb.
The dmabuf sync operation has a origin DMA_BUF_IOCTL_SYNC which can sync
dmabuf with size of the buffer, i.e all range sync.
On rockchip, the dmabuf sync implements DMA_BUF_IOCTL_SYNC_PARTIAL which
can sync dmabuf with partial size of the buffer.
On rockchip, the userspace call partial sync without a device mapped to
the dmabuf, that actually not according to the dma-api rules, but things
can not be changed. In this case, the partial sync must to work with a
scatterlist table hasn't been mapped, the sg_dma_address(sg) hasn't been
set. The partial sync should use sg_phys(sg) instead which always has a
good value.
Change-Id: I804e033921f2f72c79fed1a73def78bcbd34b71d
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
The dma-heap will allocate a scatterlist table at alloc time and store
into the heap buffer. Usually a device should attach to the dmabuf and
then map the dmabuf with the attachment, a new scatterlist table will be
created and set during dma map.
In the dma map, the sg_dma_address will be set for the first scatter of
the scatterlist table, if the device has a iommu domain, sg_dma_address
is set with the iova start address, else it will be set with a physical
address.
For a dmabuf hasn't been dma mapped, the sg_dma_address is a error value
(-1 = DMA_MAPPING_ERROR).
The partial sync hits the case that no device mapped to the dmabuf.
It's not easy to support both iommu/no iommu devices for partial sync,
this patch make the partial sync simple to implement for no iommu case.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Ib5d0715c4bde95bc444d6fbb873456c94755f550
Switch to use for_each_sgtable_sg to use orig_nents instead of nents for
the for the partial sync sgl.
struct sg_table is a common structure used for describing a memory
buffer. It consists of a scatterlist with memory pages and DMA addresses
(sgl entry), as well as the number of scatterlist entries: CPU pages
(orig_nents entry) and DMA mapped pages (nents entry).
It turned out that it was a common mistake to misuse nents and orig_nents
entries, calling the scatterlist iterating functions with a wrong number
of the entries.
To avoid such issues, lets introduce a common wrappers operating directly
on the struct sg_table objects, which take care of the proper use of
the nents and orig_nents entries.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I3f88b98f43b07f97c56b949f7625bebbc65dec26
Export the hardware decompression interface to the user layer.
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I033f0beabc2e44022418dcd06798ad94e971ff10
This part of the information is printed when the mapping fails
due to MMU limitations.
Update driver version to 1.2.17
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I2d6e4219ebc54d285bc9c25742f93503f7633b5e
Make sure to get the correct current_mm in asynchronous mode.
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Iec2b989e072b68b88d920ce8591924168bac3a7e
According to gki commit d483eed85f ("ANDROID: GKI: set vfs-only exports into their own namespace").
ERROR: modpost: module video_rkispp uses symbol kernel_write from namespace VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver, but does not import it.
ERROR: modpost: module video_rkispp uses symbol filp_open from namespace VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia96b7434d14187e0f3fce5bdf59956d3644db50c
According to gki commit d483eed85f ("ANDROID: GKI: set vfs-only exports into their own namespace").
ERROR: modpost: module gt1x-ts uses symbol filp_open from namespace VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2b25adf85977f90958292ef2af91c1ab6e5aa3e4
According to gki commit d483eed85f ("ANDROID: GKI: set vfs-only exports into their own namespace").
ERROR: modpost: module tp_elan_5515 uses symbol filp_open from namespace VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I22f2fd565c01e804d1e252d6a33dcb62a7b73f62
According to gki commit d483eed85f ("ANDROID: GKI: set vfs-only exports into their own namespace").
ERROR: modpost: module mc3230 uses symbol filp_open from namespace VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I29d6a1c79987dc30f4870c42e2995e7045e635ac
Its for sensor adapter to sync all of sensor state, to avoid isp getting the wrong state
in the case of app execution order: sensor0 config param -> run isp0 ... sensorn config param -> run ispn
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I90cc6a1716d5198150b5a0897ada0412622b72d3
According to gki commit d483eed85f ("ANDROID: GKI: set vfs-only exports into their own namespace").
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ie75429695e0f23ada39d8677a918e5b1c0b8fd97
Adding uvc attribute "uvc_num_request" to set the number of uvc
requests by configfs, the maximum limit is 64, and the recommended
value is 2.
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I6031ba0b569a4ff53e16a59a5bcce021d80823db
This patch add pll frac freq around 1G for audio product,
which will do fine tune pll for async clk situation,
such as BT, UAC.
Because we have no much more PLLs, and much more devices
share the same PLL, so, we should setup around 1G to serve
all the devices.
PLLs in rv1106:
APLL: CPU
DPLL: DDR
GPLL: DEVICES
CPLL: DEVICES
GPLL: 1188MHz
CPLL: 1000MHz
* PLLs support frac mode:
GPLL
DPLL
So, the only way to use audio pll frac freq is to switch to
use GPLL. and switch the role of GPLL and CPLL.
GPLL: audio frac freq (~1G)
CPLL: 1188MHz
Tested by UAC product, so, we first address this. and, of course,
there still have chance apply this to other situation, such as IPC.
but, need more test. at this time, we just handle for UAC.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ief13456b6274802836266228d3288d91a148feff
This patch add pll frac freq around 1G for audio product,
which will do fine tune pll for async clk situation,
such as BT, UAC.
Because we have no much more PLLs, and much more devices
share the same PLL, so, we should setup around 1G to serve
all the devices.
PLLs in rv1106:
APLL: CPU
DPLL: DDR
GPLL: DEVICES
CPLL: DEVICES
GPLL: 1188MHz
CPLL: 1000MHz
* PLLs support frac mode:
GPLL
DPLL
So, the only way to use audio pll frac freq is to switch to
use GPLL. and switch the role of GPLL and CPLL.
GPLL: audio frac freq (~1G)
CPLL: 1188MHz
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: If26f464ac88cd21195db14084f8b4e9ffb457890
1.Remove the dependence on the linux clock framework
2.Change to use the compatible APIs to get device property
3.Add the necessary device property "clock-frequency" for ACPI
Change-Id: I6b996ad4fba8af8d871633947a9eb6a38b8c8707
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
Enable CONFIG_CHARGER_SGM41542 used for sgm41542 which found on
rk3588s tablet
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Ieeeebfe2dde83f40a7589a6fa0418e01ad3433cf
The global structure system_monitor is same as argument from the
function for rockchip_system_monitor_parse_dt, fix to monitor to make
code easy to read.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I2e0412e9aac697e34e3cc35e1547e837ae7f69b8
If the clk_get_rate return '0', it will happen division by zero.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I1d2c6b12b961a78629f22496fe8f8b685b27dc09
