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

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

Merge "crypto: msm: Use scnprintf() instead of snprintf()"

parents e04d18e1 f10d7180

drivers/crypto/msm/qcedev.c

+5 −5
Original line number Diff line number Diff line
@@ -2133,21 +2133,21 @@ static int _disp_stats(int id) 
	int len = 0;



	pstat = &_qcedev_stat;

	len = snprintf(_debug_read_buf, DEBUG_MAX_RW_BUF - 1,

	len = scnprintf(_debug_read_buf, DEBUG_MAX_RW_BUF - 1,

			"\nQualcomm QCE dev driver %d Statistics:\n",

				id + 1);



	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   Encryption operation success       : %d\n",

					pstat->qcedev_enc_success);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   Encryption operation fail   : %d\n",

					pstat->qcedev_enc_fail);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   Decryption operation success     : %d\n",

					pstat->qcedev_dec_success);



	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   Encryption operation fail          : %d\n",

					pstat->qcedev_dec_fail);

drivers/crypto/msm/qcrypto.c

+30 −30
Original line number Diff line number Diff line
@@ -669,110 +669,110 @@ static int _disp_stats(int id) 
	struct crypto_engine *pe;



	pstat = &_qcrypto_stat;

	len = snprintf(_debug_read_buf, DEBUG_MAX_RW_BUF - 1,

	len = scnprintf(_debug_read_buf, DEBUG_MAX_RW_BUF - 1,

			"\nQualcomm crypto accelerator %d Statistics:\n",

				id + 1);



	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   ABLK AES CIPHER encryption   : %d\n",

					pstat->ablk_cipher_aes_enc);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   ABLK AES CIPHER decryption   : %d\n",

					pstat->ablk_cipher_aes_dec);



	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   ABLK DES CIPHER encryption   : %d\n",

					pstat->ablk_cipher_des_enc);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   ABLK DES CIPHER decryption   : %d\n",

					pstat->ablk_cipher_des_dec);



	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   ABLK 3DES CIPHER encryption  : %d\n",

					pstat->ablk_cipher_3des_enc);



	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   ABLK 3DES CIPHER decryption  : %d\n",

					pstat->ablk_cipher_3des_dec);



	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   ABLK CIPHER operation success: %d\n",

					pstat->ablk_cipher_op_success);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   ABLK CIPHER operation fail   : %d\n",

					pstat->ablk_cipher_op_fail);



	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   AEAD SHA1-AES encryption      : %d\n",

					pstat->aead_sha1_aes_enc);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   AEAD SHA1-AES decryption      : %d\n",

					pstat->aead_sha1_aes_dec);



	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   AEAD SHA1-DES encryption      : %d\n",

					pstat->aead_sha1_des_enc);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   AEAD SHA1-DES decryption      : %d\n",

					pstat->aead_sha1_des_dec);



	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   AEAD SHA1-3DES encryption     : %d\n",

					pstat->aead_sha1_3des_enc);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   AEAD SHA1-3DES decryption     : %d\n",

					pstat->aead_sha1_3des_dec);



	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   AEAD CCM-AES encryption     : %d\n",

					pstat->aead_ccm_aes_enc);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   AEAD CCM-AES decryption     : %d\n",

					pstat->aead_ccm_aes_dec);



	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   AEAD operation success       : %d\n",

					pstat->aead_op_success);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   AEAD operation fail          : %d\n",

					pstat->aead_op_fail);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   AEAD bad message             : %d\n",

					pstat->aead_bad_msg);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   SHA1 digest			 : %d\n",

					pstat->sha1_digest);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   SHA256 digest		 : %d\n",

					pstat->sha256_digest);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   SHA  operation fail          : %d\n",

					pstat->sha_op_fail);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   SHA  operation success          : %d\n",

					pstat->sha_op_success);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   SHA1 HMAC digest			 : %d\n",

					pstat->sha1_hmac_digest);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   SHA256 HMAC digest		 : %d\n",

					pstat->sha256_hmac_digest);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   SHA HMAC operation fail          : %d\n",

					pstat->sha_hmac_op_fail);

	len += snprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

	len += scnprintf(_debug_read_buf + len, DEBUG_MAX_RW_BUF - len - 1,

			"   SHA HMAC operation success          : %d\n",

					pstat->sha_hmac_op_success);

	spin_lock_irqsave(&cp->lock, flags);

	list_for_each_entry(pe, &cp->engine_list, elist) {

		len += snprintf(

		len += scnprintf(

			_debug_read_buf + len,

			DEBUG_MAX_RW_BUF - len - 1,

			"   Engine %d Req                : %d\n",

			pe->unit,

			pe->total_req

		);

		len += snprintf(

		len += scnprintf(

			_debug_read_buf + len,

			DEBUG_MAX_RW_BUF - len - 1,

			"   Engine %d Req Error          : %d\n",