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

Commit c1e552dd authored by Avaneesh Kumar Dwivedi's avatar Avaneesh Kumar Dwivedi
Browse files

soc: qcom: Collect minidump when encryption not required 



Minidump was supported only with encrypted dumps, but there
are cases when minidump need to be collected even when encryption
is not supported.
This change caters to such requirement and collects minidump even
when encryption is not required.

Change-Id: I74d94099fd58fe076fc6e9168bac8744f97d2e46
Signed-off-by: default avatarAvaneesh Kumar Dwivedi <akdwived@codeaurora.org>
parent 202aa1fb

drivers/soc/qcom/peripheral-loader.c

+5 −2
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ int pil_do_ramdump(struct pil_desc *desc, 
	struct pil_priv *priv = desc->priv;

	struct pil_seg *seg;

	int count = 0, ret;

	u32 encryption_status = 0;



	if (desc->minidump_ss) {

		pr_info("Minidump : md_ss_toc->md_ss_toc_init is 0x%x\n",
@@ -280,12 +281,14 @@ int pil_do_ramdump(struct pil_desc *desc, 
		 * Collect minidump if SS ToC is valid and segment table

		 * is initialized in memory and encryption status is set.

		 */

		encryption_status = desc->minidump_ss->encryption_status;



		if ((desc->minidump_ss->md_ss_smem_regions_baseptr != 0) &&

			(desc->minidump_ss->md_ss_toc_init == true) &&

			(desc->minidump_ss->md_ss_enable_status ==

				MD_SS_ENABLED)) {

			if (desc->minidump_ss->encryption_status ==

				MD_SS_ENCR_DONE) {

			if (encryption_status == MD_SS_ENCR_DONE ||

				encryption_status == MD_SS_ENCR_NOTREQ) {

				pr_info("Minidump : Dumping for %s\n",

					desc->name);

				return pil_do_minidump(desc, minidump_dev);

drivers/soc/qcom/pil-msa.c

+8 −4
Original line number Diff line number Diff line
@@ -797,14 +797,18 @@ int pil_mss_reset_load_mba(struct pil_desc *pil) 
int pil_mss_debug_reset(struct pil_desc *pil)

{

	struct q6v5_data *drv = container_of(pil, struct q6v5_data, desc);

	u32 encryption_status;

	int ret;





	if (!pil->minidump_ss)

		return 0;

	if (pil->minidump_ss) {

		if (pil->minidump_ss->md_ss_enable_status != MD_SS_ENABLED)



	encryption_status = pil->minidump_ss->encryption_status;



	if ((pil->minidump_ss->md_ss_enable_status != MD_SS_ENABLED) ||

		encryption_status == MD_SS_ENCR_NOTREQ)

		return 0;

	}



	/*

	 * Bring subsystem out of reset and enable required