wlan: HDD : Host changes for UBSP stats.
Added support to get the stats from firmware through IOCTL.
The change is generic and can be used to get the stats
other than UBSP from firmware with minimal change in host
and using same interface file.
This handles the HDD changes.
CRs-Fixed: 764578
Change-Id: I6289b9b32b11983df6ea6bddab4a4b83f2a77cd5
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 139d67b..714d51f 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -106,6 +106,8 @@
#define WLAN_WAIT_TIME_POWER 800
#define WLAN_WAIT_TIME_COUNTRY 1000
#define WLAN_WAIT_TIME_CHANNEL_UPDATE 600
+#define FW_STATE_WAIT_TIME 500
+#define FW_STATE_RSP_LEN 100
/* Amount of time to wait for sme close session callback.
This value should be larger than the timeout used by WDI to wait for
a response from WCNSS */
@@ -277,6 +279,7 @@
#define POWER_CONTEXT_MAGIC 0x504F5752 //POWR
#define SNR_CONTEXT_MAGIC 0x534E5200 //SNR
#define BCN_MISS_RATE_CONTEXT_MAGIC 0x513F5753
+#define FW_STATS_CONTEXT_MAGIC 0x5022474E //FW STATS
/*
* Driver miracast parameters 0-Disabled
@@ -829,6 +832,33 @@
#endif
+typedef enum
+{
+ FW_UBSP_STATS = 1,
+ FW_STATS_MAX,
+}hddFwStatsType;
+
+typedef struct
+{
+ struct completion completion;
+ tANI_U32 magic;
+ hdd_adapter_t *pAdapter;
+}fwStatsContext_t;
+
+typedef struct
+{
+ tANI_U32 ubsp_enter_cnt;
+ tANI_U32 ubsp_jump_ddr_cnt;
+}hddUbspFwStats;
+
+typedef struct
+{
+ hddFwStatsType type;
+ /*data*/
+ union{
+ hddUbspFwStats ubspStats;
+ }hddFwStatsData;
+}fwStatsResult_t;
#define WLAN_HDD_ADAPTER_MAGIC 0x574c414e //ASCII "WLAN"
@@ -1034,6 +1064,7 @@
sme_QosWmmUpType hddWmmDscpToUpMap[WLAN_HDD_MAX_DSCP+1];
/* Lock for active sessions while processing deauth/Disassoc */
spinlock_t lock_for_active_session;
+ fwStatsResult_t fwStatsRsp;
};
#define WLAN_HDD_GET_STATION_CTX_PTR(pAdapter) (&(pAdapter)->sessionCtx.station)
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 382bc92..8bb7809 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -1962,6 +1962,68 @@
return;
}
+void hdd_FWStatisCB( VOS_STATUS status, void *fwStats, void *data )
+{
+ fwStatsContext_t *fwStatsCtx;
+ fwStatsResult_t *fwStatsResult;
+ hdd_adapter_t *pAdapter;
+
+ hddLog(VOS_TRACE_LEVEL_INFO, FL(" with status = %d"),status);
+
+ if (NULL == data)
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR, FL("argument data is NULL"));
+ return;
+ }
+ /* there is a race condition that exists between this callback
+ function and the caller since the caller could time out either
+ before or while this code is executing. we use a spinlock to
+ serialize these actions */
+ spin_lock(&hdd_context_lock);
+ fwStatsCtx = (fwStatsContext_t *) data;
+ if (fwStatsCtx->magic != FW_STATS_CONTEXT_MAGIC)
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("invalid context magic: %08x"), fwStatsCtx->magic);
+ spin_unlock(&hdd_context_lock);
+ return;
+ }
+ pAdapter = fwStatsCtx->pAdapter;
+ if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic))
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("pAdapter returned is NULL or invalid"));
+ spin_unlock(&hdd_context_lock);
+ return;
+ }
+ pAdapter->fwStatsRsp.type = 0;
+ if ((VOS_STATUS_SUCCESS == status) && (NULL != fwStats))
+ {
+ fwStatsResult = (fwStatsResult_t *)fwStats;
+ switch( fwStatsResult->type )
+ {
+ case FW_UBSP_STATS:
+ {
+ memcpy(&pAdapter->fwStatsRsp,fwStatsResult,sizeof(fwStatsResult_t));
+
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ FL("ubsp_enter_cnt = %d ubsp_jump_ddr_cnt = %d"),
+ pAdapter->fwStatsRsp.hddFwStatsData.ubspStats.ubsp_enter_cnt,
+ pAdapter->fwStatsRsp.hddFwStatsData.ubspStats.ubsp_jump_ddr_cnt);
+ }
+ break;
+ default:
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL(" No handling for stats type %d"),fwStatsResult->type);
+ }
+ }
+ }
+ complete(&(fwStatsCtx->completion));
+ spin_unlock(&hdd_context_lock);
+ return;
+}
+
static int hdd_get_dwell_time(hdd_config_t *pCfg, tANI_U8 *command, char *extra, tANI_U8 n, tANI_U8 *len)
{
int ret = 0;
@@ -4161,12 +4223,114 @@
}
}
#endif
+ else if (strncmp(command, "GETFWSTATS", 10) == 0)
+ {
+ eHalStatus status;
+ char *buf = NULL;
+ char len;
+ long waitRet;
+ fwStatsContext_t fwStatsCtx;
+ fwStatsResult_t *fwStatsRsp = &(pAdapter->fwStatsRsp);
+ tANI_U8 *ptr = command;
+ int stats = *(ptr + 11) - '0';
+
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("stats = %d "),stats);
+ if (!IS_FEATURE_FW_STATS_ENABLE)
+ {
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ FL("Get Firmware stats feature not supported"));
+ ret = -EINVAL;
+ goto exit;
+ }
+
+ if (FW_STATS_MAX <= stats || 0 >= stats)
+ {
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ FL(" stats %d not supported"),stats);
+ ret = -EINVAL;
+ goto exit;
+ }
+
+ init_completion(&(fwStatsCtx.completion));
+ fwStatsCtx.magic = FW_STATS_CONTEXT_MAGIC;
+ fwStatsCtx.pAdapter = pAdapter;
+ fwStatsRsp->type = 0;
+ status = sme_GetFwStats( (tHalHandle)pHddCtx->hHal, stats,
+ (&fwStatsCtx), hdd_FWStatisCB);
+ if (eHAL_STATUS_SUCCESS != status)
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL(" fail to post WDA cmd status = %d"), status);
+ ret = -EINVAL;
+ goto exit;
+ }
+ waitRet = wait_for_completion_timeout
+ (&(fwStatsCtx.completion), FW_STATE_WAIT_TIME);
+ if (waitRet <= 0)
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("failed to wait on GwtFwstats"));
+ //Make magic number to zero so that callback is not executed.
+ spin_lock(&hdd_context_lock);
+ fwStatsCtx.magic = 0x0;
+ spin_unlock(&hdd_context_lock);
+ ret = -EINVAL;
+ goto exit;
+ }
+ if (fwStatsRsp->type)
+ {
+ buf = kmalloc(FW_STATE_RSP_LEN, GFP_KERNEL);
+ if (!buf)
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL(" failed to allocate memory"));
+ ret = -ENOMEM;
+ goto exit;
+ }
+ switch( fwStatsRsp->type )
+ {
+ case FW_UBSP_STATS:
+ {
+ len = snprintf(buf, FW_STATE_RSP_LEN,
+ "GETFWSTATS: ubsp_enter_cnt %d ubsp_jump_ddr_cnt %d",
+ fwStatsRsp->hddFwStatsData.ubspStats.ubsp_enter_cnt,
+ fwStatsRsp->hddFwStatsData.ubspStats.ubsp_jump_ddr_cnt);
+ }
+ break;
+ default:
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR, FL( "No handling for stats type %d"),fwStatsRsp->type);
+ ret = -EFAULT;
+ kfree(buf);
+ goto exit;
+ }
+ }
+ if (copy_to_user(priv_data.buf, buf, len + 1))
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL(" failed to copy data to user buffer"));
+ ret = -EFAULT;
+ kfree(buf);
+ goto exit;
+ }
+ ret = len;
+ kfree(buf);
+ }
+ else
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("failed to fetch the stats"));
+ ret = -EFAULT;
+ goto exit;
+ }
+
+ }
else {
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_UNSUPPORTED_IOCTL,
pAdapter->sessionId, 0));
- hddLog( VOS_TRACE_LEVEL_WARN, "%s: Unsupported GUI command %s",
- __func__, command);
+ hddLog( VOS_TRACE_LEVEL_WARN, FL("Unsupported GUI command %s"),
+ command);
}
}
exit: