evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: ipa3: Adapt version handling to support IPAv3.5/3.5.1"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-26 22:22:17 -07:00 • committed by Gerrit - the friendly Code Review server
commit 9982c0b83f
6 changed files with 45 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/platform/msm/ipa/ipa_api.c
View file

@ -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;

6
drivers/platform/msm/ipa/ipa_v3/ipa.c
View file

@ -3838,10 +3838,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();

2
drivers/platform/msm/ipa/ipa_v3/ipa_dp.c
View file

@ -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) {

1
drivers/platform/msm/ipa/ipa_v3/ipa_i.h
View file

@ -2015,4 +2015,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_ */

4
drivers/platform/msm/ipa/ipa_v3/ipa_interrupts.c
View file

@ -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);
}

30
drivers/platform/msm/ipa/ipa_v3/ipa_utils.c
View file

@ -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);
@ -3604,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;
}