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

Commit 51201a7e authored by Skylar Chang's avatar Skylar Chang
Browse files

msm: ipa: remove IPA PM usage from IPAv2 



IPA PM framework is not present on IPAv2 and
should not be used.

Change-Id: I7f3c9e0b11627823e63f801d7650ce876d0b1c0d
CRs-Fixed: 2179225
Acked-by: default avatarAdy Abraham <adya@qti.qualcomm.com>
Signed-off-by: default avatarSkylar Chang <chiaweic@codeaurora.org>
parent 475ad2b7

drivers/platform/msm/ipa/ipa_api.c

+12 −0
Original line number Diff line number Diff line
@@ -3191,6 +3191,18 @@ int ipa_tz_unlock_reg(struct ipa_tz_unlock_reg_info *reg_info, u16 num_regs) 
	return ret;

}



/**

 * ipa_pm_is_used() - Returns if IPA PM framework is used

 */

bool ipa_pm_is_used(void)

{

	bool ret;



	IPA_API_DISPATCH_RETURN(ipa_pm_is_used);



	return ret;

}



static const struct dev_pm_ops ipa_pm_ops = {

	.suspend_noirq = ipa_ap_suspend,

	.resume_noirq = ipa_ap_resume,

drivers/platform/msm/ipa/ipa_api.h

+2 −0
Original line number Diff line number Diff line
@@ -417,6 +417,8 @@ struct ipa_api_controller { 
	int (*ipa_get_smmu_params)(struct ipa_smmu_in_params *in,

		struct ipa_smmu_out_params *out);

	int (*ipa_is_vlan_mode)(enum ipa_vlan_ifaces iface, bool *res);



	bool (*ipa_pm_is_used)(void);

};



#ifdef CONFIG_IPA3

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

+0 −5
Original line number Diff line number Diff line
@@ -5360,11 +5360,6 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
	return result;

}



bool ipa_pm_is_used(void)

{

	return (ipa3_ctx) ? ipa3_ctx->use_ipa_pm : false;

}



static int get_ipa_dts_pm_info(struct platform_device *pdev,

	struct ipa3_plat_drv_res *ipa_drv_res)

{

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

+6 −0
Original line number Diff line number Diff line
@@ -4572,6 +4572,11 @@ static int ipa3_is_vlan_mode(enum ipa_vlan_ifaces iface, bool *res) 
	return 0;

}



static bool ipa3_pm_is_used(void)

{

	return (ipa3_ctx) ? ipa3_ctx->use_ipa_pm : false;

}



int ipa3_bind_api_controller(enum ipa_hw_type ipa_hw_type,

	struct ipa_api_controller *api_ctrl)

{
@@ -4757,6 +4762,7 @@ int ipa3_bind_api_controller(enum ipa_hw_type ipa_hw_type, 
	api_ctrl->ipa_tz_unlock_reg = ipa3_tz_unlock_reg;

	api_ctrl->ipa_get_smmu_params = ipa3_get_smmu_params;

	api_ctrl->ipa_is_vlan_mode = ipa3_is_vlan_mode;

	api_ctrl->ipa_pm_is_used = ipa3_pm_is_used;



	return 0;

}