Merge "msm: ipa4: Mhi test case fix" (c81ef088) · Commits · e / devices / android_kernel_xiaomi_markw

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4608,7 +4608,7 @@ static ssize_t ipa3_write(struct file file, const char __user buf,
	}		}

	if (count > 0)		if (count > 0)
	dbg_buff[count - 1] = '\0';		dbg_buff[count] = '\0';

	/* Prevent consequent calls from trying to load the FW again. */		/* Prevent consequent calls from trying to load the FW again. */
	if (ipa3_is_ready())		if (ipa3_is_ready())

drivers/platform/msm/ipa/test/ipa_test_mhi.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -612,7 +612,8 @@ static int ipa_mhi_test_config_channel_context(
	p_events[ev_ring_idx].rp =		p_events[ev_ring_idx].rp =
	(u32)event_ring_bufs[ev_ring_idx].phys_base;		(u32)event_ring_bufs[ev_ring_idx].phys_base;
	p_events[ev_ring_idx].wp =		p_events[ev_ring_idx].wp =
	(u32)event_ring_bufs[ev_ring_idx].phys_base;		(u32)event_ring_bufs[ev_ring_idx].phys_base +
			event_ring_bufs[ev_ring_idx].size - 16;
	} else {		} else {
	IPA_UT_LOG("Skip configuring event ring - already done\n");		IPA_UT_LOG("Skip configuring event ring - already done\n");
	}		}
	@@ -3261,11 +3262,11 @@ IPA_UT_DEFINE_SUITE_START(mhi, "MHI for GSI",
	IPA_UT_ADD_TEST(suspend_resume_with_open_aggr,		IPA_UT_ADD_TEST(suspend_resume_with_open_aggr,
	"several suspend/resume iterations with open aggregation frame",		"several suspend/resume iterations with open aggregation frame",
	ipa_mhi_test_in_loop_suspend_resume_aggr_open,		ipa_mhi_test_in_loop_suspend_resume_aggr_open,
	true, IPA_HW_v3_0, IPA_HW_MAX),		true, IPA_HW_v3_0, IPA_HW_v3_5_1),
	IPA_UT_ADD_TEST(force_suspend_resume_with_open_aggr,		IPA_UT_ADD_TEST(force_suspend_resume_with_open_aggr,
	"several force suspend/resume iterations with open aggregation frame",		"several force suspend/resume iterations with open aggregation frame",
	ipa_mhi_test_in_loop_force_suspend_resume_aggr_open,		ipa_mhi_test_in_loop_force_suspend_resume_aggr_open,
	true, IPA_HW_v3_0, IPA_HW_MAX),		true, IPA_HW_v3_0, IPA_HW_v3_5_1),
	IPA_UT_ADD_TEST(suspend_resume_with_host_wakeup,		IPA_UT_ADD_TEST(suspend_resume_with_host_wakeup,
	"several suspend and host wakeup resume iterations",		"several suspend and host wakeup resume iterations",
	ipa_mhi_test_in_loop_suspend_host_wakeup,		ipa_mhi_test_in_loop_suspend_host_wakeup,