Commit Graph

858657 Commits

Author SHA1 Message Date
Ren Jianing
83aa893b04 usb: gadget: legacy: audio: fix error parameter of sizeof
This patch fixes the issue that a pointer is used as the parameter
of sizeof.

Fixes: 9de5fa6df1 (FROMLIST: usb: gadget: f_uac*: Reduce code duplication)
Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: I66bfc58e71c498dd8a82f9b5045f851585e1f441
2020-09-29 17:28:57 +08:00
Wyon Bi
3c43df1143 drm/bridge: analogix_dp: Don't handle adjust request if clock recovery is already ok
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I44aa6678285607c838cb8c27dc566349a17d59c5
2020-09-29 17:28:20 +08:00
Elaine Zhang
bcec179ee8 rtc: hym8563: set init time
remove the buf[0] & HYM8563_SEC_VL, it's unsuitable for some hym8563.
set rtc init time for first power on.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Iaa207d554d9df9ad8f138fc2f196c8a7a991b141
2020-09-29 17:27:36 +08:00
Liang Chen
bb9a41524c soc: rockchip: pvtm: support module
This submit supports to compile rockchip pvtm into a module.

Change-Id: Id32b2dad80af8657b28e308d155539e3c7dac48a
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-09-29 15:12:39 +08:00
Finley Xiao
d4f55632eb soc: rockchip: ipa: Add support to be build as module
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I71caeb44f4d31da03e3a5ca56c2a24edc6486ebd
2020-09-29 14:59:54 +08:00
Ziyuan Xu
b3fc2ac3b2 ARM: configs: rv1126-battery.config: rework by standard process
Update by:
make ARCH=arm rv1126_defconfig rv1126-tb.config
cp .config rv1126.config
make ARCH=arm rv1126_defconfig rv1126-tb.config rv1126-battery.config
scripts/diffconfig -m rv1126.config .config > arch/arm/configs/rv1126-battery.config

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I9f24066c7bb3679898b81e3229715c964a000856
2020-09-29 09:19:16 +08:00
Weiwen Chen
a814718222 ARM: configs: rv1126-emmc-drivers-builtin.config: add CONFIG_VIDEO_IMX307
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Iba82831e0a6241ff708fe44bbecc4857930ab67e
2020-09-28 15:18:21 +08:00
Jianqun Xu
412436b9d7 gpio: rockchip: make gpio-bank name with bank index
Fix the name of gpio bank to be more general, make it with bank index
instead of node name.

Change-Id: Ia7e61e2eaa2cdd8f3ff0482cfc7c857f2a505935
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-09-27 17:28:54 +08:00
Tao Huang
1dbe7f3096 ARM: rockchip_defconfig: Disable CONFIG_ROCKCHIP_ONE_INITRD
For support generic + vendor ramdisk.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I52af171f8d1e5179a98cdd499cc6272ea0c0be17
2020-09-27 17:18:41 +08:00
Tao Huang
15f7fbbe28 arm64: rockchip_defconfig: Disable CONFIG_ROCKCHIP_ONE_INITRD
For support generic + vendor ramdisk.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4df08194b80d20d288f4e1e61eec1037ef80dcfe
2020-09-27 17:18:41 +08:00
Tao Huang
78c27ecb0c init: Introduce config ROCKCHIP_ONE_INITRD
This feature is conflict with Android 11 which has the generic ramdisk
and the vendor ramdisk.

Fixes: c44194873a ("HACK: get ramdisk correct size with rk bootloader")
Change-Id: I4d158862398973f3ca205fbbbaa48022c2903936
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-09-27 17:18:41 +08:00
Tao Huang
acf4d3c4f9 rk: scripts: Fix repack bootimg for boot image v3
v3 do not support second.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5cd6d402be5adb35f0634a5af19c4310582d25ee
2020-09-27 17:09:56 +08:00
Paul Kocialkowski
f8e9631789 UPSTREAM: rtc: hym8563: Read the valid flag directly instead of caching it
The RTC has a valid bit in the seconds register that indicates whether
power was lost since the pevious time set. This bit is currently read
once at probe time, cached and updated with set_time.

Howeever, caching the bit may prevent detecting power loss at runtime
(which can happen if the RTC's supply is distinct from the the platform's).

Writing the seconds register when setting time will clear the bit,
so there should be no downside in reading the bit directly instead of
caching it.

