From c07e36bfc56c9d4c2ec896e09d243159552291c8 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 11 May 2021 07:29:32 +0000 Subject: [PATCH 1/3] ANDROID: db845c_gki.fragment: Add QCOM_TSENSE config to avoid thermal crashes This adds QCOM_TSENSE to the db845c_gki.fragment which is needed to avoid hard crashes seen on db845c (which crash into USB dump mode). This was causing some troube in our testing as we'd occasionally see hard crashes in certian CTS tests (also reproducible with a forkbomb). After lots of debugging we've narrowed down this config as the change which avoids the hard crashes. Thanks to: Vinod Koul and Bjorn Andersson for helping debug this issue! Bug: 146449535 Reported-by: YongQin Liu Signed-off-by: John Stultz Change-Id: I0752c85e44028e6272c14b59fa09d2baf2e18feb --- arch/arm64/configs/db845c_gki.fragment | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/db845c_gki.fragment b/arch/arm64/configs/db845c_gki.fragment index c8ca9a8110c6..2e69bf2494cb 100644 --- a/arch/arm64/configs/db845c_gki.fragment +++ b/arch/arm64/configs/db845c_gki.fragment @@ -12,6 +12,7 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=m CONFIG_PINCTRL_SDM845=m CONFIG_POWER_RESET_QCOM_PON=m CONFIG_SYSCON_REBOOT_MODE=m +CONFIG_QCOM_TSENS=m CONFIG_QCOM_WDT=m CONFIG_PM8916_WATCHDOG=m CONFIG_MFD_SPMI_PMIC=m From 1c75846438c1378f7a74f2b20429ea0bd5881c46 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 11 May 2021 21:31:41 +0000 Subject: [PATCH 2/3] ANDROID: abi_gki_aarch64_db845c: Regenerate symbols list after enabling QCOM_TSENSE After enabling QCOM_TSENSE to avoid thermal crashes, we need to add some symbols to the symbol list. Generated with: BUILD_CONFIG=common/build.config.db845c build/build_abi.sh -s BUILD_CONFIG=common/build.config.gki.aarch64 build/build_abi.sh -u Leaf changes summary: 1 artifact changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 1 Added function: [A] 'function int thermal_zone_get_slope(thermal_zone_device*)' Bug: 146449535 Signed-off-by: John Stultz Change-Id: Ieea94a314c0f513bb8af447fe6673b2f40986748 --- android/abi_gki_aarch64.xml | 481 +++++++++++++++++---------------- android/abi_gki_aarch64_db845c | 14 +- 2 files changed, 252 insertions(+), 243 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index 5cf98b3e7288..1440b007a403 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -4102,6 +4102,7 @@ + @@ -28209,7 +28210,7 @@ - + @@ -30241,7 +30242,7 @@ - + @@ -32514,7 +32515,7 @@ - + @@ -80827,7 +80828,7 @@ - + @@ -80899,7 +80900,7 @@ - + @@ -80972,7 +80973,7 @@ - + @@ -83219,7 +83220,7 @@ - + @@ -83291,7 +83292,7 @@ - + @@ -83336,7 +83337,7 @@ - + @@ -130129,6 +130130,10 @@ + + + + @@ -164709,13 +164714,13 @@ - - + + - - - + + + @@ -165784,10 +165789,210 @@ + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -165871,7 +166076,7 @@ - + @@ -165922,7 +166127,18 @@ + + + + + + + + + + + @@ -166111,6 +166327,13 @@ + + + + + + + @@ -166118,6 +166341,10 @@ + + + + @@ -177035,218 +177262,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -177330,17 +177346,6 @@ - - - - - - - - - - - diff --git a/android/abi_gki_aarch64_db845c b/android/abi_gki_aarch64_db845c index 671c62ec75aa..b77a5a8637cb 100644 --- a/android/abi_gki_aarch64_db845c +++ b/android/abi_gki_aarch64_db845c @@ -92,6 +92,7 @@ devm_phy_get devm_pinctrl_register devm_platform_ioremap_resource + devm_regmap_field_alloc __devm_regmap_init_mmio_clk devm_regulator_bulk_get devm_regulator_get @@ -213,6 +214,7 @@ irq_set_irq_wake irq_to_desc jiffies + jiffies_to_usecs kfree kfree_skb kimage_vaddr @@ -251,6 +253,8 @@ __netdev_alloc_skb netif_napi_add netif_napi_del + nvmem_cell_get + nvmem_cell_put nvmem_cell_read of_address_to_resource of_alias_get_id @@ -368,6 +372,7 @@ __register_rpmsg_driver regmap_bulk_read regmap_bulk_write + regmap_field_read regmap_read regmap_update_bits_base regmap_write @@ -1048,8 +1053,6 @@ no_llseek nsecs_to_jiffies ns_to_timespec - nvmem_cell_get - nvmem_cell_put of_device_is_available of_dma_configure of_drm_find_bridge @@ -1227,10 +1230,8 @@ of_irq_get # required by qcom_hwspinlock.ko - devm_regmap_field_alloc hwspin_lock_register hwspin_lock_unregister - regmap_field_read regmap_field_update_bits_base # required by qcom_q6v5.ko @@ -1252,7 +1253,6 @@ __memcpy_toio # required by qcom_spmi-regulator.ko - jiffies_to_usecs regulator_disable_regmap regulator_enable_regmap regulator_is_enabled_regmap @@ -1263,6 +1263,10 @@ rproc_get_by_child try_wait_for_completion +# required by qcom_tsens.ko + devm_thermal_zone_of_sensor_register + thermal_zone_get_slope + # required by qmi_helpers.ko init_net kernel_getsockname From 82038e31f36ab917f55966a419ffeebb1b9a2fc1 Mon Sep 17 00:00:00 2001 From: Alessio Balsini Date: Fri, 14 May 2021 10:38:40 +0100 Subject: [PATCH 3/3] ANDROID: FUSE OWNERS pointing to android-mainline OWNERS This was generated with: $ build/synchronize_owners common-mainline/ android-mainline \ common11-5.4 common12-5.10 common12-5.4 common-4.19-stable Test: none Bug: 188034287 Signed-off-by: Alessio Balsini Change-Id: Iaf020cae75ab47aa12e64bfdfbc8d76efd74880b --- fs/fuse/OWNERS | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 fs/fuse/OWNERS diff --git a/fs/fuse/OWNERS b/fs/fuse/OWNERS new file mode 100644 index 000000000000..6c04da7a65d5 --- /dev/null +++ b/fs/fuse/OWNERS @@ -0,0 +1,2 @@ +# include OWNERS from the authoritative android-mainline branch +include kernel/common:android-mainline:/fs/fuse/OWNERS