Crashdump collection is enabled based on the DLOAD bit in the TCSR register.
This bit is set during bootup and cleared during shutdown. During crash,
dload bit is not cleared, due to which uboot starts crashdump collection.
This patch series adds the support for crashdump collection.
DTS patch depends on the IPQ9574 baseport series
https://lore.kernel.org/linux-arm-msm/[email protected]/
V3:
- change logs are added to the respective patches.
V2 can be found at
https://lore.kernel.org/linux-arm-kernel/[email protected]/
Changes in V2:
- rebased on linux-next/master
- dropped co-developed by tag wherever applicable
- V1 can be found at
https://lore.kernel.org/linux-arm-kernel/[email protected]/
Poovendhan Selvaraj (5):
dt-bindings: scm: Add compatible for IPQ9574
arm64: dts: qcom: Add support for Crashdump collection on IPQ9574
firmware: scm: Modify only the DLOAD bit in TCSR register for download
mode
arm64: defconfig: Enable scm download mode config for IPQ Targets
dt-bindings: mfd: Add the tcsr compatible for IPQ9574
.../bindings/firmware/qcom,scm.yaml | 1 +
.../devicetree/bindings/mfd/qcom,tcsr.yaml | 1 +
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 26 ++++++++++++++++++-
arch/arm64/configs/defconfig | 1 +
drivers/firmware/qcom_scm.c | 12 ++++++---
5 files changed, 36 insertions(+), 5 deletions(-)
base-commit: 49a8133221c71b935f36a7c340c0271c2a9ee2db
--
2.17.1
Add the scm compatible string for IPQ9574 SoC
Signed-off-by: Poovendhan Selvaraj <[email protected]>
---
Changes in V3:
- Dropped the Co-developed by tag
Documentation/devicetree/bindings/firmware/qcom,scm.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/firmware/qcom,scm.yaml b/Documentation/devicetree/bindings/firmware/qcom,scm.yaml
index 4193492ba73e..82120b98af56 100644
--- a/Documentation/devicetree/bindings/firmware/qcom,scm.yaml
+++ b/Documentation/devicetree/bindings/firmware/qcom,scm.yaml
@@ -27,6 +27,7 @@ properties:
- qcom,scm-ipq6018
- qcom,scm-ipq806x
- qcom,scm-ipq8074
+ - qcom,scm-ipq9574
- qcom,scm-mdm9607
- qcom,scm-msm8226
- qcom,scm-msm8660
--
2.17.1
Enable Crashdump collection in ipq9574
Co-developed-by: Anusha Rao <[email protected]>
Signed-off-by: Anusha Rao <[email protected]>
Co-developed-by: Kathiravan Thirumoorthy <[email protected]>
Signed-off-by: Kathiravan Thirumoorthy <[email protected]>
Signed-off-by: Poovendhan Selvaraj <[email protected]>
---
Changes in V3:
- No changes
arch/arm64/boot/dts/qcom/ipq9574.dtsi | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
index 2b86ba17bb32..9c4523f50a57 100644
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
@@ -81,6 +81,13 @@
reg = <0x0 0x40000000 0x0 0x0>;
};
+ firmware {
+ scm {
+ compatible = "qcom,scm-ipq9574", "qcom,scm";
+ qcom,dload-mode = <&tcsr_boot_misc 0>;
+ };
+ };
+
pmu {
compatible = "arm,cortex-a73-pmu";
interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
@@ -95,11 +102,17 @@
#address-cells = <2>;
#size-cells = <2>;
ranges;
-
tz_region: tz@4a600000 {
reg = <0x0 0x4a600000 0x0 0x400000>;
no-map;
};
+
+ smem@4aa00000 {
+ compatible = "qcom,smem";
+ reg = <0x0 0x4aa00000 0x0 0x00100000>;
+ hwlocks = <&tcsr_mutex 0>;
+ no-map;
+ };
};
soc: soc@0 {
@@ -150,6 +163,17 @@
#power-domain-cells = <1>;
};
+ tcsr_mutex: hwlock@1905000 {
+ compatible = "qcom,tcsr-mutex";
+ reg = <0x01905000 0x8000>;
+ #hwlock-cells = <1>;
+ };
+
+ tcsr_boot_misc: syscon@193d100 {
+ ompatible = "qcom,tcsr-ipq9574", "syscon";
+ reg = <0x0193d100 0x4>;
+ };
+
sdhc_1: mmc@7804000 {
compatible = "qcom,ipq9574-sdhci", "qcom,sdhci-msm-v5";
reg = <0x07804000 0x1000>, <0x07805000 0x1000>;
--
2.17.1
CrashDump collection is based on the DLOAD bit of TCSR register.
To retain other bits, we read the register and modify only the DLOAD bit as
the other bits have their own significance.
Co-developed-by: Anusha Rao <[email protected]>
Signed-off-by: Anusha Rao <[email protected]>
Co-developed-by: Kathiravan Thirumoorthy <[email protected]>
Signed-off-by: Kathiravan Thirumoorthy <[email protected]>
Signed-off-by: Poovendhan Selvaraj <[email protected]>
---
Changes in V3:
- retain the value of tcsr register when download mode is not set
drivers/firmware/qcom_scm.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
index 2000323722bf..2ad7ccf0abcd 100644
--- a/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c
@@ -407,7 +407,7 @@ int qcom_scm_set_remote_state(u32 state, u32 id)
}
EXPORT_SYMBOL(qcom_scm_set_remote_state);
-static int __qcom_scm_set_dload_mode(struct device *dev, bool enable)
+static int __qcom_scm_set_dload_mode(struct device *dev, u32 val, bool enable)
{
struct qcom_scm_desc desc = {
.svc = QCOM_SCM_SVC_BOOT,
@@ -417,7 +417,7 @@ static int __qcom_scm_set_dload_mode(struct device *dev, bool enable)
.owner = ARM_SMCCC_OWNER_SIP,
};
- desc.args[1] = enable ? QCOM_SCM_BOOT_SET_DLOAD_MODE : 0;
+ desc.args[1] = enable ? val | QCOM_SCM_BOOT_SET_DLOAD_MODE : val;
return qcom_scm_call_atomic(__scm->dev, &desc, NULL);
}
@@ -426,15 +426,19 @@ static void qcom_scm_set_download_mode(bool enable)
{
bool avail;
int ret = 0;
+ u32 dload_addr_val;
avail = __qcom_scm_is_call_available(__scm->dev,
QCOM_SCM_SVC_BOOT,
QCOM_SCM_BOOT_SET_DLOAD_MODE);
+ ret = qcom_scm_io_readl(__scm->dload_mode_addr, &dload_addr_val);
+
if (avail) {
- ret = __qcom_scm_set_dload_mode(__scm->dev, enable);
+ ret = __qcom_scm_set_dload_mode(__scm->dev, dload_addr_val, enable);
} else if (__scm->dload_mode_addr) {
ret = qcom_scm_io_writel(__scm->dload_mode_addr,
- enable ? QCOM_SCM_BOOT_SET_DLOAD_MODE : 0);
+ enable ? dload_addr_val |
+ QCOM_SCM_BOOT_SET_DLOAD_MODE : dload_addr_val);
} else {
dev_err(__scm->dev,
"No available mechanism for setting download mode\n");
--
2.17.1
Enabling the download mode config by default as the IPQ Targets use
crashdump feature extensively to debug crashes.
Signed-off-by: Poovendhan Selvaraj <[email protected]>
---
Changes in V3:
- Updated the commit message
arch/arm64/configs/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 37a60df14e1d..42c9ccdbf0dc 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -258,6 +258,7 @@ CONFIG_ARM_SCPI_PROTOCOL=y
CONFIG_RASPBERRYPI_FIRMWARE=y
CONFIG_INTEL_STRATIX10_SERVICE=y
CONFIG_INTEL_STRATIX10_RSU=m
+CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT=y
CONFIG_EFI_CAPSULE_LOADER=y
CONFIG_IMX_SCU=y
CONFIG_IMX_SCU_PD=y
--
2.17.1
Add the tcsr compatible string for IPQ9574 SoC
Acked-by: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Poovendhan Selvaraj <[email protected]>
---
Changes in V3:
- Updated the subject
- Added the Acked by tag
Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
index 2eeebe920e6e..203fc890c9a3 100644
--- a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
+++ b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
@@ -31,6 +31,7 @@ properties:
- qcom,tcsr-ipq5332
- qcom,tcsr-ipq6018
- qcom,tcsr-ipq8064
+ - qcom,tcsr-ipq9574
- qcom,tcsr-mdm9615
- qcom,tcsr-msm8226
- qcom,tcsr-msm8660
--
2.17.1
On 08/02/2023 06:33, Poovendhan Selvaraj wrote:
> Add the scm compatible string for IPQ9574 SoC
>
> Signed-off-by: Poovendhan Selvaraj <[email protected]>
Acked-by: Krzysztof Kozlowski <[email protected]>
Best regards,
Krzysztof
On 08/02/2023 06:33, Poovendhan Selvaraj wrote:
> Enable Crashdump collection in ipq9574
>
> Co-developed-by: Anusha Rao <[email protected]>
> Signed-off-by: Anusha Rao <[email protected]>
> Co-developed-by: Kathiravan Thirumoorthy <[email protected]>
> Signed-off-by: Kathiravan Thirumoorthy <[email protected]>
> Signed-off-by: Poovendhan Selvaraj <[email protected]>
> ---
> Changes in V3:
> - No changes
> arch/arm64/boot/dts/qcom/ipq9574.dtsi | 26 +++++++++++++++++++++++++-
> 1 file changed, 25 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
> index 2b86ba17bb32..9c4523f50a57 100644
> --- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
> +++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
> @@ -81,6 +81,13 @@
> reg = <0x0 0x40000000 0x0 0x0>;
> };
>
> + firmware {
> + scm {
> + compatible = "qcom,scm-ipq9574", "qcom,scm";
> + qcom,dload-mode = <&tcsr_boot_misc 0>;
> + };
> + };
> +
> pmu {
> compatible = "arm,cortex-a73-pmu";
> interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
> @@ -95,11 +102,17 @@
> #address-cells = <2>;
> #size-cells = <2>;
> ranges;
> -
I don't think anything improved here - still unrelated change.
Best regards,
Krzysztof
On 08/02/2023 06:33, Poovendhan Selvaraj wrote:
> Enabling the download mode config by default as the IPQ Targets use
Freescale IPQ?
> crashdump feature extensively to debug crashes.
That's still not enough. Only few targets use it, but all 99% others
don't yet you want to enable it by default. That's not a justification
for me, especially that I do not see problem with enabling it during
runtime.
Best regards,
Krzysztof
On Wed, Feb 08, 2023 at 11:03:31AM +0530, Poovendhan Selvaraj wrote:
> Enabling the download mode config by default as the IPQ Targets use
> crashdump feature extensively to debug crashes.
>
No thanks.
You can pass qcom_scm.download_mode=1 on the kernel command line to turn
this on dynamically when you want it. There's no reason to attempt
enabling download mode on every Qualcomm board running the upstream
kernel.
Regards,
Bjorn
> Signed-off-by: Poovendhan Selvaraj <[email protected]>
> ---
> Changes in V3:
> - Updated the commit message
>
> arch/arm64/configs/defconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
> index 37a60df14e1d..42c9ccdbf0dc 100644
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@ -258,6 +258,7 @@ CONFIG_ARM_SCPI_PROTOCOL=y
> CONFIG_RASPBERRYPI_FIRMWARE=y
> CONFIG_INTEL_STRATIX10_SERVICE=y
> CONFIG_INTEL_STRATIX10_RSU=m
> +CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT=y
> CONFIG_EFI_CAPSULE_LOADER=y
> CONFIG_IMX_SCU=y
> CONFIG_IMX_SCU_PD=y
> --
> 2.17.1
>
On 2/9/2023 3:12 AM, Bjorn Andersson wrote:
> On Wed, Feb 08, 2023 at 11:03:31AM +0530, Poovendhan Selvaraj wrote:
>> Enabling the download mode config by default as the IPQ Targets use
>> crashdump feature extensively to debug crashes.
>>
> No thanks.
>
> You can pass qcom_scm.download_mode=1 on the kernel command line to turn
> this on dynamically when you want it. There's no reason to attempt
> enabling download mode on every Qualcomm board running the upstream
> kernel.
>
> Regards,
> Bjorn
Okay sure...i will remove this patch in next series.
Regards,
Poovendhan S
>> Signed-off-by: Poovendhan Selvaraj <[email protected]>
>> ---
>> Changes in V3:
>> - Updated the commit message
>>
>> arch/arm64/configs/defconfig | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
>> index 37a60df14e1d..42c9ccdbf0dc 100644
>> --- a/arch/arm64/configs/defconfig
>> +++ b/arch/arm64/configs/defconfig
>> @@ -258,6 +258,7 @@ CONFIG_ARM_SCPI_PROTOCOL=y
>> CONFIG_RASPBERRYPI_FIRMWARE=y
>> CONFIG_INTEL_STRATIX10_SERVICE=y
>> CONFIG_INTEL_STRATIX10_RSU=m
>> +CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT=y
>> CONFIG_EFI_CAPSULE_LOADER=y
>> CONFIG_IMX_SCU=y
>> CONFIG_IMX_SCU_PD=y
>> --
>> 2.17.1
>>
On 2/8/2023 1:30 PM, Krzysztof Kozlowski wrote:
> On 08/02/2023 06:33, Poovendhan Selvaraj wrote:
>> Enabling the download mode config by default as the IPQ Targets use
> Freescale IPQ?
>
>> crashdump feature extensively to debug crashes.
> That's still not enough. Only few targets use it, but all 99% others
> don't yet you want to enable it by default. That's not a justification
> for me, especially that I do not see problem with enabling it during
> runtime.
>
> Best regards,
> Krzysztof
Okay sure...will remove this patch in next series.
Regards,
Poovendhan S
On 2/8/2023 1:29 PM, Krzysztof Kozlowski wrote:
> On 08/02/2023 06:33, Poovendhan Selvaraj wrote:
>> Enable Crashdump collection in ipq9574
>>
>> Co-developed-by: Anusha Rao <[email protected]>
>> Signed-off-by: Anusha Rao <[email protected]>
>> Co-developed-by: Kathiravan Thirumoorthy <[email protected]>
>> Signed-off-by: Kathiravan Thirumoorthy <[email protected]>
>> Signed-off-by: Poovendhan Selvaraj <[email protected]>
>> ---
>> Changes in V3:
>> - No changes
>> arch/arm64/boot/dts/qcom/ipq9574.dtsi | 26 +++++++++++++++++++++++++-
>> 1 file changed, 25 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>> index 2b86ba17bb32..9c4523f50a57 100644
>> --- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>> @@ -81,6 +81,13 @@
>> reg = <0x0 0x40000000 0x0 0x0>;
>> };
>>
>> + firmware {
>> + scm {
>> + compatible = "qcom,scm-ipq9574", "qcom,scm";
>> + qcom,dload-mode = <&tcsr_boot_misc 0>;
>> + };
>> + };
>> +
>> pmu {
>> compatible = "arm,cortex-a73-pmu";
>> interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
>> @@ -95,11 +102,17 @@
>> #address-cells = <2>;
>> #size-cells = <2>;
>> ranges;
>> -
> I don't think anything improved here - still unrelated change.
>
>
> Best regards,
> Krzysztof
Okay sure...next series will add required smem and download mode nodes
in different patches.
Regards,
Poovendhan S
On 14/02/2023 05:11, POOVENDHAN SELVARAJ wrote:
>
> On 2/8/2023 1:29 PM, Krzysztof Kozlowski wrote:
>> On 08/02/2023 06:33, Poovendhan Selvaraj wrote:
>>> Enable Crashdump collection in ipq9574
>>>
>>> Co-developed-by: Anusha Rao <[email protected]>
>>> Signed-off-by: Anusha Rao <[email protected]>
>>> Co-developed-by: Kathiravan Thirumoorthy <[email protected]>
>>> Signed-off-by: Kathiravan Thirumoorthy <[email protected]>
>>> Signed-off-by: Poovendhan Selvaraj <[email protected]>
>>> ---
>>> Changes in V3:
>>> - No changes
>>> arch/arm64/boot/dts/qcom/ipq9574.dtsi | 26 +++++++++++++++++++++++++-
>>> 1 file changed, 25 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>>> index 2b86ba17bb32..9c4523f50a57 100644
>>> --- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>>> +++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
>>> @@ -81,6 +81,13 @@
>>> reg = <0x0 0x40000000 0x0 0x0>;
>>> };
>>>
>>> + firmware {
>>> + scm {
>>> + compatible = "qcom,scm-ipq9574", "qcom,scm";
>>> + qcom,dload-mode = <&tcsr_boot_misc 0>;
>>> + };
>>> + };
>>> +
>>> pmu {
>>> compatible = "arm,cortex-a73-pmu";
>>> interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
>>> @@ -95,11 +102,17 @@
>>> #address-cells = <2>;
>>> #size-cells = <2>;
>>> ranges;
>>> -
>> I don't think anything improved here - still unrelated change.
>>
>>
>> Best regards,
>> Krzysztof
>
> Okay sure...next series will add required smem and download mode nodes
> in different patches.
I commented the diff - specific hunk - which is unrelated.
Best regards,
Krzysztof
On 14/02/2023 10:35, POOVENDHAN SELVARAJ wrote:
>>>> compatible = "arm,cortex-a73-pmu";
>>>> interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
> >>> @@ -95,11 +102,17 @@
>>>> #address-cells = <2>;
>>>> #size-cells = <2>;
>>>> ranges;
> *>>> -*
> >> I don't think anything improved here - still unrelated change.
> >>
>
> Are you referring to the deleted line here?
Yes, the line removal does not seem related nor justified.
Best regards,
Krzysztof
On 2/14/2023 3:14 PM, Krzysztof Kozlowski wrote:
> On 14/02/2023 10:35, POOVENDHAN SELVARAJ wrote:
>>>>> compatible = "arm,cortex-a73-pmu";
>>>>> interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
>> >>> @@ -95,11 +102,17 @@
>>>>> #address-cells = <2>;
>>>>> #size-cells = <2>;
>>>>> ranges;
>> *>>> -*
>> >> I don't think anything improved here - still unrelated change.
>> >>
>>
>> Are you referring to the deleted line here?
> Yes, the line removal does not seem related nor justified.
>
> Best regards,
> Krzysztof
Thanks... will address this.
Regards,
Poovendhan S
On Wed, 08 Feb 2023, Poovendhan Selvaraj wrote:
> Add the tcsr compatible string for IPQ9574 SoC
>
> Acked-by: Krzysztof Kozlowski <[email protected]>
> Signed-off-by: Poovendhan Selvaraj <[email protected]>
> ---
> Changes in V3:
> - Updated the subject
> - Added the Acked by tag
>
> Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml | 1 +
> 1 file changed, 1 insertion(+)
Applied, thanks
--
Lee Jones [李琼斯]