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

Commit 7db41950 authored by Sivan Reinstein's avatar Sivan Reinstein Committed by Gerrit - the friendly Code Review server
Browse files

msm: ipa: moving uC info partition to beginning of SRAM 



For IPA2.5 and on, uC requires 512 bytes for the uC info partition
in SRAM. The uC partition was moved to the beginning of SRAM and
its size was increased to 512 bytes.
Apss header partition is not used, so it's removed from SRAM.

Change-Id: I8d166ce5d1715413fc1b901da7e3b7ca15b8a2af
Signed-off-by: default avatarSivan Reinstein <sivanr@codeaurora.org>
parent 17856c12

drivers/platform/msm/ipa/ipa.c

+3 −1
Original line number Diff line number Diff line
@@ -1645,6 +1645,8 @@ int _ipa_init_sram_v2_5(void) 


#define IPA_SRAM_SET(ofst, val) (ipa_sram_mmio[(ofst - 4) / 4] = val)



	IPA_SRAM_SET(IPA_MEM_PART(v4_flt_ofst) - 4, IPA_MEM_CANARY_VAL);

	IPA_SRAM_SET(IPA_MEM_PART(v4_flt_ofst), IPA_MEM_CANARY_VAL);

	IPA_SRAM_SET(IPA_MEM_PART(v6_flt_ofst) - 4, IPA_MEM_CANARY_VAL);

	IPA_SRAM_SET(IPA_MEM_PART(v6_flt_ofst), IPA_MEM_CANARY_VAL);

	IPA_SRAM_SET(IPA_MEM_PART(v4_rt_ofst) - 4, IPA_MEM_CANARY_VAL);
@@ -1656,7 +1658,7 @@ int _ipa_init_sram_v2_5(void) 
	IPA_SRAM_SET(IPA_MEM_PART(modem_hdr_proc_ctx_ofst), IPA_MEM_CANARY_VAL);

	IPA_SRAM_SET(IPA_MEM_PART(modem_ofst), IPA_MEM_CANARY_VAL);

	IPA_SRAM_SET(IPA_MEM_PART(apps_v4_flt_ofst), IPA_MEM_CANARY_VAL);

	IPA_SRAM_SET(IPA_MEM_PART(uc_info_ofst), IPA_MEM_CANARY_VAL);

	IPA_SRAM_SET(IPA_MEM_PART(end_ofst), IPA_MEM_CANARY_VAL);



	iounmap(ipa_sram_mmio);

drivers/platform/msm/ipa/ipa_ram_mmap.h

+23 −15
Original line number Diff line number Diff line
@@ -202,6 +202,12 @@ 
/*

 * IPA v2.5 SRAM memory layout:

 * +----------------+

 * |    UC INFO     |

 * +----------------+

 * |    CANARY      |

 * +----------------+

 * |    CANARY      |

 * +----------------+

 * | V4 FLT HDR     |

 * +----------------+

 * |    CANARY      |
@@ -246,11 +252,22 @@ 
 * +----------------+

 * |    CANARY      |

 * +----------------+

 * |   UC INFO      |

 * +----------------+

 */

#define IPA_MEM_v2_5_RAM_OFST_START 128

#define IPA_MEM_v2_5_RAM_V4_FLT_OFST IPA_MEM_v2_5_RAM_OFST_START



#define IPA_MEM_v2_5_RAM_UC_MEM_SIZE 128

#define IPA_MEM_v2_5_RAM_UC_INFO_OFST IPA_MEM_v2_5_RAM_UC_MEM_SIZE

#define IPA_MEM_v2_5_RAM_UC_INFO_SIZE 512



/* uC info 4B aligned */

#if (IPA_MEM_v2_5_RAM_UC_INFO_OFST & 3)

#error uC info is not 4B aligned

#endif



#define IPA_MEM_v2_5_RAM_OFST_START (IPA_MEM_v2_5_RAM_UC_INFO_OFST + \

	IPA_MEM_v2_5_RAM_UC_INFO_SIZE)



#define IPA_MEM_v2_5_RAM_V4_FLT_OFST (IPA_MEM_v2_5_RAM_OFST_START + \

	2 * IPA_MEM_CANARY_SIZE)