Change-Id: I85d1dcfb32b12ed24d5f42f67fb9beb5d8d03876
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Link: https://lore.kernel.org/r/20191212153111.966923-2-paul.kocialkowski@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
(cherry picked from commit e2ed7507ae)
2020-09-27 16:23:28 +08:00
Jon Lin
69f3c341d9 drivers: rkflash: Support spinand non aligned read
Change-Id: I185838a57024af141fdd24f076186e3e068df3b1
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-09-27 15:47:48 +08:00
Wang Panzhenzhuan
5e0cb7287b media: i2c: gc2145: reduce rkisp1: CIF_ISP_PIC_SIZE_ERROR 0x00000001
Add delay to enable oneframe signal complete, when gc2145 stream off.
For uncompleted frame signal may cause rkisp1: CIF_ISP_PIC_SIZE_ERROR,
when gc2145 switch to new resolutions.

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I6be22471fabfba5da2cac9806d634837d6a08fb9
2020-09-27 15:46:38 +08:00
Yiqing Zeng
93ae71db76 media: i2c: imx335 fix set sensor vertical invert failed
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I5366c832086756e821ff43125764803b831264d1
2020-09-27 14:10:17 +08:00
Yu Qiaowei
2c3c5733d2 video/rockchip: rga2: Add src/dst/dst_over blend modes.
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: If6d46c7e3c9883b7be16ace4e8fd36ab61a7ca67
2020-09-27 10:23:10 +08:00
Allon Huang
0e98f42cbb media: rockchip: cif: fix frame_id is not identical with sof count
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ifb60f9d6d8b01da3fb3cfd634aa4200c1047a351
2020-09-25 17:26:40 +08:00
Finley Xiao
1fb4143e70 soc: rockchip: power-domain: add power domain support for rk3568
This driver is modified to support RK3568 SoCs.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I5895cedad8c8e89f0657276c913e6e99d9544762
2020-09-25 15:09:21 +08:00
Finley Xiao
37d732f459 dt-bindings: power: add binding for rk3568 power domains
Add binding documentation for the power domains
found on Rockchip RK3568 SoCs.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I7544a643096948e75f59fb8126201b0de142440d
2020-09-25 15:09:12 +08:00
Finley Xiao
b35518d619 dt-bindings: add power-domain header for RK3568 SoCs
According to a description from TRM, add all the power domains.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I7205cbf6e38c9d5abb1ef58e45641cc27fcf6ec9
2020-09-25 15:09:01 +08:00
YouMin Chen
e214fede43 arm: dts: rockchip: rv1126: add dmcbug node for ddr debug
Change-Id: Ied4e4aef80d1e376f9b02c98c4245d206f532a38
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-09-25 15:06:30 +08:00
YouMin Chen
2ff072c85c ARM: configs: rv1126_defconfig: enable ARM_ROCKCHIP_DMC_DEBUG
Change-Id: I141e36ef7596bdfbd2b7f81489a97de11b843156
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-09-25 15:06:05 +08:00
YouMin Chen
86f64099c7 PM / devfreq: rockchip_dmcdbg: add support rockchip dmc debug
Change-Id: I54f5792267fcd346bc781e3c3816b5ae2642f351
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-09-25 15:01:43 +08:00
YouMin Chen
24edb749b7 PM / devfreq: rockchip_dmc: add rockchip_dmc_timing.h
Move the dmc timing from rockchip_dmc.c to rockchip_dmc_timing.h.
In order to be able to reuse them.

Change-Id: I03edf68c68b78c08100ffa1c149d70d4d7d4ee6e
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-09-25 15:01:43 +08:00
YouMin Chen
7bf3b88f36 PM / devfreq: rockchip_dmc: add dynamic switch complt_irq
Change-Id: I7cc8c2f58e9d4e6c8d84cf5c483295ef46c055b0
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-09-25 15:01:43 +08:00
Zefa Chen
7ae8eb5163 media: i2c: imx335 support 10bit HDR DOL3 2592X1944@15fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I6ef970fae63fbf2850f0c97ddcd8a05955087694
2020-09-25 14:57:27 +08:00
Jianqun Xu
820c36ffa9 pinctrl: rockchip: remove gpiochip related codes
Remove gpiochip related codes from pinctrl driver, but populate gpio
platform devices from device tree data.

Change-Id: I347acaac2998a972e4c3be5c8827f77f468a7ad2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-09-25 14:42:12 +08:00
Jianqun Xu
eccd2f7b93 gpio: add gpio-rockchip driver
This gpio driver codes mostly are copied from pinctrl-rockchip.c with
module fixes. Also it supports the old dt nodes.

