prima: Send max tx power per band via SME queue
Currently for set max tx power per band, driver doesn't check for
current power state and directly passes that to firmware. This can
lead to crash if device is in IMPS state as firmware tries to
access phy register in chip power down state. Fix this by sending
max tx power per band request via SME queue.
Change-Id: Ic09744e0caef73ac450f5016076afa49d397bc33
CRs-Fixed: 1077944
diff --git a/CORE/HDD/inc/wlan_hdd_wext.h b/CORE/HDD/inc/wlan_hdd_wext.h
index fe8bfed..1a58dc0 100644
--- a/CORE/HDD/inc/wlan_hdd_wext.h
+++ b/CORE/HDD/inc/wlan_hdd_wext.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014, 2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -463,6 +463,6 @@
int hdd_setBand(struct net_device *dev, u8 ui_band);
int hdd_setBand_helper(struct net_device *dev, const char *command);
VOS_STATUS wlan_hdd_get_frame_logs(hdd_adapter_t *pAdapter, v_U8_t flag);
-int wlan_hdd_set_proximity(int set_value);
+int wlan_hdd_set_proximity(int set_value, tHalHandle hal);
#endif // __WEXT_IW_H__
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index e67db4d..cb63b90 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -1958,7 +1958,7 @@
}
case QCSAP_PARAM_SET_PROXIMITY:
{
- ret = wlan_hdd_set_proximity(set_value);
+ ret = wlan_hdd_set_proximity(set_value, hHal);
break;
}
default:
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index d181ed7..854b6b3 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -5560,7 +5560,7 @@
return ret;
}
-int wlan_hdd_set_proximity(int set_value)
+int wlan_hdd_set_proximity(int set_value, tHalHandle hal)
{
sHwCalValues hwCalValues;
uint16 hwCalTxPower;
@@ -5586,7 +5586,7 @@
if (txPwr > TX_PWR_MAX)
txPwr = TX_PWR_MAX;
- if (sme_SetMaxTxPowerPerBand(eCSR_BAND_24, txPwr) !=
+ if (sme_SetMaxTxPowerPerBand(eCSR_BAND_24, txPwr, hal) !=
eHAL_STATUS_SUCCESS) {
hddLog(VOS_TRACE_LEVEL_ERROR,
FL("Setting tx power failed for 2.4GHz band %d"), txPwr);
@@ -5600,7 +5600,7 @@
if (txPwr > TX_PWR_MAX)
txPwr = TX_PWR_MAX;
- if (sme_SetMaxTxPowerPerBand(eCSR_BAND_5G, txPwr) !=
+ if (sme_SetMaxTxPowerPerBand(eCSR_BAND_5G, txPwr, hal) !=
eHAL_STATUS_SUCCESS) {
hddLog(VOS_TRACE_LEVEL_ERROR,
FL("setting tx power failed for 5GHz band %d"), txPwr);
@@ -5608,14 +5608,14 @@
}
}
else if(FALSE == set_value) {
- if (sme_SetMaxTxPowerPerBand(eCSR_BAND_24, txPwr) !=
+ if (sme_SetMaxTxPowerPerBand(eCSR_BAND_24, txPwr, hal) !=
eHAL_STATUS_SUCCESS) {
hddLog(VOS_TRACE_LEVEL_ERROR,
FL("Setting tx power failed for 2.4GHz band %d"), txPwr);
return -EIO;
}
- if (sme_SetMaxTxPowerPerBand(eCSR_BAND_5G, txPwr) !=
+ if (sme_SetMaxTxPowerPerBand(eCSR_BAND_5G, txPwr, hal) !=
eHAL_STATUS_SUCCESS) {
hddLog(VOS_TRACE_LEVEL_ERROR,
FL("setting tx power failed for 5GHz band %d"), txPwr);
@@ -5982,10 +5982,13 @@
}
case WE_SET_MAX_TX_POWER_2_4:
{
+ if (NULL == hHal)
+ return -EINVAL;
+
hddLog(VOS_TRACE_LEVEL_INFO,
"%s: Setting maximum tx power %d dBm for 2.4 GHz band",
__func__, set_value);
- if (sme_SetMaxTxPowerPerBand(eCSR_BAND_24, set_value) !=
+ if (sme_SetMaxTxPowerPerBand(eCSR_BAND_24, set_value, hHal) !=
eHAL_STATUS_SUCCESS)
{
hddLog(VOS_TRACE_LEVEL_ERROR,
@@ -5998,10 +6001,13 @@
}
case WE_SET_MAX_TX_POWER_5_0:
{
+ if (NULL == hHal)
+ return -EINVAL;
+
hddLog(VOS_TRACE_LEVEL_INFO,
"%s: Setting maximum tx power %d dBm for 5.0 GHz band",
__func__, set_value);
- if (sme_SetMaxTxPowerPerBand(eCSR_BAND_5G, set_value) !=
+ if (sme_SetMaxTxPowerPerBand(eCSR_BAND_5G, set_value, hHal) !=
eHAL_STATUS_SUCCESS)
{
hddLog(VOS_TRACE_LEVEL_ERROR,
@@ -6305,7 +6311,10 @@
}
case WE_SET_PROXIMITY_ENABLE:
{
- ret = wlan_hdd_set_proximity(set_value);
+ if (NULL == hHal)
+ return -EINVAL;
+
+ ret = wlan_hdd_set_proximity(set_value, hHal);
break;
}
default:
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index ef7f97d..0ff1e91 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -1551,6 +1551,18 @@
u8 subtype;
};
+
+/**
+ * struct csr_set_tx_max_pwr_per_band - Req params to
+ * set max tx power per band
+ * @band: band for which power to be set
+ * @power: power to set in dB
+ */
+struct csr_set_tx_max_pwr_per_band {
+ eCsrBand band;
+ tPowerdBm power;
+};
+
////////////////////////////////////////////Common SCAN starts
//void *p2 -- the second context pass in for the caller
diff --git a/CORE/SME/inc/smeInside.h b/CORE/SME/inc/smeInside.h
index bb947dc..2e8f5e3 100644
--- a/CORE/SME/inc/smeInside.h
+++ b/CORE/SME/inc/smeInside.h
@@ -207,6 +207,7 @@
tAniGetFrameLogReq getFramelogCmd;
struct s_ani_set_tx_max_pwr set_tx_max_pwr;
tpNanRequest pNanReq;
+ struct csr_set_tx_max_pwr_per_band set_tx_max_pwr_per_band;
}u;
}tSmeCmd;
diff --git a/CORE/SME/inc/smeInternal.h b/CORE/SME/inc/smeInternal.h
index 3280a92..beb73bd 100644
--- a/CORE/SME/inc/smeInternal.h
+++ b/CORE/SME/inc/smeInternal.h
@@ -76,6 +76,7 @@
eSmeCommandMacSpoofRequest,
eSmeCommandGetFrameLogRequest,
eSmeCommandSetMaxTxPower,
+ eSmeCommandSetMaxTxPowerPerBand,
#ifdef FEATURE_WLAN_TDLS
//eSmeTdlsCommandMask = 0x80000, //To identify TDLS commands <TODO>
//These can be considered as csr commands.
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index 842f998..eb65b7f 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -2743,15 +2743,19 @@
eHalStatus sme_SetMaxTxPower(tHalHandle hHal, tSirMacAddr pBssid,
tSirMacAddr pSelfMacAddress, v_S7_t dB);
-/* ---------------------------------------------------------------------------
- \fn sme_SetMaxTxPowerPerBand
- \brief Used to set the Maximum Transmit Power for
- specific band dynamically. Note: this setting will not persist over reboots
- \param band
- \param power to set in dB
- \- return eHalStatus
- -------------------------------------------------------------------------*/
-eHalStatus sme_SetMaxTxPowerPerBand(eCsrBand band, v_S7_t db);
+/**
+ * sme_SetMaxTxPowerPerBand() - Set the Maximum Transmit Power
+ * specific to band dynamically
+ * @band: Band for which power needs to be applied
+ * @dB: power to set in dB
+ * @hal: HAL handle
+ *
+ * Set the maximum transmit power dynamically per band
+ *
+ * Return: eHalStatus
+ */
+eHalStatus sme_SetMaxTxPowerPerBand(eCsrBand band, v_S7_t dB,
+ tHalHandle hal);
/* ---------------------------------------------------------------------------
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 182040c..7d28b7b 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -803,6 +803,49 @@
return eHAL_STATUS_SUCCESS;
}
+/**
+ * sme_process_set_max_tx_power_per_band() - Set the Maximum Transmit Power
+ * specific to band dynamically
+ * @mac_ctx: mac context
+ * @command: cmd param containing band, and power in db
+ *
+ * Set the maximum transmit power dynamically per band
+ *
+ * Return: eHalStatus
+ */
+eHalStatus sme_process_set_max_tx_power_per_band(tpAniSirGlobal mac_ctx,
+ tSmeCmd *command)
+{
+ vos_msg_t msg;
+ tMaxTxPowerPerBandParams *max_tx_params_per_band;
+
+ max_tx_params_per_band =
+ vos_mem_malloc(sizeof(*max_tx_params_per_band));
+ if (max_tx_params_per_band == NULL) {
+ smsLog(mac_ctx, LOGE,
+ FL("fail to allocate memory"));
+ return eHAL_STATUS_FAILURE;
+ }
+
+ max_tx_params_per_band->bandInfo =
+ command->u.set_tx_max_pwr_per_band.band;
+ max_tx_params_per_band->power =
+ command->u.set_tx_max_pwr_per_band.power;
+
+ msg.type = WDA_SET_MAX_TX_POWER_PER_BAND_REQ;
+ msg.reserved = 0;
+ msg.bodyptr = max_tx_params_per_band;
+
+ if (VOS_STATUS_SUCCESS !=
+ vos_mq_post_message(VOS_MODULE_ID_WDA, &msg)) {
+ smsLog(mac_ctx, LOGE,
+ FL("Unable to post message to WDA"));
+ vos_mem_free(max_tx_params_per_band);
+ return eHAL_STATUS_FAILURE;
+ }
+ return eHAL_STATUS_SUCCESS;
+}
+
static void smeProcessNanReq(tpAniSirGlobal pMac, tSmeCmd *pCommand )
{
tSirMsgQ msgQ;
@@ -1086,6 +1129,18 @@
csrReleaseCommand(pMac, pCommand);
}
break;
+ case eSmeCommandSetMaxTxPowerPerBand:
+ csrLLUnlock(&pMac->sme.smeCmdActiveList);
+ sme_process_set_max_tx_power_per_band(pMac,
+ pCommand);
+ /* We need to re-run the command */
+ fContinue = eANI_BOOLEAN_TRUE;
+ /* No Rsp expected, free cmd from active list */
+ if (csrLLRemoveEntry(&pMac->sme.smeCmdActiveList,
+ &pCommand->Link, LL_ACCESS_LOCK)) {
+ csrReleaseCommand(pMac, pCommand);
+ }
+ break;
#ifdef FEATURE_OEM_DATA_SUPPORT
case eSmeCommandOemDataReq:
@@ -9534,51 +9589,52 @@
return (status);
}
-/* ---------------------------------------------------------------------------
-
- \fn sme_SetMaxTxPowerPerBand
-
- \brief Set the Maximum Transmit Power specific to band dynamically.
- Note: this setting will not persist over reboots.
-
- \param band
- \param power to set in dB
- \- return eHalStatus
-
- ----------------------------------------------------------------------------*/
-eHalStatus sme_SetMaxTxPowerPerBand(eCsrBand band, v_S7_t dB)
+/**
+ * sme_SetMaxTxPowerPerBand() - Set the Maximum Transmit Power
+ * specific to band dynamically
+ * @band: Band for which power needs to be applied
+ * @dB: power to set in dB
+ * @hal: HAL handle
+ *
+ * Set the maximum transmit power dynamically per band
+ *
+ * Return: eHalStatus
+ */
+eHalStatus sme_SetMaxTxPowerPerBand(eCsrBand band, v_S7_t dB,
+ tHalHandle hal)
{
vos_msg_t msg;
- tpMaxTxPowerPerBandParams pMaxTxPowerPerBandParams = NULL;
+ eHalStatus status;
+ tSmeCmd *set_max_tx_pwr_per_band;
+ tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal);
- pMaxTxPowerPerBandParams = vos_mem_malloc(sizeof(tMaxTxPowerPerBandParams));
- if (NULL == pMaxTxPowerPerBandParams)
- {
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s:Not able to allocate memory for pMaxTxPowerPerBandParams",
- __func__);
- return eHAL_STATUS_FAILURE;
+ smsLog(mac_ctx, LOG1,
+ FL("band : %d power %d dB"),
+ band, dB);
+
+ MTRACE(vos_trace(VOS_MODULE_ID_SME,
+ TRACE_CODE_SME_TX_WDA_MSG, NO_SESSION, msg.type));
+
+ status = sme_AcquireGlobalLock(&mac_ctx->sme);
+ if (HAL_STATUS_SUCCESS(status)) {
+ set_max_tx_pwr_per_band = csrGetCommandBuffer(mac_ctx);
+ if (set_max_tx_pwr_per_band) {
+ set_max_tx_pwr_per_band->command = eSmeCommandSetMaxTxPowerPerBand;
+ set_max_tx_pwr_per_band->u.set_tx_max_pwr_per_band.band = band;
+ set_max_tx_pwr_per_band->u.set_tx_max_pwr_per_band.power = dB;
+ status = csrQueueSmeCommand(mac_ctx, set_max_tx_pwr_per_band,
+ eANI_BOOLEAN_TRUE);
+ if (!HAL_STATUS_SUCCESS(status)) {
+ smsLog(mac_ctx, LOGE, FL("fail to send msg status = %d"), status);
+ csrReleaseCommand(mac_ctx, set_max_tx_pwr_per_band);
+ }
+ } else {
+ smsLog(mac_ctx, LOGE, FL("can not obtain a common buffer"));
+ status = eHAL_STATUS_RESOURCES;
+ }
+ sme_ReleaseGlobalLock(&mac_ctx->sme);
}
-
- pMaxTxPowerPerBandParams->power = dB;
- pMaxTxPowerPerBandParams->bandInfo = band;
-
- msg.type = WDA_SET_MAX_TX_POWER_PER_BAND_REQ;
- msg.reserved = 0;
- msg.bodyptr = pMaxTxPowerPerBandParams;
-
- MTRACE(vos_trace(VOS_MODULE_ID_SME,
- TRACE_CODE_SME_TX_WDA_MSG, NO_SESSION, msg.type));
- if (VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MODULE_ID_WDA, &msg))
- {
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s:Not able to post WDA_SET_MAX_TX_POWER_PER_BAND_REQ",
- __func__);
- vos_mem_free(pMaxTxPowerPerBandParams);
- return eHAL_STATUS_FAILURE;
- }
-
- return eHAL_STATUS_SUCCESS;
+ return status;
}
/* ---------------------------------------------------------------------------