qcacmn: Add LOWI messages to be sent to FW

LOWI messages to register, set capability
and send RTT measurement request are not sent assuming only
LCI and LCR messages are sent out to the FW using ol_ath_lowi_data_req_to_fw.

Add code to send messages other than LCI and LCR through the API in
ol_if_lowi.c when msg subtype is not one of LCI or LCR.

Change-Id: I2deedaa6e03e769bf802337b2ec93d9573eb1b5a
CRs-Fixed: 1079169

wmi/inc/wmi_unified_param.h

@@ -4204,6 +4204,8 @@ struct lci_set_params {
 		reg_loc_dse:1,
 		dep_sta:1,
 		version:2;
+	uint8_t *colocated_bss;
+	int msg_len;
 };
 
 /**
@@ -4212,6 +4214,7 @@ struct lci_set_params {
  */
 struct lcr_set_params {
 	void *lcr_data;
+	int msg_len;
 };
 
 /**

wmi/src/wmi_unified_non_tlv.c

@@ -524,7 +524,7 @@ QDF_STATUS send_peer_delete_cmd_non_tlv(wmi_unified_t wmi_handle,
  * @peer_param_id: host param id.
  *
  * Return: QDF_STATUS_SUCCESS for success
- *         QDF_STATUS_E_NOSUPPORT when the param_id in not supported in tareget
+ *	 QDF_STATUS_E_NOSUPPORT when the param_id in not supported in tareget
  */
 static QDF_STATUS convert_host_peer_id_to_target_id_non_tlv(
 		uint32_t *targ_paramid,
@@ -4838,10 +4838,32 @@ send_lci_set_cmd_non_tlv(wmi_unified_t wmi_handle,
 	uint8_t *p;
 	wmi_oem_measreq_head *head;
 	int len;
+	int colocated_bss_len = 0;
 	wmi_rtt_lci_cfg_head *rtt_req;
+
 	rtt_req = (wmi_rtt_lci_cfg_head *) param->lci_data;
 
-	len = sizeof(wmi_oem_measreq_head)+sizeof(wmi_rtt_lci_cfg_head);
+	len = param->msg_len;
+
+	/* colocated_bss[1] contains num of vaps */
+	/* Provide colocated bssid subIE only when there are 2 vaps or more */
+	if (param->colocated_bss[1] > 1) {
+		qdf_print("%s: Adding %d co-located BSSIDs to LCI data\n",
+				 __func__, param->colocated_bss[1]);
+		/* Convert num_vaps to octets:
+		   6*Num_of_vap + 1 (Max BSSID Indicator field) */
+		param->colocated_bss[1] =
+			(param->colocated_bss[1]*IEEE80211_ADDR_LEN)+1;
+		colocated_bss_len =  param->colocated_bss[1]+2;
+		qdf_mem_copy(rtt_req->colocated_bssids_info,
+				param->colocated_bss,
+				colocated_bss_len);
+		rtt_req->co_located_bssid_len = colocated_bss_len;
+		qdf_print("%s: co_located_bssid_len: %d\n", __func__,
+				param->colocated_bss[1]+2);
+	} else {
+		qdf_print("No co-located BSSID was added to LCI data\n");
+	}
 
 	buf = wmi_buf_alloc(wmi_handle, len);
 	if (!buf) {
@@ -4853,9 +4875,7 @@ send_lci_set_cmd_non_tlv(wmi_unified_t wmi_handle,
 	qdf_mem_set(p, len, 0);
 
 	head = (wmi_oem_measreq_head *)p;
-	head->sub_type = TARGET_OEM_CONFIGURE_LCI;
-	WMI_HOST_IF_MSG_COPY_CHAR_ARRAY(&(head->head), param->lci_data,
-		sizeof(wmi_rtt_lci_cfg_head));
+	WMI_HOST_IF_MSG_COPY_CHAR_ARRAY(head, param->lci_data, len);
 	if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_OEM_REQ_CMDID))
 		return QDF_STATUS_E_FAILURE;
 
@@ -4911,7 +4931,7 @@ send_lcr_set_cmd_non_tlv(wmi_unified_t wmi_handle,
 	wmi_oem_measreq_head *head;
 	int len;
 
-	len = sizeof(wmi_oem_measreq_head)+sizeof(wmi_rtt_lcr_cfg_head);
+	len = param->msg_len;
 
 	buf = wmi_buf_alloc(wmi_handle, len);
 	if (!buf) {
@@ -4923,9 +4943,7 @@ send_lcr_set_cmd_non_tlv(wmi_unified_t wmi_handle,
 	qdf_mem_set(p, len, 0);
 
 	head = (wmi_oem_measreq_head *)p;
-	head->sub_type = TARGET_OEM_CONFIGURE_LCR;
-	WMI_HOST_IF_MSG_COPY_CHAR_ARRAY(&(head->head), param->lcr_data,
-		sizeof(wmi_rtt_lcr_cfg_head));
+	WMI_HOST_IF_MSG_COPY_CHAR_ARRAY(head, param->lcr_data, len);
 
 	if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_OEM_REQ_CMDID))
 		return QDF_STATUS_E_FAILURE;
@@ -4933,6 +4951,43 @@ send_lcr_set_cmd_non_tlv(wmi_unified_t wmi_handle,
 	return QDF_STATUS_SUCCESS;
 }
 
+ /**
+ * send_start_oem_data_cmd_non_tlv() - send oem req cmd to fw
+ * @wmi_handle: wmi handle
+ * @param: pointer to hold oem req param
+ */
+QDF_STATUS
+send_start_oem_data_cmd_non_tlv(wmi_unified_t wmi_handle,
+				uint32_t data_len,
+				uint8_t *data)
+{
+	wmi_buf_t buf;
+	uint8_t *p;
+	wmi_oem_measreq_head *head;
+
+	buf = wmi_buf_alloc(wmi_handle, data_len);
+	if (!buf) {
+		qdf_print("%s: No WMI resource!\n", __func__);
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	p = (uint8_t *) wmi_buf_data(buf);
+	qdf_mem_set(p, data_len, 0);
+
+	head = (wmi_oem_measreq_head *)p;
+	WMI_HOST_IF_MSG_COPY_CHAR_ARRAY(head, data, data_len);
+
+	if (wmi_unified_cmd_send(wmi_handle, buf,
+				data_len, WMI_OEM_REQ_CMDID)) {
+		qdf_print("%s: ERROR: Host unable to send LOWI request to FW\n",
+				__func__);
+		wmi_buf_free(buf);
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	return QDF_STATUS_SUCCESS;
+}
+
 /**
  * wmi_copy_resource_config_non_tlv() - copy resource configuration function
  * @param resource_cfg: pointer to resource configuration
@@ -6199,6 +6254,7 @@ static uint8_t *copy_rtt_report_cfr(wmi_host_rtt_meas_event *ev,
 	}
 	return p;
 }
+
 /**
  * extract_rtt_ev_non_tlv() - extract rtt event
  * @wmi_handle: wmi handle
@@ -7415,6 +7471,7 @@ struct wmi_ops non_tlv_ops =  {
 	.send_rtt_meas_req_cmd = send_rtt_meas_req_cmd_non_tlv,
 	.send_lci_set_cmd = send_lci_set_cmd_non_tlv,
 	.send_lcr_set_cmd = send_lcr_set_cmd_non_tlv,
+	.send_start_oem_data_cmd = send_start_oem_data_cmd_non_tlv,
 	.send_rtt_keepalive_req_cmd = send_rtt_keepalive_req_cmd_non_tlv,
 	.send_periodic_chan_stats_config_cmd =
 			send_periodic_chan_stats_config_cmd_non_tlv,