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

Commit a96bd379 authored by Pragaspathi Thilagaraj's avatar Pragaspathi Thilagaraj Committed by nshrivas
Browse files

qcacld-3.0: Handle roam stats event with neighbor report tlv alone 

Currently, the driver rejects the roam stats event if any of the
roam trigger or roam scan or roam results tlv is not present.
Now the firmware will send neighbor report immediately after the
neighbor report response is received from AP instead of buffering
it.

So, handle roam stats event with neighbor report tlv alone and no
other tlv is present. Also update documentation for some static
functions

Change-Id: I8a697cda9945a7611930823dd7515bc36223f32a
CRs-Fixed: 2610358
parent e397b298

core/wma/src/wma_scan_roam.c

+113 −27
Original line number Diff line number Diff line
@@ -3513,6 +3513,14 @@ wma_diag_log_11kv_info(struct wmi_neighbor_report_data *neigh_rpt, 
}

#endif



/**

 * wma_get_trigger_detail_str  - Return roam trigger string from the

 * enum WMI_ROAM_TRIGGER_REASON

 * @roam_info: Pointer to the roam trigger info

 * @buf:       Destination buffer to write the reason string

 *

 * Return: None

 */

static void

wma_get_trigger_detail_str(struct wmi_roam_trigger_info *roam_info, char *buf)

{
@@ -3584,6 +3592,16 @@ wma_get_trigger_detail_str(struct wmi_roam_trigger_info *roam_info, char *buf) 
	}

}



/**

 * wma_rso_print_trigger_info  - Roam trigger related details

 * @data:    Pointer to the roam trigger data

 * @vdev_id: Vdev ID

 *

 * Prints the vdev, roam trigger reason, time of the day at which roaming

 * was triggered.

 *

 * Return: None

 */

static void

wma_rso_print_trigger_info(struct wmi_roam_trigger_info *data, uint8_t vdev_id)

{
@@ -3601,6 +3619,16 @@ wma_rso_print_trigger_info(struct wmi_roam_trigger_info *data, uint8_t vdev_id) 
	qdf_mem_free(buf);

}



/**

 * wma_log_roam_scan_candidates  - Print roam scan candidate AP info

 * @ap:           Pointer to the candidate AP list

 * @num_entries:  Number of candidate APs

 *

 * Print the RSSI, CU load, Cu score, RSSI score, total score, BSSID

 * and time stamp at which the candidate was found details.

 *

 * Return: None

 */

static void

wma_log_roam_scan_candidates(struct wmi_roam_candidate_info *ap,

			     uint8_t num_entries)
@@ -3629,6 +3657,19 @@ wma_log_roam_scan_candidates(struct wmi_roam_candidate_info *ap, 
	}

}



/**

 * wma_rso_print_scan_info  - Print the roam scan details and candidate AP

 * details

 * @scan:      Pointer to the received tlv after sanitization

 * @vdev_id:   Vdev ID

 * @trigger:   Roam scan trigger reason

 * @timestamp: Host timestamp in millisecs

 *

 * Prinst the roam scan details with time of the day when the scan was

 * triggered and roam candidate AP with score details

 *

 * Return: None

 */

static void

wma_rso_print_scan_info(struct wmi_roam_scan_data *scan, uint8_t vdev_id,

			uint32_t trigger, uint32_t timestamp)
@@ -3682,6 +3723,15 @@ wma_rso_print_scan_info(struct wmi_roam_scan_data *scan, uint8_t vdev_id, 
	qdf_mem_free(buf1);

}



/**

 * wma_rso_print_roam_result()  - Print roam result related info

 * @res:     Roam result strucure pointer

 * @vdev_id: Vdev id

 *

 * Print roam result and failure reason if roaming failed.

 *

 * Return: None

 */

static void

wma_rso_print_roam_result(struct wmi_roam_result *res,

			  uint8_t vdev_id)
@@ -3704,9 +3754,19 @@ wma_rso_print_roam_result(struct wmi_roam_result *res, 
	qdf_mem_free(buf);

}



/**

 * wma_rso_print_11kv_info  - Print neighbor report/BTM related data

 * @neigh_rpt: Pointer to the extracted TLV structure

 * @vdev_id:   Vdev ID

 *

 * Print BTM/neighbor report info that is sent by firmware after

 * connection/roaming to an AP.

 *

 * Return: none

 */

static void

wma_rso_print_11kv_info(struct wmi_neighbor_report_data *neigh_rpt,

			uint8_t vdev_id, bool is_roam_success)

			uint8_t vdev_id)

