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

Commit 925eeae3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "firmware: qcom: tz_log: Add support for the new scm_call2 API"

parents 08e47f0c e7d75b5c
Loading
Loading
Loading
Loading
+13 −3
Original line number Diff line number Diff line
@@ -586,9 +586,19 @@ static void tzdbg_register_qsee_log_buf(void)
	req.phy_addr = (uint32_t)pa;
	req.len = len;

	if (!is_scm_armv8()) {
		/*  SCM_CALL  to register the log buffer */
		ret = scm_call(SCM_SVC_TZSCHEDULER, 1,  &req, sizeof(req),
			&resp, sizeof(resp));
	} else {
		struct scm_desc desc = {0};
		desc.args[0] = (uint32_t)pa;
		desc.args[1] = len;
		desc.arginfo = 0x22;
		ret = scm_call2(SCM_QSEEOS_FNID(1, 6), &desc);
		resp.result = desc.ret[0];
	}

	if (ret) {
		pr_err("%s: scm_call to register log buffer failed\n",
			__func__);