From d77099006caf35853729fd5540da6f2b269a8ec1 Mon Sep 17 00:00:00 2001 From: Alan Chen Date: Wed, 6 Nov 2019 13:17:43 -0800 Subject: [PATCH] qcacld-3.0: Remove arp_ac_category INI item The mechanism of overriding ARP frames with AC will not work since firmware always defaults to BE. Since this overriding is not going to be supported, remove the arp_ac_category INI and all areas that use it. Change-Id: I8bff251ded5842f3d0c95bb916eb98a051696ae0 CRs-Fixed: 2555459 --- .../core/inc/wlan_fw_offload_main.h | 2 -- .../core/src/wlan_fw_offload_main.c | 1 - .../dispatcher/inc/cfg_fwol_generic.h | 30 ------------------- .../dispatcher/inc/wlan_fwol_ucfg_api.h | 16 ---------- .../dispatcher/src/wlan_fwol_ucfg_api.c | 15 ---------- core/hdd/src/wlan_hdd_main.c | 15 ---------- 6 files changed, 79 deletions(-) diff --git a/components/fw_offload/core/inc/wlan_fw_offload_main.h b/components/fw_offload/core/inc/wlan_fw_offload_main.h index 0386ba843570..2464e9b5864d 100644 --- a/components/fw_offload/core/inc/wlan_fw_offload_main.h +++ b/components/fw_offload/core/inc/wlan_fw_offload_main.h @@ -177,7 +177,6 @@ struct wlan_fwol_neighbor_report_cfg { * @enable_rts_sifsbursting: Enable RTS SIFS Bursting * @enable_sifs_burst: Enable SIFS burst * @max_mpdus_inampdu: Max number of MPDUS - * @arp_ac_category: ARP AC category * @enable_phy_reg_retention: Enable PHY reg retention * @upper_brssi_thresh: Upper BRSSI threshold * @lower_brssi_thresh: Lower BRSSI threshold @@ -213,7 +212,6 @@ struct wlan_fwol_cfg { bool enable_rts_sifsbursting; uint8_t enable_sifs_burst; uint8_t max_mpdus_inampdu; - uint32_t arp_ac_category; uint8_t enable_phy_reg_retention; uint16_t upper_brssi_thresh; uint16_t lower_brssi_thresh; diff --git a/components/fw_offload/core/src/wlan_fw_offload_main.c b/components/fw_offload/core/src/wlan_fw_offload_main.c index 16fcd3379068..559513b9fd4c 100644 --- a/components/fw_offload/core/src/wlan_fw_offload_main.c +++ b/components/fw_offload/core/src/wlan_fw_offload_main.c @@ -502,7 +502,6 @@ QDF_STATUS fwol_cfg_on_psoc_enable(struct wlan_objmgr_psoc *psoc) cfg_get(psoc, CFG_SET_RTS_FOR_SIFS_BURSTING); fwol_cfg->enable_sifs_burst = cfg_get(psoc, CFG_SET_SIFS_BURST); fwol_cfg->max_mpdus_inampdu = cfg_get(psoc, CFG_MAX_MPDUS_IN_AMPDU); - fwol_cfg->arp_ac_category = cfg_get(psoc, CFG_ARP_AC_CATEGORY); fwol_cfg->enable_phy_reg_retention = cfg_get(psoc, CFG_ENABLE_PHY_REG); fwol_cfg->upper_brssi_thresh = cfg_get(psoc, CFG_UPPER_BRSSI_THRESH); fwol_cfg->lower_brssi_thresh = cfg_get(psoc, CFG_LOWER_BRSSI_THRESH); diff --git a/components/fw_offload/dispatcher/inc/cfg_fwol_generic.h b/components/fw_offload/dispatcher/inc/cfg_fwol_generic.h index 0bf8ee0c5d54..565d3628a0dc 100644 --- a/components/fw_offload/dispatcher/inc/cfg_fwol_generic.h +++ b/components/fw_offload/dispatcher/inc/cfg_fwol_generic.h @@ -118,35 +118,6 @@ CFG_VALUE_OR_DEFAULT, \ "This ini configure max mpdus in ampdu") -/* - * - * arp_ac_category - ARP access category - * @Min: 0 - * @Max: 3 - * @Default: 3 - * - * Firmware by default categorizes ARP packets with VOICE TID. - * This ini shall be used to override the default configuration. - * Access category enums are referenced in qca-vendor.h - * QCA_WLAN_AC_BE = 0 (Best effort) - * QCA_WLAN_AC_BK = 1 (Background) - * QCA_WLAN_AC_VI = 2 (Video) - * QCA_WLAN_AC_VO = 3 (Voice) - * - * Related: none - * - * Usage: Internal/External - * - * - */ -#define CFG_ARP_AC_CATEGORY CFG_INI_INT( \ - "arp_ac_category", \ - 0, \ - 3, \ - 3, \ - CFG_VALUE_OR_DEFAULT, \ - "Override the default ARP AC configuration") - /* * * gEnableFastPwrTransition - Configuration for fast power transition @@ -740,7 +711,6 @@ CFG(CFG_SET_RTS_FOR_SIFS_BURSTING) \ CFG(CFG_SET_SIFS_BURST) \ CFG(CFG_MAX_MPDUS_IN_AMPDU) \ - CFG(CFG_ARP_AC_CATEGORY) \ CFG(CFG_ENABLE_PHY_REG) \ CFG(CFG_UPPER_BRSSI_THRESH) \ CFG(CFG_LOWER_BRSSI_THRESH) \ diff --git a/components/fw_offload/dispatcher/inc/wlan_fwol_ucfg_api.h b/components/fw_offload/dispatcher/inc/wlan_fwol_ucfg_api.h index c83507359723..4eace388b1d5 100644 --- a/components/fw_offload/dispatcher/inc/wlan_fwol_ucfg_api.h +++ b/components/fw_offload/dispatcher/inc/wlan_fwol_ucfg_api.h @@ -179,15 +179,6 @@ QDF_STATUS ucfg_get_enable_sifs_burst(struct wlan_objmgr_psoc *psoc, QDF_STATUS ucfg_get_max_mpdus_inampdu(struct wlan_objmgr_psoc *psoc, uint8_t *max_mpdus_inampdu); -/** - * ucfg_get_arp_ac_category() - Assigns the arp_ac_category value - * @psoc: pointer to the psoc object - * - * Return: QDF Status - */ -QDF_STATUS ucfg_get_arp_ac_category(struct wlan_objmgr_psoc *psoc, - uint32_t *arp_ac_category); - /** * ucfg_get_enable_phy_reg_retention() - Assigns enable_phy_reg_retention value * @psoc: pointer to the psoc object @@ -640,13 +631,6 @@ ucfg_get_max_mpdus_inampdu(struct wlan_objmgr_psoc *psoc, return QDF_STATUS_E_FAILURE; } -static inline QDF_STATUS -ucfg_get_arp_ac_category(struct wlan_objmgr_psoc *psoc, - uint32_t *arp_ac_category) -{ - return QDF_STATUS_E_FAILURE; -} - static inline QDF_STATUS ucfg_get_enable_phy_reg_retention(struct wlan_objmgr_psoc *psoc, uint8_t *enable_phy_reg_retention) diff --git a/components/fw_offload/dispatcher/src/wlan_fwol_ucfg_api.c b/components/fw_offload/dispatcher/src/wlan_fwol_ucfg_api.c index 961f1f0e2cfb..5cabba38e211 100644 --- a/components/fw_offload/dispatcher/src/wlan_fwol_ucfg_api.c +++ b/components/fw_offload/dispatcher/src/wlan_fwol_ucfg_api.c @@ -331,21 +331,6 @@ QDF_STATUS ucfg_get_max_mpdus_inampdu(struct wlan_objmgr_psoc *psoc, return QDF_STATUS_SUCCESS; } -QDF_STATUS ucfg_get_arp_ac_category(struct wlan_objmgr_psoc *psoc, - uint32_t *arp_ac_category) -{ - struct wlan_fwol_psoc_obj *fwol_obj; - - fwol_obj = fwol_get_psoc_obj(psoc); - if (!fwol_obj) { - fwol_err("Failed to get FWOL obj"); - return QDF_STATUS_E_FAILURE; - } - - *arp_ac_category = fwol_obj->cfg.arp_ac_category; - return QDF_STATUS_SUCCESS; -} - QDF_STATUS ucfg_get_enable_phy_reg_retention(struct wlan_objmgr_psoc *psoc, uint8_t *enable_phy_reg_retention) { diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 4eb63f7476d9..170c2bd625da 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -11159,7 +11159,6 @@ static int hdd_pre_enable_configure(struct hdd_context *hdd_ctx) int ret; uint8_t val = 0; QDF_STATUS status; - uint32_t arp_ac_category; void *soc = cds_get_context(QDF_MODULE_ID_SOC); cdp_register_pause_cb(soc, wlan_hdd_txrx_pause_cb); @@ -11213,20 +11212,6 @@ static int hdd_pre_enable_configure(struct hdd_context *hdd_ctx) if (ret) goto out; - status = ucfg_get_arp_ac_category(hdd_ctx->psoc, &arp_ac_category); - - if (QDF_IS_STATUS_ERROR(status)) - return -EINVAL; - - ret = sme_cli_set_command(0, WMI_PDEV_PARAM_ARP_AC_OVERRIDE, - arp_ac_category, - PDEV_CMD); - if (0 != ret) { - hdd_err("WMI_PDEV_PARAM_ARP_AC_OVERRIDE ac: %d ret: %d", - arp_ac_category, ret); - goto out; - } - status = hdd_set_sme_chan_list(hdd_ctx); if (status != QDF_STATUS_SUCCESS) { hdd_err("Failed to init channel list: %d", status);