Prima: Add Support for firmware memory dump
Common API for fw mem dump request cfg80211 and wext(ioctl)
WLAN HAL API changes
Creation of procfs and reading through it
Simple state machine to synchronize fw dump writes and reads
Change-Id: Ifdf90e77b8d9011f664d3f776207069e11038a7e
CRs-Fixed: 916853
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index 5315338..5a27bdc 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -2528,6 +2528,11 @@
#define CFG_OPTIMIZE_CA_EVENT_ENABLE ( 1 )
#define CFG_OPTIMIZE_CA_EVENT_DEFAULT ( 0 )
+#define CFG_FWR_MEM_DUMP_NAME "gEnableFwrMemDump"
+#define CFG_FWR_MEM_DUMP_MAX ( 1 )
+#define CFG_FWR_MEM_DUMP_MIN ( 0 )
+#define CFG_FWR_MEM_DUMP_DEF ( 1 )
+
/*---------------------------------------------------------------------------
Type declarations
-------------------------------------------------------------------------*/
@@ -3041,6 +3046,7 @@
v_U32_t linkFailTxCnt;
v_BOOL_t ignorePeerHTopMode;
v_U8_t gOptimizeCAevent;
+ v_BOOL_t enableFwrMemDump;
} hdd_config_t;
/*---------------------------------------------------------------------------
diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h
index 4a8ecfe..68aed06 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg80211.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h
@@ -167,11 +167,12 @@
/* Get Wifi Specific Info */
QCA_NL80211_VENDOR_SUBCMD_GET_WIFI_INFO = 61,
+ /* Start Wifi Memory Dump */
+ QCA_NL80211_VENDOR_SUBCMD_WIFI_LOGGER_MEMORY_DUMP = 63,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SET_SSID_HOTLIST = 65,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_RESET_SSID_HOTLIST = 66,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_HOTLIST_SSID_FOUND = 67,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_HOTLIST_SSID_LOST = 68,
-
QCA_NL80211_VENDOR_SUBCMD_SETBAND = 105,
};
@@ -199,6 +200,7 @@
/*EXT TDLS*/
QCA_NL80211_VENDOR_SUBCMD_TDLS_STATE_CHANGE_INDEX,
QCA_NL80211_VENDOR_SUBCMD_NAN_INDEX,
+ QCA_NL80211_VENDOR_SUBCMD_WIFI_LOGGER_MEMORY_DUMP_INDEX,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_HOTLIST_AP_LOST_INDEX,
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SET_SSID_HOTLIST_INDEX,
@@ -1188,4 +1190,26 @@
#define cfg80211_vendor_event_alloc backported_cfg80211_vendor_event_alloc
#endif
+/**
+ * enum qca_wlan_vendor_attr_memory_dump - values for memory dump attributes
+ * @QCA_WLAN_VENDOR_ATTR_MEMORY_DUMP_INVALID - Invalid
+ * @QCA_WLAN_VENDOR_ATTR_REQUEST_ID - Indicate request ID
+ * @QCA_WLAN_VENDOR_ATTR_MEMDUMP_SIZE - Indicate size of the memory dump
+ * @QCA_WLAN_VENDOR_ATTR_MEMORY_DUMP_AFTER_LAST - To keep track of the last enum
+ * @QCA_WLAN_VENDOR_ATTR_MEMORY_DUMP_MAX - max value possible for this type
+ *
+ * enum values are used for NL attributes for data used by
+ * QCA_NL80211_VENDOR_SUBCMD_WIFI_LOGGER_MEMORY_DUMP sub command.
+ */
+enum qca_wlan_vendor_attr_memory_dump {
+ QCA_WLAN_VENDOR_ATTR_MEMORY_DUMP_INVALID = 0,
+ QCA_WLAN_VENDOR_ATTR_REQUEST_ID = 1,
+ QCA_WLAN_VENDOR_ATTR_MEMDUMP_SIZE = 2,
+
+ QCA_WLAN_VENDOR_ATTR_MEMORY_DUMP_AFTER_LAST,
+ QCA_WLAN_VENDOR_ATTR_MEMORY_DUMP_MAX =
+ QCA_WLAN_VENDOR_ATTR_MEMORY_DUMP_AFTER_LAST - 1,
+};
+
+
#endif
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index caef24e..eb5901a 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -63,6 +63,8 @@
#endif
#include "wlan_hdd_cfg80211.h"
+#include <linux/proc_fs.h> /* Necessary because we use the proc fs */
+#include <linux/fs.h>
/*---------------------------------------------------------------------------
Preprocessor definitions and constants
-------------------------------------------------------------------------*/
@@ -1217,6 +1219,17 @@
#define WLAN_WAIT_TIME_LL_STATS 5000
+/* FW memory dump feature
+@TODO : Move this code to a separate file later */
+#define PROCFS_MEMDUMP_DIR "debug"
+#define PROCFS_MEMDUMP_NAME "fwdump"
+#define FW_MEM_DUMP_REQ_ID 1
+
+int memdump_init(void);
+int memdump_deinit(void);
+void wlan_hdd_fw_mem_dump_cb(void *,tAniFwrDumpRsp *);
+int wlan_hdd_fw_mem_dump_req(hdd_context_t * pHddCtx);
+
#ifdef WLAN_FEATURE_LINK_LAYER_STATS
/**
* struct hdd_ll_stats_context - hdd link layer stats context
@@ -1533,6 +1546,7 @@
WLAN_BMUHW_TRACE_LOG_EN = 1<<1,
WLAN_QXDM_LOG_EN = 1<<2,
WLAN_DPU_TXP_LOG_EN = 1<<3,
+ WLAN_FW_MEM_DUMP_EN = 1<<6,
} WLAN_ENABLE_HW_FW_LOG_TYPE;
/*---------------------------------------------------------------------------
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 356b658..ac17690 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3396,6 +3396,13 @@
CFG_OPTIMIZE_CA_EVENT_DISABLE,
CFG_OPTIMIZE_CA_EVENT_ENABLE ),
+ REG_VARIABLE(CFG_FWR_MEM_DUMP_NAME, WLAN_PARAM_Integer,
+ hdd_config_t,enableFwrMemDump,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_FWR_MEM_DUMP_DEF,
+ CFG_FWR_MEM_DUMP_MIN,
+ CFG_FWR_MEM_DUMP_MAX),
+
};
/*
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index fab6be0..4cb9e0d 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -96,6 +96,7 @@
#include "wlan_nv.h"
#include "wlan_hdd_dev_pwr.h"
#include "qwlan_version.h"
+#include "wlan_logging_sock_svc.h"
#define g_mode_rates_size (12)
@@ -5691,6 +5692,66 @@
return ret;
}
+
+static int
+__wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy,
+ struct wireless_dev *wdev,
+ const void *data, int data_len)
+{
+ hdd_context_t *pHddCtx = wiphy_priv(wiphy);
+ int ret;
+ ENTER();
+
+ ret = wlan_hdd_validate_context(pHddCtx);
+ if (0 != ret)
+ {
+ return ret;
+ }
+
+ if( !pHddCtx->cfg_ini->enableFwrMemDump ||
+ (FALSE == sme_IsFeatureSupportedByFW(MEMORY_DUMP_SUPPORTED)))
+ {
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("FW dump Logging not supported"));
+ return -EINVAL;
+ }
+ /*call common API for FW mem dump req*/
+ ret = wlan_hdd_fw_mem_dump_req(pHddCtx);
+
+ EXIT();
+ return ret;
+}
+
+/**
+ * wlan_hdd_cfg80211_get_fw_mem_dump() - Get FW memory dump
+ * @wiphy: pointer to wireless wiphy structure.
+ * @wdev: pointer to wireless_dev structure.
+ * @data: Pointer to the NL data.
+ * @data_len:Length of @data
+ *
+ * This is called when wlan driver needs to get the firmware memory dump
+ * via vendor specific command.
+ *
+ * Return: 0 on success, error number otherwise.
+ */
+
+static int
+wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy,
+ struct wireless_dev *wdev,
+ const void *data, int data_len)
+
+{
+ int ret = 0;
+
+ vos_ssr_protect(__func__);
+ ret = __wlan_hdd_cfg80211_get_fw_mem_dump(wiphy, wdev, data,
+ data_len);
+ vos_ssr_unprotect(__func__);
+
+ return ret;
+
+}
+
+
static const struct nla_policy
wlan_hdd_set_no_dfs_flag_config_policy[QCA_WLAN_VENDOR_ATTR_SET_NO_DFS_FLAG_MAX
+1] =
@@ -6081,6 +6142,14 @@
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
+ .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_WIFI_LOGGER_MEMORY_DUMP,
+ .flags = WIPHY_VENDOR_CMD_NEED_WDEV |
+ WIPHY_VENDOR_CMD_NEED_NETDEV |
+ WIPHY_VENDOR_CMD_NEED_RUNNING,
+ .doit = wlan_hdd_cfg80211_get_fw_mem_dump
+ },
+ {
+ .info.vendor_id = QCA_NL80211_VENDOR_ID,
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_SETBAND,
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
@@ -6194,6 +6263,11 @@
.vendor_id = QCA_NL80211_VENDOR_ID,
.subcmd = QCA_NL80211_VENDOR_SUBCMD_TDLS_STATE
},
+ [QCA_NL80211_VENDOR_SUBCMD_WIFI_LOGGER_MEMORY_DUMP_INDEX] = {
+ .vendor_id = QCA_NL80211_VENDOR_ID,
+ .subcmd = QCA_NL80211_VENDOR_SUBCMD_WIFI_LOGGER_MEMORY_DUMP
+ },
+
{
.vendor_id = QCA_NL80211_VENDOR_ID,
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 9c4f047..06be08b 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -2040,6 +2040,9 @@
vos_sched_flush_rx_mqs(vosSchedContext);
#ifdef WLAN_LOGGING_SOCK_SVC_ENABLE
wlan_logging_flush_pkt_queue();
+ /*Free fw dump mem in case of SSR/Shutdown */
+ wlan_set_fwr_mem_dump_state(FW_MEM_DUMP_IDLE);
+ wlan_free_fwr_mem_dump_buffer();
#endif
/* Deinit all the TX and MC queues */
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index c2739c9..d45b07d 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -8859,6 +8859,9 @@
//Clean up HDD Nlink Service
send_btc_nlink_msg(WLAN_MODULE_DOWN_IND, 0);
+ wlan_free_fwr_mem_dump_buffer();
+ memdump_deinit();
+
#ifdef WLAN_LOGGING_SOCK_SVC_ENABLE
if (pHddCtx->cfg_ini->wlanLoggingEnable)
{
@@ -9436,7 +9439,7 @@
\return - None
--------------------------------------------------------------------------*/
-void hdd_init_frame_logging_done(void *fwlogInitCbContext, VOS_STATUS status)
+void hdd_init_frame_logging_done(void *fwlogInitCbContext, tAniLoggingInitRsp *pRsp)
{
hdd_context_t* pHddCtx = (hdd_context_t*)fwlogInitCbContext;
@@ -9447,7 +9450,7 @@
return;
}
- if ((VOS_STATUS_SUCCESS == status) &&
+ if ((pRsp->status == VOS_STATUS_SUCCESS) &&
(TRUE == pHddCtx->cfg_ini->enableMgmtLogging))
{
hddLog(VOS_TRACE_LEVEL_INFO, FL("Mgmt Frame Logging init successful"));
@@ -9457,9 +9460,21 @@
{
hddLog(VOS_TRACE_LEVEL_INFO, FL("Mgmt Frame Logging init not success"));
pHddCtx->mgmt_frame_logging = FALSE;
+ return;
}
- return;
+ /*Check feature supported by FW*/
+ if(TRUE == sme_IsFeatureSupportedByFW(MEMORY_DUMP_SUPPORTED))
+ {
+ //Store fwr mem dump size given by firmware.
+ wlan_store_fwr_mem_dump_size(pRsp->fw_mem_dump_max_size);
+ }
+ else
+ {
+ wlan_store_fwr_mem_dump_size(0);
+ }
+
+
}
/**---------------------------------------------------------------------------
@@ -9492,10 +9507,11 @@
vos_mem_set(wlanFWLoggingInitParam, sizeof(tSirFWLoggingInitParam), 0);
- hddLog(VOS_TRACE_LEVEL_INFO, "%s: Configuring %s %s %s Logging",__func__,
+ hddLog(VOS_TRACE_LEVEL_INFO, "%s: Configuring %s %s %s %s Logging",__func__,
pHddCtx->cfg_ini->enableFWLogging?"FW Log,":"",
pHddCtx->cfg_ini->enableContFWLogging ? "Cont FW log,":"",
- pHddCtx->cfg_ini->enableMgmtLogging ? "Mgmt Pkt Log":"");
+ pHddCtx->cfg_ini->enableMgmtLogging ? "Mgmt Pkt Log":"",
+ pHddCtx->cfg_ini->enableFwrMemDump ? "Fw Mem dump":"");
if (pHddCtx->cfg_ini->enableFWLogging ||
pHddCtx->cfg_ini->enableContFWLogging)
@@ -9511,7 +9527,16 @@
{
wlanFWLoggingInitParam->enableFlag |= WLAN_BMUHW_TRACE_LOG_EN;
}
-
+ if(pHddCtx->cfg_ini->enableFwrMemDump &&
+ (TRUE == sme_IsFeatureSupportedByFW(MEMORY_DUMP_SUPPORTED)))
+ {
+ wlanFWLoggingInitParam->enableFlag |= WLAN_FW_MEM_DUMP_EN;
+ }
+ if( wlanFWLoggingInitParam->enableFlag == 0 )
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Logging not enabled", __func__);
+ return;
+ }
wlanFWLoggingInitParam->frameType = WLAN_FRAME_LOGGING_FRAMETYPE_MGMT;
wlanFWLoggingInitParam->frameSize = WLAN_MGMT_LOGGING_FRAMESIZE_128BYTES;
wlanFWLoggingInitParam->bufferMode = WLAN_FRAME_LOGGING_BUFFERMODE_CIRCULAR;
@@ -10284,7 +10309,9 @@
if (pHddCtx->cfg_ini->wlanLoggingEnable &&
(pHddCtx->cfg_ini->enableFWLogging ||
pHddCtx->cfg_ini->enableMgmtLogging ||
- pHddCtx->cfg_ini->enableContFWLogging))
+ pHddCtx->cfg_ini->enableContFWLogging ||
+ pHddCtx->cfg_ini->enableFwrMemDump )
+ )
{
hdd_init_frame_logging(pHddCtx);
}
@@ -10392,6 +10419,8 @@
{
hddLog(VOS_TRACE_LEVEL_INFO, FL("Registered IPv4 notifier"));
}
+ /*Fw mem dump procfs initialization*/
+ memdump_init();
goto success;
@@ -12023,6 +12052,272 @@
return sta_id;
}
+/*FW memory dump feature*/
+/**
+ * This structure hold information about the /proc file
+ *
+ */
+static struct proc_dir_entry *proc_file, *proc_dir;
+
+/**
+ * memdump_read() - perform read operation in memory dump proc file
+ *
+ * @file - handle for the proc file.
+ * @buf - pointer to user space buffer.
+ * @count - number of bytes to be read.
+ * @pos - offset in the from buffer.
+ *
+ * This function performs read operation for the memory dump proc file.
+ *
+ * Return: number of bytes read on success, error code otherwise.
+ */
+static ssize_t memdump_read(struct file *file, char __user *buf,
+ size_t count, loff_t *pos)
+{
+ int status;
+ hdd_context_t *hdd_ctx = (hdd_context_t *)PDE_DATA(file_inode(file));
+ size_t ret_count;
+ ENTER();
+
+ hddLog(LOG1, FL("Read req for size:%zu pos:%llu"), count, *pos);
+ status = wlan_hdd_validate_context(hdd_ctx);
+ if (0 != status) {
+ return -EINVAL;
+ }
+
+ if (!wlan_fwr_mem_dump_test_and_set_read_allowed_bit()) {
+ hddLog(LOGE, FL("Current mem dump request timed out/failed"));
+ return -EINVAL;
+ }
+
+ /* run fs_read_handler in an atomic context*/
+ vos_ssr_protect(__func__);
+ ret_count = wlan_fwr_mem_dump_fsread_handler( buf, count, pos);
+ if(ret_count == 0)
+ {
+ /*Free the fwr mem dump buffer */
+ wlan_free_fwr_mem_dump_buffer();
+ wlan_set_fwr_mem_dump_state(FW_MEM_DUMP_IDLE);
+ }
+ /*if SSR/unload code is waiting for memdump_read to finish,signal it*/
+ vos_ssr_unprotect(__func__);
+ EXIT();
+ return ret_count;
+}
+
+/**
+ * struct memdump_fops - file operations for memory dump feature
+ * @read - read function for memory dump operation.
+ *
+ * This structure initialize the file operation handle for memory
+ * dump feature
+ */
+static const struct file_operations memdump_fops = {
+ read: memdump_read
+};
+
+/*
+* wlan_hdd_fw_mem_dump_cb : callback for Fw mem dump request
+* To be passed by HDD to WDA and called upon receiving of response
+* from firmware
+* @fwMemDumpReqContext : memory dump request context
+* @dump_rsp : dump response from HAL
+* Returns none
+*/
+void wlan_hdd_fw_mem_dump_cb(void *fwMemDumpReqContext,
+ tAniFwrDumpRsp *dump_rsp)
+{
+ hdd_context_t *pHddCtx = (hdd_context_t *)fwMemDumpReqContext;
+ int status;
+ ENTER();
+ status = wlan_hdd_validate_context(pHddCtx);
+ if (0 != status) {
+ return;
+ }
+
+ if (dump_rsp->dump_status != eHAL_STATUS_SUCCESS) {
+ hddLog(LOGE, FL("fw dump request declined by fwr"));
+ //report failure to user space
+ wlan_indicate_mem_dump_complete(false);
+ //Free the allocated fwr dump
+ wlan_free_fwr_mem_dump_buffer();
+ wlan_set_fwr_mem_dump_state(FW_MEM_DUMP_IDLE);
+ return;
+ }
+ else
+ hddLog(LOG1, FL("fw dump request accepted by fwr"));
+ EXIT();
+
+}
+
+/**
+ * memdump_procfs_remove() - Remove file/dir under procfs for memory dump
+ *
+ * This function removes file/dir under proc file system that was
+ * processing firmware memory dump
+ *
+ * Return: None
+ */
+static void memdump_procfs_remove(void)
+{
+ remove_proc_entry(PROCFS_MEMDUMP_NAME, proc_dir);
+ hddLog(LOG1 , FL("/proc/%s/%s removed\n"),
+ PROCFS_MEMDUMP_DIR, PROCFS_MEMDUMP_NAME);
+ remove_proc_entry(PROCFS_MEMDUMP_DIR, NULL);
+ hddLog(LOG1 , FL("/proc/%s removed\n"), PROCFS_MEMDUMP_DIR);
+}
+
+/**
+ * memdump_procfs_init() - Initialize procfs for memory dump
+ *
+ * @vos_ctx - Global vos context.
+ *
+ * This function create file under proc file system to be used later for
+ * processing firmware memory dump
+ *
+ * Return: 0 on success, error code otherwise.
+ */
+static int memdump_procfs_init(void *vos_ctx)
+{
+ hdd_context_t *hdd_ctx;
+
+ hdd_ctx = vos_get_context(VOS_MODULE_ID_HDD, vos_ctx);
+ if (!hdd_ctx) {
+ hddLog(LOGE , FL("Invalid HDD context"));
+ return -EINVAL;
+ }
+
+ proc_dir = proc_mkdir(PROCFS_MEMDUMP_DIR, NULL);
+ if (proc_dir == NULL) {
+ remove_proc_entry(PROCFS_MEMDUMP_DIR, NULL);
+ hddLog(LOGE , FL("Error: Could not initialize /proc/%s"),
+ PROCFS_MEMDUMP_DIR);
+ return -ENOMEM;
+ }
+
+ proc_file = proc_create_data(PROCFS_MEMDUMP_NAME,
+ S_IRUSR | S_IWUSR, proc_dir,
+ &memdump_fops, hdd_ctx);
+ if (proc_file == NULL) {
+ remove_proc_entry(PROCFS_MEMDUMP_NAME, proc_dir);
+ hddLog(LOGE , FL("Error: Could not initialize /proc/%s"),
+ PROCFS_MEMDUMP_NAME);
+ return -ENOMEM;
+ }
+
+ hddLog(LOG1 , FL("/proc/%s/%s created"),
+ PROCFS_MEMDUMP_DIR, PROCFS_MEMDUMP_NAME);
+
+ return 0;
+}
+
+/**
+ * memdump_init() - Initialization function for memory dump feature
+ *
+ * This function creates proc file for memdump feature and registers
+ * HDD callback function with SME.
+ *
+ * Return - 0 on success, error otherwise
+ */
+int memdump_init(void)
+{
+ hdd_context_t *hdd_ctx;
+ void *vos_ctx;
+ int status = 0;
+
+ vos_ctx = vos_get_global_context(VOS_MODULE_ID_SYS, NULL);
+ if (!vos_ctx) {
+ hddLog(LOGE, FL("Invalid VOS context"));
+ return -EINVAL;
+ }
+
+ hdd_ctx = vos_get_context(VOS_MODULE_ID_HDD, vos_ctx);
+ if (!hdd_ctx) {
+ hddLog(LOGE , FL("Invalid HDD context"));
+ return -EINVAL;
+ }
+
+ status = memdump_procfs_init(vos_ctx);
+ if (status) {
+ hddLog(LOGE , FL("Failed to create proc file"));
+ return status;
+ }
+
+ return 0;
+}
+
+/**
+ * memdump_deinit() - De initialize memdump feature
+ *
+ * This function removes proc file created for memdump feature.
+ *
+ * Return: None
+ */
+int memdump_deinit(void)
+{
+ hdd_context_t *hdd_ctx;
+ void *vos_ctx;
+
+ vos_ctx = vos_get_global_context(VOS_MODULE_ID_SYS, NULL);
+ if (!vos_ctx) {
+ hddLog(LOGE, FL("Invalid VOS context"));
+ return -EINVAL;
+ }
+
+ hdd_ctx = vos_get_context(VOS_MODULE_ID_HDD, vos_ctx);
+ if(!hdd_ctx) {
+ hddLog(LOGE , FL("Invalid HDD context"));
+ return -EINVAL;
+ }
+
+ memdump_procfs_remove();
+ return 0;
+}
+
+/**
+ * wlan_hdd_fw_mem_dump_req(pHddCtx) - common API(cfg80211/ioctl) for requesting fw mem dump to SME
+ * Return: HAL status
+ */
+
+int wlan_hdd_fw_mem_dump_req(hdd_context_t * pHddCtx)
+{
+ tAniFwrDumpReq fw_mem_dump_req={0};
+ eHalStatus status = eHAL_STATUS_FAILURE;
+ int ret=0;
+ ENTER();
+ /*Check whether a dump request is already going on
+ *Caution this function will free previously held memory if new dump request is allowed*/
+ if (!wlan_fwr_mem_dump_test_and_set_write_allowed_bit()) {
+ hddLog(LOGE, FL("Fw memdump already in progress"));
+ return -EBUSY;
+ }
+ //Allocate memory for fw mem dump buffer
+ ret = wlan_fwr_mem_dump_buffer_allocation();
+ if(ret == -EFAULT)
+ {
+ hddLog(LOGE, FL("Fwr mem dump not supported by FW"));
+ return ret;
+ }
+ if (0 != ret) {
+ hddLog(LOGE, FL("Fwr mem Allocation failed"));
+ return -ENOMEM;
+ }
+ fw_mem_dump_req.fwMemDumpReqCallback = wlan_hdd_fw_mem_dump_cb;
+ fw_mem_dump_req.fwMemDumpReqContext = pHddCtx;
+ status = sme_FwMemDumpReq(pHddCtx->hHal, &fw_mem_dump_req);
+ if(eHAL_STATUS_SUCCESS != status)
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ "%s: fw_mem_dump_req failed ", __func__);
+ wlan_free_fwr_mem_dump_buffer();
+ }
+ EXIT();
+
+ return status;
+}
+
+
+
//Register the module init/exit functions
module_init(hdd_module_init);
module_exit(hdd_module_exit);
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 3462628..4e676d9 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -241,6 +241,7 @@
#define WE_DUMP_ROAM_TIMER_LOG 12
#define WE_RESET_ROAM_TIMER_LOG 13
#define WE_GET_FW_LOGS 14
+#define WE_GET_FW_MEMDUMP 15
/* Private ioctls and their sub-ioctls */
#define WLAN_PRIV_SET_VAR_INT_GET_NONE (SIOCIWFIRSTPRIV + 7)
@@ -398,7 +399,9 @@
int wlan_hdd_set_filter(hdd_context_t *pHddCtx, tpPacketFilterCfg pRequest,
v_U8_t sessionId);
#endif
-
+static int get_fwr_memdump(struct net_device *,
+ struct iw_request_info *,
+ union iwreq_data *, char *);
/**---------------------------------------------------------------------------
\brief mem_alloc_copy_from_user_helper -
@@ -7056,6 +7059,13 @@
TRUE);
break;
}
+ case WE_GET_FW_MEMDUMP:
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "FW_MEM_DUMP requested ");
+ get_fwr_memdump(dev,info,wrqu,extra);
+ break;
+ }
default:
{
hddLog(LOGE, "%s: unknown ioctl %d", __func__, sub_cmd);
@@ -9714,6 +9724,32 @@
return ret;
}
+static int get_fwr_memdump(struct net_device *dev,
+ struct iw_request_info *info,
+ union iwreq_data *wrqu, char *extra)
+{
+ hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
+ hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ int ret;
+ ENTER();
+ // HddCtx sanity
+ ret = wlan_hdd_validate_context(pHddCtx);
+ if (0 != ret)
+ {
+ return ret;
+ }
+ if( !pHddCtx->cfg_ini->enableFwrMemDump ||
+ (FALSE == sme_IsFeatureSupportedByFW(MEMORY_DUMP_SUPPORTED)))
+ {
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("FW dump Logging not supported"));
+ return -EINVAL;
+ }
+ ret = wlan_hdd_fw_mem_dump_req(pHddCtx);
+
+ EXIT();
+ return ret;
+}
+
static int __iw_set_power_params_priv(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
@@ -10541,6 +10577,11 @@
0,
0,
"getFwLogs" },
+ {
+ WE_GET_FW_MEMDUMP,
+ 0,
+ 0,
+ "getFwMemDump" },
/* handlers for main ioctl */
{ WLAN_PRIV_SET_VAR_INT_GET_NONE,
IW_PRIV_TYPE_INT | MAX_VAR_ARGS,