Merge "msm: ipa3: fix IPA KW p1 errors"

drivers/platform/msm/ipa/ipa_clients/ipa_eth.c

@@ -545,8 +545,8 @@ static int ipa_eth_pm_register(struct ipa_eth_client *client)
 	int rc;
 
 	/* validate user input */
-	if (!client) {
-		IPA_ETH_ERR("null client");
+	if (!client || (client->client_type >= IPA_ETH_CLIENT_MAX)) {
+		IPA_ETH_ERR("null client or eth client doesn't exist");
 		return -EFAULT;
 	}
 	client_type = client->client_type;
@@ -603,8 +603,8 @@ static int ipa_eth_pm_deregister(struct ipa_eth_client *client)
 	int client_type, inst_id;
 
 	/* validate user input */
-	if (!client) {
-		IPA_ETH_ERR("null client");
+	if (!client || (client->client_type >= IPA_ETH_CLIENT_MAX)) {
+		IPA_ETH_ERR("null client or client type not defined");
 		return -EFAULT;
 	}
 	client_type = client->client_type;
@@ -635,8 +635,8 @@ static int ipa_eth_client_conn_pipes_internal(struct ipa_eth_client *client)
 	int client_type, inst_id, traff_type;
 
 	/* validate user input */
-	if (!client) {
-		IPA_ETH_ERR("null client");
+	if (!client || (client->client_type >= IPA_ETH_CLIENT_MAX)) {
+		IPA_ETH_ERR("null client or client type not defined");
 		return -EFAULT;
 	}
 	if (!ipa_eth_ctx) {
@@ -725,8 +725,8 @@ static int ipa_eth_client_reg_intf_internal(struct ipa_eth_intf_info *intf)
 	struct ipa_ioc_add_hdr *hdr;
 	struct ipa_tx_intf tx;
 	struct ipa_rx_intf rx;
-	enum ipa_client_type tx_client[IPA_CLIENT_MAX];
-	enum ipa_client_type rx_client[IPA_CLIENT_MAX];
+	enum ipa_client_type tx_client[IPA_CLIENT_MAX] = {0};
+	enum ipa_client_type rx_client[IPA_CLIENT_MAX] = {0};
 	struct ipa_ioc_tx_intf_prop *tx_prop =  NULL;
 	struct ipa_ioc_rx_intf_prop *rx_prop = NULL;
 	struct ipa_eth_client_pipe_info *pipe;
@@ -938,7 +938,7 @@ static int ipa_eth_client_set_perf_profile_internal(struct ipa_eth_client *clien
 
 	client_type = client->client_type;
 	inst_id = client->inst_id;
-	if (profile == NULL) {
+	if ((!profile) || (!client) || (client->client_type >= IPA_ETH_CLIENT_MAX)) {
 		IPA_ETH_ERR("Invalid input\n");
 		return -EINVAL;
 	}

drivers/platform/msm/ipa/ipa_common_i.h

@@ -726,6 +726,11 @@ int ipa3_nat_mdfy_pdn(struct ipa_ioc_nat_pdn_entry *mdfy_pdn);
 int ipa3_rx_poll(u32 clnt_hdl, int budget);
 void ipa3_recycle_wan_skb(struct sk_buff *skb);
 
+/*
+ * Low lat data path
+ */
+int ipa3_low_lat_rx_poll(u32 clnt_hdl, int budget);
+
 /*
 * System pipes
 */

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

@@ -640,6 +640,7 @@ static int ipa_eth_setup_aqc_gsi_channel(
 		IPAERR("Failed getting GSI EP info for client=%d\n",
 		       ep->client);
 		result = -EINVAL;
+		goto fail_get_gsi_ep_info;
 	} else
 		gsi_channel_props.ch_id = gsi_ep_info->ipa_gsi_chan_num;
 	gsi_channel_props.evt_ring_hdl = ep->gsi_evt_ring_hdl;
@@ -656,7 +657,8 @@ static int ipa_eth_setup_aqc_gsi_channel(
 	gsi_channel_props.ring_len = len;
 	gsi_channel_props.ring_base_addr =
 		(u64)pipe->info.transfer_ring_base;
-	result = gsi_alloc_channel(&gsi_channel_props, ipa3_ctx->gsi_dev_hdl,
+	result = gsi_alloc_channel(&gsi_channel_props,
+		ipa3_ctx->gsi_dev_hdl,
 		&ep->gsi_chan_hdl);
 	if (result != GSI_STATUS_SUCCESS)
 		goto fail_get_gsi_ep_info;

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

@@ -2585,9 +2585,9 @@ static ssize_t ipa_debugfs_enable_disable_drop_stats(struct file *file,
 	unsigned long missing;
 	unsigned int pipe_num = 0;
 	bool enable_pipe = true;
-	u32 pipe_bitmask[IPAHAL_IPA5_PIPE_REG_NUM];
-	u32 pipe_ep_reg_idx;
-	u32 pipe_ep_reg_bit;
+	u32 pipe_bitmask[IPAHAL_IPA5_PIPE_REG_NUM] = {0};
+	u32 pipe_ep_reg_idx = 0;
+	u32 pipe_ep_reg_bit = 0;
 	char seprator = ',';
 	int i, j;
 	bool is_pipe = false;

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

@@ -10267,10 +10267,12 @@ void ipa3_set_resorce_groups_min_max_limits(void)
 			ipa3_rsrc_src_grp_config[hw_type_idx][i][j].min;
 			val.x_max =
 			ipa3_rsrc_src_grp_config[hw_type_idx][i][j].max;
-			val.y_min =
-			ipa3_rsrc_src_grp_config[hw_type_idx][i][j + 1].min;
-			val.y_max =
-			ipa3_rsrc_src_grp_config[hw_type_idx][i][j + 1].max;
+			if ((j + 1) < IPA_GROUP_MAX) {
+				val.y_min =
+				ipa3_rsrc_src_grp_config[hw_type_idx][i][j + 1].min;
+				val.y_max =
+				ipa3_rsrc_src_grp_config[hw_type_idx][i][j + 1].max;
+			}
 			ipa3_write_rsrc_grp_type_reg(j, i, true, &val);
 		}
 	}
@@ -10282,10 +10284,12 @@ void ipa3_set_resorce_groups_min_max_limits(void)
 			ipa3_rsrc_dst_grp_config[hw_type_idx][i][j].min;
 			val.x_max =
 			ipa3_rsrc_dst_grp_config[hw_type_idx][i][j].max;
-			val.y_min =
-			ipa3_rsrc_dst_grp_config[hw_type_idx][i][j + 1].min;
-			val.y_max =
-			ipa3_rsrc_dst_grp_config[hw_type_idx][i][j + 1].max;
+			if ((j + 1) < IPA_GROUP_MAX) {
+				val.y_min =
+				ipa3_rsrc_dst_grp_config[hw_type_idx][i][j + 1].min;
+				val.y_max =
+				ipa3_rsrc_dst_grp_config[hw_type_idx][i][j + 1].max;
+			}
 			ipa3_write_rsrc_grp_type_reg(j, i, false, &val);
 		}
 	}

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

@@ -247,7 +247,8 @@ static struct ipahal_stats_init_pyld *ipahal_generate_init_pyld_tethering_v5_0(
 		if (i > 0 && !(i % IPAHAL_MAX_PIPES_PER_REG)) {
 			reg_idx++;
 		}
-		if (in->prod_bitmask[reg_idx] & ipahal_get_ep_bit(i)) {
+		if ((reg_idx < IPAHAL_IPA5_PIPE_REG_NUM) &&
+			(in->prod_bitmask[reg_idx] & ipahal_get_ep_bit(i))) {
 			bool has_cons = false;
 
 			for (j = 0; j < IPAHAL_IPA5_PIPE_REG_NUM; j++) {
@@ -291,7 +292,8 @@ static struct ipahal_stats_init_pyld *ipahal_generate_init_pyld_tethering_v5_0(
 
 	reg_idx = 0;
 	for (i = 0; i < IPAHAL_IPA5_PIPES_NUM; i++) {
-		if (in->prod_bitmask[reg_idx] & ipahal_get_ep_bit(i)) {
+		if ((reg_idx < IPAHAL_IPA5_PIPE_REG_NUM) &&
+			(in->prod_bitmask[reg_idx] & ipahal_get_ep_bit(i))) {
 			struct ipahal_stats_tethering_hdr_v5_0_hw *hdr =
 				pyld_ptr;