From 55625a2f55ab28c4622820740468a5439e59d6b8 Mon Sep 17 00:00:00 2001 From: Skylar Chang Date: Tue, 12 Jul 2016 16:59:41 -0700 Subject: [PATCH 1/2] msm: ipa3: not configure ipa_rx_hps registers In order to not violate SMMU policy on msmcobalt, IPA3 needs move resource group configuration from HLOS to TZ for those ipa_rx_hps registers. Change-Id: If9968c319f86ef66571fa8fcbb952910fabec5ad Signed-off-by: Skylar Chang --- drivers/platform/msm/ipa/ipa_v3/ipa_utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c b/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c index 395cf62c9728..6881819d2108 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c @@ -3349,6 +3349,12 @@ void ipa3_set_resorce_groups_min_max_limits(void) } } + /* move resource group configuration from HLOS to TZ */ + if (ipa3_ctx->ipa_hw_type == IPA_HW_v3_1) { + IPAERR("skip configuring ipa_rx_hps_clients from HLOS\n"); + return; + } + IPADBG("Assign RX_HPS CMDQ rsrc groups min-max limits\n"); ipa3_configure_rx_hps_clients(0, true); From a38c031c61586a1de0e7b37e02b511a171b90b67 Mon Sep 17 00:00:00 2001 From: Ghanim Fodi Date: Mon, 22 Aug 2016 17:40:19 +0300 Subject: [PATCH 2/2] msm: ipa3: Adapt version handling to support IPAv3.5/3.5.1 Adapt IPA driver code where it has different handling according to IPA H/W version, to support IPAv3.5 and IPAv3.5.1 H/W versions. Change-Id: I2e5bd023d643d2fbba32f226c5eb85c39b620f3b CRs-fixed: 1055677 Signed-off-by: Ghanim Fodi --- drivers/platform/msm/ipa/ipa_api.c | 8 ++++++ drivers/platform/msm/ipa/ipa_v3/ipa.c | 6 ++--- drivers/platform/msm/ipa/ipa_v3/ipa_dp.c | 2 +- drivers/platform/msm/ipa/ipa_v3/ipa_i.h | 1 + .../platform/msm/ipa/ipa_v3/ipa_interrupts.c | 4 +-- drivers/platform/msm/ipa/ipa_v3/ipa_utils.c | 26 ++++++++++++++++++- 6 files changed, 40 insertions(+), 7 deletions(-) diff --git a/drivers/platform/msm/ipa/ipa_api.c b/drivers/platform/msm/ipa/ipa_api.c index a08d157e2b0f..05ce3969a5c7 100644 --- a/drivers/platform/msm/ipa/ipa_api.c +++ b/drivers/platform/msm/ipa/ipa_api.c @@ -2568,6 +2568,12 @@ const char *ipa_get_version_string(enum ipa_hw_type ver) case IPA_HW_v3_1: str = "3.1"; break; + case IPA_HW_v3_5: + str = "3.5"; + break; + case IPA_HW_v3_5_1: + str = "3.5.1"; + break; default: str = "Invalid version"; break; @@ -2626,6 +2632,8 @@ static int ipa_generic_plat_drv_probe(struct platform_device *pdev_p) break; case IPA_HW_v3_0: case IPA_HW_v3_1: + case IPA_HW_v3_5: + case IPA_HW_v3_5_1: result = ipa3_plat_drv_probe(pdev_p, ipa_api_ctrl, ipa_plat_drv_match); break; diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa.c b/drivers/platform/msm/ipa/ipa_v3/ipa.c index 4db07bad7d93..2774a2746782 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa.c @@ -3860,10 +3860,10 @@ static ssize_t ipa3_write(struct file *file, const char __user *buf, if (ipa3_ctx->transport_prototype == IPA_TRANSPORT_TYPE_GSI) { IPA_ACTIVE_CLIENTS_INC_SIMPLE(); - if (ipa3_ctx->ipa_hw_type == IPA_HW_v3_0) - result = ipa3_trigger_fw_loading_mdms(); - else if (ipa3_ctx->ipa_hw_type == IPA_HW_v3_1) + if (ipa3_is_msm_device()) result = ipa3_trigger_fw_loading_msms(); + else + result = ipa3_trigger_fw_loading_mdms(); /* No IPAv3.x chipsets that don't support FW loading */ IPA_ACTIVE_CLIENTS_DEC_SIMPLE(); diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_dp.c b/drivers/platform/msm/ipa/ipa_v3/ipa_dp.c index 4c600c6131e9..260fa287fc42 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa_dp.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa_dp.c @@ -4181,7 +4181,7 @@ static uint64_t pointer_to_tag_wa(struct ipa3_tx_pkt_wrapper *tx_pkt) { u16 temp; /* Add the check but it might have throughput issue */ - if (ipa3_ctx->ipa_hw_type == IPA_HW_v3_1) { + if (ipa3_is_msm_device()) { temp = (u16) (~((unsigned long) tx_pkt & 0xFFFF000000000000) >> 48); if (temp) { diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_i.h b/drivers/platform/msm/ipa/ipa_v3/ipa_i.h index a7587b2b9675..227d3474fc79 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa_i.h +++ b/drivers/platform/msm/ipa/ipa_v3/ipa_i.h @@ -2013,4 +2013,5 @@ int ipa3_smmu_map_peer_buff(u64 iova, phys_addr_t phys_addr, int ipa3_ntn_init(void); int ipa3_get_ntn_stats(struct Ipa3HwStatsNTNInfoData_t *stats); struct dentry *ipa_debugfs_get_root(void); +bool ipa3_is_msm_device(void); #endif /* _IPA3_I_H_ */ diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_interrupts.c b/drivers/platform/msm/ipa/ipa_v3/ipa_interrupts.c index f0102a703812..c38918ec8a85 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa_interrupts.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa_interrupts.c @@ -395,7 +395,7 @@ int ipa3_add_interrupt_handler(enum ipa_irq_type interrupt, /* register SUSPEND_IRQ_EN_EE_n_ADDR for L2 interrupt*/ if ((interrupt == IPA_TX_SUSPEND_IRQ) && - (ipa3_ctx->ipa_hw_type == IPA_HW_v3_1)) { + (ipa3_ctx->ipa_hw_type >= IPA_HW_v3_1)) { val = ~0; for (client_idx = 0; client_idx < IPA_CLIENT_MAX; client_idx++) if (IPA_CLIENT_IS_Q6_CONS(client_idx) || @@ -448,7 +448,7 @@ int ipa3_remove_interrupt_handler(enum ipa_irq_type interrupt) /* clean SUSPEND_IRQ_EN_EE_n_ADDR for L2 interrupt */ if ((interrupt == IPA_TX_SUSPEND_IRQ) && - (ipa3_ctx->ipa_hw_type == IPA_HW_v3_1)) { + (ipa3_ctx->ipa_hw_type >= IPA_HW_v3_1)) { ipahal_write_reg_n(IPA_SUSPEND_IRQ_EN_EE_n, ipa_ee, 0); IPADBG("wrote IPA_SUSPEND_IRQ_EN_EE_n reg = %d\n", 0); } diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c b/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c index 6881819d2108..a21eb9c1530b 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c @@ -3350,7 +3350,7 @@ void ipa3_set_resorce_groups_min_max_limits(void) } /* move resource group configuration from HLOS to TZ */ - if (ipa3_ctx->ipa_hw_type == IPA_HW_v3_1) { + if (ipa3_ctx->ipa_hw_type >= IPA_HW_v3_1) { IPAERR("skip configuring ipa_rx_hps_clients from HLOS\n"); return; } @@ -3610,3 +3610,27 @@ int ipa3_load_fws(const struct firmware *firmware) IPADBG("IPA FWs (GSI FW, HPS and DPS) were loaded\n"); return 0; } + +/** + * ipa3_is_msm_device() - Is the running device a MSM or MDM? + * Determine according to IPA version + * + * Return value: true if MSM, false if MDM + * + */ +bool ipa3_is_msm_device(void) +{ + switch (ipa3_ctx->ipa_hw_type) { + case IPA_HW_v3_0: + case IPA_HW_v3_5: + return false; + case IPA_HW_v3_1: + case IPA_HW_v3_5_1: + return true; + default: + IPAERR("unknown HW type %d\n", ipa3_ctx->ipa_hw_type); + ipa_assert(); + } + + return false; +}