Commit Graph

1055188 Commits

Author SHA1 Message Date
Tao Huang
d648938407 Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common
* android12-5.10: (1647 commits)
  FROMGIT: mm/page_owner: record the timestamp of all pages during free
  UPSTREAM: mm/page_io: use pr_alert_ratelimited for swap read/write errors
  ANDROID: roll back xt_IDLETIMER to 5.10.21 upstream/vanilla version
  ANDROID: qcom: Add ip, rtnl and free related symbols
  FROMGIT: power: supply: Fix build error when CONFIG_POWER_SUPPLY is not enabled.
  FROMGIT: usb: dwc3: gadget: modify the scale in vbus_draw callback
  BACKPORT: FROMLIST: usb: dwc3: gadget: Clear DEP flags after stop transfers in ep disable
  FROMLIST: Makefile: fix GDB warning with CONFIG_RELR
  ANDROID: refresh ABI XML before enabling KMI enforcement
  Revert "Revert "ANDROID: GKI: Enable bounds sanitizer""
  Revert "ANDROID: Revert "f2fs: fix to tag FIEMAP_EXTENT_MERGED in f2fs_fiemap()""
  ANDROID: Enforce KMI stability
  ANDROID: enable options prior to enforcing KMI
  Revert "ANDROID: GKI: temporarily disable LTO/CFI"
  ANDROID: gki_defconfig: Enable NET_CLS_{BASIC,TCINDEX,MATCHALL} & NET_ACT_{GACT,MIRRED}
  FROMLIST: selftests: Add a MREMAP_DONTUNMAP selftest for shmem
  FROMLIST: mm: Extend MREMAP_DONTUNMAP to non-anonymous mappings
  ANDROID: GKI: enable CONFIG_CMA_SYSFS
  ANDROID: make cma_sysfs experimental
  FROMLIST: mm: cma: support sysfs
  ...

Change-Id: I6145eddeb253bea33164fc909e7790d30f17ef1f
2021-04-25 18:33:22 +08:00
Finley Xiao
154292ae52 nvmem: rockchip-otp: Add support for rk3568-otp
This adds the necessary data for handling efuse on the rk3568.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ia74d77b68a6303223eaccdc08e882851a917f50f
2021-04-22 16:07:27 +08:00
Sugar Zhang
d731c63d8b nvmem: rockchip-otp: Add write protection for oem zone
This patch reserved 16 bytes at the tail for write protection
and future extension.

+----------+------------------+--------------------------+
| TYPE     | RANGE(byte)      | NOTE                     |
+----------+------------------+--------------------------+
| system   | 0x000 ~ 0x0ff    | system info, read only   |
+----------+------------------+--------------------------+
| oem      | 0x100 ~ 0x1ef    | for customized           |
+----------+------------------+--------------------------+
| reserved | 0x1f0 ~ 0x1f7    | future extension         |
+----------+------------------+--------------------------+
| wp       | 0x1f8 ~ 0x1ff    | write protection for oem |
+----------+------------------+--------------------------+

+-----+    +------------------+
| wp  | -- | wp for oem range |
+-----+    +------------------+
| 1f8 |    | 0x100 ~ 0x11f    |
+-----+    +------------------+
| 1f9 |    | 0x120 ~ 0x13f    |
+-----+    +------------------+
| 1fa |    | 0x140 ~ 0x15f    |
+-----+    +------------------+
| 1fb |    | 0x160 ~ 0x17f    |
+-----+    +------------------+
| 1fc |    | 0x180 ~ 0x19f    |
+-----+    +------------------+
| 1fd |    | 0x1a0 ~ 0x1bf    |
+-----+    +------------------+
| 1fe |    | 0x1c0 ~ 0x1df    |
+-----+    +------------------+
| 1ff |    | 0x1e0 ~ 0x1ef    |
+-----+    +------------------+

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: If23bb8d77d684a3bff5797e35914c1f897c69fb0
2021-04-22 16:07:27 +08:00
Sugar Zhang
6ac3f5e46b nvmem: rockchip-otp: Add magic-number for enable otp write func
This patch add magic for enable otp write func to avoid unexpected written.

e.g.:

echo 1380926283 > /sys/module/nvmem_rockchip_otp/parameters/rockchip_otp_wr_magic

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I0d2d5fe97de4f69f2a30142d62a21e17d818d98f
2021-04-22 16:07:27 +08:00
Sugar Zhang
57116bb96f nvmem: rockchip-otp: Add mutex for read/write
Change-Id: I4d8b1b3d8e4ad729d3beeccf2357342e45643676
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-04-22 16:07:27 +08:00
Sugar Zhang
e34822842c nvmem: rockchip-otp: Add support for oem zone write
The oem zone ranges from 256 to 511 bytes. userspace
can read/write the raw NVMEM file located at
/sys/bus/nvmem/devices/rockchip-otp0/nvmem

