Commit Graph

1066174 Commits

Author SHA1 Message Date
Elliot Berman
774f1bd29c ANDROID: Disable CFI on restricted vendor hooks in TRACE_HEADER_MULTI_READ
commit 5e767aa07e ("ANDROID: use static_call() for restricted hooks")
introduced an implementation of __iteriter_##_name when
TRACE_HEADER_MULTI_READ is defined. __nocfi that function as well in
order to keep the performance optimizations from commit 384becf164
("ANDROID: Disable CFI on restricted vendor hooks").

Fixes: 384becf164 ("ANDROID: Disable CFI on restricted vendor hooks")
Change-Id: I6ea1cd767bad95c324c06398475174b710ae4dbe
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
2021-09-09 17:44:12 +00:00
Jaegeuk Kim
90c60a51f5 UPSTREAM: f2fs: guarantee to write dirty data when enabling checkpoint back
We must flush all the dirty data when enabling checkpoint back. Let's guarantee
that first by adding a retry logic on sync_inodes_sb(). In addition to that,
this patch adds to flush data in fsync when checkpoint is disabled, which can
mitigate the sync_inodes_sb() failures in advance.

Bug: 194449609
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit dddd3d6529)
Change-Id: I5bbef7386ddbb44fd925262fb68a8ef0a4960993
2021-09-09 10:41:52 +00:00
Tao Huang
72f82d9b66 ARM: rockchip_defconfig: update by savedefconfig
CONFIG_MEDIA_SUBDRV_AUTOSELECT is default n.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I354ca6c3a04adb2effa4656d21ebac132851d395
2021-09-09 18:40:15 +08:00
Tao Huang
1f5fdb76d9 arm64: rockchip_defconfig: update by savedefconfig
CONFIG_MEDIA_SUBDRV_AUTOSELECT is default n.
CONFIG_MEDIA_CONTROLLER and CONFIG_VIDEO_V4L2_SUBDEV_API is selected by
CONFIG_VIDEO_DW9714.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I98b93dc1cc204089db2e31665210710437a1df19
2021-09-09 18:40:15 +08:00
Greg Kroah-Hartman
06e0ef2a71 ANDROID: GKI: fix up spi structure change
The spi_controller structure changed 2 fields from unsigned to signed to
fix a bug in 5.10.63.  Work around that by only preserve the previous
CRC symbols, while keeping the signed change so that the bug remains
fixed as the structure size did not change at all.

Note, this affects the libabigail structures, so they are updated as
well:

Functions changes summary: 0 Removed, 1 Changed (345 filtered out), 0 Added functions
Variables changes summary: 0 Removed, 0 Changed (3 filtered out), 0 Added variables

1 function with some indirect sub-type change:

  [C] 'function spi_controller* __devm_spi_alloc_controller(device*, unsigned int, bool)' at spi.c:2490:1 has some indirect sub-type changes:
    return type changed:
      in pointed to type 'struct spi_controller' at spi.h:472:1:
        type size hasn't changed
        2 data member changes (1 filtered):
          'u8 unused_native_cs' has *some* difference - please report as a bug
          type of 'u8 max_native_cs' changed:
            typedef name changed from u8 to s8 at int-ll64.h:16:1
            underlying type 'typedef __u8' at int-ll64.h:21:1 changed:
              typedef name changed from __u8 to __s8 at int-ll64.h:20:1
              underlying type 'unsigned char' changed:
                type name changed from 'unsigned char' to 'signed char'
                type size hasn't changed

Fixes: 35f3f8504c ("spi: Switch to signed types for *_native_cs SPI controller fields")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0e3f02558bfdd6c36f41c172977e1bf51bfbc263
2021-09-09 11:59:07 +02:00
Tao Huang
6e6807ee01 arm64: rockchip_gki.config: Enable more camera sensors
+CONFIG_VIDEO_GC2145=m
+CONFIG_VIDEO_GC2385=m
+CONFIG_VIDEO_GC4C33=m
+CONFIG_VIDEO_GC8034=m
+CONFIG_VIDEO_OV13850=m
+CONFIG_VIDEO_OV8858=m

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia23536c7bc017e4f66a6a55eac65a498025176f3
2021-09-09 17:38:12 +08:00
Tao Huang
50e3124b35 arm64: rockchip_gki.config: Enable CONFIG_VIDEO_ROCKCHIP_ISP
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1d5fbcce966f8f382c91c899faf636fd5487f40d
2021-09-09 17:35:30 +08:00
Cai YiWei
d7a97ba0f3 media: rockchip: isp: fix compile error
Change-Id: I2f4705c826cd8368eed207d7b2ed9b6717bdaa7d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-09-09 17:30:20 +08:00
Jon Lin
db0f003c66 mtd: nand: bbt: Fix error in BBT block location methord
Avoid the high 32btis input param of GENMASK bigger then BITS_PER_LONG.

For example offs 62, bits_per_block 3, and BITS_PER_LONG 64, then:
GENMASK(offs + bits_per_block - 1, offs) -> GENMASK(64, 62) -> 0.
But actually we want to mask GENMASK(63, 62) which is equals to
0xc000000000000000.

