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

Commit 86b89e3b authored by Zhen Kong's avatar Zhen Kong
Browse files

firmware: qcom: change to use scnprintf in tz_log driver 



Change to use scnprintf as it returns the actual size written to the
buffer.

Change-Id: Idcd92a5dff75c3d42ba05377875c8272094e134e
Signed-off-by: default avatarZhen Kong <zkong@codeaurora.org>
parent 405fe317

drivers/firmware/qcom/tz_log.c

+15 −15
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -336,7 +336,7 @@ static int _disp_tz_general_stats(void) 
{

	int len = 0;



	len += snprintf(tzdbg.disp_buf + len, debug_rw_buf_size - 1,

	len += scnprintf(tzdbg.disp_buf + len, debug_rw_buf_size - 1,

			"   Version        : 0x%x\n"

			"   Magic Number   : 0x%x\n"

			"   Number of CPU  : %d\n",
@@ -361,7 +361,7 @@ static int _disp_tz_vmid_stats(void) 


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

		if (ptr->vmid < 0xFF) {

			len += snprintf(tzdbg.disp_buf + len,

			len += scnprintf(tzdbg.disp_buf + len,

				(debug_rw_buf_size - 1) - len,

				"   0x%x        %s\n",

				(uint32_t)ptr->vmid, (uint8_t *)ptr->desc);
@@ -396,7 +396,7 @@ static int _disp_tz_boot_stats(void) 


	for (i = 0; i < tzdbg.diag_buf->cpu_count; i++) {

		if (tzdbg.tz_version >= QSEE_VERSION_TZ_3_X) {

			len += snprintf(tzdbg.disp_buf + len,

			len += scnprintf(tzdbg.disp_buf + len,

					(debug_rw_buf_size - 1) - len,

					"  CPU #: %d\n"

					"     Warmboot jump address : 0x%llx\n"
@@ -423,7 +423,7 @@ static int _disp_tz_boot_stats(void) 
			}

			ptr_64++;

		} else {

			len += snprintf(tzdbg.disp_buf + len,

			len += scnprintf(tzdbg.disp_buf + len,

					(debug_rw_buf_size - 1) - len,

					"  CPU #: %d\n"

					"     Warmboot jump address     : 0x%x\n"
@@ -459,7 +459,7 @@ static int _disp_tz_reset_stats(void) 
					tzdbg.diag_buf->reset_info_off);



	for (i = 0; i < tzdbg.diag_buf->cpu_count; i++) {

		len += snprintf(tzdbg.disp_buf + len,

		len += scnprintf(tzdbg.disp_buf + len,

				(debug_rw_buf_size - 1) - len,

				"  CPU #: %d\n"

				"     Reset Type (reason)       : 0x%x\n"
@@ -497,7 +497,7 @@ static int _disp_tz_interrupt_stats(void) 
	if (tzdbg.tz_version < QSEE_VERSION_TZ_4_X) {

		tzdbg_ptr = ptr;

		for (i = 0; i < (*num_int); i++) {

			len += snprintf(tzdbg.disp_buf + len,

			len += scnprintf(tzdbg.disp_buf + len,

				(debug_rw_buf_size - 1) - len,

				"     Interrupt Number          : 0x%x\n"

				"     Type of Interrupt         : 0x%x\n"
@@ -506,13 +506,13 @@ static int _disp_tz_interrupt_stats(void) 
				(uint32_t)tzdbg_ptr->int_info,

				(uint8_t *)tzdbg_ptr->int_desc);

			for (j = 0; j < tzdbg.diag_buf->cpu_count; j++) {

				len += snprintf(tzdbg.disp_buf + len,

				len += scnprintf(tzdbg.disp_buf + len,

				(debug_rw_buf_size - 1) - len,

				"     int_count on CPU # %d      : %u\n",

				(uint32_t)j,

				(uint32_t)tzdbg_ptr->int_count[j]);

			}

			len += snprintf(tzdbg.disp_buf + len,

			len += scnprintf(tzdbg.disp_buf + len,

					debug_rw_buf_size - 1, "\n");



			if (len > (debug_rw_buf_size - 1)) {
@@ -525,7 +525,7 @@ static int _disp_tz_interrupt_stats(void) 
	} else {

		tzdbg_ptr_tz40 = ptr;

		for (i = 0; i < (*num_int); i++) {

			len += snprintf(tzdbg.disp_buf + len,

			len += scnprintf(tzdbg.disp_buf + len,

				(debug_rw_buf_size - 1) - len,

				"     Interrupt Number          : 0x%x\n"

				"     Type of Interrupt         : 0x%x\n"
@@ -534,13 +534,13 @@ static int _disp_tz_interrupt_stats(void) 
				(uint32_t)tzdbg_ptr_tz40->int_info,

				(uint8_t *)tzdbg_ptr_tz40->int_desc);

			for (j = 0; j < tzdbg.diag_buf->cpu_count; j++) {

				len += snprintf(tzdbg.disp_buf + len,

				len += scnprintf(tzdbg.disp_buf + len,

				(debug_rw_buf_size - 1) - len,

				"     int_count on CPU # %d      : %u\n",

				(uint32_t)j,

				(uint32_t)tzdbg_ptr_tz40->int_count[j]);

			}

			len += snprintf(tzdbg.disp_buf + len,

			len += scnprintf(tzdbg.disp_buf + len,

					debug_rw_buf_size - 1, "\n");



			if (len > (debug_rw_buf_size - 1)) {
@@ -563,7 +563,7 @@ static int _disp_tz_log_stats_legacy(void) 


	ptr = (unsigned char *)tzdbg.diag_buf +

					tzdbg.diag_buf->ring_off;

	len += snprintf(tzdbg.disp_buf, (debug_rw_buf_size - 1) - len,

	len += scnprintf(tzdbg.disp_buf, (debug_rw_buf_size - 1) - len,

							"%s\n", ptr);



	tzdbg.stat[TZDBG_LOG].data = tzdbg.disp_buf;
@@ -753,7 +753,7 @@ static int _disp_hyp_general_stats(size_t count) 
	int i;

	struct hypdbg_boot_info_t *ptr = NULL;



	len += snprintf((unsigned char *)tzdbg.disp_buf + len,

	len += scnprintf((unsigned char *)tzdbg.disp_buf + len,

			tzdbg.hyp_debug_rw_buf_size - 1,

			"   Magic Number    : 0x%x\n"

			"   CPU Count       : 0x%x\n"
@@ -764,7 +764,7 @@ static int _disp_hyp_general_stats(size_t count) 


	ptr = tzdbg.hyp_diag_buf->boot_info;

	for (i = 0; i < tzdbg.hyp_diag_buf->cpu_count; i++) {

		len += snprintf((unsigned char *)tzdbg.disp_buf + len,

		len += scnprintf((unsigned char *)tzdbg.disp_buf + len,

				(tzdbg.hyp_debug_rw_buf_size - 1) - len,

				"  CPU #: %d\n"

				"     Warmboot entry CPU counter: 0x%x\n"