The rest of otp which ranging from 0 to 255 bytes is
used for system, it is protected by hardware, any writes
to this range will be ignored and not take effect.

e.g.

/#hexdump -C /sys/bus/nvmem/devices/rockchip-otp0/nvmem
00000000  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
*
00000100  ff ff ff ff ff ff ff ff  0f 0f 0f 0f 0f 0f 0f 0f
00000110  00 01 02 03 04 05 06 07  08 09 0a 0b 0c 0d 0e 0f
00000120  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
*
00000200

Change-Id: I3e222d87525887fd5a38aa724e97f2dd163345aa
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-04-22 16:07:27 +08:00
Finley Xiao
4912677140 nvmem: rockchip-otp: Add support for rv1126-otp
This adds the necessary data for handling efuse on the rv1126.

Change-Id: Id46ae2354674482ca1e2d69888acce3028f0f902
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-04-22 16:07:27 +08:00
Tao Huang
e887ab9108 nvmem: rockchip-otp: refactor rockchip_data
Add clocks and reg_read to rockchip_data, allow support more SoCs.

Change-Id: I45271d69dae808d741c953ce61b921b9a3d21202
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-22 16:07:27 +08:00
Finley Xiao
b8a9d36974 nvmem: rockchip-otp: Add support to initialize otp when probe
Change-Id: I6ae99f68394787fc2e8e6868d788390f271073ed
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-04-22 16:07:27 +08:00
Finley Xiao
60c3b5abb6 nvmem: rockchip-otp: Update driver to use reset array API
This patch also makes resets as optional.

Change-Id: I25c0be3e811fafad824dd9096a6b89b3fc7d4b47
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-04-22 16:07:27 +08:00
Finley Xiao
0fa9ee931b soc: rockchip: Add rockchip system monitor support
Change-Id: I4cb7fafcb33fda0212b5ad1f6eebd44503556336
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-04-22 14:14:51 +08:00
Tao Huang
d550abe23f arm64: rockchip_defconfig: Enable CONFIG_ROCKCHIP_OPP
default y on 4.19.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1c1ec22ada995ffb61067d7a7f818c48390328da
2021-04-22 14:14:09 +08:00
Finley Xiao
21bc2c85b0 soc: rockchip: add CONFIG_ROCKCHIP_OPP for rockchip_opp_select.c
Change-Id: I0cde56d1ad7482c8d4e8b518fc49cc028da6501b
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-04-22 14:14:03 +08:00
Tao Huang
2c276cf23c arm64: rockchip_defconfig: Enable CONFIG_ROCKCHIP_IPA
default y on 4.19.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I70136e77bbdf7e94c4134a8b0294b01a03aa3730
2021-04-22 14:13:55 +08:00
Finley Xiao
8cb20ca552 soc: rockchip: Add a simple power model for ipa
This patch adds support to calculate the static power in milliwatts
consumed by devices.

Change-Id: Ied4ba5adecea45ff34b372a6e23c70882000aef3
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-04-22 14:13:47 +08:00
Tao Huang
8f6c950a10 arm64: rockchip_defconfig: reorder CONFIG_ROCKCHIP_PVTM
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I840b4cea66f18c775e5c2382b38e8aec976d499f
2021-04-22 14:13:40 +08:00
Finley Xiao
f6fb2a487a soc: rockchip: pvtm: add driver handling Rockchip pvtm
This patch supports acquiring pvtm values.

Change-Id: I20c0c5a5136371880da1c246b0d71c7a2bddc1d6
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-04-22 14:12:18 +08:00
Tao Huang
6fff252f36 arm64: rockchip_defconfig: Enable CONFIG_ROCKCHIP_GRF
default y on 4.19.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I641a95a86c6d3c39b7465895eb2a0237a2476c5d
2021-04-22 10:55:41 +08:00
Huibin Hong
f79786d3b1 soc: rockchip: grf: enable module
Change-Id: I8e9a264f41a8b84e559688a3c0980b01ed061031
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2021-04-22 10:53:30 +08:00
Huibin Hong
347111763f soc: rockchip: grf: enable swd and uart2 switch for rv1126
Change-Id: Ideee9a80f7e2763ed15fe1ed7ac627f7fa6a9c71
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-04-22 10:51:49 +08:00
Shawn Lin
436cb774c7 soc: rockchip: grf: postpone jtag switching for PX30 Soc
PX30_GRF_SOC_CON5 is intended for postponing the auto switch
of pinmux from SDMMC to JTAG after removing the SD cards.
However, the default value is too small to meet the actual
requirement. Increase this value to 5 seconds currently.

Change-Id: I18fafe07822b81d9cd448ab71c1f0e49a75db357
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2021-04-22 10:51:49 +08:00
Huibin Hong
f7079a2411 soc: rockchip: grf: unmask uart dma request for RK3308 Soc
Change-Id: I06d955d92d04785bea3248b82fe99c515d471467
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2021-04-22 10:51:49 +08:00
Simon Xue
5e4f5a2dca soc: rockchip: hw-decompress: Add support rockchip hardware decompress
Change-Id: Ib882919642a6c72b0292292bc0fd35d7a3d78dee
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-21 20:33:13 +08:00
Tao Huang
0365836557 arm64: rockchip_defconfig: Enable CONFIG_ROCKCHIP_DEBUG
default y on 4.19.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I947ed816e7ede80b3824ffccc52a38f74a5937e5
2021-04-21 19:49:41 +08:00
Huibin Hong
37d39fb8f2 soc: rockchip: debug: print dbgpcsr of cpus when panic
Change-Id: I4a3d60986b0bd23d43fa7fd5479b43cb65662996
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2021-04-21 19:47:38 +08:00
Elaine Zhang
30ab0ae1d1 soc: rockchip: modify the config ROCKCHIP_PM_DOMAINS to tristate
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I09a067d6842fb0fef3329c4e3eb0701fa6f41968
2021-04-21 19:40:05 +08:00
Tao Huang
ecf95a329a arm64: rockchip_defconfig: Enable CONFIG_ROCKCHIP_CPUINFO
default y on 4.19.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ie2f1555adb43e3eb1b10e04479efb1e771169531
2021-04-21 17:18:59 +08:00
Tao Huang
374a8f27c2 soc: rockchip: add cpuinfo support
Set system_serial_low/high from eFuse ID.
Serial can read from /proc/cpuinfo.