{

	char time[TIME_STRING_LEN], time1[TIME_STRING_LEN];

	char *buf, *tmp;
@@ -3714,13 +3774,8 @@ wma_rso_print_11kv_info(struct wmi_neighbor_report_data *neigh_rpt, 
	uint16_t buf_left = ROAM_CHANNEL_BUF_SIZE, buf_cons;

	uint8_t num_ch = neigh_rpt->num_freq;



	if (!is_roam_success)

		return;



	if (!type) {

		WMA_LOGI("AP doesn't support neighbor rpt/BTM");

	if (!type)

		return;

	}



	buf = qdf_mem_malloc(ROAM_CHANNEL_BUF_SIZE);

	if (!buf)
@@ -3782,15 +3837,9 @@ int wma_roam_stats_event_handler(WMA_HANDLE handle, uint8_t *event, 
	}



	num_tlv = fixed_param->roam_scan_trigger_count;

	if (num_tlv != param_buf->num_roam_scan_info ||

	    num_tlv != param_buf->num_roam_trigger_reason ||

	    num_tlv != param_buf->num_roam_result ||

	    num_tlv != param_buf->num_roam_neighbor_report_info) {

		wma_err_rl("Invalid roam stats num_tlv:%d num_scan:%d num_res:%d num_rept:%d",

			   num_tlv, param_buf->num_roam_scan_info,

			   param_buf->num_roam_result,

			   param_buf->num_roam_neighbor_report_info);

		goto err;

	if (num_tlv > MAX_ROAM_SCAN_STATS_TLV) {

		wma_err_rl("Limiting roam triggers to 5");

		num_tlv = MAX_ROAM_SCAN_STATS_TLV;

	}



	rem_len = WMI_SVC_MSG_MAX_SIZE - sizeof(*fixed_param);
@@ -3843,6 +3892,28 @@ int wma_roam_stats_event_handler(WMA_HANDLE handle, uint8_t *event, 
		goto err;

	}



	if (!num_tlv) {

		roam_info = qdf_mem_malloc(sizeof(*roam_info));

		if (!roam_info)

			return -ENOMEM;



		status = wmi_unified_extract_roam_11kv_stats(

					wma->wmi_handle, event,

					&roam_info->data_11kv, 0, 0);

		if (QDF_IS_STATUS_ERROR(status)) {

			WMA_LOGE("%s: Roam 11kv stats extract failed vdev %d",

				 __func__, vdev_id);

			qdf_mem_free(roam_info);

			goto err;

		}



		if (roam_info->data_11kv.present)

			wma_rso_print_11kv_info(&roam_info->data_11kv, vdev_id);



		qdf_mem_free(roam_info);

		return 0;

	}



	for (i = 0; i < num_tlv; i++) {

		roam_info = qdf_mem_malloc(sizeof(*roam_info));

		if (!roam_info)
@@ -3900,21 +3971,36 @@ int wma_roam_stats_event_handler(WMA_HANDLE handle, uint8_t *event, 
		num_rpt += roam_info->data_11kv.num_freq;



		/* Driver debug logs */

		wma_rso_print_trigger_info(&roam_info->trigger, vdev_id);

		if (roam_info->trigger.present)

			wma_rso_print_trigger_info(&roam_info->trigger,

						   vdev_id);



		if (roam_info->scan.present && roam_info->trigger.present)

			wma_rso_print_scan_info(&roam_info->scan, vdev_id,

					roam_info->trigger.trigger_reason,

					roam_info->trigger.timestamp);



		if (roam_info->result.present)

			wma_rso_print_roam_result(&roam_info->result, vdev_id);

		wma_rso_print_11kv_info(&roam_info->data_11kv, vdev_id,

					roam_info->result.status);



		if (roam_info->data_11kv.present)

			wma_rso_print_11kv_info(&roam_info->data_11kv, vdev_id);



		/* CNSS diag log*/

		wma_diag_log_roam_trigger_info(&roam_info->trigger, vdev_id);

		wma_diag_log_roam_scan_info(&roam_info->scan, vdev_id,

		if (roam_info->trigger.present)

			wma_diag_log_roam_trigger_info(&roam_info->trigger,

						       vdev_id);



		if (roam_info->scan.present)

			wma_diag_log_roam_scan_info(

					&roam_info->scan, vdev_id,

					roam_info->trigger.trigger_reason,

					roam_info->trigger.timestamp);



		if (roam_info->result.present)

			wma_diag_log_roam_result(&roam_info->result, vdev_id);

		if (roam_info->result.status)



		if (roam_info->data_11kv.present)

			wma_diag_log_11kv_info(&roam_info->data_11kv, vdev_id,

					       roam_info->result.status);