Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a0202d2 authored by sheenam monga's avatar sheenam monga Committed by Gerrit - the friendly Code Review server
Browse files

wlan: Remove FW memory dump feature 

FW memory dump feature is no longer used. Hence remove FW memory
dump feature code changes.

Change-Id: I4800e8e1a047275a83673cc3ee5bf7ed152833d8
CRs-Fixed: 2592288
parent b654f708

CORE/HDD/inc/wlan_hdd_cfg.h

+0 −6
Original line number Diff line number Diff line
@@ -3008,11 +3008,6 @@ This feature requires the dependent cfg.ini "gRoamPrefer5GHz" set to 1 */ 
#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 )



#define CFG_ACTIVE_PASSIVE_CHAN_CONV_NAME "gActivePassiveChCon"

#define CFG_ACTIVE_PASSIVE_CHAN_CONV_MIN  (0)

#define CFG_ACTIVE_PASSIVE_CHAN_CONV_MAX  (1)
@@ -3837,7 +3832,6 @@ typedef struct 
   v_U32_t                     linkFailTxCnt;

   v_BOOL_t                    ignorePeerHTopMode;

   v_U8_t                      gOptimizeCAevent;

   v_BOOL_t                    enableFwrMemDump;

   v_U8_t                      gActivePassiveChCon;

   v_U32_t                     cfgExtScanConcMode;

   v_U16_t                     rps_mask;

CORE/HDD/inc/wlan_hdd_cfg80211.h

+0 −25
Original line number Diff line number Diff line
@@ -209,8 +209,6 @@ enum qca_nl80211_vendor_subcmds { 


    /* 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,



    /*

     * APIs corresponding to the sub commands 65-68 are deprecated.
@@ -491,7 +489,6 @@ enum qca_nl80211_vendor_subcmds_index { 
    /*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_MONITOR_RSSI_INDEX,

    QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_HOTLIST_AP_LOST_INDEX,
@@ -1651,7 +1648,6 @@ enum qca_wlan_vendor_attr_offloaded_packets 
 * @WIFI_LOGGER_WATCHDOG_TIMER_SUPPORTED - monitor FW health

 */

enum wifi_logger_supported_features {

    WIFI_LOGGER_MEMORY_DUMP_SUPPORTED = (1 << (0)),

    WIFI_LOGGER_PER_PACKET_TX_RX_STATUS_SUPPORTED = (1 << (1)),

    WIFI_LOGGER_CONNECT_EVENT_SUPPORTED = (1 << (2)),

    WIFI_LOGGER_POWER_EVENT_SUPPORTED = (1 << (3)),
@@ -1845,27 +1841,6 @@ backported_cfg80211_vendor_event_alloc(struct wiphy *wiphy, 
int wlan_hdd_send_hang_reason_event(hdd_context_t *hdd_ctx,

				    unsigned int reason);



/**

 * 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,

};



#if defined(CFG80211_DISCONNECTED_V2) || \

(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0))

static inline void wlan_hdd_cfg80211_indicate_disconnect(struct net_device *dev,

CORE/HDD/inc/wlan_hdd_main.h

+0 −11
Original line number Diff line number Diff line
@@ -1488,8 +1488,6 @@ struct hdd_fw_mem_dump_req_ctx { 
 */

typedef void (*hdd_fw_mem_dump_req_cb)(void *context);



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);

void wlan_hdd_fw_mem_dump_req_cb(void *context);
@@ -2372,15 +2370,6 @@ int hdd_parse_disable_chan_cmd(hdd_adapter_t *adapter, tANI_U8 *ptr); 
int hdd_get_disable_ch_list(hdd_context_t *hdd_ctx, tANI_U8 *buf,

                            uint32_t buf_len);



/**

 * hdd_is_memdump_supported() - to check if memdump feature support

 *

 * This function is used to check if memdump feature is supported in

 * the host driver

 *

 * Return: true if supported and false otherwise

 */

bool hdd_is_memdump_supported(void);



/**

 * hdd_is_cli_iface_up() - check if there is any cli iface up

CORE/HDD/src/wlan_hdd_cfg.c

+0 −7
Original line number Diff line number Diff line
@@ -3592,13 +3592,6 @@ REG_VARIABLE( CFG_EXTSCAN_ENABLE, WLAN_PARAM_Integer, 
                 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),



   REG_VARIABLE( CFG_ACTIVE_PASSIVE_CHAN_CONV_NAME, WLAN_PARAM_Integer,

                 hdd_config_t, gActivePassiveChCon,

                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,

CORE/HDD/src/wlan_hdd_cfg80211.c

+0 −82
Original line number Diff line number Diff line
@@ -6365,71 +6365,6 @@ wlan_hdd_cfg80211_get_concurrency_matrix(struct wiphy *wiphy, 
    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 -EOPNOTSUPP;













    }













    /*call common API for FW mem dump req*/













    ret = wlan_hdd_fw_mem_dump_req(pHddCtx);

























    if (!ret)













    {













        /*indicate to userspace the status of fw mem dump */













        wlan_indicate_mem_dump_complete(true);













    }













    else













    {













        /*else send failure to userspace */













        wlan_indicate_mem_dump_complete(false);













    }













    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















qca_wlan_vendor_wifi_logger_start_policy










@@ -8556,9 +8491,6 @@ __wlan_hdd_cfg80211_get_logger_supp_feature(struct wiphy *wiphy,



























	features = 0;



























	if (hdd_is_memdump_supported())













		features |= WIFI_LOGGER_MEMORY_DUMP_SUPPORTED;



























	reply_skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy,















			sizeof(uint32_t) + NLA_HDRLEN + NLMSG_HDRLEN);















	if (!reply_skb) {










@@ -8760,14 +8692,6 @@ const struct wiphy_vendor_command hdd_wiphy_vendor_commands[] =













                 WIPHY_VENDOR_CMD_NEED_NETDEV,















        .doit = wlan_hdd_cfg80211_get_concurrency_matrix















    },













    {













        .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,










@@ -8964,12 +8888,6 @@ struct nl80211_vendor_cmd_info wlan_hdd_cfg80211_vendor_events[] =













        .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













    },







































    [QCA_NL80211_VENDOR_SUBCMD_NAN_INDEX] = {















        .vendor_id = QCA_NL80211_VENDOR_ID,















        .subcmd = QCA_NL80211_VENDOR_SUBCMD_NAN