Change-Id: I7f26b5fe0827c16e2146a40e035a81de74284191
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-09-25 14:42:12 +08:00
Elaine Zhang
b3912fea8a clk: rockchip: rk3568: export PCLK_CORE_PVTM clock id
mark pclk_core_pre as critical.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I7da6a93dc1352acb2b336006bd1e30c49b8d6074
2020-09-25 14:23:48 +08:00
Elaine Zhang
9190b05f4a clk: rockchip: rk3568: export PCLK_EDPPHY_GRF clock id
Change-Id: Ic16fbe5ab6831d7797d417bfce75d9a3c3964fe4
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-09-25 14:12:04 +08:00
Tao Huang
891307ee1d ARM: rockchip_defconfig: merge r/android-4.19 android-recommended-arm.config
https://android.googlesource.com/kernel/configs
commit d298b222cd37 ("Freeze kernel configs for r.")

+CONFIG_CRYPTO_SHA2_ARM_CE=y
+CONFIG_CRYPTO_AES_ARM_CE=y

commit 63f8ad1f4b79 ("Recommend enabling architecture-optimized AES and SHA-256")
It's usually very helpful to enable AES-XTS and SHA-256 optimized with
the ARM crypto extensions (or x86 AES-NI and SHA-NI).  AES-XTS is used
by file-based encryption; SHA-256 is used by dm-verity.  I was a bit
surprised to see that these weren't already in the recommended configs.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ibc40ed1b493f07eb92328024bff463903f50cb6f
2020-09-25 11:26:45 +08:00
Tao Huang
daeddb16eb ARM: rockchip_defconfig: Enable CONFIG_DM_BOW
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
2020-09-25 11:07:19 +08:00
Tao Huang
f2b4beac41 ARM: rockchip_defconfig: merge r/android-4.19 android base config
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
2020-09-25 10:40:18 +08:00
Tao Huang
b4befcdd6a Revert "ANDROID: sdcardfs: remove sdcardfs from system"
This reverts commit 7d8d128141.

Keep sdcardfs available for Android before 11.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic1652698f81ad403cfdf13ebde5b1c8be685c516
2020-09-25 09:32:14 +08:00
Tao Huang
4d843f0419 Revert "Revert "ANDROID: fs: Restore vfs_path_lookup() export""
This reverts commit 0fb8b79adc.

For sdcardfs.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I910e0454b071be541de4bfa89eb4c724b2c75e05
2020-09-25 09:32:11 +08:00
Tao Huang
f9cb1a06e3 Revert "Revert "ANDROID: vfs: add d_canonical_path for stacked filesystem support""
This reverts commit fc411cf98a.

For sdcardfs.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I56fd2ee1acda8664548055c4b9ce14a3cb3233ce
2020-09-25 09:32:07 +08:00
Tao Huang
ebf16f78d6 Revert "Revert "ANDROID: vfs: Add permission2 for filesystems with per mount permissions""
This reverts commit 633920f372.

For sdcardfs.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia24ead566b4b804ceef51a952988f707c2ffb9ac
2020-09-25 09:32:04 +08:00
Tao Huang
47046cdf6d Revert "Revert "ANDROID: vfs: Add setattr2 for filesystems with per mount permissions""
This reverts commit 3b7ef7882a.

For sdcardfs.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I9705b248bc301cd24ef9de53cd8de380c0202bc0
2020-09-25 09:31:59 +08:00
Tao Huang
445d582f54 Revert "Revert "ANDROID: fscrypt: add key removal notifier chain""
This reverts commit 4da740c10d.

For sdcardfs.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I863e5efdf4aeec130447b1a655659ce16db55bd4
2020-09-25 09:30:42 +08:00
Tao Huang
72c2e95348 arm64: rockchip_defconfig: merge r/android-4.19 android recommended config
https://android.googlesource.com/kernel/configs
commit 8c7922ea12ed ("android-4.14, android-4.19, android-5.4: Disable KPROBES for R")

android-recommended.config and android-recommended-arm64.config:

