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

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

Merge "msm: ipa3: change FnR prints to low"

parents 1b35a9d9 9ba1638c

drivers/platform/msm/ipa/ipa_v3/ipa.c

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 


#define IPA_AGGR_MAX_STR_LENGTH (10)



#define CLEANUP_TAG_PROCESS_TIMEOUT 150

#define CLEANUP_TAG_PROCESS_TIMEOUT 500



#define IPA_AGGR_STR_IN_BYTES(str) \

	(strnlen((str), IPA_AGGR_MAX_STR_LENGTH - 1) + 1)
@@ -2213,7 +2213,7 @@ static int ipa3_q6_set_ex_path_to_apps(void) 
		}

	}



	/* Will wait 150msecs for IPA tag process completion */

	/* Will wait 500msecs for IPA tag process completion */

	retval = ipa3_tag_process(desc, num_descs,

		msecs_to_jiffies(CLEANUP_TAG_PROCESS_TIMEOUT));

	if (retval) {

drivers/platform/msm/ipa/ipa_v3/ipa_flt.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static int ipa_prep_flt_tbl_for_cmt(enum ipa_ip_type ip, 
			IPAERR("failed to calculate HW FLT rule size\n");

			return -EPERM;

		}

		IPADBG("pipe %d rule_id (handle) %u hw_len %d priority %u\n",

		IPADBG_LOW("pipe %d rule_id(handle) %u hw_len %d priority %u\n",

			pipe_idx, entry->rule_id, entry->hw_len, entry->prio);



		if (entry->rule.hashable)

drivers/platform/msm/ipa/ipa_v3/ipa_rt.c

+10 −10
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static int ipa_prep_rt_tbl_for_cmt(enum ipa_ip_type ip, 
			return -EPERM;

		}



		IPADBG("RT rule id (handle) %d hw_len %u priority %u\n",

		IPADBG_LOW("RT rule id (handle) %d hw_len %u priority %u\n",

			entry->id, entry->hw_len, entry->prio);



		if (entry->rule.hashable)
@@ -642,23 +642,23 @@ int __ipa_commit_rt_v3(enum ipa_ip_type ip) 
		goto fail_imm_cmd_construct;

	}



	IPADBG("Hashable HEAD\n");

	IPADBG_LOW("Hashable HEAD\n");

	IPA_DUMP_BUFF(alloc_params.hash_hdr.base,

		alloc_params.hash_hdr.phys_base, alloc_params.hash_hdr.size);



	IPADBG("Non-Hashable HEAD\n");

	IPADBG_LOW("Non-Hashable HEAD\n");

	IPA_DUMP_BUFF(alloc_params.nhash_hdr.base,

		alloc_params.nhash_hdr.phys_base, alloc_params.nhash_hdr.size);



	if (alloc_params.hash_bdy.size) {

		IPADBG("Hashable BODY\n");

		IPADBG_LOW("Hashable BODY\n");

		IPA_DUMP_BUFF(alloc_params.hash_bdy.base,

			alloc_params.hash_bdy.phys_base,

			alloc_params.hash_bdy.size);

	}



	if (alloc_params.nhash_bdy.size) {

		IPADBG("Non-Hashable BODY\n");

		IPADBG_LOW("Non-Hashable BODY\n");

		IPA_DUMP_BUFF(alloc_params.nhash_bdy.base,

			alloc_params.nhash_bdy.phys_base,

			alloc_params.nhash_bdy.size);
@@ -1675,7 +1675,7 @@ int ipa3_rt_read_tbl_from_hw(u32 tbl_idx, enum ipa_ip_type ip_type, 
	u8 *rule_addr;

	int rule_idx;



	IPADBG("tbl_idx=%d ip_type=%d hashable=%d entry=0x%p num_entry=0x%p\n",

	IPADBG_LOW("tbl_idx=%d ip_t=%d hashable=%d entry=0x%p num_entry=0x%p\n",

		tbl_idx, ip_type, hashable, entry, num_entry);



	if (ip_type == IPA_IP_v4 && tbl_idx >= IPA_MEM_PART(v4_rt_num_index)) {
@@ -1716,7 +1716,7 @@ int ipa3_rt_read_tbl_from_hw(u32 tbl_idx, enum ipa_ip_type ip_type, 
				IPA_MEM_PART(v6_rt_nhash_ofst);

	}



	IPADBG("hdr_base_ofst=0x%llx\n", hdr_base_ofst);

	IPADBG_LOW("hdr_base_ofst=0x%llx\n", hdr_base_ofst);



	res = ipahal_fltrt_read_addr_from_hdr(ipa_sram_mmio + hdr_base_ofst,

		tbl_idx, &tbl_addr, &is_sys);
@@ -1724,7 +1724,7 @@ int ipa3_rt_read_tbl_from_hw(u32 tbl_idx, enum ipa_ip_type ip_type, 
		IPAERR("failed to read table address from header structure\n");

		goto bail;

	}

	IPADBG("rt tbl %d: tbl_addr=0x%llx is_sys=%d\n",

	IPADBG_LOW("rt tbl %d: tbl_addr=0x%llx is_sys=%d\n",

		tbl_idx, tbl_addr, is_sys);

	if (!tbl_addr) {

		IPAERR("invalid rt tbl addr\n");
@@ -1760,7 +1760,7 @@ int ipa3_rt_read_tbl_from_hw(u32 tbl_idx, enum ipa_ip_type ip_type, 
		rule_addr = ipa_sram_mmio + hdr_base_ofst + tbl_addr;

	}



	IPADBG("First rule addr 0x%p\n", rule_addr);

	IPADBG_LOW("First rule addr 0x%p\n", rule_addr);



	if (!rule_addr) {

		/* Modem table in system memory or empty table */
@@ -1776,7 +1776,7 @@ int ipa3_rt_read_tbl_from_hw(u32 tbl_idx, enum ipa_ip_type ip_type, 
			goto bail;

		}



		IPADBG("rule_size=%d\n", entry[rule_idx].rule_size);

		IPADBG_LOW("rule_size=%d\n", entry[rule_idx].rule_size);

		if (!entry[rule_idx].rule_size)

			break;