Change-Id: Ie3ee89a4b3e3deca45ccf429bfdfc5b88e3e6b9c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-09-09 16:39:20 +08:00
Xiao Ya peng
7d408752e0 arm64: configs: rk3568_nvr.config: enabled CONFIG_HZ_100.
disabled CONFIG_HIGH_RES_TIMERS

Signed-off-by: Xiao Ya peng <yp.xiao@rock-chips.com>
Change-Id: I8fcfa9880d1988536888081b2fccc2e3c58431ed
2021-09-09 16:36:10 +08:00
Guochun Huang
a1e099fb78 drm/bridge: dw-mipi-dsi: dual-channel-dsi: power off dual phy during sleep
Change-Id: Ic3abc81d7a6ffb8016d884ea29b3cb48e983f5f8
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2021-09-09 15:27:24 +08:00
Mike Rapoport
8cf5bb6946 UPSTREAM: mm: memblock: fix section mismatch warning again
Commit 34dc2efb39 ("memblock: fix section mismatch warning") marked
memblock_bottom_up() and memblock_set_bottom_up() as __init, but they
could be referenced from non-init functions like
memblock_find_in_range_node() on architectures that enable
CONFIG_ARCH_KEEP_MEMBLOCK.

For such builds kernel test robot reports:

   WARNING: modpost: vmlinux.o(.text+0x74fea4): Section mismatch in reference from the function memblock_find_in_range_node() to the function .init.text:memblock_bottom_up()
   The function memblock_find_in_range_node() references the function __init memblock_bottom_up().
   This is often because memblock_find_in_range_node lacks a __init  annotation or the annotation of memblock_bottom_up is wrong.

Replace __init annotations with __init_memblock annotations so that the
appropriate section will be selected depending on
CONFIG_ARCH_KEEP_MEMBLOCK.

