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

Commit 585751dd authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 21cd9556 on remote branch 

Change-Id: I3887b77735e7a5cd992d6cfe366f1bba5f4120c5
parents 0953ca87 21cd9556

drivers/platform/msm/gsi/gsi.c

+6 −3
Original line number Diff line number Diff line
@@ -4836,9 +4836,12 @@ int gsi_flow_control_ee(unsigned int chan_idx, unsigned int ee, 
		msecs_to_jiffies(GSI_CMD_TIMEOUT));

	if (res == 0) {

		GSIERR("chan_idx=%u ee=%u timed out\n", chan_idx, ee);

		res = -GSI_STATUS_TIMED_OUT;

		GSI_ASSERT();

		goto free_lock;

		GSIERR("GSI_EE_n_CNTXT_GLOB_IRQ_EN_OFFS = 0x%x\n",

				gsi_readl(gsi_ctx->base +

				GSI_EE_n_CNTXT_GLOB_IRQ_EN_OFFS(gsi_ctx->per.ee)));

		GSIERR("GSI_EE_n_CNTXT_GLOB_IRQ_STTS_OFFS IRQ type = 0x%x\n",

				gsi_readl(gsi_ctx->base +

				GSI_EE_n_CNTXT_GLOB_IRQ_STTS_OFFS(gsi_ctx->per.ee)));

	}



	gsi_ctx->scratch.word0.val = gsi_readl(gsi_ctx->base +

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

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

	ipa3_ctx->max_num_smmu_cb = resource_p->max_num_smmu_cb;

	ipa3_ctx->hw_type_index = ipa3_get_hw_type_index();

	ipa3_ctx->fnr_stats_not_supported = resource_p->fnr_stats_not_supported;



	if (resource_p->gsi_fw_file_name) {

		ipa3_ctx->gsi_fw_file_name =
@@ -7961,6 +7962,7 @@ static int get_ipa_dts_configuration(struct platform_device *pdev, 
	ipa_drv_res->is_eth_bridging_supported = false;

	ipa_drv_res->is_bw_monitor_supported = false;

	ipa_drv_res->modem_load_ipa_fw = false;

	ipa_drv_res->fnr_stats_not_supported = false;



	/* Get IPA HW Version */

	result = of_property_read_u32(pdev->dev.of_node, "qcom,ipa-hw-ver",
@@ -8255,6 +8257,13 @@ static int get_ipa_dts_configuration(struct platform_device *pdev, 
		ipa_drv_res->modem_load_ipa_fw

		? "True" : "False");



	ipa_drv_res->fnr_stats_not_supported =

		of_property_read_bool(pdev->dev.of_node,

		"qcom,fnr-stats-not-supported");

	IPADBG(": FnR stats not supported = %s\n",

		ipa_drv_res->fnr_stats_not_supported

		? "True" : "False");



	result = of_property_read_string(pdev->dev.of_node,

			"qcom,use-gsi-ipa-fw", &ipa_drv_res->gsi_fw_file_name);

	if (!result)

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

+2 −0
Original line number Diff line number Diff line
@@ -2153,6 +2153,7 @@ struct ipa3_context { 
	bool is_eth_bridging_supported;

	bool is_bw_monitor_supported;

	bool modem_load_ipa_fw;

	bool fnr_stats_not_supported;

};



struct ipa3_plat_drv_res {
@@ -2225,6 +2226,7 @@ struct ipa3_plat_drv_res { 
	bool is_eth_bridging_supported;

	bool is_bw_monitor_supported;

	bool modem_load_ipa_fw;

	bool fnr_stats_not_supported;

};



/**

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

+7 −1
Original line number Diff line number Diff line
@@ -1204,6 +1204,11 @@ static netdev_tx_t ipa3_wwan_xmit(struct sk_buff *skb, struct net_device *dev) 
		return NETDEV_TX_OK;

	}



	if (unlikely(skb == NULL)) {

		IPAWANERR_RL("unexpected NULL data\n");

		return NETDEV_TX_BUSY;

	}



	if (skb->protocol != htons(ETH_P_MAP)) {

		IPAWANDBG_LOW

		("SW filtering out none QMAP packet received from %s",
@@ -4169,7 +4174,8 @@ int rmnet_ipa3_query_tethering_stats_all( 
	} else if (upstream_type == IPA_UPSTEAM_WLAN) {

		IPAWANDBG_LOW(" query wifi-backhaul stats\n");

		if (ipa3_ctx_get_type(IPA_HW_TYPE) < IPA_HW_v4_5 ||

			!ipa3_ctx_get_flag(IPA_HW_STATS_EN)) {

			!ipa3_ctx_get_flag(IPA_HW_STATS_EN) ||

			ipa3_ctx->fnr_stats_not_supported) {

			IPAWANDBG("hw version %d,hw_stats.enabled %d\n",

				ipa3_ctx_get_type(IPA_HW_TYPE),

				ipa3_ctx_get_flag(IPA_HW_STATS_EN));