https://android.googlesource.com/kernel/configs
commit 8c7922ea12ed ("android-4.14, android-4.19, android-5.4: Disable KPROBES for R")
+CONFIG_DM_BOW=y
commit c85479e4c183 ("Add CONFIG_DM_BOW to recommended")
If you are using Q on ext4 userdata, you need this feature.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2b1f942a775656435104984c2e85095e78c91435
https://android.googlesource.com/kernel/configs
commit 5f72fe526dfe ("Merge "Require CONFIG_ANDROID_BINDERFS for R launching devices." into rvc-dev")
android-base.config and android-base-conditional.xml:
+CONFIG_IKHEADERS=m
-CONFIG_RT_GROUP_SCHED=y
+CONFIG_NAMESPACES=y
-CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
-CONFIG_IP6_NF_NAT=y
-CONFIG_IP6_NF_TARGET_MASQUERADE=y
+CONFIG_BPF_JIT=y
+# CONFIG_FW_CACHE is not set
+CONFIG_DM_SNAPSHOT=y
+CONFIG_DUMMY=y
+CONFIG_VETH=y
+# CONFIG_DEVMEM is not set
+CONFIG_EXT4_FS_POSIX_ACL=y
-# CONFIG_F2FS_FS_POSIX_ACL is not set
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+CONFIG_STATIC_USERMODEHELPER=y
+CONFIG_STATIC_USERMODEHELPER_PATH=""
Except CONFIG_ANDROID_BINDERFS=y which do not supported by Android before 11.
CONFIG_ANDROID_BINDERFS is set by Android.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I8de7e0392c1fb0fe05f957f1f2710b295cafea07
This reverts commit 7d8d128141.
Keep sdcardfs available for Android before 11.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic1652698f81ad403cfdf13ebde5b1c8be685c516
https://android.googlesource.com/kernel/configs
commit 5f72fe526dfe ("Merge "Require CONFIG_ANDROID_BINDERFS for R launching devices." into rvc-dev")
android-base.config and android-base-conditional.xml:
+CONFIG_IKHEADERS=m
-CONFIG_RT_GROUP_SCHED=y
-# CONFIG_UTS_NS is not set
+CONFIG_BPF_JIT_ALWAYS_ON=y
-CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
-CONFIG_IP6_NF_NAT=y
-CONFIG_IP6_NF_TARGET_MASQUERADE=y
+CONFIG_BPF_JIT=y
+# CONFIG_FW_CACHE is not set
+CONFIG_DM_SNAPSHOT=y
+CONFIG_DUMMY=y
+CONFIG_VETH=y
+CONFIG_EXT4_FS_POSIX_ACL=y
-# CONFIG_F2FS_FS_POSIX_ACL is not set
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+CONFIG_STATIC_USERMODEHELPER=y
+CONFIG_STATIC_USERMODEHELPER_PATH=""
Except CONFIG_ANDROID_BINDERFS=y which do not supported by Android before 11.
CONFIG_ANDROID_BINDERFS is set by Android.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic63cfa0d0294ddc7c623c44d5a183979eed74b9c
Fixes: d892c9f357 ("ANDROID: GKI: pwm: core: Add option to config PWM duty/period with u64 data length")
Fixes: a9d887dc1c ("pwm: Convert period and duty cycle to u64")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1b22ce071efb768a7f68628c90282b5e222e9c52
This reverts commit fd2e0c7338.
This patch is incomplete and halt system booting because of calling
trust with wrong idle paramter.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I8361bd1d585433dfbd41816c71f6de4b63d6cb49
This reverts commit a8baa34ace.
Replaced by commit 62260dfc3b ("f2fs: don't leak filename in f2fs_try_convert_inline_dir()").
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I9b9e7c8278d40a42c679b9dd08b26c7a0b107b83
'commit e24979f0e7 ("ANDROID: GKI: iommu: Snapshot of vendor changes")'
would cause system crash, the main reason is __iommu_unmap need to do
iommu_pgsize for "iova and size", otherwise iommu page table
may overflow
Fixes: e24979f0e7 ("ANDROID: GKI: iommu: Snapshot of vendor changes")
Change-Id: I4712a2956ecaa74751b2b46dc32715d78e66c68b
Signed-off-by: Simon Xue <xxm@rock-chips.com>
fs/f2fs/inode.c: In function 'sanity_check_inode':
warning: format '%lu' expects argument of type 'long unsigned int',
but argument 6 has type 'blkcnt_t {aka long long unsigned int}'
Change-Id: Ibc600242dbdc600dd31111b5ba1413c329e26c5e
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Which confuse pm_qos_request and dev_pm_qos_request.
So get this bug:
[ 0.264863] ==================================================================
[ 0.265600] BUG: KASAN: slab-out-of-bounds in find_next_bit+0x38/0x9c
[ 0.266241] Read of size 8 at addr ffffffc0d27c4eb0 by task swapper/0/1
[ 0.266887]
[ 0.267055] CPU: 5 PID: 1 Comm: swapper/0 Not tainted 4.19.126 #121
[ 0.267671] Hardware name: Rockchip RK3399 Evaluation Board v3 (Android) (DT)
[ 0.268370] Call trace:
[ 0.268632] dump_backtrace+0x0/0x220
[ 0.269004] show_stack+0x14/0x1c
[ 0.269344] dump_stack+0xd8/0x118
[ 0.269693] print_address_description+0x80/0x2e4
[ 0.270163] __kasan_report+0x15c/0x1c4
[ 0.270550] kasan_report+0x10/0x18
[ 0.270904] __asan_load8+0x80/0x88
[ 0.271259] find_next_bit+0x38/0x9c
[ 0.271620] cpumask_next+0x20/0x28
[ 0.271977] pm_qos_update_target+0x380/0x65c
[ 0.272417] apply_constraint+0x94/0x13c
[ 0.272813] __dev_pm_qos_add_request+0x204/0x258
[ 0.273284] dev_pm_qos_expose_latency_limit+0x84/0x1ac
[ 0.273806] register_cpu+0x1a8/0x1c4
[ 0.274177] topology_init+0x90/0xd0
[ 0.274539] do_one_initcall+0x1fc/0x3d8
[ 0.274937] do_initcall_level+0x1c4/0x1f8
[ 0.275350] do_basic_setup+0x68/0x80
[ 0.275722] kernel_init_freeable+0x108/0x194
[ 0.276161] kernel_init+0x14/0x2a0
[ 0.276514] ret_from_fork+0x10/0x18
[ 0.276870]
[ 0.277027] Allocated by task 1:
[ 0.277358] __kasan_kmalloc+0xf0/0x1d4
[ 0.277740] kasan_kmalloc+0xc/0x14
[ 0.278083] __kmalloc+0x114/0x378
[ 0.278424] kobject_get_path+0x60/0xe4
[ 0.278804] kobject_uevent_env+0x174/0x81c
[ 0.279217] kobject_uevent+0x10/0x18
[ 0.279581] device_add+0xa3c/0xe68
[ 0.279929] device_register+0x1c/0x28
[ 0.280300] register_cpu+0x158/0x1c4
[ 0.280664] topology_init+0x90/0xd0
[ 0.281018] do_one_initcall+0x1fc/0x3d8
[ 0.281410] do_initcall_level+0x1c4/0x1f8
[ 0.281814] do_basic_setup+0x68/0x80
[ 0.282183] kernel_init_freeable+0x108/0x194
[ 0.282610] kernel_init+0x14/0x2a0
[ 0.282957] ret_from_fork+0x10/0x18
[ 0.283305]
[ 0.283461] Freed by task 1:
[ 0.283758] __kasan_slab_free+0x140/0x234
[ 0.284164] kasan_slab_free+0x10/0x1c
[ 0.284533] kfree+0x1a0/0x730
[ 0.284840] kobject_uevent_env+0x208/0x81c
[ 0.285248] kobject_uevent+0x10/0x18
[ 0.285615] device_add+0xa3c/0xe68
[ 0.285962] device_register+0x1c/0x28
[ 0.286337] register_cpu+0x158/0x1c4
[ 0.286699] topology_init+0x90/0xd0
[ 0.287054] do_one_initcall+0x1fc/0x3d8
[ 0.287441] do_initcall_level+0x1c4/0x1f8
[ 0.287848] do_basic_setup+0x68/0x80
[ 0.288210] kernel_init_freeable+0x108/0x194
[ 0.288643] kernel_init+0x14/0x2a0
[ 0.288987] ret_from_fork+0x10/0x18
[ 0.289336]
[ 0.289498] The buggy address belongs to the object at ffffffc0d27c4e00
[ 0.289498] which belongs to the cache kmalloc-128 of size 128
[ 0.290726] The buggy address is located 48 bytes to the right of
[ 0.290726] 128-byte region [ffffffc0d27c4e00, ffffffc0d27c4e80)
[ 0.291915] The buggy address belongs to the page:
[ 0.292395] page:ffffffbf0349f100 count:1 mapcount:0 mapping:ffffffc00a2c7c00 index:0x0
[ 0.293184] flags: 0x200(slab)
[ 0.293504] raw: 0000000000000200 dead000000000100 dead000000000200 ffffffc00a2c7c00
[ 0.294273] raw: 0000000000000000 0000000000100010 00000001ffffffff 0000000000000000
[ 0.295028] page dumped because: kasan: bad access detected
[ 0.295576]
[ 0.295731] Memory state around the buggy address:
[ 0.296194] ffffffc0d27c4d80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
[ 0.296905] ffffffc0d27c4e00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
[ 0.297617] >ffffffc0d27c4e80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
[ 0.298323] ^
[ 0.298787] ffffffc0d27c4f00: 00 00 00 00 00 00 00 fc fc fc fc fc fc fc fc fc
[ 0.299498] ffffffc0d27c4f80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
[ 0.300206] ==================================================================
Fixes: 723feab600 ("ANDROID: GKI: QoS: Enhance framework to support cpu/irq specific QoS requests")
Change-Id: I87d682d30d8147cdba6309a9d4ffd6dcb25e0960
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Via p_chmask/c_chmask the user can define whether uac1 shall support
playback and/or capture. This has only effect on the created ALSA
device, but not on the USB descriptor. This patch adds playback/capture
descriptors dependent on that parameter.
Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Signed-off-by: Zain Wang <wzz@rock-chips.com>
Change-Id: Iced9b9687ff3a760861f735d532825fb91707633
drivers/clk/rockchip/clk-rk3568.c:162:2: warning: this decimal constant is unsigned only in ISO C90
RK3568_CPUCLK_RATE(2208000000, 1, 1, 1, 9, 9, 9, 9),
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I697e4b2a9611cf49233d40361863cc820f20d1fa
drivers/net/wireless/rockchip_wlan/rtl8821cs/hal/phydm/phydm_dfs.c:1507:4:
warning: misleading indentation; statement is not part of the previous 'if'
[-Wmisleading-indentation]
dfs->pri_cond4 = 1;
^
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2aabcd339f71061872327712fbfeb39176073c69
This is a workaround to bypass RKISP dma buf sync between MIPI TX(mmap)
and MIPI RX(userptr|dmabuf).
Change-Id: I3d4966f35f2f3330816ac8a3d614486aa3276ebf
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
enable monitor:
add rockchip,restart-monitor-en to rkispp node on dts or
echo Y > /sys/module/video_rkispp/parameters/monitor
Change-Id: I481bb6021166a14dc8f115fe76fcfba092662a7a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
Skip ->prepare() or/and ->finish() cache synchronisation if
user-space requested us to do so (or when queue dma direction
permits us to skip cache syncs).
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
(cherry picked from commit dcf3bfe7c7)
Conflicts:
drivers/media/common/videobuf2/videobuf2-core.c
Change-Id: I9cb129fa00f5355fbcda552a3c08052c7c324743
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Set video buffer cache management flags corresponding to V4L2 cache
flags.
Both ->prepare() and ->finish() cache management hints should be
passed during this stage (buffer preparation), because there is
no other way for user-space to tell V4L2 to avoid ->finish() cache
flush.
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
(cherry picked from commit f5f5fa73fb)
Conflicts:
drivers/media/common/videobuf2/videobuf2-v4l2.c
Change-Id: I6d90d080a7468be5e8f96b26dcd36bf583bd5741
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Extend vb2_buffer and vb2_queue structs with cache management
members.
V4L2 UAPI already contains two buffer flags which user-space,
supposedly, can use to control buffer cache sync:
- V4L2_BUF_FLAG_NO_CACHE_INVALIDATE
- V4L2_BUF_FLAG_NO_CACHE_CLEAN
None of these, however, do anything at the moment. This patch
set is intended to change it.
Since user-space cache management hints are supposed to be
implemented on a per-buffer basis we need to extend vb2_buffer
struct with two new members ->need_cache_sync_on_prepare and
->need_cache_sync_on_finish, which will store corresponding
user-space hints.
In order to preserve the existing behaviour, user-space cache
managements flags will be handled only by those drivers that
permit user-space cache hints. That's the purpose of vb2_queue
->allow_cache_hints member. Driver must set ->allow_cache_hints
during queue initialisation to enable cache management hints
mechanism.
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
(cherry picked from commit 6d2199868a)
Conflicts:
include/media/videobuf2-core.h
Change-Id: I26952d567d599d23e3867e8c1fb735d70e4cae5c
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
We need enable CONFIG_ARM_CPU_TOPOLOGY for scheduler.
The default value of CONFIG_ARM_CPU_TOPOLOGY is y, so just delete
'# CONFIG_ARM_CPU_TOPOLOGY is not set'.
Change-Id: I6917cfe7d521fa00885e82743738f12f832512f9
Signed-off-by: Liang Chen <cl@rock-chips.com>
vcc_bat has no voltage divider, so correct it.
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: Ibb3eb7b32c84414bf47677c422d2cbf3b1ddbac3
