qcacmn: Log enhancement for PNO scan (2573f436) · Commits · e / devices / android_kernel_oneplus_sm7250

os_if/linux/scan/src/wlan_cfg80211_scan.c

+22 −20

Original line number	Original line	Diff line number	Diff line
	@@ -199,8 +199,6 @@ __wlan_config_sched_scan_plan(struct pno_scan_req_params *pno_req,
	pno_req->fast_scan_max_cycles = scan_timer_repeat_value;		pno_req->fast_scan_max_cycles = scan_timer_repeat_value;
	pno_req->slow_scan_period =		pno_req->slow_scan_period =
	(slow_scan_multiplier * pno_req->fast_scan_period);		(slow_scan_multiplier * pno_req->fast_scan_period);
	osif_debug("Base scan interval: %d sec PNO Scan Timer Repeat Value: %d",
	(request->interval / 1000), scan_timer_repeat_value);
	}		}
	#endif		#endif

	@@ -446,10 +444,13 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,

	enable_dfs_pno_chnl_scan = ucfg_scan_is_dfs_chnl_scan_enabled(psoc);		enable_dfs_pno_chnl_scan = ucfg_scan_is_dfs_chnl_scan_enabled(psoc);
	if (request->n_channels) {		if (request->n_channels) {
	char chl = qdf_mem_malloc((request->n_channels 5) + 1);		uint32_t buff_len;
			char *chl;
	int len = 0;		int len = 0;
	bool ap_or_go_present = wlan_cfg80211_is_ap_go_present(psoc);		bool ap_or_go_present = wlan_cfg80211_is_ap_go_present(psoc);

			buff_len = (request->n_channels * 5) + 1;
			chl = qdf_mem_malloc(buff_len);
	if (!chl) {		if (!chl) {
	ret = -ENOMEM;		ret = -ENOMEM;
	goto error;		goto error;
	@@ -482,11 +483,10 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
	if (!ok)		if (!ok)
	continue;		continue;
	}		}
	len += snprintf(chl + len, 5, "%d ", chan_freq);		len += qdf_scnprintf(chl + len, buff_len - len, " %d", chan_freq);
	valid_ch[num_chan++] = chan_freq;		valid_ch[num_chan++] = chan_freq;
	}		}
	osif_notice("No. of Scan Channels: %d", num_chan);		osif_debug("Channel-List[%d]:%s", num_chan, chl);
	osif_notice("Channel-List: %s", chl);
	qdf_mem_free(chl);		qdf_mem_free(chl);
	chl = NULL;		chl = NULL;
	/* If all channels are DFS and dropped,		/* If all channels are DFS and dropped,
	@@ -519,10 +519,6 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
	req->networks_list[i].encryption = 0; /eED_ANY /		req->networks_list[i].encryption = 0; /eED_ANY /
	req->networks_list[i].bc_new_type = 0; /eBCAST_UNKNOWN /		req->networks_list[i].bc_new_type = 0; /eBCAST_UNKNOWN /

	osif_notice("Received ssid:%.*s",
	req->networks_list[i].ssid.length,
	req->networks_list[i].ssid.ssid);

	/Copying list of valid channel into request /		/Copying list of valid channel into request /
	qdf_mem_copy(req->networks_list[i].channels, valid_ch,		qdf_mem_copy(req->networks_list[i].channels, valid_ch,
	num_chan * sizeof(uint32_t));		num_chan * sizeof(uint32_t));
	@@ -552,8 +548,6 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
	j++;		j++;
	}		}
	}		}
	osif_notice("Number of hidden networks being Configured = %d",
	request->n_ssids);

	/*		/*
	* Before Kernel 4.4		* Before Kernel 4.4
	@@ -575,9 +569,7 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
	wlan_config_sched_scan_plan(req, request);		wlan_config_sched_scan_plan(req, request);
	req->delay_start_time = wlan_config_sched_scan_start_delay(request);		req->delay_start_time = wlan_config_sched_scan_start_delay(request);
	req->scan_backoff_multiplier = scan_backoff_multiplier;		req->scan_backoff_multiplier = scan_backoff_multiplier;
	osif_notice("Base scan interval: %d sec, scan cycles: %d, slow scan interval %d",
	req->fast_scan_period, req->fast_scan_max_cycles,
	req->slow_scan_period);
	wlan_hdd_sched_scan_update_relative_rssi(req, request);		wlan_hdd_sched_scan_update_relative_rssi(req, request);

	psoc = wlan_pdev_get_psoc(pdev);		psoc = wlan_pdev_get_psoc(pdev);
	@@ -590,6 +582,20 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,

	if (ucfg_ie_whitelist_enabled(psoc, vdev))		if (ucfg_ie_whitelist_enabled(psoc, vdev))
	ucfg_copy_ie_whitelist_attrs(psoc, &req->ie_whitelist);		ucfg_copy_ie_whitelist_attrs(psoc, &req->ie_whitelist);

			osif_debug("Network count %d n_ssids %d fast_scan_period: %d msec slow_scan_period: %d msec, fast_scan_max_cycles: %d, relative_rssi %d band_pref %d, rssi_pref %d",
			req->networks_cnt, request->n_ssids, req->fast_scan_period,
			req->slow_scan_period, req->fast_scan_max_cycles,
			req->relative_rssi, req->band_rssi_pref.band,
			req->band_rssi_pref.rssi);

			for (i = 0; i < req->networks_cnt; i++)
			osif_debug("[%d] ssid: %.*s, RSSI th %d bc NW type %u",
			i, req->networks_list[i].ssid.length,
			req->networks_list[i].ssid.ssid,
			req->networks_list[i].rssi_thresh,
			req->networks_list[i].bc_new_type);

	status = ucfg_scan_pno_start(vdev, req);		status = ucfg_scan_pno_start(vdev, req);
	if (QDF_IS_STATUS_ERROR(status)) {		if (QDF_IS_STATUS_ERROR(status)) {
	osif_err("Failed to enable PNO");		osif_err("Failed to enable PNO");
	@@ -597,8 +603,6 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
	goto error;		goto error;
	}		}

	osif_info("PNO scan request offloaded");

	error:		error:
	qdf_mem_free(req);		qdf_mem_free(req);
	return ret;		return ret;
	@@ -610,9 +614,7 @@ int wlan_cfg80211_sched_scan_stop(struct wlan_objmgr_vdev *vdev)

	status = ucfg_scan_pno_stop(vdev);		status = ucfg_scan_pno_stop(vdev);
	if (QDF_IS_STATUS_ERROR(status))		if (QDF_IS_STATUS_ERROR(status))
	osif_err("Failed to disabled PNO");		osif_debug("Failed to disable PNO");
	else
	osif_info("PNO scan disabled");

	return 0;		return 0;
	}		}

umac/scan/dispatcher/src/wlan_scan_ucfg_api.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -190,12 +190,12 @@ QDF_STATUS ucfg_scan_pno_stop(struct wlan_objmgr_vdev *vdev)
	}		}
	if (!scan_vdev_obj->pno_in_progress) {		if (!scan_vdev_obj->pno_in_progress) {
	scm_debug("pno already stopped");		scm_debug("pno already stopped");
	return QDF_STATUS_E_ALREADY;		return QDF_STATUS_SUCCESS;
	}		}

	status = tgt_scan_pno_stop(vdev, wlan_vdev_get_id(vdev));		status = tgt_scan_pno_stop(vdev, wlan_vdev_get_id(vdev));
	if (QDF_IS_STATUS_ERROR(status))		if (QDF_IS_STATUS_ERROR(status))
	scm_err("pno start failed");		scm_err("pno stop failed");
	else		else
	scan_vdev_obj->pno_in_progress = false;		scan_vdev_obj->pno_in_progress = false;

wmi/src/wmi_unified_tlv.c

+1 −19

Original line number	Original line	Diff line number	Diff line
	@@ -4835,9 +4835,6 @@ static QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle,
	cmd->delay_start_time = WMI_SEC_TO_MSEC(pno->delay_start_time);		cmd->delay_start_time = WMI_SEC_TO_MSEC(pno->delay_start_time);
	cmd->fast_scan_max_cycles = pno->fast_scan_max_cycles;		cmd->fast_scan_max_cycles = pno->fast_scan_max_cycles;
	cmd->scan_backoff_multiplier = pno->scan_backoff_multiplier;		cmd->scan_backoff_multiplier = pno->scan_backoff_multiplier;
	WMI_LOGD("fast_scan_period: %d msec slow_scan_period: %d msec",
	cmd->fast_scan_period, cmd->slow_scan_period);
	WMI_LOGD("fast_scan_max_cycles: %d", cmd->fast_scan_max_cycles);

	/* mac randomization attributes */		/* mac randomization attributes */
	if (pno->scan_random.randomize) {		if (pno->scan_random.randomize) {
	@@ -4852,7 +4849,7 @@ static QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle,
	buf_ptr += sizeof(wmi_nlo_config_cmd_fixed_param);		buf_ptr += sizeof(wmi_nlo_config_cmd_fixed_param);

	cmd->no_of_ssids = QDF_MIN(pno->networks_cnt, WMI_NLO_MAX_SSIDS);		cmd->no_of_ssids = QDF_MIN(pno->networks_cnt, WMI_NLO_MAX_SSIDS);
	WMI_LOGD("SSID count : %d", cmd->no_of_ssids);
	WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC,		WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC,
	cmd->no_of_ssids * sizeof(nlo_configured_parameters));		cmd->no_of_ssids * sizeof(nlo_configured_parameters));
	buf_ptr += WMI_TLV_HDR_SIZE;		buf_ptr += WMI_TLV_HDR_SIZE;
	@@ -4870,10 +4867,6 @@ static QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle,
	qdf_mem_copy(nlo_list[i].ssid.ssid.ssid,		qdf_mem_copy(nlo_list[i].ssid.ssid.ssid,
	pno->networks_list[i].ssid.ssid,		pno->networks_list[i].ssid.ssid,
	nlo_list[i].ssid.ssid.ssid_len);		nlo_list[i].ssid.ssid.ssid_len);
	WMI_LOGD("index: %d ssid: %.*s len: %d", i,
	nlo_list[i].ssid.ssid.ssid_len,
	(char *)nlo_list[i].ssid.ssid.ssid,
	nlo_list[i].ssid.ssid.ssid_len);

	/* Copy rssi threshold */		/* Copy rssi threshold */
	if (pno->networks_list[i].rssi_thresh &&		if (pno->networks_list[i].rssi_thresh &&
	@@ -4882,21 +4875,16 @@ static QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle,
	nlo_list[i].rssi_cond.valid = true;		nlo_list[i].rssi_cond.valid = true;
	nlo_list[i].rssi_cond.rssi =		nlo_list[i].rssi_cond.rssi =
	pno->networks_list[i].rssi_thresh;		pno->networks_list[i].rssi_thresh;
	WMI_LOGD("RSSI threshold : %d dBm",
	nlo_list[i].rssi_cond.rssi);
	}		}
	nlo_list[i].bcast_nw_type.valid = true;		nlo_list[i].bcast_nw_type.valid = true;
	nlo_list[i].bcast_nw_type.bcast_nw_type =		nlo_list[i].bcast_nw_type.bcast_nw_type =
	pno->networks_list[i].bc_new_type;		pno->networks_list[i].bc_new_type;
	WMI_LOGD("Broadcast NW type (%u)",
	nlo_list[i].bcast_nw_type.bcast_nw_type);
	}		}
	buf_ptr += cmd->no_of_ssids * sizeof(nlo_configured_parameters);		buf_ptr += cmd->no_of_ssids * sizeof(nlo_configured_parameters);

	/* Copy channel info */		/* Copy channel info */
	cmd->num_of_channels = QDF_MIN(pno->networks_list[0].channel_cnt,		cmd->num_of_channels = QDF_MIN(pno->networks_list[0].channel_cnt,
	WMI_NLO_MAX_CHAN);		WMI_NLO_MAX_CHAN);
	WMI_LOGD("Channel count: %d", cmd->num_of_channels);
	WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32,		WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32,
	(cmd->num_of_channels * sizeof(uint32_t)));		(cmd->num_of_channels * sizeof(uint32_t)));
	buf_ptr += WMI_TLV_HDR_SIZE;		buf_ptr += WMI_TLV_HDR_SIZE;
	@@ -4909,8 +4897,6 @@ static QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle,
	channel_list[i] =		channel_list[i] =
	wlan_chan_to_freq(pno->		wlan_chan_to_freq(pno->
	networks_list[0].channels[i]);		networks_list[0].channels[i]);

	WMI_LOGD("Ch[%d]: %d MHz", i, channel_list[i]);
	}		}
	buf_ptr += cmd->num_of_channels * sizeof(uint32_t);		buf_ptr += cmd->num_of_channels * sizeof(uint32_t);
	WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC,		WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC,
	@@ -4956,7 +4942,6 @@ static QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle,
	WMITLV_TAG_STRUC_wmi_connected_nlo_rssi_params,		WMITLV_TAG_STRUC_wmi_connected_nlo_rssi_params,
	WMITLV_GET_STRUCT_TLVLEN(connected_nlo_rssi_params));		WMITLV_GET_STRUCT_TLVLEN(connected_nlo_rssi_params));
	nlo_relative_rssi->relative_rssi = pno->relative_rssi;		nlo_relative_rssi->relative_rssi = pno->relative_rssi;
	WMI_LOGD("relative_rssi %d", nlo_relative_rssi->relative_rssi);
	buf_ptr += sizeof(*nlo_relative_rssi);		buf_ptr += sizeof(*nlo_relative_rssi);

	/*		/*
	@@ -4978,9 +4963,6 @@ static QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle,
	connected_nlo_bss_band_rssi_pref));		connected_nlo_bss_band_rssi_pref));
	nlo_band_rssi[i].band = pno->band_rssi_pref.band;		nlo_band_rssi[i].band = pno->band_rssi_pref.band;
	nlo_band_rssi[i].rssi_pref = pno->band_rssi_pref.rssi;		nlo_band_rssi[i].rssi_pref = pno->band_rssi_pref.rssi;
	WMI_LOGI("band_pref %d, rssi_pref %d",
	nlo_band_rssi[i].band,
	nlo_band_rssi[i].rssi_pref);
	}		}
	buf_ptr += cmd->num_cnlo_band_pref * sizeof(*nlo_band_rssi);		buf_ptr += cmd->num_cnlo_band_pref * sizeof(*nlo_band_rssi);