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

Commit dc6d1159 authored by Ghanim Fodi's avatar Ghanim Fodi Committed by Gerrit - the friendly Code Review server
Browse files

msm: ipa: Update IPA_SRAM_DIRECT_ACCESS_n for IPA4.5 



IPA shared RAM S/W area access can be done via this
register. At IPA4.5 the register name and offset
changed. This change updates the code accordingly.

CRs-Fixed: 2291194
Change-Id: Ibd683181f551df63097a58fd1e0473a3564236b6
Signed-off-by: default avatarGhanim Fodi <gfodi@codeaurora.org>
parent 740bdf65

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

+3 −3
Original line number Diff line number Diff line
@@ -2649,18 +2649,18 @@ int _ipa_init_sram_v3(void) 
	unsigned long phys_addr;



	IPADBG(

	    "ipa_wrapper_base(0x%08X) ipa_reg_base_ofst(0x%08X) IPA_SRAM_DIRECT_ACCESS_n(0x%08X) smem_restricted_bytes(0x%08X) smem_sz(0x%08X)\n",

	    "ipa_wrapper_base(0x%08X) ipa_reg_base_ofst(0x%08X) IPA_SW_AREA_RAM_DIRECT_ACCESS_n(0x%08X) smem_restricted_bytes(0x%08X) smem_sz(0x%08X)\n",

	    ipa3_ctx->ipa_wrapper_base,

	    ipa3_ctx->ctrl->ipa_reg_base_ofst,

	    ipahal_get_reg_n_ofst(

		IPA_SRAM_DIRECT_ACCESS_n,

		IPA_SW_AREA_RAM_DIRECT_ACCESS_n,

		ipa3_ctx->smem_restricted_bytes / 4),

	    ipa3_ctx->smem_restricted_bytes,

	    ipa3_ctx->smem_sz);



	phys_addr = ipa3_ctx->ipa_wrapper_base +

		ipa3_ctx->ctrl->ipa_reg_base_ofst +

		ipahal_get_reg_n_ofst(IPA_SRAM_DIRECT_ACCESS_n,

		ipahal_get_reg_n_ofst(IPA_SW_AREA_RAM_DIRECT_ACCESS_n,

			ipa3_ctx->smem_restricted_bytes / 4);



	ipa_sram_mmio = ioremap(phys_addr, ipa3_ctx->smem_sz);

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

+1 −1
Original line number Diff line number Diff line
@@ -1623,7 +1623,7 @@ int ipa3_flt_read_tbl_from_hw(u32 pipe_idx, enum ipa_ip_type ip_type, 
	/* map IPA SRAM */

	ipa_sram_mmio = ioremap(ipa3_ctx->ipa_wrapper_base +

		ipa3_ctx->ctrl->ipa_reg_base_ofst +

		ipahal_get_reg_n_ofst(IPA_SRAM_DIRECT_ACCESS_n,

		ipahal_get_reg_n_ofst(IPA_SW_AREA_RAM_DIRECT_ACCESS_n,

			ipa3_ctx->smem_restricted_bytes / 4),

		ipa3_ctx->smem_sz);

	if (!ipa_sram_mmio) {

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

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static int ipa3_nat_ipv6ct_mmap(struct file *filp, struct vm_area_struct *vma) 


		phys_addr = ipa3_ctx->ipa_wrapper_base +

			ipa3_ctx->ctrl->ipa_reg_base_ofst +

			ipahal_get_reg_n_ofst(IPA_SRAM_DIRECT_ACCESS_n,

			ipahal_get_reg_n_ofst(IPA_SW_AREA_RAM_DIRECT_ACCESS_n,

				dev->smem_offset);



		if (remap_pfn_range(

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

+1 −1
Original line number Diff line number Diff line
@@ -1938,7 +1938,7 @@ int ipa3_rt_read_tbl_from_hw(u32 tbl_idx, enum ipa_ip_type ip_type, 
	/* map IPA SRAM */

	ipa_sram_mmio = ioremap(ipa3_ctx->ipa_wrapper_base +

		ipa3_ctx->ctrl->ipa_reg_base_ofst +

		ipahal_get_reg_n_ofst(IPA_SRAM_DIRECT_ACCESS_n,

		ipahal_get_reg_n_ofst(IPA_SW_AREA_RAM_DIRECT_ACCESS_n,

			ipa3_ctx->smem_restricted_bytes / 4),

		ipa3_ctx->smem_sz);

	if (!ipa_sram_mmio) {

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

+3 −2
Original line number Diff line number Diff line
@@ -249,7 +249,8 @@ static void ipa3_log_evt_hdlr(void) 
		if (ipa3_ctx->uc_ctx.uc_event_top_ofst +

			sizeof(struct IpaHwEventLogInfoData_t) >=

			ipa3_ctx->ctrl->ipa_reg_base_ofst +

			ipahal_get_reg_n_ofst(IPA_SRAM_DIRECT_ACCESS_n, 0) +

			ipahal_get_reg_n_ofst(

				IPA_SW_AREA_RAM_DIRECT_ACCESS_n, 0) +

			ipa3_ctx->smem_sz) {

			IPAERR("uc_top 0x%x outside SRAM\n",

				ipa3_ctx->uc_ctx.uc_event_top_ofst);
@@ -657,7 +658,7 @@ int ipa3_uc_interface_init(void) 


	phys_addr = ipa3_ctx->ipa_wrapper_base +

		ipa3_ctx->ctrl->ipa_reg_base_ofst +

		ipahal_get_reg_n_ofst(IPA_SRAM_DIRECT_ACCESS_n, 0);

		ipahal_get_reg_n_ofst(IPA_SW_AREA_RAM_DIRECT_ACCESS_n, 0);

	ipa3_ctx->uc_ctx.uc_sram_mmio = ioremap(phys_addr,

					       IPA_RAM_UC_SMEM_SIZE);

	if (!ipa3_ctx->uc_ctx.uc_sram_mmio) {