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

Commit 8d7a4b59 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm: msm: ipa: Add support to get MHI config dynamically"

parents 4fc9872b 73cd4d29

Documentation/devicetree/bindings/platform/msm/ipa.txt

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ Optional: 
	compatible "qcom,ipa-smmu-uc-cb"

- qcom,use-a2-service: determine if A2 service will be used

- qcom,use-ipa-tethering-bridge: determine if tethering bridge will be used

- qcom,use-ipa-in-mhi-mode: Boolean context flag to indicate whether

				device booting in MHI config or not.

- qcom,use-ipa-bamdma-a2-bridge: determine if a2/ipa hw bridge will be used

- qcom,ee: which EE is assigned to (non-secure) APPS from IPA-BAM POV. This

is a number

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

+9 −0
Original line number Diff line number Diff line
@@ -5071,6 +5071,7 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
	ipa3_ctx->gsi_ch20_wa = resource_p->gsi_ch20_wa;

	ipa3_ctx->use_ipa_pm = resource_p->use_ipa_pm;

	ipa3_ctx->ipa3_active_clients_logging.log_rdy = false;

	ipa3_ctx->ipa_config_is_mhi = resource_p->ipa_mhi_dynamic_config;

	ipa3_ctx->mhi_evid_limits[0] = resource_p->mhi_evid_limits[0];

	ipa3_ctx->mhi_evid_limits[1] = resource_p->mhi_evid_limits[1];
@@ -5601,6 +5602,7 @@ static int get_ipa_dts_configuration(struct platform_device *pdev, 
	ipa_drv_res->ipa3_hw_mode = 0;

	ipa_drv_res->modem_cfg_emb_pipe_flt = false;

	ipa_drv_res->ipa_wdi2 = false;

	ipa_drv_res->ipa_mhi_dynamic_config = false;

	ipa_drv_res->use_64_bit_dma_mask = false;

	ipa_drv_res->use_bw_vote = false;

	ipa_drv_res->wan_rx_ring_size = IPA_GENERIC_RX_POOL_SZ;
@@ -5663,6 +5665,13 @@ static int get_ipa_dts_configuration(struct platform_device *pdev, 
		ipa_drv_res->use_ipa_teth_bridge

		? "True" : "False");



	ipa_drv_res->ipa_mhi_dynamic_config =

			of_property_read_bool(pdev->dev.of_node,

			"qcom,use-ipa-in-mhi-mode");

	IPADBG(": ipa_mhi_dynamic_config (%s)\n",

		ipa_drv_res->ipa_mhi_dynamic_config

		? "True" : "False");



	ipa_drv_res->modem_cfg_emb_pipe_flt =

			of_property_read_bool(pdev->dev.of_node,

			"qcom,modem-cfg-emb-pipe-flt");

drivers/platform/msm/ipa/ipa_v3/ipa_i.h

+1 −0
Original line number Diff line number Diff line
@@ -1441,6 +1441,7 @@ struct ipa3_plat_drv_res { 
	bool gsi_ch20_wa;

	bool tethered_flow_control;

	u32 mhi_evid_limits[2]; /* start and end values */

	bool ipa_mhi_dynamic_config;

	u32 ipa_tz_unlock_reg_num;

	struct ipa_tz_unlock_reg_info *ipa_tz_unlock_reg;

	bool use_ipa_pm;