From f4390fad6e4452e45c27b1d04dd418844b160393 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Thu, 22 Dec 2016 13:17:33 -0800 Subject: [PATCH] qcacld-3.0: Remove obsolete ioctls to dump AGC address space Host driver does not have access to agc register address space and any attempt to read it leads to SNOC error. Remove AGC dump related sub ioctls support. Change-Id: I65d2152d5f03001e8473b365bd287cc71f3e5ffe CRs-Fixed: 1104738 --- core/hdd/src/wlan_hdd_wext.c | 90 +----------------------------------- core/wma/inc/wma_api.h | 18 ++------ core/wma/src/wma_main.c | 20 -------- 3 files changed, 5 insertions(+), 123 deletions(-) diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index f0f055b445..14042a6136 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -429,14 +429,7 @@ static const hdd_freq_chan_map_t freq_chan_map[] = { #define WLAN_PRIV_SET_NONE_GET_NONE (SIOCIWFIRSTPRIV + 6) #define WE_SET_REASSOC_TRIGGER 8 #define WE_IBSS_GET_PEER_INFO_ALL 10 -#define WE_DUMP_AGC_START 11 -#define WE_DUMP_AGC 12 -#define WE_DUMP_CHANINFO_START 13 -#define WE_DUMP_CHANINFO 14 -#define WE_DUMP_WATCHDOG 15 -#ifdef CONFIG_ATH_PCIE_ACCESS_DEBUG -#define WE_DUMP_PCIE_LOG 16 -#endif +/* Sub ioctls 11 to 16 are not used */ #define WE_GET_RECOVERY_STAT 17 #define WE_GET_FW_PROFILE_DATA 18 #define WE_STOP_OBSS_SCAN 19 @@ -8201,57 +8194,6 @@ static int __iw_setnone_getnone(struct net_device *dev, return 0; } - case WE_DUMP_AGC_START: - { - hdd_notice("WE_DUMP_AGC_START"); - ret = wma_cli_set_command(adapter->sessionId, - GEN_PARAM_DUMP_AGC_START, - 0, GEN_CMD); - break; - } - case WE_DUMP_AGC: - { - hdd_notice("WE_DUMP_AGC"); - ret = wma_cli_set_command(adapter->sessionId, - GEN_PARAM_DUMP_AGC, - 0, GEN_CMD); - break; - } - - case WE_DUMP_CHANINFO_START: - { - hdd_notice("WE_DUMP_CHANINFO_START"); - ret = wma_cli_set_command(adapter->sessionId, - GEN_PARAM_DUMP_CHANINFO_START, - 0, GEN_CMD); - break; - } - case WE_DUMP_CHANINFO: - { - hdd_notice("WE_DUMP_CHANINFO_START"); - ret = wma_cli_set_command(adapter->sessionId, - GEN_PARAM_DUMP_CHANINFO, - 0, GEN_CMD); - break; - } - case WE_DUMP_WATCHDOG: - { - hdd_notice("WE_DUMP_WATCHDOG"); - ret = wma_cli_set_command(adapter->sessionId, - GEN_PARAM_DUMP_WATCHDOG, - 0, GEN_CMD); - break; - } -#ifdef CONFIG_ATH_PCIE_ACCESS_DEBUG - case WE_DUMP_PCIE_LOG: - { - hdd_err("WE_DUMP_PCIE_LOG"); - ret = wma_cli_set_command(adapter->sessionId, - GEN_PARAM_DUMP_PCIE_ACCESS_LOG, - 0, GEN_CMD); - break; - } -#endif case WE_STOP_OBSS_SCAN: { /* @@ -11306,36 +11248,6 @@ static const struct iw_priv_args we_private_args[] = { 0, "reassoc"}, - {WE_DUMP_AGC_START, - 0, - 0, - "dump_agc_start"}, - - {WE_DUMP_AGC, - 0, - 0, - "dump_agc"}, - - {WE_DUMP_CHANINFO_START, - 0, - 0, - "dump_chninfo_en"}, - - {WE_DUMP_CHANINFO, - 0, - 0, - "dump_chninfo"}, - - {WE_DUMP_WATCHDOG, - 0, - 0, - "dump_watchdog"}, -#ifdef CONFIG_ATH_PCIE_ACCESS_DEBUG - {WE_DUMP_PCIE_LOG, - 0, - 0, - "dump_pcie_log"}, -#endif {WE_STOP_OBSS_SCAN, 0, 0, diff --git a/core/wma/inc/wma_api.h b/core/wma/inc/wma_api.h index 9b8e647f2f..7f03e70983 100644 --- a/core/wma/inc/wma_api.h +++ b/core/wma/inc/wma_api.h @@ -48,26 +48,16 @@ typedef void *WMA_HANDLE; * enum GEN_PARAM - general parameters * @GEN_VDEV_PARAM_AMPDU: Set ampdu size * @GEN_VDEV_PARAM_AMSDU: Set amsdu size - * @GEN_PARAM_DUMP_AGC_START: dump agc start - * @GEN_PARAM_DUMP_AGC: dump agc - * @GEN_PARAM_DUMP_CHANINFO_START: dump channel info start - * @GEN_PARAM_DUMP_CHANINFO: dump channel info * @GEN_PARAM_CRASH_INJECT: inject crash - * @GEN_PARAM_DUMP_PCIE_ACCESS_LOG: dump pcie access log - * @GEN_PARAM_TX_CHAIN_MASK_CCK: cck tx chain mask + * @GEN_PARAM_MODULATED_DTIM: moduled dtim + * @GEN_PARAM_CAPTURE_TSF: read tsf + * @GEN_PARAM_RESET_TSF_GPIO: reset tsf gpio + * @GEN_VDEV_ROAM_SYNCH_DELAY: roam sync delay */ typedef enum { GEN_VDEV_PARAM_AMPDU = 0x1, GEN_VDEV_PARAM_AMSDU, - GEN_PARAM_DUMP_AGC_START, - GEN_PARAM_DUMP_AGC, - GEN_PARAM_DUMP_CHANINFO_START, - GEN_PARAM_DUMP_CHANINFO, - GEN_PARAM_DUMP_WATCHDOG, GEN_PARAM_CRASH_INJECT, -#ifdef CONFIG_ATH_PCIE_ACCESS_DEBUG - GEN_PARAM_DUMP_PCIE_ACCESS_LOG, -#endif GEN_PARAM_MODULATED_DTIM, GEN_PARAM_CAPTURE_TSF, GEN_PARAM_RESET_TSF_GPIO, diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index e0ff2616b0..d29539fb1f 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -961,21 +961,6 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, return; } break; - case GEN_PARAM_DUMP_AGC_START: - htc_dump(wma->htc_handle, AGC_DUMP, true); - break; - case GEN_PARAM_DUMP_AGC: - htc_dump(wma->htc_handle, AGC_DUMP, false); - break; - case GEN_PARAM_DUMP_CHANINFO_START: - htc_dump(wma->htc_handle, CHAN_DUMP, true); - break; - case GEN_PARAM_DUMP_CHANINFO: - htc_dump(wma->htc_handle, CHAN_DUMP, false); - break; - case GEN_PARAM_DUMP_WATCHDOG: - htc_dump(wma->htc_handle, WD_DUMP, false); - break; case GEN_PARAM_CRASH_INJECT: if (QDF_GLOBAL_FTM_MODE == cds_get_conparam()) WMA_LOGE("Crash inject not allowed in FTM mode"); @@ -990,11 +975,6 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, case GEN_PARAM_RESET_TSF_GPIO: ret = wma_reset_tsf_gpio(wma, privcmd->param_value); break; -#ifdef CONFIG_ATH_PCIE_ACCESS_DEBUG - case GEN_PARAM_DUMP_PCIE_ACCESS_LOG: - htc_dump(wma->htc_handle, PCIE_DUMP, false); - break; -#endif /* CONFIG_ATH_PCIE_ACCESS_DEBUG */ case GEN_PARAM_MODULATED_DTIM: wma_set_modulated_dtim(wma, privcmd); break;