#define IPA_MEM_v2_5_RAM_V4_FLT_SIZE 88



/* V4 filtering header table is 8B aligned */
@@ -310,7 +327,7 @@ 


#define IPA_MEM_v2_5_RAM_APPS_HDR_OFST (IPA_MEM_v2_5_RAM_MODEM_HDR_OFST + \

	IPA_MEM_v2_5_RAM_MODEM_HDR_SIZE)

#define IPA_MEM_v2_5_RAM_APPS_HDR_SIZE 72

#define IPA_MEM_v2_5_RAM_APPS_HDR_SIZE 0



/* header table is 8B aligned */

#if (IPA_MEM_v2_5_RAM_APPS_HDR_OFST & 7)
@@ -364,17 +381,8 @@ 
#error filtering rule is not 4B aligned

#endif



#define IPA_MEM_v2_5_RAM_UC_INFO_OFST (IPA_MEM_v2_5_RAM_APPS_V6_FLT_OFST + \

#define IPA_MEM_v2_5_RAM_END_OFST (IPA_MEM_v2_5_RAM_APPS_V6_FLT_OFST + \

	IPA_MEM_v2_5_RAM_APPS_V6_FLT_SIZE + IPA_MEM_CANARY_SIZE)

#define IPA_MEM_v2_5_RAM_UC_INFO_SIZE 292



/* uC info 4B aligned */

#if (IPA_MEM_v2_5_RAM_UC_INFO_OFST & 3)

#error uC info is not 4B aligned

#endif



#define IPA_MEM_v2_5_RAM_END_OFST (IPA_MEM_v2_5_RAM_UC_INFO_OFST + \

	IPA_MEM_v2_5_RAM_UC_INFO_SIZE)

#define IPA_MEM_v2_5_RAM_APPS_V4_RT_OFST IPA_MEM_v2_5_RAM_END_OFST

#define IPA_MEM_v2_5_RAM_APPS_V4_RT_SIZE 0

#define IPA_MEM_v2_5_RAM_APPS_V6_RT_OFST IPA_MEM_v2_5_RAM_END_OFST

drivers/platform/msm/ipa/ipa_utils.c

+5 −5
Original line number Diff line number Diff line
@@ -3935,6 +3935,11 @@ static void ipa_init_mem_partition_v2_5(void) 
	IPADBG("NAT OFST 0x%x SIZE 0x%x\n", IPA_MEM_PART(nat_ofst),

		IPA_MEM_PART(nat_size));



	IPA_MEM_PART(uc_info_ofst) = IPA_MEM_v2_5_RAM_UC_INFO_OFST;

	IPA_MEM_PART(uc_info_size) = IPA_MEM_v2_5_RAM_UC_INFO_SIZE;

	IPADBG("UC INFO OFST 0x%x SIZE 0x%x\n", IPA_MEM_PART(uc_info_ofst),

		IPA_MEM_PART(uc_info_size));



	IPA_MEM_PART(ofst_start) = IPA_MEM_v2_5_RAM_OFST_START;

	IPADBG("RAM OFST 0x%x\n", IPA_MEM_PART(ofst_start));
@@ -4044,11 +4049,6 @@ static void ipa_init_mem_partition_v2_5(void) 
	IPADBG("V6 APPS FLT OFST 0x%x SIZE 0x%x\n",

		IPA_MEM_PART(apps_v6_flt_ofst), IPA_MEM_PART(apps_v6_flt_size));



	IPA_MEM_PART(uc_info_ofst) = IPA_MEM_v2_5_RAM_UC_INFO_OFST;

	IPA_MEM_PART(uc_info_size) = IPA_MEM_v2_5_RAM_UC_INFO_SIZE;

	IPADBG("V6 UC INFO OFST 0x%x SIZE 0x%x\n", IPA_MEM_PART(uc_info_ofst),

		IPA_MEM_PART(uc_info_size));



	IPA_MEM_PART(end_ofst) = IPA_MEM_v2_5_RAM_END_OFST;

	IPA_MEM_PART(apps_v4_rt_ofst) = IPA_MEM_v2_5_RAM_APPS_V4_RT_OFST;

	IPA_MEM_PART(apps_v4_rt_size) = IPA_MEM_v2_5_RAM_APPS_V4_RT_SIZE;