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

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

Merge "msm: ipa3: Add support to take data of tput threshold BW from dtsi"

parents 3ef51303 371ea7b3

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

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ memory allocation over a PCIe bridge 
                                a pipe reset via the IPA uC is required

- qcom,ipa-wdi2:                Boolean context flag to indicate whether

                                using wdi-2.0 or not

- qcom,throughput-threshold:    An array of throughput threshold for NOM and TURBO.

- qcom,use-64-bit-dma-mask:     Boolean context flag to indicate whether

                                using 64bit dma mask or not

- qcom,use-dma-zone:            Boolean context flag to indicate whether memory

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

+16 −0
Original line number Diff line number Diff line
@@ -4893,6 +4893,14 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
		goto fail_bind;

	}



	if (resource_p->default_threshold[0] > 0)

		ipa3_ctx->ctrl->clock_scaling_bw_threshold_nominal =

		resource_p->default_threshold[0];



	if (resource_p->default_threshold[1] > 0)

		ipa3_ctx->ctrl->clock_scaling_bw_threshold_turbo =

		resource_p->default_threshold[1];



	if (ipa3_bus_scale_table) {

		IPADBG("Use bus scaling info from device tree\n");

		ipa3_ctx->ctrl->msm_bus_data_ptr = ipa3_bus_scale_table;
@@ -5452,6 +5460,14 @@ static int get_ipa_dts_configuration(struct platform_device *pdev, 
			ipa_drv_res->ipa_wdi2

			? "True" : "False");



	/* Updat BW for NOM and TURBO TPUT threshold from Device Tree*/

	result = of_property_read_u32_array(pdev->dev.of_node,

		"qcom,throughput-threshold",

		ipa_drv_res->default_threshold,

		IPA_PM_THRESHOLD_MAX);

	if (result)

		IPAERR("failed to read qcom,throughput-thresholds\n");



	ipa_drv_res->use_64_bit_dma_mask =

			of_property_read_bool(pdev->dev.of_node,

			"qcom,use-64-bit-dma-mask");

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

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ 


#define IPA_IPC_LOG_PAGES 50



#define IPA_PM_THRESHOLD_MAX 2



#define IPADBG(fmt, args...) \

	do { \

		pr_debug(DRV_NAME " %s:%d " fmt, __func__, __LINE__, ## args);\
@@ -1360,6 +1362,7 @@ struct ipa3_plat_drv_res { 
	bool ipa_bam_remote_mode;

	bool modem_cfg_emb_pipe_flt;

	bool ipa_wdi2;

	u32 default_threshold[IPA_PM_THRESHOLD_MAX];

	bool use_64_bit_dma_mask;

	u32 wan_rx_ring_size;

	u32 lan_rx_ring_size;