From 0e195d94836ddbe44eec32b8ab0f22d1aa8e3a34 Mon Sep 17 00:00:00 2001 From: Vivek Kumar Date: Wed, 3 Jun 2020 14:28:14 +0530 Subject: [PATCH 1/7] ARM: dts: msm: Add DT node for msm-watchdog in SM8150 Add device node for hardware msm-watchdog present in SM8150 SoC with proper bark and bite time configuration, this is needed to report bugs related to system lockups in the kernel. Change-Id: Ibf2c059278e7896cf8f625ea1f981d55a84690b8 --- qcom/sm8150.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/qcom/sm8150.dtsi b/qcom/sm8150.dtsi index af788edb304f..debeed2eda24 100644 --- a/qcom/sm8150.dtsi +++ b/qcom/sm8150.dtsi @@ -2238,6 +2238,18 @@ reg-names = "llcc_base", "llcc_broadcast_base"; cap-based-alloc-and-pwr-collapse; }; + + wdog: qcom,wdt@17c10000 { + compatible = "qcom,msm-watchdog"; + reg = <0x17c10000 0x1000>; + reg-names = "wdt-base"; + interrupts = , + ; + qcom,bark-time = <11000>; + qcom,pet-time = <9360>; + qcom,ipi-ping; + qcom,wakeup-enable; + }; }; &firmware { From 5b0090dd30279ff4344421be9d00e78cc9406ac8 Mon Sep 17 00:00:00 2001 From: Vivek Kumar Date: Wed, 3 Jun 2020 14:54:36 +0530 Subject: [PATCH 2/7] ARM: dts: msm: Add dt node for restart driver on SM8150 Add device node for msm-poweroff driver on SM8150 and populate pshold and tcsr register addresses needed for restarting the SoC. Change-Id: Iaf9524d53f501bdc3e4f5aa0966be8325dadfc16 --- qcom/sm8150.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/qcom/sm8150.dtsi b/qcom/sm8150.dtsi index debeed2eda24..a751493985ca 100644 --- a/qcom/sm8150.dtsi +++ b/qcom/sm8150.dtsi @@ -1002,6 +1002,13 @@ interrupts = ; }; + restart@c264000 { + compatible = "qcom,pshold"; + reg = <0xc264000 0x4>, + <0x1fd3000 0x4>; + reg-names = "pshold-base", "tcsr-boot-misc-detect"; + }; + qcom,msm-rtb { compatible = "qcom,msm-rtb"; qcom,rtb-size = <0x100000>; From 52d0e4d78faadcf4f66f6ee759375fccb44c4846 Mon Sep 17 00:00:00 2001 From: Vivek Kumar Date: Thu, 30 Jul 2020 21:21:46 +0530 Subject: [PATCH 3/7] ARM: dts: msm: Add DT node for msm-watchdog in SDMSHRIKE Add device node for hardware msm-watchdog present in SDMSHRIKE SoC with proper bark and bite time configuration, this is needed to report bugs related to system lockups in the kernel. Change-Id: I7d65fbcb6deb526fa8583af9a2f1c51cac57d436 --- qcom/sdmshrike.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/qcom/sdmshrike.dtsi b/qcom/sdmshrike.dtsi index e2b30bc4fe10..5ad6c58e6051 100644 --- a/qcom/sdmshrike.dtsi +++ b/qcom/sdmshrike.dtsi @@ -881,6 +881,18 @@ cap-based-alloc-and-pwr-collapse; }; + wdog: qcom,wdt@17c10000 { + compatible = "qcom,msm-watchdog"; + reg = <0x17c10000 0x1000>; + reg-names = "wdt-base"; + interrupts = , + ; + qcom,bark-time = <11000>; + qcom,pet-time = <9360>; + qcom,ipi-ping; + qcom,wakeup-enable; + }; + qcom,msm-imem@146bf000 { compatible = "qcom,msm-imem"; reg = <0x146bf000 0x1000>; From e1b682b88204c2a6f1a652aa08dca37a4ceb2b4b Mon Sep 17 00:00:00 2001 From: Saurabh Ambulkar Date: Thu, 30 Jul 2020 20:51:00 +0530 Subject: [PATCH 4/7] ARM: dts: msm: Add dt node for restart driver on SDMSHRIKE Add device node for msm-poweroff driver on SDMSHRIKE and populate pshold and tcsr register addresses needed for restarting the SoC. Change-Id: Iab7fa7e2000ca035b5ba79025c3eac6b7f8b6fd7 --- qcom/sdmshrike.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/qcom/sdmshrike.dtsi b/qcom/sdmshrike.dtsi index 5ad6c58e6051..284f386171f3 100644 --- a/qcom/sdmshrike.dtsi +++ b/qcom/sdmshrike.dtsi @@ -947,6 +947,13 @@ &mc_virt SLAVE_EBI1>; }; + restart@c264000 { + compatible = "qcom,pshold"; + reg = <0xc264000 0x4>, + <0x1fd3000 0x4>; + reg-names = "pshold-base", "tcsr-boot-misc-detect"; + }; + qcom,mpm2-sleep-counter@c221000 { compatible = "qcom,mpm2-sleep-counter"; reg = <0xc221000 0x1000>; From ec3d4ce69ea961da0d51293fd41c557139947b59 Mon Sep 17 00:00:00 2001 From: Shreyas K K Date: Wed, 16 Dec 2020 20:27:48 +0530 Subject: [PATCH 5/7] ARM: dts: msm: Update QSEECOM CMA region Update QSEECOM CMA region DT node to include the missing properties. Change-Id: I07ff420c21cefec77d0d20ac89dcb5de5d4651bf --- qcom/sdmshrike.dtsi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/qcom/sdmshrike.dtsi b/qcom/sdmshrike.dtsi index 284f386171f3..5cb3e27a8cc5 100644 --- a/qcom/sdmshrike.dtsi +++ b/qcom/sdmshrike.dtsi @@ -420,10 +420,12 @@ reg = <0x0 0x98900000 0x0 0x1400000>; }; - qseecom_mem: qseecom_region@0x9e400000 { + qseecom_mem: qseecom_region { compatible = "shared-dma-pool"; - no-map; - reg = <0x0 0x9e400000 0x0 0x1400000>; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x1400000>; }; From bdb34249a279a14c84e5dfbc35b7edf5913fc4b4 Mon Sep 17 00:00:00 2001 From: Shreyas K K Date: Tue, 1 Dec 2020 11:48:07 +0530 Subject: [PATCH 6/7] ARM: dts: msm: Add core-hang detect nodes to SM8150 Add core-hang detect nodes for silver and gold cores on SM8150. Change-Id: Iccde8bfaeda5b88c205f28cbcec4af7f93ec196a --- qcom/sm8150.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/qcom/sm8150.dtsi b/qcom/sm8150.dtsi index a751493985ca..67df8db0972d 100644 --- a/qcom/sm8150.dtsi +++ b/qcom/sm8150.dtsi @@ -2257,6 +2257,24 @@ qcom,ipi-ping; qcom,wakeup-enable; }; + + qcom,chd_sliver { + compatible = "qcom,core-hang-detect"; + label = "silver"; + qcom,threshold-arr = <0x18000058 0x18010058 + 0x18020058 0x18030058>; + qcom,config-arr = <0x18000060 0x18010060 + 0x18020060 0x18030060>; + }; + + qcom,chd_gold { + compatible = "qcom,core-hang-detect"; + label = "gold"; + qcom,threshold-arr = <0x18040058 0x18050058 + 0x18060058 0x18070058>; + qcom,config-arr = <0x18040060 0x18050060 + 0x18060060 0x18070060>; + }; }; &firmware { From fadc763191b37c7e481d409144bc814282b7154d Mon Sep 17 00:00:00 2001 From: Shreyas K K Date: Tue, 1 Dec 2020 11:56:25 +0530 Subject: [PATCH 7/7] ARM: dts: msm: Add core-hang detect nodes to SDMSHRIKE Add core-hang detect nodes for silver and gold cores on SDMSHRIKE. Change-Id: Ie6f73a8bf3e5bf405b845089676fb4be0fd71cd1 --- qcom/sdmshrike.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/qcom/sdmshrike.dtsi b/qcom/sdmshrike.dtsi index 5cb3e27a8cc5..784e7684e9df 100644 --- a/qcom/sdmshrike.dtsi +++ b/qcom/sdmshrike.dtsi @@ -1922,6 +1922,24 @@ qcom,firmware-name = "venus"; memory-region = <&pil_video_mem>; }; + + qcom,chd_silver { + compatible = "qcom,core-hang-detect"; + label = "silver"; + qcom,threshold-arr = <0x18000058 0x18010058 + 0x18020058 0x18030058>; + qcom,config-arr = <0x18000060 0x18010060 + 0x18020060 0x18030060>; + }; + + qcom,chd_gold { + compatible = "qcom,core-hang-detect"; + label = "gold"; + qcom,threshold-arr = <0x18040058 0x18050058 + 0x18060058 0x18070058>; + qcom,config-arr = <0x18040060 0x18050060 + 0x18060060 0x18070060>; + }; }; #include "sdmshrike-pinctrl.dtsi"