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

Commit df5aaded 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: change IPA_UC_MAILBOX offset"

parents 9607b14b 59119189

drivers/platform/msm/ipa/ipa_reg.h

+2 −2
Original line number Diff line number Diff line
@@ -298,8 +298,8 @@ Common Registers 
#define IPA_IRQ_EE_UC_n_INT_BMSK 0x1

#define IPA_IRQ_EE_UC_n_INT_SHFT 0x0



#define IPA_UC_MAILBOX_m_n_OFFS(m, n) (0x0003a000 + 0x80 * (m) + 0x4 * (n))

#define IPA_UC_MAILBOX_m_n_OFFS_v2_5(m, n) (0x00062000 + 0x80 * (m) + 0x4 * (n))

#define IPA_UC_MAILBOX_m_n_OFFS(m, n) (0x0001a000 + 0x80 * (m) + 0x4 * (n))

#define IPA_UC_MAILBOX_m_n_OFFS_v2_5(m, n) (0x00022000 + 0x80 * (m) + 0x4 * (n))



#define IPA_SYS_PKT_PROC_CNTXT_BASE_OFST (0x000005d8)

#define IPA_LOCAL_PKT_PROC_CNTXT_BASE_OFST (0x000005e0)

drivers/platform/msm/ipa/ipa_uc_wdi.c

+4 −0
Original line number Diff line number Diff line
@@ -552,12 +552,14 @@ int ipa_connect_wdi_pipe(struct ipa_wdi_in_params *in, 
		if (ipa_ctx->ipa_hw_type == IPA_HW_v2_5) {

				out->uc_door_bell_pa =

				 ipa_ctx->ipa_wrapper_base +

				   IPA_REG_BASE_OFST_v2_5 +

				   IPA_UC_MAILBOX_m_n_OFFS_v2_5(

				    IPA_HW_WDI_TX_MBOX_START_INDEX/32,

				    IPA_HW_WDI_TX_MBOX_START_INDEX % 32);

		} else {

				out->uc_door_bell_pa =

				 ipa_ctx->ipa_wrapper_base +

				   IPA_REG_BASE_OFST_v2_0 +

				   IPA_UC_MAILBOX_m_n_OFFS(

				    IPA_HW_WDI_TX_MBOX_START_INDEX/32,

				    IPA_HW_WDI_TX_MBOX_START_INDEX % 32);
@@ -571,12 +573,14 @@ int ipa_connect_wdi_pipe(struct ipa_wdi_in_params *in, 
		if (ipa_ctx->ipa_hw_type == IPA_HW_v2_5) {

				out->uc_door_bell_pa =

				 ipa_ctx->ipa_wrapper_base +

				   IPA_REG_BASE_OFST_v2_5 +

				   IPA_UC_MAILBOX_m_n_OFFS_v2_5(

				    IPA_HW_WDI_RX_MBOX_START_INDEX/32,

				    IPA_HW_WDI_RX_MBOX_START_INDEX % 32);

		} else {

				out->uc_door_bell_pa =

				 ipa_ctx->ipa_wrapper_base +

				   IPA_REG_BASE_OFST_v2_0 +

				   IPA_UC_MAILBOX_m_n_OFFS(

				    IPA_HW_WDI_RX_MBOX_START_INDEX/32,

				    IPA_HW_WDI_RX_MBOX_START_INDEX % 32);