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

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

Merge "msm: ipa: removing apps IPv4 & IPv6 filtering partitions from SRAM"

parents ada81eb9 f7622034

drivers/platform/msm/ipa/ipa.c

+0 −1
Original line number Diff line number Diff line
@@ -1654,7 +1654,6 @@ int _ipa_init_sram_v2_5(void) 
							IPA_MEM_CANARY_VAL);

	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(end_ofst), IPA_MEM_CANARY_VAL);



	iounmap(ipa_sram_mmio);

drivers/platform/msm/ipa/ipa_ram_mmap.h

+3 −9
Original line number Diff line number Diff line
@@ -246,12 +246,6 @@ 
 * +----------------+

 * |    CANARY      |

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

 * | APPS V4 FLT    |

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

 * | APPS V6 FLT    |

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

 * |    CANARY      |

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

 */



#define IPA_MEM_v2_5_RAM_UC_MEM_SIZE 128
@@ -356,7 +350,7 @@ 


#define IPA_MEM_v2_5_RAM_MODEM_OFST (IPA_MEM_v2_5_RAM_APPS_HDR_PROC_CTX_OFST + \

	IPA_MEM_v2_5_RAM_APPS_HDR_PROC_CTX_SIZE + IPA_MEM_CANARY_SIZE)

#define IPA_MEM_v2_5_RAM_MODEM_SIZE 3276

#define IPA_MEM_v2_5_RAM_MODEM_SIZE 5800



/* modem memory is 4B aligned */

#if (IPA_MEM_v2_5_RAM_MODEM_OFST & 3)
@@ -365,7 +359,7 @@ 


#define IPA_MEM_v2_5_RAM_APPS_V4_FLT_OFST (IPA_MEM_v2_5_RAM_MODEM_OFST + \

	IPA_MEM_v2_5_RAM_MODEM_SIZE + IPA_MEM_CANARY_SIZE)

#define IPA_MEM_v2_5_RAM_APPS_V4_FLT_SIZE 2176

#define IPA_MEM_v2_5_RAM_APPS_V4_FLT_SIZE 0



/* filtering rule is 4B aligned */

#if (IPA_MEM_v2_5_RAM_APPS_V4_FLT_OFST & 3)
@@ -374,7 +368,7 @@ 


#define IPA_MEM_v2_5_RAM_APPS_V6_FLT_OFST (IPA_MEM_v2_5_RAM_APPS_V4_FLT_OFST + \

	IPA_MEM_v2_5_RAM_APPS_V4_FLT_SIZE)

#define IPA_MEM_v2_5_RAM_APPS_V6_FLT_SIZE 348

#define IPA_MEM_v2_5_RAM_APPS_V6_FLT_SIZE 0



/* filtering rule is 4B aligned */

#if (IPA_MEM_v2_5_RAM_APPS_V6_FLT_OFST & 3)