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

Commit e0e663e3 authored by Amir Samuelov's avatar Amir Samuelov Committed by Gerrit - the friendly Code Review server
Browse files

soc: qcom: spss_utils: fix IAR-DB-Recovery 



Read calculated cmacs on SUBSYS_AFTER_POWERUP event.
Allow user space to get the calc cmac regardless of ioctl.

Change-Id: I91d87c657a2217f467d3630e0dce41c98497d8bd
Signed-off-by: default avatarAmir Samuelov <amirs@codeaurora.org>
parent 5168327a

drivers/soc/qcom/spss_utils.c

+41 −10
Original line number Diff line number Diff line
@@ -920,6 +920,7 @@ static int spss_get_fw_calc_cmac(void) 
	u8 __iomem *reg = NULL;

	int i;

	u32 val;

	u32 cmac[CMAC_SIZE_IN_DWORDS] = {0};



	if (cmac_mem == NULL) {

		pr_err("invalid cmac_mem.\n");
@@ -938,6 +939,12 @@ static int spss_get_fw_calc_cmac(void) 
		reg += sizeof(u32);

	}



	/* check for any pattern to mark invalid cmac */

	if (cmac[0] == cmac[1])

		return -EINVAL; /* not valid cmac */



	memcpy(calc_fw_cmac, cmac, sizeof(calc_fw_cmac));



	pr_debug("calc_fw_cmac : 0x%08x,0x%08x,0x%08x,0x%08x\n",

	    calc_fw_cmac[0], calc_fw_cmac[1],

	    calc_fw_cmac[2], calc_fw_cmac[3]);
@@ -951,8 +958,10 @@ static int spss_get_apps_calc_cmac(void) 
	int i, j;

	u32 val;



	if (cmac_mem == NULL)

	if (cmac_mem == NULL) {

		pr_err("invalid cmac_mem.\n");

		return -EFAULT;

	}



	reg = cmac_mem; /* IAR buffer base */

	reg += CMAC_SIZE_IN_BYTES; /* skip the saved fw cmac */
@@ -963,18 +972,23 @@ static int spss_get_apps_calc_cmac(void) 


	/* get apps cmac from ddr */

	for (j = 0; j < ARRAY_SIZE(calc_apps_cmac); j++) {

		for (i = 0; i < CMAC_SIZE_IN_DWORDS; i++) {

		u32 cmac[CMAC_SIZE_IN_DWORDS] = {0};



		memset(cmac, 0, sizeof(cmac));



		for (i = 0; i < ARRAY_SIZE(cmac); i++) {

			val = readl_relaxed(reg);

			calc_apps_cmac[j][i] = val;

			cmac[i] = val;

			reg += sizeof(u32);

		}

		reg += CMAC_SIZE_IN_BYTES; /* skip the saved cmac */



		/* check for any pattern to mark end of cmacs */

		if (saved_apps_cmac[j][0] == saved_apps_cmac[j][1]) {

			memset(calc_apps_cmac[j], 0, sizeof(calc_apps_cmac[j]));

			break; /* no more cmacs */

		}

		if (cmac[0] == cmac[1])

			break; /* no more valid cmacs */



		memcpy(calc_apps_cmac[j], cmac, sizeof(calc_apps_cmac[j]));



		pr_debug("app [%d] cmac : 0x%08x,0x%08x,0x%08x,0x%08x\n", j,

			calc_apps_cmac[j][0], calc_apps_cmac[j][1],

			calc_apps_cmac[j][2], calc_apps_cmac[j][3]);
@@ -989,8 +1003,10 @@ static int spss_set_saved_uefi_apps_cmac(void) 
	int i, j;

	u32 val;



	if (cmac_mem == NULL)

	if (cmac_mem == NULL) {

		pr_err("invalid cmac_mem.\n");

		return -EFAULT;

	}



	reg = cmac_mem; /* IAR buffer base */

	reg += (2*CMAC_SIZE_IN_BYTES); /* skip the saved and calc fw cmac */
@@ -1047,14 +1063,14 @@ static int spss_utils_pil_callback(struct notifier_block *nb, 
		mutex_unlock(&event_lock);

		break;

	case SUBSYS_BEFORE_POWERUP:

		pr_debug("[SUBSYS_BEFORE_POWERUP] event.\n");

		pr_info("[SUBSYS_BEFORE_POWERUP] event.\n");

		if (is_iar_active && is_ssr_disabled) {

			pr_err("SPSS SSR disabled, requesting reboot\n");

			kernel_restart("SPSS SSR disabled, requesting reboot");

		}

		break;

	case SUBSYS_AFTER_POWERUP:

		pr_debug("[SUBSYS_AFTER_POWERUP] event.\n");

		pr_info("[SUBSYS_AFTER_POWERUP] event.\n");

		mutex_lock(&event_lock);

		event_id = SPSS_EVENT_ID_SPU_POWER_UP;

		complete_all(&spss_events[event_id]);
@@ -1064,6 +1080,21 @@ static int spss_utils_pil_callback(struct notifier_block *nb, 
		reinit_completion(&spss_events[event_id]);

		spss_events_signaled[event_id] = false;

		mutex_unlock(&event_lock);



		/*

		 * For IAR-DB-Recovery, read cmac regadless of is_iar_active.

		 * please notice that HYP unmap this area, it is a race.

		 */

		if (cmac_mem == NULL) {

			cmac_mem = ioremap_nocache(cmac_mem_addr, CMAC_MEM_SIZE);

			if (!cmac_mem) {

				pr_err("can't map cmac_mem.\n");

				return -EFAULT;

			}

		}



		spss_get_fw_calc_cmac();

		spss_get_apps_calc_cmac();

		break;

	case SUBSYS_RAMDUMP_NOTIFICATION:

		pr_debug("[SUBSYS_RAMDUMP_NOTIFICATION] event.\n");