Skip to content
Snippets Groups Projects
Commit baeff441 authored by guyang's avatar guyang
Browse files

platform: msm_shared: Remove TZ logging on default.

Add change to remove scm call to register shared
buffer to TZ. This is to avoid invalid pointer
access by TZ when TZ_LOG driver is not enabled in
HLOS because then the pointer in TZ will still hold
the buffer address send by LK which is invalid when
HLOS comes up.

Change-Id: I4d63e1222e3b03e2212dbc47369f70ab5ccedc00
parent 86c0702b
No related branches found
No related tags found
No related merge requests found
......@@ -44,6 +44,8 @@
#define QSEOS_CHECK_VERSION_CMD 0x00001803
#define ENABLE_TZ_LOGGING 0
#define MAX_SCM_ARGS 10
#define N_EXT_SCM_ARGS 7
#define FIRST_EXT_ARG_IDX 3
......@@ -1339,8 +1341,10 @@ int qseecom_tz_init()
struct qsee_apps_region_info_ireq req;
struct qseecom_command_scm_resp resp;
int rc = GENERIC_ERROR;
#if ENABLE_TZ_LOGGING
/* register log buffer scm request */
void *buf = NULL;
#endif
/* Register app region with TZ */
req.qsee_cmd_id = QSEE_APP_REGION_NOTIFICATION;
req.addr = APP_REGION_ADDR;
......@@ -1354,6 +1358,7 @@ int qseecom_tz_init()
rc, req.addr, req.size);
if (rc)
goto err;
#if ENABLE_TZ_LOGGING
buf = memalign(PAGE_SIZE, ROUNDUP(QSEE_LOG_BUF_SIZE, PAGE_SIZE));
if (!buf) {
rc = GENERIC_ERROR;
......@@ -1373,6 +1378,7 @@ int qseecom_tz_init()
rc, logbuf_req.phy_addr, logbuf_req.len);
if (rc)
goto err;
#endif
err:
if (!rc) {
qseecom.qseecom_tz_init_done = 1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment