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

Commit 83f01c23 authored Jun 15, 2015 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Jun 15, 2015

Merge "msm: ipa: fix modem SW SRAM partition issue"

parents 7661795e 0c35f526

drivers/platform/msm/ipa/ipa.c

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1191,8 +1191,14 @@ int ipa_init_q6_smem(void)

	ipa_inc_client_enable_clks();		ipa_inc_client_enable_clks();

			if (ipa_ctx->ipa_hw_type == IPA_HW_v2_0)
			rc = ipa_init_smem_region(IPA_MEM_PART(modem_size) -
			IPA_MEM_RAM_MODEM_NETWORK_STATS_SIZE,
			IPA_MEM_PART(modem_ofst));
			else
	rc = ipa_init_smem_region(IPA_MEM_PART(modem_size),		rc = ipa_init_smem_region(IPA_MEM_PART(modem_size),
	IPA_MEM_PART(modem_ofst));		IPA_MEM_PART(modem_ofst));

	if (rc) {		if (rc) {
	IPAERR("failed to initialize Modem RAM memory\n");		IPAERR("failed to initialize Modem RAM memory\n");
	ipa_dec_client_disable_clks();		ipa_dec_client_disable_clks();

drivers/platform/msm/ipa/ipa_ram_mmap.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -49,6 +49,7 @@
	#define IPA_MEM_CANARY_SIZE 4		#define IPA_MEM_CANARY_SIZE 4
	#define IPA_MEM_CANARY_VAL 0xdeadbeef		#define IPA_MEM_CANARY_VAL 0xdeadbeef

			#define IPA_MEM_RAM_MODEM_NETWORK_STATS_SIZE 256
	/*		/*
	* IPA v2.0 and v2.1 SRAM memory layout:		* IPA v2.0 and v2.1 SRAM memory layout:
	* +-------------+		* +-------------+
	@@ -166,7 +167,7 @@

	#define IPA_MEM_v2_RAM_APPS_V4_FLT_OFST (IPA_MEM_v2_RAM_MODEM_OFST + \		#define IPA_MEM_v2_RAM_APPS_V4_FLT_OFST (IPA_MEM_v2_RAM_MODEM_OFST + \
	IPA_MEM_v2_RAM_MODEM_SIZE + IPA_MEM_CANARY_SIZE)		IPA_MEM_v2_RAM_MODEM_SIZE + IPA_MEM_CANARY_SIZE)
	#define IPA_MEM_v2_RAM_APPS_V4_FLT_SIZE 2176		#define IPA_MEM_v2_RAM_APPS_V4_FLT_SIZE 1920

	/* filtering rule is 4B aligned */		/* filtering rule is 4B aligned */
	#if (IPA_MEM_v2_RAM_APPS_V4_FLT_OFST & 3)		#if (IPA_MEM_v2_RAM_APPS_V4_FLT_OFST & 3)