Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28a66470 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add minidump id for Cdsp on atoll"

parents b97f98b1 6498d27b

Documentation/devicetree/bindings/pil/subsys-pil-tz.txt

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ Optional properties: 
			regardless of the fact that it's requested to power-off

			explicitly, the framework won't try to power it off again.



- qcom,minidump-as-elf32: Boolean. If set, minidump is collected in ELF32 format.



Example:

	qcom,venus@fdce0000 {

		compatible = "qcom,pil-tz-generic";

arch/arm64/boot/dts/qcom/atoll.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -1538,12 +1538,14 @@ 
		qcom,pas-id = <18>;

		qcom,proxy-timeout-ms = <10000>;

		qcom,smem-id = <601>;

		qcom,minidump-id = <7>;

		qcom,sysmon-id = <7>;

		qcom,ssctl-instance-id = <0x17>;

		qcom,firmware-name = "cdsp";

		memory-region = <&pil_cdsp_mem>;

		qcom,signal-aop;

		qcom,complete-ramdump;

		qcom,minidump-as-elf32;



		/* Inputs from turing */

		interrupts-extended = <&pdc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,
@@ -1688,12 +1690,14 @@ 
		qcom,pas-id = <1>;

		qcom,proxy-timeout-ms = <10000>;

		qcom,smem-id = <423>;

		qcom,minidump-id = <5>;

		qcom,sysmon-id = <1>;

		qcom,ssctl-instance-id = <0x14>;

		qcom,firmware-name = "adsp";

		memory-region = <&pil_adsp_mem>;

		qcom,signal-aop;

		qcom,complete-ramdump;

		qcom,minidump-as-elf32;



		/* Inputs from lpass */

		interrupts-extended = <&pdc GIC_SPI 162 IRQ_TYPE_EDGE_RISING>,

drivers/soc/qcom/peripheral-loader.c

+8 −1
Original line number Diff line number Diff line
@@ -397,6 +397,10 @@ static int pil_do_minidump(struct pil_desc *desc, void *ramdump_dev) 
					      &ss_valid_seg_cnt,

					      desc->num_aux_minidump_ids);



	if (desc->minidump_as_elf32)

		ret = do_elf_ramdump(ramdump_dev, ramdump_segs,

				     ss_valid_seg_cnt);

	else

		ret = do_minidump(ramdump_dev, ramdump_segs, ss_valid_seg_cnt);

	if (ret)

		pil_err(desc, "%s: Minidump collection failed for subsys %s rc:%d\n",
@@ -1604,6 +1608,9 @@ int pil_desc_init(struct pil_desc *desc) 
	if (!desc->unmap_fw_mem)

		desc->unmap_fw_mem = unmap_fw_mem;



	desc->minidump_as_elf32 = of_property_read_bool(

					ofnode, "qcom,minidump-as-elf32");



	return 0;

err_parse_dt:

	ida_simple_remove(&pil_ida, priv->id);

drivers/soc/qcom/peripheral-loader.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ struct pil_desc { 
	int minidump_id;

	int *aux_minidump_ids;

	int num_aux_minidump_ids;

	bool minidump_as_elf32;

};



/**