+CONFIG_HID_STEAM=y

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ie164a4a6028a51381e71302c30349bd5d90a88d9
2020-09-24 19:34:13 +08:00
Tao Huang
19e5ddd1ee arm64: rockchip_defconfig: merge r/android-4.19 android base config
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
2020-09-24 19:10:56 +08:00
Tao Huang
c3f6e699db leds: rgb13h: Fix for PWM duty/period with u64 data length
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
2020-09-24 19:02:10 +08:00
Tao Huang
850bf5abc3 Revert "ANDROID: GKI: arm64: psci: Support for OS initiated scheme"
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
2020-09-24 18:07:20 +08:00
Tao Huang
d47d281214 Revert "f2fs: fix memory leak in f2fs_try_convert_inline_dir()"
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
2020-09-24 18:02:43 +08:00
Simon Xue
3739a5c605 ANDROID: GKI: iommu: fix system crash
'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>
2020-09-24 18:02:31 +08:00
Simon Xue
7ee238f8c2 ANDROID: GKI: iommu/rockchip: Add .map_sg callback
Fixes: e24979f0e7 ("ANDROID: GKI: iommu: Snapshot of vendor changes")
Change-Id: I577f8d816e6332e9fa01a26c43ab1d4ab74f04d1
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2020-09-24 18:02:21 +08:00
Tao Huang
5bd3bf5983 f2fs: sync upstream for avoid gcc warning
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>
2020-09-24 18:01:34 +08:00
Tao Huang
17823171af PM / QoS: Do not call pm_qos_set_value_for_cpus()
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>
2020-09-24 18:01:24 +08:00
Tao Huang
48f4e7f7c2 Merge tag 'ASB-2020-09-05_4.19-stable' of https://android.googlesource.com/kernel/common
https://source.android.com/security/bulletin/2020-09-01
CVE-2020-0402
CVE-2020-0404
CVE-2020-0407

* tag 'ASB-2020-09-05_4.19-stable': (3616 commits)
  Linux 4.19.143
  ALSA: usb-audio: Update documentation comment for MS2109 quirk
  HID: hiddev: Fix slab-out-of-bounds write in hiddev_ioctl_usage()
  tpm: Unify the mismatching TPM space buffer sizes
  usb: dwc3: gadget: Handle ZLP for sg requests
  usb: dwc3: gadget: Fix handling ZLP
  usb: dwc3: gadget: Don't setup more than requested
  btrfs: check the right error variable in btrfs_del_dir_entries_in_log
  usb: storage: Add unusual_uas entry for Sony PSZ drives
  USB: cdc-acm: rework notification_buffer resizing
  USB: gadget: u_f: Unbreak offset calculation in VLAs
  USB: gadget: f_ncm: add bounds checks to ncm_unwrap_ntb()
  USB: gadget: u_f: add overflow checks to VLA macros
  usb: host: ohci-exynos: Fix error handling in exynos_ohci_probe()
  USB: Ignore UAS for JMicron JMS567 ATA/ATAPI Bridge
  USB: quirks: Ignore duplicate endpoint on Sound Devices MixPre-D
  USB: quirks: Add no-lpm quirk for another Raydium touchscreen
  usb: uas: Add quirk for PNY Pro Elite
  USB: yurex: Fix bad gfp argument
  drm/amd/pm: correct Vega12 swctf limit setting
  ...

Change-Id: Iece02c55e9b3446bdda5dc7bdfbe3e310b2dbc83

Conflicts:
	arch/arm/boot/dts/rk322x.dtsi
	arch/arm64/boot/dts/rockchip/rk3399.dtsi
	arch/arm64/kernel/cpuinfo.c
	drivers/clk/clk.c
	drivers/clk/rockchip/clk-cpu.c
	drivers/clk/rockchip/clk-rk3228.c
	drivers/devfreq/governor_simpleondemand.c
	drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
	drivers/gpu/drm/drm_edid.c
	drivers/hid/usbhid/hid-core.c
	drivers/media/i2c/ov5695.c
	drivers/media/v4l2-core/v4l2-ioctl.c
	drivers/regulator/core.c
	drivers/thermal/cpu_cooling.c
	drivers/usb/core/quirks.c
	drivers/usb/dwc2/platform.c
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/core.h
	drivers/usb/dwc3/gadget.c
	drivers/usb/host/ehci-platform.c
	drivers/usb/storage/unusual_uas.h
	include/drm/drm_connector.h
	include/linux/clk-provider.h
	include/linux/devfreq.h
	include/linux/pci_ids.h
	kernel/power/wakeup_reason.c
	mm/memory.c
	mm/swapfile.c
2020-09-24 17:59:50 +08:00