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

Commit be1ef9c2 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 0a4dd8e5 26f60a0a

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

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ Optional: 
- qcom,smmu-disable-htw: boolean value to turn off SMMU page table caching

- 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
@@ -4855,6 +4855,7 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
	ipa3_ctx->apply_rg10_wa = resource_p->apply_rg10_wa;

	ipa3_ctx->gsi_ch20_wa = resource_p->gsi_ch20_wa;

	ipa3_ctx->ipa3_active_clients_logging.log_rdy = false;

	ipa3_ctx->ipa_config_is_mhi = resource_p->ipa_mhi_dynamic_config;

	if (resource_p->ipa_tz_unlock_reg) {

		ipa3_ctx->ipa_tz_unlock_reg_num =

			resource_p->ipa_tz_unlock_reg_num;
@@ -5395,6 +5396,7 @@ static int get_ipa_dts_configuration(struct platform_device *pdev, 
	ipa_drv_res->ipa_bam_remote_mode = false;

	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->wan_rx_ring_size = IPA_GENERIC_RX_POOL_SZ;

	ipa_drv_res->lan_rx_ring_size = IPA_GENERIC_RX_POOL_SZ;
@@ -5457,6 +5459,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->ipa_bam_remote_mode =

			of_property_read_bool(pdev->dev.of_node,

			"qcom,ipa-bam-remote-mode");

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

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

	bool gsi_ch20_wa;

	bool tethered_flow_control;

	bool ipa_mhi_dynamic_config;

	u32 ipa_tz_unlock_reg_num;

	struct ipa_tz_unlock_reg_info *ipa_tz_unlock_reg;

};