Link: https://lore.kernel.org/lkml/202103160133.UzhgY0wt-lkp@intel.com
Link: https://lkml.kernel.org/r/20210316171347.14084-1-rppt@kernel.org
Fixes: 34dc2efb39 ("memblock: fix section mismatch warning")
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Reported-by: kernel test robot <lkp@intel.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Acked-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit a024b7c285)
Bug: 187129171
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: Ic5c2281030801424904ba3df442464d670e37667
2021-09-08 20:50:48 +00:00
Zefa Chen
e6cd868ed8 media: i2c: ov13850 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Id2c6b146f0c80bee2508ba1ef2f82ed4e250e218
2021-09-08 20:08:51 +08:00
Zefa Chen
e2f9aba1fb media: i2c: ov12d2q fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia18274073299cb0d867d800a431d806a72bb821a
2021-09-08 20:08:37 +08:00
Zefa Chen
7191c26865 media: i2c: ov9281 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I9c9605d668bae13c1c90a89be3bc9a54cedc103e
2021-09-08 20:08:11 +08:00
Zefa Chen
1fc1905431 media: i2c: ov8858 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I72c29e787a6ee82b7ade0e73ed462afeac301f34
2021-09-08 20:07:56 +08:00
Zefa Chen
0fa474c1db media: i2c: ov4689 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I804e63414962484f85909dab524344dad85463a7
2021-09-08 20:07:10 +08:00
Zefa Chen
980313270d media: i2c: ov4688 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I8c3b6206804d58014bfa58d1d0f4f389e8fdf9d1
2021-09-08 20:07:01 +08:00
Zefa Chen
68724d4d7b media: i2c: ov4686 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I809a81e719587a0e81ae87e752dfab59300fb7ce
2021-09-08 20:06:26 +08:00
Zefa Chen
67a0f5ecfa media: i2c: ov2718 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib3eee457614461400603df9c6972799fafa15254
2021-09-08 20:05:59 +08:00
Zefa Chen
07d6f292b6 media: i2c: ov02k10 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I5c463e531a8b97d874e3dc793095f4f481961ea5
2021-09-08 20:05:26 +08:00
Zefa Chen
9832de4c02 media: i2c: ov02b10 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I3ff2e3cdd7667f324923101434a663990c99d45c
2021-09-08 20:05:02 +08:00
Zefa Chen
f3053daf2e media: i2c: os05a20 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie73e5a8c51168fccef7a2953f1a9ae046b9683c7
2021-09-08 20:04:48 +08:00
Zefa Chen
a103d7b776 media: i2c: os04a10 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I2b18912a38abc484ae5d536f5a0c972f446e932a
2021-09-08 20:04:23 +08:00
Zefa Chen
49c227761a media: i2c: os02g10 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iac097db4aa0c03409ba4c84cc9fa68e1abbb4d68
2021-09-08 19:30:50 +08:00
Zefa Chen
871a7558a3 media: i2c: imx415 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I221bfc2c80d935f6cded97ec4fd26b6e88ba2e4b
2021-09-08 19:29:39 +08:00
Zefa Chen
7c143edefb include: uapi/linux/rk-camera-module.h add RKMODULE_GET_SONY_BRL command
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I55bbf4c5e5163286e1f8c68b1a1734bcefcf2b22
2021-09-08 19:29:32 +08:00
Zefa Chen
84a3d28c54 media: i2c: imx378 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I51d6cf84eff318655b856f3289bb733281c46708
2021-09-08 19:29:29 +08:00
Zefa Chen
9830a41bda media: i2c: imx347 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I07ffa7f6af00447a03513d311c78174ebc775358
2021-09-08 19:29:17 +08:00
Zefa Chen
b8bf953518 media: i2c: imx335 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib32be90ab02d3866f0445d0eeaf6db9484b3f985
2021-09-08 19:29:00 +08:00
Zefa Chen
2b8ebc7099 media: i2c: imx334 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia1ec948b69b12181030ff8f41665482c0c45c1fe
2021-09-08 19:28:00 +08:00
Zefa Chen
b4d2b726b4 media: i2c: imx327 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ibb8e83153afb93b03a843e6736a67aa6403b4641
2021-09-08 19:27:50 +08:00
Zefa Chen
039feed83a media: i2c: imx323 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie2bab9a6b80217b69dbd9bc2a48e80985001acd7
2021-09-08 19:16:58 +08:00
Zefa Chen
1f97b865ce media: i2c: imx317 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I881bb7d8613bde13109349d58b42682c18f5c738
2021-09-08 19:14:49 +08:00
Zefa Chen
95ffa7ac25 media: i2c: imx307 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I8327261ab82f84329ebb65f54fea396640a44b15
2021-09-08 19:13:31 +08:00
Zefa Chen
84d1fcadf6 media: i2c: ar0230 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I493409d941ef8897755901c9591ed9bc2b3b8477
2021-09-08 19:12:09 +08:00
Zefa Chen
d0afe23adc media: i2c: gc02m2 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I58397455b74b3e828d598c4f7d24d9ce22239aba
2021-09-08 19:12:05 +08:00
Zefa Chen
cfac4b4f7d media: i2c: gc2053 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I31afb9537914a945c34a12c5dec82317d0966cb2
2021-09-08 19:11:59 +08:00
Zefa Chen
2a4a44c86f media: i2c: gc2093 fix compile erro
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I2a14239d916baa2011e0b9be0482de829b47489d
2021-09-08 19:11:56 +08:00
Zefa Chen
867f8374b1 media: i2c: gc2145 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I5a17191191cf77ce8b9659412e176399b7a91c65
2021-09-08 19:11:52 +08:00
Zefa Chen
68cd1ce67e media: i2c: gc2385 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I0173f964629c0b5e91d5d03557bcbf211f694dac
2021-09-08 19:10:49 +08:00
Zefa Chen
fadb99909b media: i2c: gc4663 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I1ceaeb69a5542a04998ec5c538ad0a8c2ac7851c
2021-09-08 19:10:45 +08:00
Zefa Chen
f7e5b13d65 media: i2c: gc4c33 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I3061acd579c00ddc72985f658d23b0311e45710c
2021-09-08 19:10:42 +08:00
Zefa Chen
bb5c40169f media: i2c: gc5025 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iefb494c5b5fdee0f664e43a40761b6271d51ba78
2021-09-08 19:10:39 +08:00
Zefa Chen
5d9f877ff7 media: i2c: gc8034 fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I637495f900c31dd8cd46d27ded30f34017e02395
2021-09-08 19:10:33 +08:00
Jon Lin
f05fb91b2e arm64: rockchip_linux_defconfig: change sfc to standard spi framework
Support sfc spi standard drivers from drivers/spi/spi-rockchip-sfc.c.

Change-Id: Ic21223e7ece1ef0143a2021151c8cfc8a0008891
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-09-08 17:25:13 +08:00
Jon Lin
202d0ee2fe ARM: configs: rv1126_robot_defconfig: change sfc to standard spi framework
Support sfc spi standard drivers from drivers/spi/spi-rockchip-sfc.c.

Change-Id: I8590da2d1c628ccede2c8e6a1a3224a795cb82a9
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-09-08 17:22:52 +08:00
Jon Lin
0e7fc44087 ARM: rv1126_defconfig: change sfc to standard spi framework
Support sfc spi standard drivers from drivers/spi/spi-rockchip-sfc.c.

Change-Id: I4e9608334093fa5d1c450e68c3cb230ba79b48f2
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-09-08 17:21:08 +08:00
Jon Lin
7fd3742946 ARM: dts: rockchip: add flash subnode to sfc for rv1126 board
Change-Id: I0b104a67f0714ed9c0a82ad4afecb90c8f8817a9
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-09-08 17:17:28 +08:00
Jon Lin
8e5c2775a9 ARM: dts: rv1126: change sfc to standard spi framework
Support sfc spi standard drivers from drivers/spi/spi-rockchip-sfc.c.

Change-Id: If94a343a6c19e26e3c2dd343623252bf5f8e159b
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-09-08 16:57:49 +08:00