qcacmn: Fix the coding convention issues in Spectral target_if layer
Current target_if spectral layer code is not following coding convention rules in some places. Change-Id: I1c0e78c6cdbe97db657c341d74582567a29a86b0 CRs-Fixed: 2151555
This commit is contained in:
Shiva Krishna Pittala
committed by
snandini
snandini
parent
6273adc01a
commit
318d20fc69
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011,2017 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2011,2017-2018 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for
|
||||
@@ -27,83 +27,134 @@
|
||||
#include <wlan_osif_priv.h>
|
||||
#include <reg_services_public_struct.h>
|
||||
|
||||
|
||||
#ifdef SPECTRAL_USE_NETLINK_SOCKETS
|
||||
struct sock *target_if_spectral_nl_sock;
|
||||
static atomic_t spectral_nl_users = ATOMIC_INIT(0);
|
||||
|
||||
#if (KERNEL_VERSION(2, 6, 31) > LINUX_VERSION_CODE)
|
||||
void target_if_spectral_nl_data_ready(struct sock *sk, int len)
|
||||
void
|
||||
target_if_spectral_nl_data_ready(struct sock *sk, int len)
|
||||
{
|
||||
qdf_print("%s %d\n", __func__, __LINE__);
|
||||
}
|
||||
|
||||
#else
|
||||
void target_if_spectral_nl_data_ready(struct sk_buff *skb)
|
||||
void
|
||||
target_if_spectral_nl_data_ready(struct sk_buff *skb)
|
||||
{
|
||||
qdf_print("%s %d\n", __func__, __LINE__);
|
||||
}
|
||||
#endif /* VERSION */
|
||||
|
||||
#endif /* VERSION */
|
||||
|
||||
int target_if_spectral_init_netlink(struct target_if_spectral *spectral)
|
||||
{
|
||||
/**
|
||||
* target_if_spectral_init_nl_cfg() - Initialize netlink kernel
|
||||
* configuration parameters
|
||||
* @spectral : Pointer to netlink_kernel_cfg
|
||||
*
|
||||
* Initialize netlink kernel configuration parameters required
|
||||
* for spectral module
|
||||
*
|
||||
* Return: None
|
||||
*/
|
||||
#if KERNEL_VERSION(3, 6, 0) <= LINUX_VERSION_CODE
|
||||
|
||||
struct netlink_kernel_cfg cfg = {
|
||||
.groups = 1,
|
||||
.input = target_if_spectral_nl_data_ready,
|
||||
};
|
||||
static void
|
||||
target_if_spectral_init_nl_cfg(struct netlink_kernel_cfg *cfg)
|
||||
{
|
||||
cfg->groups = 1;
|
||||
cfg->input = target_if_spectral_nl_data_ready;
|
||||
}
|
||||
#else
|
||||
static void
|
||||
target_if_spectral_init_nl_cfg(struct netlink_kernel_cfg *cfg)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* target_if_spectral_create_nl_sock() - Create Netlink socket
|
||||
* @spectral : Pointer to netlink_kernel_cfg
|
||||
*
|
||||
* Create Netlink socket required for spectral module
|
||||
*
|
||||
* Return: None
|
||||
*/
|
||||
#if KERNEL_VERSION(3, 7, 0) <= LINUX_VERSION_CODE
|
||||
static void
|
||||
target_if_spectral_create_nl_sock(struct netlink_kernel_cfg *cfg)
|
||||
{
|
||||
target_if_spectral_nl_sock =
|
||||
(struct sock *)netlink_kernel_create(&init_net,
|
||||
NETLINK_ATHEROS, cfg);
|
||||
}
|
||||
#elif KERNEL_VERSION(3, 6, 0) <= LINUX_VERSION_CODE
|
||||
static void
|
||||
target_if_spectral_create_nl_sock(struct netlink_kernel_cfg *cfg)
|
||||
{
|
||||
target_if_spectral_nl_sock =
|
||||
(struct sock *)netlink_kernel_create(&init_net,
|
||||
NETLINK_ATHEROS,
|
||||
THIS_MODULE, cfg);
|
||||
}
|
||||
#elif (KERNEL_VERSION(2, 6, 31) > LINUX_VERSION_CODE)
|
||||
static void
|
||||
target_if_spectral_create_nl_sock(struct netlink_kernel_cfg *cfg)
|
||||
{
|
||||
target_if_spectral_nl_sock =
|
||||
(struct sock *)netlink_kernel_create(
|
||||
NETLINK_ATHEROS, 1,
|
||||
&target_if_spectral_nl_data_ready,
|
||||
THIS_MODULE);
|
||||
}
|
||||
#else
|
||||
#if (KERNEL_VERSION(3, 10, 0) <= LINUX_VERSION_CODE)
|
||||
static void
|
||||
target_if_spectral_create_nl_sock(struct netlink_kernel_cfg *cfg)
|
||||
{
|
||||
memset(cfg, 0, sizeof(*cfg));
|
||||
cfg->groups = 1;
|
||||
cfg->input = &target_if_spectral_nl_data_ready;
|
||||
target_if_spectral_nl_sock =
|
||||
(struct sock *)netlink_kernel_create(&init_net,
|
||||
NETLINK_ATHEROS, cfg);
|
||||
}
|
||||
#else
|
||||
static void
|
||||
target_if_spectral_create_nl_sock(struct netlink_kernel_cfg *cfg)
|
||||
{
|
||||
target_if_spectral_nl_sock =
|
||||
(struct sock *)netlink_kernel_create(
|
||||
&init_net,
|
||||
NETLINK_ATHEROS, 1,
|
||||
&target_if_spectral_nl_data_ready,
|
||||
NULL, THIS_MODULE);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
int
|
||||
target_if_spectral_init_netlink(struct target_if_spectral *spectral)
|
||||
{
|
||||
struct netlink_kernel_cfg cfg;
|
||||
|
||||
memset(&cfg, 0, sizeof(cfg));
|
||||
|
||||
target_if_spectral_init_nl_cfg(&cfg);
|
||||
|
||||
if (!spectral) {
|
||||
qdf_print("%s: sc_spectral is NULL\n", __func__);
|
||||
return -EIO;
|
||||
qdf_print("%s: sc_spectral is NULL\n", __func__);
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
spectral->spectral_sent_msg = 0;
|
||||
|
||||
if (!target_if_spectral_nl_sock) {
|
||||
#if KERNEL_VERSION(3, 7, 0) <= LINUX_VERSION_CODE
|
||||
target_if_spectral_nl_sock = (struct sock *)netlink_kernel_create(
|
||||
&init_net,
|
||||
NETLINK_ATHEROS,
|
||||
&cfg);
|
||||
#elif KERNEL_VERSION(3, 6, 0) <= LINUX_VERSION_CODE
|
||||
target_if_spectral_nl_sock = (struct sock *)netlink_kernel_create(
|
||||
&init_net,
|
||||
NETLINK_ATHEROS,
|
||||
THIS_MODULE,
|
||||
&cfg);
|
||||
#elif (KERNEL_VERSION(2, 6, 31) > LINUX_VERSION_CODE)
|
||||
target_if_spectral_nl_sock = (
|
||||
struct sock *)netlink_kernel_create(NETLINK_ATHEROS,
|
||||
1,
|
||||
&target_if_spectral_nl_data_ready,
|
||||
THIS_MODULE);
|
||||
#else
|
||||
#if (KERNEL_VERSION(3, 10, 0) <= LINUX_VERSION_CODE)
|
||||
struct netlink_kernel_cfg cfg;
|
||||
target_if_spectral_create_nl_sock(&cfg);
|
||||
|
||||
memset(&cfg, 0, sizeof(cfg));
|
||||
cfg.groups = 1;
|
||||
cfg.input = &target_if_spectral_nl_data_ready;
|
||||
target_if_spectral_nl_sock = (struct sock *)netlink_kernel_create(
|
||||
&init_net, NETLINK_ATHEROS, &cfg);
|
||||
#else
|
||||
target_if_spectral_nl_sock = (struct sock *)netlink_kernel_create(
|
||||
&init_net,
|
||||
NETLINK_ATHEROS,
|
||||
1,
|
||||
&target_if_spectral_nl_data_ready,
|
||||
NULL,
|
||||
THIS_MODULE);
|
||||
#endif
|
||||
#endif
|
||||
if (!target_if_spectral_nl_sock) {
|
||||
qdf_print("%s NETLINK_KERNEL_CREATE FAILED\n", __func__);
|
||||
return -ENODEV;
|
||||
}
|
||||
if (!target_if_spectral_nl_sock) {
|
||||
qdf_print("%s NETLINK_KERNEL_CREATE FAILED\n",
|
||||
__func__);
|
||||
return -ENODEV;
|
||||
}
|
||||
}
|
||||
atomic_inc(&spectral_nl_users);
|
||||
spectral->spectral_sock = target_if_spectral_nl_sock;
|
||||
@@ -119,38 +170,26 @@ int target_if_spectral_init_netlink(struct target_if_spectral *spectral)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int target_if_spectral_destroy_netlink(struct target_if_spectral *spectral)
|
||||
int
|
||||
target_if_spectral_destroy_netlink(struct target_if_spectral *spectral)
|
||||
{
|
||||
spectral->spectral_sock = NULL;
|
||||
if (atomic_dec_and_test(&spectral_nl_users)) {
|
||||
sock_release(target_if_spectral_nl_sock->sk_socket);
|
||||
target_if_spectral_nl_sock = NULL;
|
||||
sock_release(target_if_spectral_nl_sock->sk_socket);
|
||||
target_if_spectral_nl_sock = NULL;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif /* SPECTRAL_USE_NETLINK_SOCKETS */
|
||||
#endif /* SPECTRAL_USE_NETLINK_SOCKETS */
|
||||
|
||||
static void spectral_process_noise_pwr_report(
|
||||
static void
|
||||
target_if_spectral_process_noise_pwr_report(
|
||||
struct target_if_spectral *spectral,
|
||||
const SPECTRAL_SAMP_MSG *spec_samp_msg)
|
||||
const struct spectral_samp_msg *spec_samp_msg)
|
||||
{
|
||||
int i, done;
|
||||
|
||||
/*
|
||||
* qdf_print(
|
||||
* "%s: #%d/%d datalen=%d tstamp=%x last_tstamp=%x "
|
||||
* "rssi=%d nb_lower=%d peak=%d\n",
|
||||
* __func__, spectral->noise_pwr_reports_recv,
|
||||
* spectral->noise_pwr_reports_reqd,
|
||||
* spec_samp_msg->samp_data.spectral_data_len,
|
||||
* spec_samp_msg->samp_data.spectral_tstamp,
|
||||
* spec_samp_msg->samp_data.spectral_last_tstamp,
|
||||
* spec_samp_msg->samp_data.spectral_lower_rssi,
|
||||
* spec_samp_msg->samp_data.spectral_nb_lower,
|
||||
* spec_samp_msg->samp_data.spectral_lower_max_index);
|
||||
*/
|
||||
|
||||
qdf_spin_lock(&spectral->noise_pwr_reports_lock);
|
||||
|
||||
if (!spectral->noise_pwr_reports_reqd) {
|
||||
@@ -159,55 +198,41 @@ static void spectral_process_noise_pwr_report(
|
||||
}
|
||||
|
||||
if (spectral->noise_pwr_reports_recv <
|
||||
spectral->noise_pwr_reports_reqd) {
|
||||
spectral->noise_pwr_reports_reqd) {
|
||||
spectral->noise_pwr_reports_recv++;
|
||||
|
||||
/*
|
||||
* qdf_print(
|
||||
* "#%d/%d: rssi=%3d,%3d,%3d %3d,%3d,%3d\n",
|
||||
* spectral->noise_pwr_reports_recv,
|
||||
* spectral->noise_pwr_reports_reqd,
|
||||
* spec_samp_msg->samp_data.spectral_chain_ctl_rssi[0],
|
||||
* spec_samp_msg->samp_data.spectral_chain_ctl_rssi[1],
|
||||
* spec_samp_msg->samp_data.spectral_chain_ctl_rssi[2],
|
||||
* spec_samp_msg->samp_data.spectral_chain_ext_rssi[0],
|
||||
* spec_samp_msg->samp_data.spectral_chain_ext_rssi[1],
|
||||
* spec_samp_msg->samp_data.spectral_chain_ext_rssi[2]);
|
||||
*/
|
||||
for (i = 0; i < HOST_MAX_ANTENNA; i++) {
|
||||
uint32_t index;
|
||||
|
||||
for (i = 0; i < ATH_HOST_MAX_ANTENNA; i++) {
|
||||
uint32_t index;
|
||||
|
||||
if (spectral->noise_pwr_chain_ctl[i]) {
|
||||
index = spectral->noise_pwr_chain_ctl[i]->rptcount++;
|
||||
spectral->noise_pwr_chain_ctl[i]->pwr[index] =
|
||||
spec_samp_msg->samp_data.spectral_chain_ctl_rssi[i];
|
||||
if (spectral->noise_pwr_chain_ctl[i]) {
|
||||
index =
|
||||
spectral->noise_pwr_chain_ctl[i]->
|
||||
rptcount++;
|
||||
spectral->noise_pwr_chain_ctl[i]->pwr[index] =
|
||||
spec_samp_msg->samp_data.
|
||||
spectral_chain_ctl_rssi[i];
|
||||
}
|
||||
if (spectral->noise_pwr_chain_ext[i]) {
|
||||
index =
|
||||
spectral->noise_pwr_chain_ext[i]->
|
||||
rptcount++;
|
||||
spectral->noise_pwr_chain_ext[i]->pwr[index] =
|
||||
spec_samp_msg->samp_data.
|
||||
spectral_chain_ext_rssi[i];
|
||||
}
|
||||
}
|
||||
if (spectral->noise_pwr_chain_ext[i]) {
|
||||
index = spectral->noise_pwr_chain_ext[i]->rptcount++;
|
||||
spectral->noise_pwr_chain_ext[i]->pwr[index] =
|
||||
spec_samp_msg->samp_data.spectral_chain_ext_rssi[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
done = (spectral->noise_pwr_reports_recv >=
|
||||
spectral->noise_pwr_reports_reqd);
|
||||
spectral->noise_pwr_reports_reqd);
|
||||
|
||||
qdf_spin_unlock(&spectral->noise_pwr_reports_lock);
|
||||
|
||||
if (done) {
|
||||
qdf_spin_lock(&spectral->ath_spectral_lock);
|
||||
qdf_spin_lock(&spectral->spectral_lock);
|
||||
target_if_stop_spectral_scan(spectral->pdev_obj);
|
||||
spectral->sc_spectral_scan = 0;
|
||||
qdf_spin_unlock(&spectral->ath_spectral_lock);
|
||||
|
||||
/*
|
||||
* qdf_print(
|
||||
* "%s: done: %d/%d recv - set sc_spectral_scan = 0\n",
|
||||
* __func__, spectral->noise_pwr_reports_recv,
|
||||
* spectral->noise_pwr_reports_reqd);
|
||||
*/
|
||||
qdf_spin_unlock(&spectral->spectral_lock);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -219,89 +244,102 @@ static void spectral_process_noise_pwr_report(
|
||||
*
|
||||
*/
|
||||
|
||||
void target_if_spectral_create_samp_msg(
|
||||
struct target_if_spectral *spectral,
|
||||
struct target_if_samp_msg_params *params)
|
||||
#ifdef SPECTRAL_CLASSIFIER_IN_KERNEL
|
||||
static void
|
||||
target_if_spectral_init_interf_list(
|
||||
struct spectral_samp_data *data,
|
||||
struct target_if_samp_msg_params *params)
|
||||
{
|
||||
if (params->interf_list.count)
|
||||
OS_MEMCPY(&data->interf_list,
|
||||
¶ms->interf_list, sizeof(struct INTERF_SRC_RSP));
|
||||
else
|
||||
data->interf_list.count = 0;
|
||||
}
|
||||
#else
|
||||
static void
|
||||
target_if_spectral_init_interf_list(
|
||||
struct spectral_samp_data *data,
|
||||
struct target_if_samp_msg_params *params)
|
||||
{
|
||||
data->interf_list.count = 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
target_if_spectral_create_samp_msg(struct target_if_spectral *spectral,
|
||||
struct target_if_samp_msg_params *params)
|
||||
{
|
||||
/*
|
||||
* XXX : Non-Rentrant. Will be an issue with dual concurrent
|
||||
* operation on multi-processor system
|
||||
*/
|
||||
|
||||
int temp_samp_msg_len = 0;
|
||||
int temp_samp_msg_len = 0;
|
||||
|
||||
static SPECTRAL_SAMP_MSG spec_samp_msg;
|
||||
static struct spectral_samp_msg spec_samp_msg;
|
||||
|
||||
SPECTRAL_SAMP_MSG *msg = NULL;
|
||||
SPECTRAL_SAMP_DATA *data = NULL;
|
||||
u_int8_t *bin_pwr_data = NULL;
|
||||
SPECTRAL_CLASSIFIER_PARAMS *cp = NULL;
|
||||
SPECTRAL_CLASSIFIER_PARAMS *pcp = NULL;
|
||||
struct target_if_spectral_ops *p_sops = NULL;
|
||||
struct spectral_samp_msg *msg = NULL;
|
||||
struct spectral_samp_data *data = NULL;
|
||||
uint8_t *bin_pwr_data = NULL;
|
||||
struct spectral_classifier_params *cp = NULL;
|
||||
struct spectral_classifier_params *pcp = NULL;
|
||||
struct target_if_spectral_ops *p_sops = NULL;
|
||||
struct target_if_spectral_skb_event *sp_skb_event = NULL;
|
||||
|
||||
#ifdef SPECTRAL_USE_NETLINK_SOCKETS
|
||||
static int samp_msg_index;
|
||||
#endif
|
||||
|
||||
p_sops = GET_TIF_SPECTRAL_OPS(spectral);
|
||||
p_sops = GET_TARGET_IF_SPECTRAL_OPS(spectral);
|
||||
|
||||
temp_samp_msg_len = sizeof(SPECTRAL_SAMP_MSG) -
|
||||
(MAX_NUM_BINS * sizeof(u_int8_t));
|
||||
temp_samp_msg_len += (params->pwr_count * sizeof(u_int8_t));
|
||||
temp_samp_msg_len = sizeof(struct spectral_samp_msg) -
|
||||
(MAX_NUM_BINS * sizeof(uint8_t));
|
||||
temp_samp_msg_len += (params->pwr_count * sizeof(uint8_t));
|
||||
if (spectral->ch_width == CH_WIDTH_160MHZ)
|
||||
temp_samp_msg_len +=
|
||||
(params->pwr_count_sec80 * sizeof(u_int8_t));
|
||||
bin_pwr_data = params->bin_pwr_data;
|
||||
temp_samp_msg_len +=
|
||||
(params->pwr_count_sec80 * sizeof(uint8_t));
|
||||
bin_pwr_data = params->bin_pwr_data;
|
||||
|
||||
memset(&spec_samp_msg, 0, sizeof(SPECTRAL_SAMP_MSG));
|
||||
memset(&spec_samp_msg, 0, sizeof(struct spectral_samp_msg));
|
||||
|
||||
data = &spec_samp_msg.samp_data;
|
||||
|
||||
spec_samp_msg.signature = SPECTRAL_SIGNATURE;
|
||||
spec_samp_msg.freq = params->freq;
|
||||
spec_samp_msg.freq_loading = params->freq_loading;
|
||||
spec_samp_msg.samp_data.spectral_data_len = params->datalen;
|
||||
spec_samp_msg.samp_data.spectral_rssi = params->rssi;
|
||||
spec_samp_msg.samp_data.ch_width = spectral->ch_width;
|
||||
spec_samp_msg.signature = SPECTRAL_SIGNATURE;
|
||||
spec_samp_msg.freq = params->freq;
|
||||
spec_samp_msg.freq_loading = params->freq_loading;
|
||||
spec_samp_msg.samp_data.spectral_data_len = params->datalen;
|
||||
spec_samp_msg.samp_data.spectral_rssi = params->rssi;
|
||||
spec_samp_msg.samp_data.ch_width = spectral->ch_width;
|
||||
|
||||
spec_samp_msg.samp_data.spectral_combined_rssi =
|
||||
(u_int8_t)params->rssi;
|
||||
spec_samp_msg.samp_data.spectral_upper_rssi = params->upper_rssi;
|
||||
spec_samp_msg.samp_data.spectral_lower_rssi = params->lower_rssi;
|
||||
spec_samp_msg.samp_data.spectral_combined_rssi =
|
||||
(uint8_t)params->rssi;
|
||||
spec_samp_msg.samp_data.spectral_upper_rssi = params->upper_rssi;
|
||||
spec_samp_msg.samp_data.spectral_lower_rssi = params->lower_rssi;
|
||||
|
||||
OS_MEMCPY(
|
||||
spec_samp_msg.samp_data.spectral_chain_ctl_rssi,
|
||||
params->chain_ctl_rssi,
|
||||
sizeof(params->chain_ctl_rssi));
|
||||
OS_MEMCPY(
|
||||
spec_samp_msg.samp_data.spectral_chain_ext_rssi,
|
||||
params->chain_ext_rssi,
|
||||
sizeof(params->chain_ext_rssi));
|
||||
OS_MEMCPY(spec_samp_msg.samp_data.spectral_chain_ctl_rssi,
|
||||
params->chain_ctl_rssi, sizeof(params->chain_ctl_rssi));
|
||||
OS_MEMCPY(spec_samp_msg.samp_data.spectral_chain_ext_rssi,
|
||||
params->chain_ext_rssi, sizeof(params->chain_ext_rssi));
|
||||
|
||||
spec_samp_msg.samp_data.spectral_bwinfo = params->bwinfo;
|
||||
spec_samp_msg.samp_data.spectral_tstamp = params->tstamp;
|
||||
spec_samp_msg.samp_data.spectral_max_index = params->max_index;
|
||||
spec_samp_msg.samp_data.spectral_bwinfo = params->bwinfo;
|
||||
spec_samp_msg.samp_data.spectral_tstamp = params->tstamp;
|
||||
spec_samp_msg.samp_data.spectral_max_index = params->max_index;
|
||||
|
||||
/* Classifier in user space needs access to these */
|
||||
spec_samp_msg.samp_data.spectral_lower_max_index =
|
||||
params->max_lower_index;
|
||||
spec_samp_msg.samp_data.spectral_upper_max_index =
|
||||
params->max_upper_index;
|
||||
spec_samp_msg.samp_data.spectral_nb_lower =
|
||||
params->nb_lower;
|
||||
spec_samp_msg.samp_data.spectral_nb_upper = params->nb_upper;
|
||||
spec_samp_msg.samp_data.spectral_last_tstamp =
|
||||
params->last_tstamp;
|
||||
spec_samp_msg.samp_data.spectral_max_mag = params->max_mag;
|
||||
spec_samp_msg.samp_data.bin_pwr_count =
|
||||
params->pwr_count;
|
||||
spec_samp_msg.samp_data.lb_edge_extrabins =
|
||||
spectral->lb_edge_extrabins;
|
||||
spec_samp_msg.samp_data.rb_edge_extrabins =
|
||||
spectral->rb_edge_extrabins;
|
||||
spec_samp_msg.samp_data.spectral_combined_rssi = params->rssi;
|
||||
spec_samp_msg.samp_data.spectral_max_scale = params->max_exp;
|
||||
spec_samp_msg.samp_data.spectral_lower_max_index =
|
||||
params->max_lower_index;
|
||||
spec_samp_msg.samp_data.spectral_upper_max_index =
|
||||
params->max_upper_index;
|
||||
spec_samp_msg.samp_data.spectral_nb_lower = params->nb_lower;
|
||||
spec_samp_msg.samp_data.spectral_nb_upper = params->nb_upper;
|
||||
spec_samp_msg.samp_data.spectral_last_tstamp = params->last_tstamp;
|
||||
spec_samp_msg.samp_data.spectral_max_mag = params->max_mag;
|
||||
spec_samp_msg.samp_data.bin_pwr_count = params->pwr_count;
|
||||
spec_samp_msg.samp_data.lb_edge_extrabins = spectral->lb_edge_extrabins;
|
||||
spec_samp_msg.samp_data.rb_edge_extrabins = spectral->rb_edge_extrabins;
|
||||
spec_samp_msg.samp_data.spectral_combined_rssi = params->rssi;
|
||||
spec_samp_msg.samp_data.spectral_max_scale = params->max_exp;
|
||||
|
||||
#ifdef SPECTRAL_USE_NETLINK_SOCKETS
|
||||
|
||||
@@ -320,201 +358,222 @@ void target_if_spectral_create_samp_msg(
|
||||
*/
|
||||
|
||||
spec_samp_msg.samp_data.noise_floor = params->noise_floor;
|
||||
#endif /* SPECTRAL_USE_NETLINK_SOCKETS */
|
||||
#endif /* SPECTRAL_USE_NETLINK_SOCKETS */
|
||||
|
||||
/* Classifier in user space needs access to these */
|
||||
cp = &spec_samp_msg.samp_data.classifier_params;
|
||||
cp = &spec_samp_msg.samp_data.classifier_params;
|
||||
pcp = ¶ms->classifier_params;
|
||||
|
||||
OS_MEMCPY(cp, pcp, sizeof(SPECTRAL_CLASSIFIER_PARAMS));
|
||||
OS_MEMCPY(cp, pcp, sizeof(struct spectral_classifier_params));
|
||||
|
||||
SPECTRAL_MSG_COPY_CHAR_ARRAY(
|
||||
&data->bin_pwr[0],
|
||||
bin_pwr_data,
|
||||
params->pwr_count);
|
||||
SPECTRAL_MESSAGE_COPY_CHAR_ARRAY(&data->bin_pwr[0],
|
||||
bin_pwr_data, params->pwr_count);
|
||||
|
||||
#ifdef SPECTRAL_USE_NETLINK_SOCKETS
|
||||
spec_samp_msg.vhtop_ch_freq_seg1 =
|
||||
params->vhtop_ch_freq_seg1;
|
||||
spec_samp_msg.vhtop_ch_freq_seg2 =
|
||||
params->vhtop_ch_freq_seg2;
|
||||
spec_samp_msg.vhtop_ch_freq_seg1 = params->vhtop_ch_freq_seg1;
|
||||
spec_samp_msg.vhtop_ch_freq_seg2 = params->vhtop_ch_freq_seg2;
|
||||
|
||||
if (spectral->ch_width == CH_WIDTH_160MHZ) {
|
||||
spec_samp_msg.samp_data.spectral_rssi_sec80 = params->rssi_sec80;
|
||||
spec_samp_msg.samp_data.noise_floor_sec80 = params->noise_floor_sec80;
|
||||
spec_samp_msg.samp_data.spectral_rssi_sec80 =
|
||||
params->rssi_sec80;
|
||||
spec_samp_msg.samp_data.noise_floor_sec80 =
|
||||
params->noise_floor_sec80;
|
||||
|
||||
spec_samp_msg.samp_data.spectral_data_len_sec80 =
|
||||
params->datalen_sec80;
|
||||
spec_samp_msg.samp_data.spectral_max_index_sec80 =
|
||||
params->max_index_sec80;
|
||||
spec_samp_msg.samp_data.spectral_max_mag_sec80 =
|
||||
params->max_mag_sec80;
|
||||
spec_samp_msg.samp_data.bin_pwr_count_sec80 =
|
||||
params->pwr_count_sec80;
|
||||
SPECTRAL_MSG_COPY_CHAR_ARRAY(&data->bin_pwr_sec80[0],
|
||||
(params->bin_pwr_data_sec80),
|
||||
params->pwr_count_sec80);
|
||||
spec_samp_msg.samp_data.spectral_data_len_sec80 =
|
||||
params->datalen_sec80;
|
||||
spec_samp_msg.samp_data.spectral_max_index_sec80 =
|
||||
params->max_index_sec80;
|
||||
spec_samp_msg.samp_data.spectral_max_mag_sec80 =
|
||||
params->max_mag_sec80;
|
||||
spec_samp_msg.samp_data.bin_pwr_count_sec80 =
|
||||
params->pwr_count_sec80;
|
||||
SPECTRAL_MESSAGE_COPY_CHAR_ARRAY(&data->bin_pwr_sec80[0],
|
||||
(params->bin_pwr_data_sec80),
|
||||
params->pwr_count_sec80);
|
||||
|
||||
/* Note: REVERSE_ORDER is not a known use case for secondary 80 data at
|
||||
* this point.
|
||||
*/
|
||||
/*
|
||||
* Note: REVERSE_ORDER is not a known use case for
|
||||
* secondary 80 data at this point.
|
||||
*/
|
||||
}
|
||||
#endif /* SPECTRAL_USE_NETLINK_SOCKETS */
|
||||
#endif /* SPECTRAL_USE_NETLINK_SOCKETS */
|
||||
|
||||
#ifdef SPECTRAL_CLASSIFIER_IN_KERNEL
|
||||
if (params->interf_list.count)
|
||||
OS_MEMCPY(
|
||||
&data->interf_list,
|
||||
¶ms->interf_list,
|
||||
sizeof(struct INTERF_SRC_RSP));
|
||||
else
|
||||
#endif
|
||||
data->interf_list.count = 0;
|
||||
target_if_spectral_init_interf_list(data, params);
|
||||
|
||||
#ifdef SPECTRAL_USE_NETLINK_SOCKETS
|
||||
target_if_spectral_prep_skb(spectral);
|
||||
if (spectral->spectral_skb) {
|
||||
p_sops->get_mac_address(spectral, spec_samp_msg.macaddr);
|
||||
spectral->spectral_nlh =
|
||||
(struct nlmsghdr *)spectral->spectral_skb->data;
|
||||
memcpy(NLMSG_DATA(spectral->spectral_nlh),
|
||||
&spec_samp_msg,
|
||||
sizeof(SPECTRAL_SAMP_MSG));
|
||||
msg = (SPECTRAL_SAMP_MSG *)NLMSG_DATA(spectral->spectral_nlh);
|
||||
/* Broadcast spectral data only if it is a edma supported device */
|
||||
if (!spectral->sc_spectral_non_edma)
|
||||
target_if_spectral_bcast_msg(spectral);
|
||||
samp_msg_index++;
|
||||
p_sops->get_mac_address(spectral, spec_samp_msg.macaddr);
|
||||
spectral->spectral_nlh =
|
||||
(struct nlmsghdr *)spectral->spectral_skb->data;
|
||||
memcpy(NLMSG_DATA(spectral->spectral_nlh),
|
||||
&spec_samp_msg, sizeof(struct spectral_samp_msg));
|
||||
msg = (struct spectral_samp_msg *)NLMSG_DATA(
|
||||
spectral->spectral_nlh);
|
||||
/*
|
||||
* Broadcast spectral data only
|
||||
* if it is a edma supported device
|
||||
*/
|
||||
if (!spectral->sc_spectral_non_edma)
|
||||
target_if_spectral_bcast_msg(spectral);
|
||||
samp_msg_index++;
|
||||
}
|
||||
|
||||
/* Check if the device is non-edma and follow the required broadcast
|
||||
/*
|
||||
* Check if the device is non-edma and follow the required broadcast
|
||||
* path if true
|
||||
*/
|
||||
if (spectral->sc_spectral_non_edma) {
|
||||
/* Allocating memory for the queue entity to hold the spectral socket
|
||||
* buffer
|
||||
*/
|
||||
sp_skb_event = (struct target_if_spectral_skb_event
|
||||
*)qdf_mem_malloc(sizeof(struct target_if_spectral_skb_event));
|
||||
|
||||
if (sp_skb_event) {
|
||||
OS_MEMZERO(
|
||||
sp_skb_event,
|
||||
sizeof(struct target_if_spectral_skb_event));
|
||||
sp_skb_event->sp_skb = spectral->spectral_skb;
|
||||
sp_skb_event->sp_nlh = spectral->spectral_nlh;
|
||||
spectral->spectral_skb = NULL;
|
||||
spectral->spectral_nlh = NULL;
|
||||
|
||||
/* Queue spectral socket buffers to be broadcasted outside irq
|
||||
* lock
|
||||
/*
|
||||
* Allocating memory for the queue entity to
|
||||
* hold the spectral socket buffer
|
||||
*/
|
||||
qdf_spin_lock(&spectral->spectral_skbqlock);
|
||||
STAILQ_INSERT_TAIL(
|
||||
&spectral->spectral_skbq,
|
||||
sp_skb_event,
|
||||
spectral_skb_list);
|
||||
qdf_spin_unlock(&spectral->spectral_skbqlock);
|
||||
}
|
||||
sp_skb_event = (struct target_if_spectral_skb_event
|
||||
*)qdf_mem_malloc(
|
||||
sizeof(
|
||||
struct target_if_spectral_skb_event));
|
||||
|
||||
if (sp_skb_event) {
|
||||
OS_MEMZERO(sp_skb_event,
|
||||
sizeof(struct target_if_spectral_skb_event));
|
||||
sp_skb_event->sp_skb = spectral->spectral_skb;
|
||||
sp_skb_event->sp_nlh = spectral->spectral_nlh;
|
||||
spectral->spectral_skb = NULL;
|
||||
spectral->spectral_nlh = NULL;
|
||||
|
||||
/*
|
||||
* Queue spectral socket buffers to be broadcasted
|
||||
* outside irq lock
|
||||
*/
|
||||
qdf_spin_lock(&spectral->spectral_skbqlock);
|
||||
STAILQ_INSERT_TAIL(&spectral->spectral_skbq,
|
||||
sp_skb_event, spectral_skb_list);
|
||||
qdf_spin_unlock(&spectral->spectral_skbqlock);
|
||||
}
|
||||
}
|
||||
#else
|
||||
/*
|
||||
* call the indicate function to pass the data to the net layer
|
||||
* Windows will pass to a spectral WIN32 service
|
||||
*/
|
||||
msg = (SPECTRAL_SAMP_MSG *)qdf_mem_malloc(sizeof(SPECTRAL_SAMP_MSG));
|
||||
msg = (struct spectral_samp_msg *)qdf_mem_malloc(
|
||||
sizeof(struct spectral_samp_msg));
|
||||
if (msg) {
|
||||
OS_MEMCPY(msg, &spec_samp_msg, sizeof(SPECTRAL_SAMP_MSG));
|
||||
ath_spectral_indicate(
|
||||
params->sc,
|
||||
(void *)msg,
|
||||
sizeof(SPECTRAL_SAMP_MSG));
|
||||
OS_FREE(msg);
|
||||
msg = NULL;
|
||||
OS_MEMCPY(msg, &spec_samp_msg,
|
||||
sizeof(struct spectral_samp_msg));
|
||||
ath_spectral_indicate(params->sc, (void *)msg,
|
||||
sizeof(struct spectral_samp_msg));
|
||||
OS_FREE(msg);
|
||||
msg = NULL;
|
||||
} else {
|
||||
qdf_print("No buffer\n");
|
||||
qdf_print("No buffer\n");
|
||||
}
|
||||
#endif /* SPECTRAL_USE_NETLINK_SOCKETS */
|
||||
#endif /* SPECTRAL_USE_NETLINK_SOCKETS */
|
||||
|
||||
if (spectral->sc_spectral_noise_pwr_cal)
|
||||
spectral_process_noise_pwr_report(spectral, &spec_samp_msg);
|
||||
target_if_spectral_process_noise_pwr_report(
|
||||
spectral, &spec_samp_msg);
|
||||
}
|
||||
|
||||
#ifdef SPECTRAL_USE_NETLINK_SOCKETS
|
||||
|
||||
void target_if_spectral_prep_skb(struct target_if_spectral *spectral)
|
||||
void
|
||||
target_if_spectral_prep_skb(struct target_if_spectral *spectral)
|
||||
{
|
||||
spectral->spectral_skb = dev_alloc_skb(MAX_SPECTRAL_PAYLOAD);
|
||||
|
||||
if (spectral->spectral_skb) {
|
||||
skb_put(spectral->spectral_skb, MAX_SPECTRAL_PAYLOAD);
|
||||
spectral->spectral_nlh =
|
||||
(struct nlmsghdr *)spectral->spectral_skb->data;
|
||||
skb_put(spectral->spectral_skb, MAX_SPECTRAL_PAYLOAD);
|
||||
spectral->spectral_nlh =
|
||||
(struct nlmsghdr *)spectral->spectral_skb->data;
|
||||
|
||||
OS_MEMZERO(spectral->spectral_nlh, sizeof(*spectral->spectral_nlh));
|
||||
OS_MEMZERO(spectral->spectral_nlh,
|
||||
sizeof(*spectral->spectral_nlh));
|
||||
|
||||
/* Possible bug that size of SPECTRAL_SAMP_MSG and SPECTRAL_MSG
|
||||
* differ by 3 bytes so we miss 3 bytes
|
||||
*/
|
||||
/*
|
||||
* Possible bug that size of struct spectral_samp_msg and
|
||||
* SPECTRAL_MSG differ by 3 bytes so we miss 3 bytes
|
||||
*/
|
||||
|
||||
spectral->spectral_nlh->nlmsg_len =
|
||||
NLMSG_SPACE(sizeof(SPECTRAL_SAMP_MSG));
|
||||
spectral->spectral_nlh->nlmsg_pid = 0;
|
||||
spectral->spectral_nlh->nlmsg_flags = 0;
|
||||
spectral->spectral_nlh->nlmsg_len =
|
||||
NLMSG_SPACE(sizeof(struct spectral_samp_msg));
|
||||
spectral->spectral_nlh->nlmsg_pid = 0;
|
||||
spectral->spectral_nlh->nlmsg_flags = 0;
|
||||
} else {
|
||||
spectral->spectral_skb = NULL;
|
||||
spectral->spectral_nlh = NULL;
|
||||
spectral->spectral_skb = NULL;
|
||||
spectral->spectral_nlh = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void target_if_spectral_unicast_msg(struct target_if_spectral *spectral)
|
||||
#if (KERNEL_VERSION(2, 6, 31) > LINUX_VERSION_CODE)
|
||||
static inline void
|
||||
target_if_init_spectral_skb_dst_pid(
|
||||
struct target_if_spectral *spectral)
|
||||
{
|
||||
NETLINK_CB(spectral->spectral_skb).dst_pid =
|
||||
spectral->spectral_pid;
|
||||
}
|
||||
#else
|
||||
static inline void
|
||||
target_if_init_spectral_skb_dst_pid(
|
||||
struct target_if_spectral *spectral)
|
||||
{
|
||||
}
|
||||
#endif /* VERSION - field depracated by newer kernel */
|
||||
|
||||
#if KERNEL_VERSION(3, 7, 0) > LINUX_VERSION_CODE
|
||||
static inline void
|
||||
target_if_init_spectral_skb_pid_portid(
|
||||
struct target_if_spectral *spectral)
|
||||
{
|
||||
NETLINK_CB(spectral->spectral_skb).pid = 0; /* from kernel */
|
||||
}
|
||||
#else
|
||||
static inline void
|
||||
target_if_init_spectral_skb_pid_portid(
|
||||
struct target_if_spectral *spectral)
|
||||
{
|
||||
NETLINK_CB(spectral->spectral_skb).portid = 0; /* from kernel */
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
target_if_spectral_unicast_msg(struct target_if_spectral *spectral)
|
||||
{
|
||||
if (!spectral) {
|
||||
qdf_print("%s Spectral is NULL\n", __func__);
|
||||
return;
|
||||
qdf_print("%s Spectral is NULL\n", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!spectral->spectral_sock) {
|
||||
qdf_print("%s Spectral Socket is invalid\n", __func__);
|
||||
dev_kfree_skb(spectral->spectral_skb);
|
||||
spectral->spectral_skb = NULL;
|
||||
return;
|
||||
qdf_print("%s Spectral Socket is invalid\n", __func__);
|
||||
dev_kfree_skb(spectral->spectral_skb);
|
||||
spectral->spectral_skb = NULL;
|
||||
return;
|
||||
}
|
||||
|
||||
if (spectral->spectral_skb) {
|
||||
#if (KERNEL_VERSION(2, 6, 31) > LINUX_VERSION_CODE)
|
||||
NETLINK_CB(spectral->spectral_skb).dst_pid = spectral->spectral_pid;
|
||||
#endif /* VERSION - field depracated by newer kernel */
|
||||
#if KERNEL_VERSION(3, 7, 0) > LINUX_VERSION_CODE
|
||||
NETLINK_CB(spectral->spectral_skb).pid = 0; /* from kernel */
|
||||
#else
|
||||
NETLINK_CB(spectral->spectral_skb).portid = 0; /* from kernel */
|
||||
#endif
|
||||
/* to mcast group 1<<0 */
|
||||
NETLINK_CB(spectral->spectral_skb).dst_group = 0;
|
||||
target_if_init_spectral_skb_dst_pid(spectral);
|
||||
|
||||
netlink_unicast(
|
||||
spectral->spectral_sock,
|
||||
spectral->spectral_skb,
|
||||
spectral->spectral_pid,
|
||||
MSG_DONTWAIT);
|
||||
target_if_init_spectral_skb_pid_portid(spectral);
|
||||
|
||||
/* to mcast group 1<<0 */
|
||||
NETLINK_CB(spectral->spectral_skb).dst_group = 0;
|
||||
|
||||
netlink_unicast(spectral->spectral_sock,
|
||||
spectral->spectral_skb,
|
||||
spectral->spectral_pid, MSG_DONTWAIT);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Function : target_if_spectral_bcast_msg
|
||||
* Description : Passes the Spectral Message to Host
|
||||
* Input : Pointer to spectral
|
||||
* Output : Void
|
||||
*
|
||||
*/
|
||||
void target_if_spectral_bcast_msg(struct target_if_spectral *spectral)
|
||||
void
|
||||
target_if_spectral_bcast_msg(struct target_if_spectral *spectral)
|
||||
{
|
||||
#if (KERNEL_VERSION(2, 6, 31) >= LINUX_VERSION_CODE)
|
||||
fd_set write_set;
|
||||
#endif
|
||||
SPECTRAL_SAMP_MSG *msg = NULL;
|
||||
struct nlmsghdr *nlh = NULL;
|
||||
struct spectral_samp_msg *msg = NULL;
|
||||
struct nlmsghdr *nlh = NULL;
|
||||
int status;
|
||||
|
||||
#if (KERNEL_VERSION(2, 6, 31) >= LINUX_VERSION_CODE)
|
||||
@@ -522,7 +581,7 @@ void target_if_spectral_bcast_msg(struct target_if_spectral *spectral)
|
||||
#endif
|
||||
|
||||
if (!spectral)
|
||||
return;
|
||||
return;
|
||||
|
||||
if (!spectral->spectral_sock) {
|
||||
dev_kfree_skb(spectral->spectral_skb);
|
||||
@@ -531,15 +590,13 @@ void target_if_spectral_bcast_msg(struct target_if_spectral *spectral)
|
||||
}
|
||||
|
||||
if (!spectral->spectral_skb)
|
||||
return;
|
||||
return;
|
||||
|
||||
nlh = (struct nlmsghdr *)spectral->spectral_skb->data;
|
||||
msg = (SPECTRAL_SAMP_MSG *)NLMSG_DATA(spectral->spectral_nlh);
|
||||
/* print_samp_msg (msg, sc); */
|
||||
status = target_if_send_phydata(
|
||||
spectral->pdev_obj,
|
||||
spectral->spectral_sock,
|
||||
spectral->spectral_skb);
|
||||
msg = (struct spectral_samp_msg *)NLMSG_DATA(spectral->spectral_nlh);
|
||||
status = target_if_send_phydata(spectral->pdev_obj,
|
||||
spectral->spectral_sock,
|
||||
spectral->spectral_skb);
|
||||
if (status == 0)
|
||||
spectral->spectral_sent_msg++;
|
||||
|
||||
@@ -548,31 +605,29 @@ void target_if_spectral_bcast_msg(struct target_if_spectral *spectral)
|
||||
spectral->spectral_skb = NULL;
|
||||
}
|
||||
|
||||
void target_if_spectral_skb_dequeue(unsigned long data)
|
||||
void
|
||||
target_if_spectral_skb_dequeue(void *data)
|
||||
{
|
||||
struct target_if_spectral *spectral =
|
||||
(struct target_if_spectral *)data;
|
||||
struct target_if_spectral *spectral = (struct target_if_spectral *)data;
|
||||
struct target_if_spectral_skb_event *sp_skb_event = NULL;
|
||||
|
||||
qdf_spin_lock(&spectral->spectral_skbqlock);
|
||||
/* Deque all the spectral socket buffers queued */
|
||||
while (!STAILQ_EMPTY(&spectral->spectral_skbq)) {
|
||||
sp_skb_event = STAILQ_FIRST(&spectral->spectral_skbq);
|
||||
if (sp_skb_event) {
|
||||
spectral->spectral_skb = sp_skb_event->sp_skb;
|
||||
spectral->spectral_nlh = sp_skb_event->sp_nlh;
|
||||
STAILQ_REMOVE_HEAD(
|
||||
&spectral->spectral_skbq,
|
||||
spectral_skb_list);
|
||||
qdf_spin_unlock(&spectral->spectral_skbqlock);
|
||||
OS_FREE(sp_skb_event);
|
||||
/* Broadcast spectral data after dequeing */
|
||||
target_if_spectral_bcast_msg(spectral);
|
||||
qdf_spin_lock(&spectral->spectral_skbqlock);
|
||||
}
|
||||
sp_skb_event = STAILQ_FIRST(&spectral->spectral_skbq);
|
||||
if (sp_skb_event) {
|
||||
spectral->spectral_skb = sp_skb_event->sp_skb;
|
||||
spectral->spectral_nlh = sp_skb_event->sp_nlh;
|
||||
STAILQ_REMOVE_HEAD(&spectral->spectral_skbq,
|
||||
spectral_skb_list);
|
||||
qdf_spin_unlock(&spectral->spectral_skbqlock);
|
||||
OS_FREE(sp_skb_event);
|
||||
/* Broadcast spectral data after dequeing */
|
||||
target_if_spectral_bcast_msg(spectral);
|
||||
qdf_spin_lock(&spectral->spectral_skbqlock);
|
||||
}
|
||||
}
|
||||
qdf_spin_unlock(&spectral->spectral_skbqlock);
|
||||
}
|
||||
|
||||
#endif /* SPECTRAL_USE_NETLINK_SOCKETS */
|
||||
|
||||
#endif /* SPECTRAL_USE_NETLINK_SOCKETS */
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2015,2017 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2015,2017-2018 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for
|
||||
@@ -541,7 +541,7 @@ OS_TIMER_FUNC(spectral_sim_phyerrdelivery_handler)
|
||||
OS_GET_TIMER_ARG(spectral, struct target_if_spectral *);
|
||||
qdf_assert_always(spectral);
|
||||
|
||||
p_sops = GET_TIF_SPECTRAL_OPS(spectral);
|
||||
p_sops = GET_TARGET_IF_SPECTRAL_OPS(spectral);
|
||||
qdf_assert_always(spectral);
|
||||
|
||||
simctx = (ath_spectralsim_context *)spectral->simctx;
|
||||
|
||||
Reference in New Issue
Block a user