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

Commit 2ae69d5f authored by Swetha Chikkaboraiah's avatar Swetha Chikkaboraiah Committed by Gerrit - the friendly Code Review server
Browse files

drivers: qcom: pil: Call pil_clear_segment when S2 mapping is done



The function pil_clear_segment should be called only
when S2 mapping is success. So update clear_fw_region
accordingly.

Change-Id: Ie5bcf5b322ce347b08a575d18b7de3226027af91
Signed-off-by: default avatarSwetha Chikkaboraiah <schikk@codeaurora.org>
parent 2dbef210
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -1197,6 +1197,7 @@ int pil_boot(struct pil_desc *desc)
	if (desc->shutdown_fail)
		pil_err(desc, "Subsystem shutdown failed previously!\n");

	desc->clear_fw_region = true;
	/* Reinitialize for new image */
	pil_release_mmap(desc);

@@ -1250,6 +1251,8 @@ int pil_boot(struct pil_desc *desc)
	if (desc->ops->init_image)
		ret = desc->ops->init_image(desc, fw->data, fw->size);
	if (ret) {
		/* S2 mapping not yet done */
		desc->clear_fw_region = false;
		pil_err(desc, "Initializing image failed(rc:%d)\n", ret);
		goto err_boot;
	}
@@ -1259,6 +1262,8 @@ int pil_boot(struct pil_desc *desc)
		ret = desc->ops->mem_setup(desc, priv->region_start,
				priv->region_end - priv->region_start);
	if (ret) {
		/* S2 mapping is failed */
		desc->clear_fw_region = false;
		pil_err(desc, "Memory setup error(rc:%d)\n", ret);
		goto err_deinit_image;
	}