samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Add support to fetch min and max tx power

Browse Source 
Add support to fetch min and max tx power from target for
a given set of mcs, nss, chainmask, bw, and other rate flags.

Change-Id: Iafe082db81503a52bdc704d4b71d86d23788fddb
CRs-Fixed: 2061802
This commit is contained in:
Om Prakash Tripathi
2017-09-06 15:22:04 +05:30
committed by snandini
parent d9bdeb72a0
commit 53ed74b1ac
2 changed files with 201 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
wmi_unified_non_tlv.c
View File

@@ -4433,6 +4433,87 @@ send_nf_dbr_dbm_info_get_cmd_non_tlv(wmi_unified_t wmi_handle)
WMI_PDEV_GET_NFCAL_POWER_CMDID); WMI_PDEV_GET_NFCAL_POWER_CMDID);
} }
/**
* enum packet_power_non_tlv_flags: Target defined
* packet power rate flags
* @WMI_NON_TLV_FLAG_ONE_CHAIN: one chain
* @WMI_NON_TLV_FLAG_TWO_CHAIN: two chain
* @WMI_NON_TLV_FLAG_THREE_CHAIN: three chain
* @WMI_NON_TLV_FLAG_FOUR_CHAIN: four chain
* @WMI_NON_TLV_FLAG_STBC: STBC is set
* @WMI_NON_TLV_FLAG_40MHZ: 40MHz channel width
* @WMI_NON_TLV_FLAG_80MHZ: 80MHz channel width
* @WMI_NON_TLV_FLAG_1600MHZ: 1600MHz channel width
* @WMI_NON_TLV_FLAG_TXBF: Tx Bf enabled
* @WMI_NON_TLV_FLAG_RTSENA: RTS enabled
* @WMI_NON_TLV_FLAG_CTSENA: CTS enabled
* @WMI_NON_TLV_FLAG_LDPC: LDPC is set
* @WMI_NON_TLV_FLAG_SERIES1: Rate series 1
* @WMI_NON_TLV_FLAG_SGI: Short gaurd interval
* @WMI_NON_TLV_FLAG_MU2: MU2 data
* @WMI_NON_TLV_FLAG_MU3: MU3 data
*/
enum packet_power_non_tlv_flags {
WMI_NON_TLV_FLAG_ONE_CHAIN = 0x0001,
WMI_NON_TLV_FLAG_TWO_CHAIN = 0x0005,
WMI_NON_TLV_FLAG_THREE_CHAIN = 0x0007,
WMI_NON_TLV_FLAG_FOUR_CHAIN = 0x000F,
WMI_NON_TLV_FLAG_STBC = 0x0010,
WMI_NON_TLV_FLAG_40MHZ = 0x0020,
WMI_NON_TLV_FLAG_80MHZ = 0x0040,
WMI_NON_TLV_FLAG_160MHZ = 0x0080,
WMI_NON_TLV_FLAG_TXBF = 0x0100,
WMI_NON_TLV_FLAG_RTSENA = 0x0200,
WMI_NON_TLV_FLAG_CTSENA = 0x0400,
WMI_NON_TLV_FLAG_LDPC = 0x0800,
WMI_NON_TLV_FLAG_SERIES1 = 0x1000,
WMI_NON_TLV_FLAG_SGI = 0x2000,
WMI_NON_TLV_FLAG_MU2 = 0x4000,
WMI_NON_TLV_FLAG_MU3 = 0x8000,
};
/**
* convert_to_power_info_rate_flags() - convert packet_power_info_params
* to FW understandable format
* @param: pointer to hold packet power info param
*
* @return FW understandable 16 bit rate flags
*/
static uint16_t
convert_to_power_info_rate_flags(struct packet_power_info_params *param)
{
uint16_t rateflags = 0;
if (param->chainmask)
rateflags |= (param->chainmask & 0xf);
if (param->chan_width == WMI_HOST_CHAN_WIDTH_40)
rateflags |= WMI_NON_TLV_FLAG_40MHZ;
if (param->chan_width == WMI_HOST_CHAN_WIDTH_80)
rateflags |= WMI_NON_TLV_FLAG_80MHZ;
if (param->chan_width == WMI_HOST_CHAN_WIDTH_160)
rateflags |= WMI_NON_TLV_FLAG_160MHZ;
if (param->rate_flags & WMI_HOST_FLAG_STBC)
rateflags |= WMI_NON_TLV_FLAG_STBC;
if (param->rate_flags & WMI_HOST_FLAG_LDPC)
rateflags |= WMI_NON_TLV_FLAG_LDPC;
if (param->rate_flags & WMI_HOST_FLAG_TXBF)
rateflags |= WMI_NON_TLV_FLAG_TXBF;
if (param->rate_flags & WMI_HOST_FLAG_RTSENA)
rateflags |= WMI_NON_TLV_FLAG_RTSENA;
if (param->rate_flags & WMI_HOST_FLAG_CTSENA)
rateflags |= WMI_NON_TLV_FLAG_CTSENA;
if (param->rate_flags & WMI_HOST_FLAG_SGI)
rateflags |= WMI_NON_TLV_FLAG_SGI;
if (param->rate_flags & WMI_HOST_FLAG_SERIES1)
rateflags |= WMI_NON_TLV_FLAG_SERIES1;
if (param->rate_flags & WMI_HOST_FLAG_MU2)
rateflags |= WMI_NON_TLV_FLAG_MU2;
if (param->rate_flags & WMI_HOST_FLAG_MU3)
rateflags |= WMI_NON_TLV_FLAG_MU3;
return rateflags;
}
/** /**
* send_packet_power_info_get_cmd_non_tlv() - send request to get packet power * send_packet_power_info_get_cmd_non_tlv() - send request to get packet power
* info to fw * info to fw
@@ -4447,20 +4528,24 @@ send_packet_power_info_get_cmd_non_tlv(wmi_unified_t wmi_handle,
{ {
wmi_pdev_get_tpc_cmd *cmd; wmi_pdev_get_tpc_cmd *cmd;
wmi_buf_t wmibuf; wmi_buf_t wmibuf;
u_int32_t len = sizeof(wmi_pdev_get_tpc_cmd); u_int32_t len = sizeof(wmi_pdev_get_tpc_cmd);
wmibuf = wmi_buf_alloc(wmi_handle, len); wmibuf = wmi_buf_alloc(wmi_handle, len);
if (wmibuf == NULL) if (wmibuf == NULL)
return QDF_STATUS_E_NOMEM; return QDF_STATUS_E_NOMEM;
cmd = (wmi_pdev_get_tpc_cmd *)wmi_buf_data(wmibuf); cmd = (wmi_pdev_get_tpc_cmd *)wmi_buf_data(wmibuf);
cmd->rate_flags = param->rate_flags; cmd->rate_flags = convert_to_power_info_rate_flags(param);
cmd->nss = param->nss; cmd->nss = param->nss;
cmd->preamble = param->preamble; cmd->preamble = param->preamble;
cmd->hw_rate = param->hw_rate; cmd->hw_rate = param->hw_rate;
cmd->rsvd = 0x0; cmd->rsvd = 0x0;
qdf_print("%s[%d] commandID %d, wmi_pdev_get_tpc_cmd=0x%x\n", __func__,
__LINE__, WMI_PDEV_GET_TPC_CMDID, *((u_int32_t *)cmd)); WMI_LOGD("%s[%d] commandID %d, wmi_pdev_get_tpc_cmd=0x%x,"
"rate_flags: 0x%x, nss: %d, preamble: %d, hw_rate: %d\n",
__func__, __LINE__, WMI_PDEV_GET_TPC_CMDID, *((u_int32_t *)cmd),
cmd->rate_flags, cmd->nss, cmd->preamble, cmd->hw_rate);
return wmi_unified_cmd_send(wmi_handle, wmibuf, len, return wmi_unified_cmd_send(wmi_handle, wmibuf, len,
WMI_PDEV_GET_TPC_CMDID); WMI_PDEV_GET_TPC_CMDID);
} }

119
wmi_unified_tlv.c
View File

@@ -10537,13 +10537,116 @@ send_set_mimogain_table_cmd_tlv(wmi_unified_t wmi_handle,
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }
/**
* enum packet_power_tlv_flags: target defined
* packet power rate flags for TLV
* @WMI_TLV_FLAG_ONE_CHAIN: one chain
* @WMI_TLV_FLAG_TWO_CHAIN: two chain
* @WMI_TLV_FLAG_THREE_CHAIN: three chain
* @WMI_TLV_FLAG_FOUR_CHAIN: four chain
* @WMI_TLV_FLAG_FIVE_CHAIN: five chain
* @WMI_TLV_FLAG_SIX_CHAIN: six chain
* @WMI_TLV_FLAG_SEVEN_CHAIN: seven chain
* @WMI_TLV_FLAG_EIGHT_CHAIN:eight chain
* @WMI_TLV_FLAG_STBC: STBC is set
* @WMI_TLV_FLAG_40MHZ: 40MHz chan width
* @WMI_TLV_FLAG_80MHZ: 80MHz chan width
* @WMI_TLV_FLAG_160MHZ: 160MHz chan width
* @WMI_TLV_FLAG_TXBF: Tx Bf enabled
* @WMI_TLV_FLAG_RTSENA: RTS enabled
* @WMI_TLV_FLAG_CTSENA: CTS enabled
* @WMI_TLV_FLAG_LDPC: LDPC is set
* @WMI_TLV_FLAG_SGI: Short gaurd interval
* @WMI_TLV_FLAG_SU: SU Data
* @WMI_TLV_FLAG_DL_MU_MIMO_AC: DL AC MU data
* @WMI_TLV_FLAG_DL_MU_MIMO_AX: DL AX MU data
* @WMI_TLV_FLAG_DL_OFDMA: DL OFDMA data
* @WMI_TLV_FLAG_UL_OFDMA: UL OFDMA data
* @WMI_TLV_FLAG_UL_MU_MIMO: UL MU data
*
* @WMI_TLV_FLAG_BW_MASK: bandwidth mask
* @WMI_TLV_FLAG_BW_SHIFT: bandwidth shift
* @WMI_TLV_FLAG_SU_MU_OFDMA_MASK: su/mu/ofdma mask
* @WMI_TLV_FLAG_SU_MU_OFDMA_shift: su/mu/ofdma shift
*/
enum packet_power_tlv_flags {
WMI_TLV_FLAG_ONE_CHAIN = 0x00000001,
WMI_TLV_FLAG_TWO_CHAIN = 0x00000003,
WMI_TLV_FLAG_THREE_CHAIN = 0x00000007,
WMI_TLV_FLAG_FOUR_CHAIN = 0x0000000F,
WMI_TLV_FLAG_FIVE_CHAIN = 0x0000001F,
WMI_TLV_FLAG_SIX_CHAIN = 0x0000003F,
WMI_TLV_FLAG_SEVEN_CHAIN = 0x0000007F,
WMI_TLV_FLAG_EIGHT_CHAIN = 0x0000008F,
WMI_TLV_FLAG_STBC = 0x00000100,
WMI_TLV_FLAG_40MHZ = 0x00000200,
WMI_TLV_FLAG_80MHZ = 0x00000300,
WMI_TLV_FLAG_160MHZ = 0x00000400,
WMI_TLV_FLAG_TXBF = 0x00000800,
WMI_TLV_FLAG_RTSENA = 0x00001000,
WMI_TLV_FLAG_CTSENA = 0x00002000,
WMI_TLV_FLAG_LDPC = 0x00004000,
WMI_TLV_FLAG_SGI = 0x00008000,
WMI_TLV_FLAG_SU = 0x00100000,
WMI_TLV_FLAG_DL_MU_MIMO_AC = 0x00200000,
WMI_TLV_FLAG_DL_MU_MIMO_AX = 0x00300000,
WMI_TLV_FLAG_DL_OFDMA = 0x00400000,
WMI_TLV_FLAG_UL_OFDMA = 0x00500000,
WMI_TLV_FLAG_UL_MU_MIMO = 0x00600000,
WMI_TLV_FLAG_CHAIN_MASK = 0xff,
WMI_TLV_FLAG_BW_MASK = 0x3,
WMI_TLV_FLAG_BW_SHIFT = 9,
WMI_TLV_FLAG_SU_MU_OFDMA_MASK = 0x7,
WMI_TLV_FLAG_SU_MU_OFDMA_SHIFT = 20,
};
/**
* convert_to_power_info_rate_flags() - convert packet_power_info_params
* to FW understandable format
* @param: pointer to hold packet power info param
*
* @return FW understandable 32 bit rate flags
*/
static uint32_t
convert_to_power_info_rate_flags(struct packet_power_info_params *param)
{
uint32_t rateflags = 0;
if (param->chainmask)
rateflags |=
(param->chainmask & WMI_TLV_FLAG_CHAIN_MASK);
if (param->chan_width)
rateflags |=
((param->chan_width & WMI_TLV_FLAG_BW_MASK)
<< WMI_TLV_FLAG_BW_SHIFT);
if (param->su_mu_ofdma)
rateflags |=
((param->su_mu_ofdma & WMI_TLV_FLAG_SU_MU_OFDMA_MASK)
<< WMI_TLV_FLAG_SU_MU_OFDMA_SHIFT);
if (param->rate_flags & WMI_HOST_FLAG_STBC)
rateflags |= WMI_TLV_FLAG_STBC;
if (param->rate_flags & WMI_HOST_FLAG_LDPC)
rateflags |= WMI_TLV_FLAG_LDPC;
if (param->rate_flags & WMI_HOST_FLAG_TXBF)
rateflags |= WMI_TLV_FLAG_TXBF;
if (param->rate_flags & WMI_HOST_FLAG_RTSENA)
rateflags |= WMI_TLV_FLAG_RTSENA;
if (param->rate_flags & WMI_HOST_FLAG_CTSENA)
rateflags |= WMI_TLV_FLAG_CTSENA;
if (param->rate_flags & WMI_HOST_FLAG_SGI)
rateflags |= WMI_TLV_FLAG_SGI;
return rateflags;
}
/** /**
* send_packet_power_info_get_cmd_tlv() - send request to get packet power * send_packet_power_info_get_cmd_tlv() - send request to get packet power
* info to fw * info to fw
* @wmi_handle: wmi handle * @wmi_handle: wmi handle
* @param: pointer to hold packet power info param * @param: pointer to hold packet power info param
* *
* @return QDF_STATUS_SUCCESS on success and -ve on failure. * @return QDF_STATUS_SUCCESS on success and -ve on failure.
*/ */
static QDF_STATUS static QDF_STATUS
send_packet_power_info_get_cmd_tlv(wmi_unified_t wmi_handle, send_packet_power_info_get_cmd_tlv(wmi_unified_t wmi_handle,
@@ -10567,15 +10670,16 @@ send_packet_power_info_get_cmd_tlv(wmi_unified_t wmi_handle,
wmi_pdev_get_tpc_cmd_fixed_param)); wmi_pdev_get_tpc_cmd_fixed_param));
cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target( cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
param->pdev_id); param->pdev_id);
cmd->rate_flags = param->rate_flags; cmd->rate_flags = convert_to_power_info_rate_flags(param);
cmd->nss = param->nss; cmd->nss = param->nss;
cmd->preamble = param->preamble; cmd->preamble = param->preamble;
cmd->hw_rate = param->hw_rate; cmd->hw_rate = param->hw_rate;
WMI_LOGI("%s[%d] commandID %d, wmi_pdev_get_tpc_cmd=0x%x\n",
__func__, WMI_LOGI("%s[%d] commandID %d, wmi_pdev_get_tpc_cmd=0x%x,"
__LINE__, "rate_flags: 0x%x, nss: %d, preamble: %d, hw_rate: %d\n",
WMI_PDEV_GET_TPC_CMDID, __func__, __LINE__, WMI_PDEV_GET_TPC_CMDID, *((u_int32_t *)cmd),
*((u_int32_t *)cmd)); cmd->rate_flags, cmd->nss, cmd->preamble, cmd->hw_rate);
if (wmi_unified_cmd_send(wmi_handle, wmibuf, len, if (wmi_unified_cmd_send(wmi_handle, wmibuf, len,
WMI_PDEV_GET_TPC_CMDID)) { WMI_PDEV_GET_TPC_CMDID)) {
WMI_LOGE(FL("Failed to get tpc command\n")); WMI_LOGE(FL("Failed to get tpc command\n"));
@@ -19356,6 +19460,7 @@ static void populate_tlv_events_id(uint32_t *event_ids)
WMI_PDEV_DFS_RADAR_DETECTION_EVENTID; WMI_PDEV_DFS_RADAR_DETECTION_EVENTID;
event_ids[wmi_tt_stats_event_id] = WMI_THERM_THROT_STATS_EVENTID; event_ids[wmi_tt_stats_event_id] = WMI_THERM_THROT_STATS_EVENTID;
event_ids[wmi_11d_new_country_event_id] = WMI_11D_NEW_COUNTRY_EVENTID; event_ids[wmi_11d_new_country_event_id] = WMI_11D_NEW_COUNTRY_EVENTID;
event_ids[wmi_pdev_tpc_event_id] = WMI_PDEV_TPC_EVENTID;
} }
#ifndef CONFIG_MCL #ifndef CONFIG_MCL