ath11k: Add support spectral scan for IPQ6018
PATCH v2 1/1 ath11k: Add support spectral scan for IPQ6018
IPQ6018 supported with 4 bytes FFT BIN size. so supported 4 bytes parsing logic in FFT report process. since spectral_fft_sz is configured as zero in hw_params, spectral is not supported in QCA6390 platform.
Tested-on: IPQ6018 WLAN.HK.2.1.0.1-01228-QCAHKSWPL_SILICONZ-1
---
v2:
- Rebased on top of ToT
drivers/net/wireless/ath/ath11k/core.c | 3 +++ drivers/net/wireless/ath/ath11k/hw.h | 1 + drivers/net/wireless/ath/ath11k/spectral.c | 26 ++++++++++++++++---------- 3 files changed, 20 insertions(+), 10 deletions(-)
drivers/net/wireless/ath/ath11k/core.c +3 -0
@@ -57,6 +57,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .vdev_start_delay = false, .htt_peer_map_v2 = true, .tcl_0_only = false, + .spectral_fft_sz = 2, }, { .hw_rev = ATH11K_HW_IPQ6018_HW10,
@@ -86,6 +87,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .vdev_start_delay = false, .htt_peer_map_v2 = true, .tcl_0_only = false, + .spectral_fft_sz = 4, }, { .name = "qca6390 hw2.0",
@@ -115,6 +117,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .vdev_start_delay = true, .htt_peer_map_v2 = false, .tcl_0_only = true, + .spectral_fft_sz = 0, }, };
drivers/net/wireless/ath/ath11k/hw.h +1 -0
@@ -155,6 +155,7 @@ struct ath11k_hw_params {bool vdev_start_delay;bool htt_peer_map_v2;bool tcl_0_only; +u8 spectral_fft_sz; };struct ath11k_hw_ops {
drivers/net/wireless/ath/ath11k/spectral.c +16 -10
@@ -17,8 +17,6 @@#define ATH11K_SPECTRAL_ATH11K_MIN_IB_BINS 32#define ATH11K_SPECTRAL_ATH11K_MAX_IB_BINS 256 -#define ATH11K_SPECTRAL_SAMPLE_FFT_BIN_MASK 0xFF -#define ATH11K_SPECTRAL_SCAN_COUNT_MAX 4095/* Max channel computed by sum of 2g and 5g band channels */
@@ -557,16 +555,16 @@ static u8 ath11k_spectral_get_max_exp(s8 max_index, u8 max_magnitude,return max_exp; } -static void ath11k_spectral_parse_16bit_fft (u8 *outbins,u8 *inbins,int num_bins) +static void ath11k_spectral_parse_fft (u8 *outbins,u8 *inbins,int num_bins,u8 fft_sz) { -int i; -__le16 *data = (__le16 *)inbins; +int i, j; i =0 ; + j =0 ;while (i < num_bins) { - outbins[i] = (__le16_to_cpu (data[i])) & -ATH11K_SPECTRAL_SAMPLE_FFT_BIN_MASK ; + outbins[i] = inbins[j]; i++; + j += fft_sz; } }
@@ -588,6 +586,12 @@ int ath11k_spectral_process_fft(struct ath11k *ar,lockdep_assert_held (&ar->spectral.lock); +if (!ab->hw_params.spectral_fft_sz) { +ath11k_warn (ab,"invalid bin size type for hw rev %d\n" , + ab->hw_rev); +return -EINVAL ; + } + tlv = (struct spectral_tlv *)data; tlv_len =FIELD_GET (SPECTRAL_TLV_HDR_LEN ,__le32_to_cpu (tlv->header));/* convert Dword into bytes */
@@ -649,9 +653,8 @@ int ath11k_spectral_process_fft(struct ath11k *ar, freq = summary->meta.freq2; fft_sample->freq2 =__cpu_to_be16 (freq); -ath11k_spectral_parse_16bit_fft (fft_sample->data, - fft_report->bins, - num_bins); +ath11k_spectral_parse_fft (fft_sample->data, fft_report->bins, num_bins, + ab->hw_params.spectral_fft_sz); fft_sample->max_exp = ath11k_spectral_get_max_exp(fft_sample->max_index, search.peak_mag,
@@ -959,6 +962,9 @@ int ath11k_spectral_init(struct ath11k_base *ab) ab->wmi_ab.svc_map))return 0 ; +if (!ab->hw_params.spectral_fft_sz) +return 0 ; +for (i =0 ; i < ab->num_radios; i++) { ar = ab->pdevs[i].ar; sp = &ar->spectral;
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 9 lines · Karthikeyan Periyasamy
IPQ6018 supported with 4 bytes FFT BIN size. so supported 4 bytes parsing logic in FFT report process. since
spectral_fft_szis configured as zero inhw_params, spectral is not supported in QCA6390 platform.Tested-on: IPQ6018 WLAN.HK.2.1.0.1-01228-QCAHKSWPL_SILICONZ-1
Signed-off-by Karthikeyan Periyasamy <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
5cca5fa1c164 ath11k: Add support spectral scan for IPQ6018
Signature · 3 lines
https://patchwork.kernel.org/patch/11778965/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 9 lines · Karthikeyan Periyasamy
IPQ6018 supported with 4 bytes FFT BIN size. so supported 4 bytes parsing logic in FFT report process. since
spectral_fft_szis configured as zero inhw_params, spectral is not supported in QCA6390 platform.Tested-on: IPQ6018 WLAN.HK.2.1.0.1-01228-QCAHKSWPL_SILICONZ-1
Signed-off-by Karthikeyan Periyasamy <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
5cca5fa1c164 ath11k: Add support spectral scan for IPQ6018
Signature · 9 lines
https://patchwork.kernel.org/patch/11778965/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k