samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Código Incidencias Pull Requests Acciones Paquetes Proyectos Lanzamientos Wiki Actividad

qcacmn: Cleanup vdev mgmt related structures in WMI

Explorar el Código 
Cleanup WMI to use new data structures in vdev mlme
for corresponding vdev mgmt op

Change-Id: I0126dcb34e569aac2af82de15e0f3362cf5a0a5e
CRs-Fixed: 2383346
Este commit está contenido en:
Naga
2019-01-18 18:50:03 +05:30
cometido por nshrivas
padre ba29b56cd6
commit 71b2748ffc
Se han modificado 2 ficheros con 84 adiciones y 41 borrados
Descargar archivo de parche Descargar archivo de diferencias Expandir todos los archivos Contraer todos los archivos

100
wmi/inc/wmi_unified_param.h
Ver fichero

@@ -604,36 +604,6 @@ typedef enum {
(((_tid) == 4) || ((_tid) == 5)) ? WMI_HOST_AC_VI : \
WMI_HOST_AC_VO)
/**
* struct vdev_create_params - vdev create cmd parameter
* @if_id: interface id
* @type: interface type
* @subtype: interface subtype
* @nss_2g: NSS for 2G
* @nss_5g: NSS for 5G
* @pdev_id: pdev id on pdev for this vdev
* @mbssid-flags: MBSS IE flags indicating vdev type
* @vdevid_trans: id of transmitting vdev for MBSS IE
*/
struct vdev_create_params {
uint8_t if_id;
uint32_t type;
uint32_t subtype;
uint8_t nss_2g;
uint8_t nss_5g;
uint32_t pdev_id;
uint32_t mbssid_flags;
uint8_t vdevid_trans;
};
/**
* struct vdev_delete_params - vdev delete cmd parameter
* @if_id: interface id
*/
struct vdev_delete_params {
uint8_t if_id;
};
/**
* struct channel_param - Channel parameters with all
* info required by target.
@@ -680,6 +650,47 @@ struct channel_param {
uint8_t reg_class_id;
};
/**
* struct mac_ssid - mac ssid structure
* @length:
* @mac_ssid[WMI_MAC_MAX_SSID_LENGTH]:
*/
struct mac_ssid {
uint8_t length;
uint8_t mac_ssid[WMI_MAC_MAX_SSID_LENGTH];
} qdf_packed;
#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE
/**
* struct vdev_create_params - vdev create cmd parameter
* @if_id: interface id
* @type: interface type
* @subtype: interface subtype
* @nss_2g: NSS for 2G
* @nss_5g: NSS for 5G
* @pdev_id: pdev id on pdev for this vdev
* @mbssid-flags: MBSS IE flags indicating vdev type
* @vdevid_trans: id of transmitting vdev for MBSS IE
*/
struct vdev_create_params {
uint8_t if_id;
uint32_t type;
uint32_t subtype;
uint8_t nss_2g;
uint8_t nss_5g;
uint32_t pdev_id;
uint32_t mbssid_flags;
uint8_t vdevid_trans;
};
/**
* struct vdev_delete_params - vdev delete cmd parameter
* @if_id: interface id
*/
struct vdev_delete_params {
uint8_t if_id;
};
/**
* struct vdev_stop_params - vdev stop cmd parameter
* @vdev_id: vdev id
@@ -714,16 +725,6 @@ struct vdev_down_params {
uint8_t vdev_id;
};
/**
* struct mac_ssid - mac ssid structure
* @length:
* @mac_ssid[WMI_MAC_MAX_SSID_LENGTH]:
*/
struct mac_ssid {
uint8_t length;
uint8_t mac_ssid[WMI_MAC_MAX_SSID_LENGTH];
} qdf_packed;
/**
* enum wmi_bcn_tx_rate_code - beacon tx rate code
*/
@@ -799,6 +800,7 @@ struct vdev_scan_nac_rssi_params {
uint32_t chan_num;
uint32_t action; /* WMI_FILTER_NAC_RSSI_ACTION */
};
#endif /* CMN_VDEV_MGR_TGT_IF_ENABLE */
/**
* enum nss_chains_band_info - Band info for dynamic nss, chains change feature
@@ -873,6 +875,7 @@ struct hidden_ssid_vdev_restart_params {
#endif
};
#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE
/**
* struct vdev_set_params - vdev set cmd parameter
* @if_id: vdev id
@@ -894,6 +897,7 @@ struct sifs_trigger_param {
uint32_t if_id;
uint32_t param_value;
};
#endif
/**
* struct peer_delete_params - peer delete cmd parameter
@@ -903,6 +907,7 @@ struct peer_delete_params {
uint8_t vdev_id;
};
#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE
/**
* struct peer_flush_params - peer flush cmd parameter
* @peer_tid_bitmap: peer tid bitmap
@@ -912,6 +917,7 @@ struct peer_flush_params {
uint32_t peer_tid_bitmap;
uint8_t vdev_id;
};
#endif
/**
* struct peer_set_params - peer set cmd parameter
@@ -1071,6 +1077,7 @@ struct pdev_params {
uint32_t param_value;
};
#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE
/**
* struct beacon_tmpl_params - beacon template cmd parameter
* @vdev_id: vdev id
@@ -1116,6 +1123,7 @@ struct beacon_params {
bool is_bitctl_reqd;
bool is_high_latency;
};
#endif
/**
* struct fd_params - FD cmd parameter
@@ -1301,6 +1309,7 @@ struct peer_assoc_params {
struct wmi_host_ppe_threshold peer_ppet;
};
#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE
/**
* struct sta_ps_params - sta ps cmd parameter
* @vdev_id: vdev id
@@ -1312,6 +1321,7 @@ struct sta_ps_params {
uint32_t param;
uint32_t value;
};
#endif
/**
* struct ap_ps_params - ap ps cmd parameter
@@ -1347,6 +1357,7 @@ struct scan_chan_list_params {
struct channel_param ch_param[1];
};
#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE
/**
* struct multiple_vdev_restart_params - Multiple vdev restart cmd parameter
* @pdev_id: Pdev identifier
@@ -1366,6 +1377,7 @@ struct multiple_vdev_restart_params {
struct channel_param ch_param;
uint32_t vdev_ids[WMI_HOST_PDEV_MAX_VDEVS];
};
#endif
/**
* struct fw_hang_params - fw hang command parameters
* @type: 0:unused 1: ASSERT, 2:not respond detect command, 3:simulate ep-full
@@ -2922,6 +2934,7 @@ typedef struct {
/* add new members here */
} wmi_host_ext_resource_config;
#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE
/**
* struct set_neighbour_rx_params - Neighbour RX params
* @vdev_id: vdev id
@@ -2935,6 +2948,7 @@ struct set_neighbour_rx_params {
uint32_t action;
uint32_t type;
};
#endif
/**
* struct set_fwtest_params - FW test params
@@ -2946,6 +2960,7 @@ struct set_fwtest_params {
uint32_t value;
};
#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE
/**
* struct set_custom_aggr_size_params - custom aggr size params
* @vdev_id : vdev id
@@ -2964,6 +2979,7 @@ struct set_custom_aggr_size_params {
tx_ac_enable:1,
reserved:26;
};
#endif
/**
* enum wmi_host_custom_aggr_type_t: custon aggregate type
@@ -3031,6 +3047,7 @@ struct peer_chan_width_switch_params {
struct peer_chan_width_switch_info *chan_width_peer_list;
};
#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE
/**
* struct config_ratemask_params - ratemask config parameters
* @vdev_id: vdev id
@@ -3046,6 +3063,7 @@ struct config_ratemask_params {
uint32_t higher32;
uint32_t lower32_2;
};
#endif
/**
* struct config_fils_params - FILS config params
@@ -7193,6 +7211,7 @@ struct coex_config_params {
#define WMI_HOST_PDEV_ID_1 1
#define WMI_HOST_PDEV_ID_2 2
#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE
/**
* struct tbttoffset_params - Tbttoffset event params
* @vdev_id: Virtual AP device identifier
@@ -7202,6 +7221,7 @@ struct tbttoffset_params {
uint32_t vdev_id;
uint32_t tbttoffset;
};
#endif
/**
* struct wmi_host_ready_ev_param - Data revieved in ready event

25
wmi/src/wmi_unified_tlv.c
Ver fichero

@@ -198,7 +198,11 @@ static QDF_STATUS send_vdev_create_cmd_tlv(wmi_unified_t wmi_handle,
WMITLV_TAG_STRUC_wmi_vdev_create_cmd_fixed_param,
WMITLV_GET_STRUCT_TLVLEN
(wmi_vdev_create_cmd_fixed_param));
#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE
cmd->vdev_id = param->vdev_id;
#else
cmd->vdev_id = param->if_id;
#endif
cmd->vdev_type = param->type;
cmd->vdev_subtype = param->subtype;
cmd->flags = param->mbssid_flags;
@@ -207,7 +211,11 @@ static QDF_STATUS send_vdev_create_cmd_tlv(wmi_unified_t wmi_handle,
copy_vdev_create_pdev_id(wmi_handle, cmd, param);
WMI_CHAR_ARRAY_TO_MAC_ADDR(macaddr, &cmd->vdev_macaddr);
WMI_LOGD("%s: ID = %d[pdev:%d] VAP Addr = %02x:%02x:%02x:%02x:%02x:%02x",
#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE
__func__, param->vdev_id, cmd->pdev_id,
#else
__func__, param->if_id, cmd->pdev_id,
#endif
macaddr[0], macaddr[1], macaddr[2],
macaddr[3], macaddr[4], macaddr[5]);
buf_ptr = (uint8_t *)cmd + sizeof(*cmd);
@@ -482,8 +490,11 @@ static QDF_STATUS send_vdev_start_cmd_tlv(wmi_unified_t wmi_handle,
/* Fill channel info */
copy_channel_info(cmd, chan, req);
#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE
cmd->beacon_interval = req->beacon_interval;
#else
cmd->beacon_interval = req->beacon_intval;
#endif
cmd->dtim_period = req->dtim_period;
cmd->bcn_tx_rate = req->bcn_tx_rate_code;
@@ -491,7 +502,11 @@ static QDF_STATUS send_vdev_start_cmd_tlv(wmi_unified_t wmi_handle,
cmd->flags |= WMI_UNIFIED_VDEV_START_BCN_TX_RATE_PRESENT;
if (!req->is_restart) {
#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE
cmd->beacon_interval = req->beacon_interval;
#else
cmd->beacon_interval = req->beacon_intval;
#endif
cmd->dtim_period = req->dtim_period;
/* Copy the SSID */
@@ -530,7 +545,11 @@ static QDF_STATUS send_vdev_start_cmd_tlv(wmi_unified_t wmi_handle,
"Tx SS %d, Rx SS %d, ldpc_rx: %d, cac %d, regd %d, HE ops: %d"
"req->dis_hw_ack: %d ", __func__, req->vdev_id,
chan->mhz, req->channel.phy_mode, chan->info,
#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE
req->channel.dfs_set, req->beacon_interval, cmd->dtim_period,
#else
req->channel.dfs_set, req->beacon_intval, cmd->dtim_period,
#endif
chan->band_center_freq1, chan->band_center_freq2,
chan->reg_info_1, chan->reg_info_2, req->channel.maxregpower,
req->preferred_tx_streams, req->preferred_rx_streams,
@@ -1647,7 +1666,11 @@ static QDF_STATUS send_vdev_set_param_cmd_tlv(wmi_unified_t wmi_handle,
WMITLV_TAG_STRUC_wmi_vdev_set_param_cmd_fixed_param,
WMITLV_GET_STRUCT_TLVLEN
(wmi_vdev_set_param_cmd_fixed_param));
#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE
cmd->vdev_id = param->vdev_id;
#else
cmd->vdev_id = param->if_id;
#endif
cmd->param_id = vdev_param;
cmd->param_value = param->param_value;
WMI_LOGD("Setting vdev %d param = %x, value = %u",