Change-Id: If412fc5a89a5e5092b510452fc5a126fdd374ac2
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-21 17:17:52 +08:00
Yifeng Zhao
a97ecd3b34 soc: rockchip: disable loader update vi vendor storage
The note /dev/vendor_storage include api to update loader,
this node must config root user access only, but some
project set this node`s owner as bluetooth ,it is a high
risk that the loader data will be corrupted.

Disable this api by default.

Change-Id: I6beb1b3cf51bffebd0ae05368d8c266439a61f91
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
2021-04-20 21:35:15 +08:00
Yifeng Zhao
537dce547b soc: rockchip: support mtd vendor storage
This patch is used to support vendor storage for SPI NAND
and SLC NAND via mtd interface.

Change-Id: I6f011cb9052a014845629e103976b36adb5fa589
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
2021-04-20 21:29:21 +08:00
Dingqiang Lin
23ad2d5063 soc: rockchip: add flash vendor storage support
Change-Id: I0261e652161e6a20a4d988c4ddfd7f186ad2200e
Signed-off-by: Dingqiang Lin <jon.lin@rock-chips.com>
2021-04-20 21:22:41 +08:00
Tao Huang
7f2c096357 soc: rockchip: sdmmc_vendor_storage: Include rk_sdmmc_ops.h
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I6ab2cc7741f47f175f1a3e429a9ebfafcf3cf7ad
2021-04-20 21:22:41 +08:00
Tao Huang
1ebc797453 mmc: host: rk_sdmmc_ops depends on CONFIG_ROCKCHIP_MMC_VENDOR_STORAGE
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I03a003343dec9ffb7610aa2690467d53e0bd300d
2021-04-20 21:22:40 +08:00
Tao Huang
d1c6b54ea3 arm64: rockchip_defconfig: Enable emmc vendor storage
+CONFIG_ROCKCHIP_VENDOR_STORAGE=y
+CONFIG_ROCKCHIP_MMC_VENDOR_STORAGE=y

default y on 4.19.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I0cc09457466f65485e705ce539cf48e02473468f
2021-04-20 21:22:40 +08:00
Yifeng Zhao
6f05d54b63 soc: rockchip: mmc: add emmc vendor storage
Change-Id: I3996cccaed265af2295dbc1ee77746928e1beec5
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
2021-04-20 21:22:40 +08:00
Tao Huang
644a09599f soc: rockchip: add CPU_XXX config
For build kernel only support the given CPU.

Change-Id: I3d4790779d0ad0ecff6661ffb0b70e2df287fd5a
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-20 20:26:46 +08:00
Lin Jinhan
e12e07ff48 hwrng: rockchip - add support for Rockchip HW RNG
Change-Id: Ia14bd624716eb6531ef8674843ccfbada3197d8e
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2021-04-20 19:02:38 +08:00
Joseph Chen
6c14d5d76c firmware: rockchip: add compile option for rockchip sip
Change-Id: I996a90b3f6cb471f255566dfab0059a55da8866d
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2021-04-16 19:24:42 +08:00
Tao Huang
c75dc801f4 arm64: rockchip_defconfig: Enable CONFIG_ROCKCHIP_FIQ_DEBUGGER
Which default y on 4.19

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I437ec5402b1a5802b9cdf8498bbb9321b39d1e20
2021-04-16 15:41:24 +08:00
Huibin Hong
8a4d1d8f1f soc: rockchip: add rk fiq debugger platform driver
Change-Id: Ibb32efc190ce49d657973133a30632c71f0d806c
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2021-04-16 15:39:25 +08:00
Huibin Hong
67ab450d38 staging: android: Add generic fiq serial debugger
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I6c0e1a17c45f077b45cb29287648e901b62abab0
2021-04-16 15:08:11 +08:00
Shawn Lin
b03bca5eae mmc: dw_mmc-rockchip: Just set default sample value for legacy mode
.set_ios() is called from .resume() as well. For SDIO device which sets
keep-power-in-suspend, nothing should be changed after resuming, as well
as sample tuning value, since this value is tuned already. So we should
not overwrite it with the default value.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I18974f28d7a2253fd151817a5a3e4105c2e976b3
2021-04-16 14:22:36 +08:00
Tao Huang
a21e820a5a arm64: cpuinfo: add system serial support
Change-Id: I4542f07226e47e67be1f2792cffaa71fd6401442
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-15 20:47:17 +08:00
Tao Huang
4efaa99002 arm64: cpuinfo: compat task get hwcap from compat_hwcap_str
backport 3.10 patch

Change-Id: Ice8b552450f34772ece0a56f04ba758886c955e2
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-15 20:47:17 +08:00
Tao Huang
d4d46e45d5 arm64: dts: rockchip: Add rk356x boards to Makefile
This reverts part of commit 251c226c35 ("rk: revert to v4.19").

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ie2742038ee35cb4ff89ba3abc6a2e8f900461e6f
2021-04-15 18:54:50 +08:00
Tao Huang
eae9461bbd arm64: dts: rockchip: Fix the warnings caused by i2c_bus_reg
Fix the following warnings:
arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts:274.18-285.4:
ERROR (i2c_bus_reg): /i2c@fe5c0000/wacom@09: I2C bus unit address format error, expected "9"
arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts:551.18-562.4:
ERROR (i2c_bus_reg): /i2c@fe5b0000/wacom@09: I2C bus unit address format error, expected "9"
arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts:678.17-690.4:
ERROR (i2c_bus_reg): /i2c@fe5e0000/kxtj3@0e: I2C bus unit address format error, expected "e"
arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts:698.18-710.4:
ERROR (i2c_bus_reg): /i2c@fe5a0000/wacom@09: I2C bus unit address format error, expected "9"

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia116424ecbb3285d77274ef19b6b93ef5f0f1480
2021-04-15 18:54:50 +08:00
Wu Liangqing
bdf1b69b38 mmc: dw_mmc-rockchip: set xfer timer 100ms
Fixes: 1d1a1f03f3 ("mmc: dw_mmc: add xfer timer for avoid DTO without actual data payload")
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I00ae095cff35b3960e1f9189d03f9908fed0aa33
2021-04-15 15:15:19 +08:00
Tao Huang
33bae277f6 gpu: remove unused rogue_m driver
Change-Id: I2d38df29926bc7c2e7e618b777cd36768cab0d0e
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-13 18:55:57 +08:00
Tao Huang
b72885a1c1 gpu: remove unused rogue driver
Change-Id: I067a96e88b4a389470b12446dea573134b835018
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-13 18:46:13 +08:00
Shawn Lin
78f9ac0daa treewide: Migrate rockchip dts file to use new host type tags
supports-* stuff were used for rockchip platforms to speed up booting
if we know what exactly the host was used for. As we have upstreamed all
these with some very similar ways, now it's the time we migrate our dts
files to use new properties.

They were converted by:

sed -i "s/supports-emmc;/no-sdio;\n\tno-sd;/g" `grep supports-emmc -rl arch/*`
sed -i "s/supports-sd;/no-sdio;\n\tno-mmc;/g" `grep supports-sd -rl arch/*`
sed -i "s/supports-sdio;/no-sd;\n\tno-mmc;/g" `grep supports-sdio -rl arch/*`

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I33e5317ee5c7305803cf18ff4a370658abf555b0
2021-04-13 14:40:36 +08:00