diff --git a/components/pmo/core/src/wlan_pmo_main.c b/components/pmo/core/src/wlan_pmo_main.c index d576159efa..acec4b6235 100644 --- a/components/pmo/core/src/wlan_pmo_main.c +++ b/components/pmo/core/src/wlan_pmo_main.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -262,8 +263,6 @@ static void wlan_pmo_init_cfg(struct wlan_objmgr_psoc *psoc, psoc_cfg->is_bus_suspend_enabled_in_sap_mode = 0; psoc_cfg->is_bus_suspend_enabled_in_go_mode = 0; } - psoc_cfg->is_dynamic_pcie_gen_speed_change_enabled = - cfg_get(psoc, CFG_ENABLE_DYNAMIC_PCIE_GEN_SPEED_SWITCH); psoc_cfg->default_power_save_mode = psoc_cfg->power_save_mode; psoc_cfg->max_ps_poll = cfg_get(psoc, CFG_PMO_MAX_PS_POLL); diff --git a/components/pmo/dispatcher/inc/wlan_pmo_common_cfg.h b/components/pmo/dispatcher/inc/wlan_pmo_common_cfg.h index 7d48283e43..61c396702b 100644 --- a/components/pmo/dispatcher/inc/wlan_pmo_common_cfg.h +++ b/components/pmo/dispatcher/inc/wlan_pmo_common_cfg.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -528,27 +529,6 @@ 0, \ "This ini is used to enable bus suspend in P2PGO mode") -/* - * - * enable_dynamic_pcie_gen_speed_switch - enable dynamic PCIe gen speed change - * @Min: 0 - * @Max: 1 - * @Default: 0 - * - * This ini is used to enable dynamic PCIe gen speed change - * - * 0: Dynamic PCIe gen speed change is not enabled - * 1: Dynamic PCIe gen speed change is enabled - * - * Usage: Internal - * - * - */ -#define CFG_ENABLE_DYNAMIC_PCIE_GEN_SPEED_SWITCH CFG_INI_BOOL( \ - "enable_dynamic_pcie_gen_speed_switch", \ - 0, \ - "This ini is used to enable dynamic PCIe gen speed change") - /* * * igmp_version_support - Configure igmp version @@ -637,7 +617,6 @@ CFG(CFG_ENABLE_BUS_SUSPEND_IN_SAP_MODE) \ CFG(CFG_ENABLE_BUS_SUSPEND_IN_GO_MODE)\ CFG(CFG_DISCONNECT_SAP_TDLS_IN_WOW) \ - CFG(CFG_ENABLE_DYNAMIC_PCIE_GEN_SPEED_SWITCH) \ CFG(CFG_IGMP_VERSION_SUPPORT) \ CFG(CFG_ENABLE_ICMP_OFFLOAD) diff --git a/components/pmo/dispatcher/inc/wlan_pmo_common_public_struct.h b/components/pmo/dispatcher/inc/wlan_pmo_common_public_struct.h index ba2ee1890b..6d8b1ba5af 100644 --- a/components/pmo/dispatcher/inc/wlan_pmo_common_public_struct.h +++ b/components/pmo/dispatcher/inc/wlan_pmo_common_public_struct.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -442,7 +443,6 @@ struct pmo_psoc_cfg { bool is_mod_dtim_on_sys_suspend_enabled; bool is_bus_suspend_enabled_in_sap_mode; bool is_bus_suspend_enabled_in_go_mode; - bool is_dynamic_pcie_gen_speed_change_enabled; #ifdef WLAN_ENABLE_GPIO_WAKEUP bool enable_gpio_wakeup; uint32_t gpio_wakeup_pin; diff --git a/components/pmo/dispatcher/inc/wlan_pmo_ucfg_api.h b/components/pmo/dispatcher/inc/wlan_pmo_ucfg_api.h index 8d56332cf2..4a7749358c 100644 --- a/components/pmo/dispatcher/inc/wlan_pmo_ucfg_api.h +++ b/components/pmo/dispatcher/inc/wlan_pmo_ucfg_api.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -2269,16 +2270,6 @@ ucfg_pmo_get_go_mode_bus_suspend(struct wlan_objmgr_psoc *psoc); enum pmo_suspend_mode ucfg_pmo_get_suspend_mode(struct wlan_objmgr_psoc *psoc); -/** - * ucfg_pmo_get_dynamic_pcie_gen_switch_cfg() - get PMO config for - * dynamic PCIe gen speed change - * @psoc: pointer to psoc object - * - * Return: bool - */ -bool -ucfg_pmo_get_dynamic_pcie_gen_switch_cfg(struct wlan_objmgr_psoc *psoc); - #ifdef SYSTEM_PM_CHECK /** * ucfg_pmo_notify_system_resume() - system resume notification to pmo diff --git a/components/pmo/dispatcher/src/wlan_pmo_ucfg_api.c b/components/pmo/dispatcher/src/wlan_pmo_ucfg_api.c index 2e4025dc20..0527bcd601 100644 --- a/components/pmo/dispatcher/src/wlan_pmo_ucfg_api.c +++ b/components/pmo/dispatcher/src/wlan_pmo_ucfg_api.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -948,14 +949,6 @@ ucfg_pmo_get_suspend_mode(struct wlan_objmgr_psoc *psoc) return pmo_psoc_ctx->psoc_cfg.suspend_mode; } -bool -ucfg_pmo_get_dynamic_pcie_gen_switch_cfg(struct wlan_objmgr_psoc *psoc) -{ - struct pmo_psoc_priv_obj *pmo_psoc_ctx = pmo_psoc_get_priv(psoc); - - return pmo_psoc_ctx->psoc_cfg.is_dynamic_pcie_gen_speed_change_enabled; -} - QDF_STATUS ucfg_pmo_core_txrx_suspend(struct wlan_objmgr_psoc *psoc) { return pmo_core_txrx_suspend(psoc); diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 6826112dde..4b1c20527d 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2013-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -377,8 +378,6 @@ static void wma_set_default_tgt_config(tp_wma_handle wma_handle, ucfg_pmo_get_sap_mode_bus_suspend(wma_handle->psoc); tgt_cfg->is_go_connected_d3wow_enabled = ucfg_pmo_get_go_mode_bus_suspend(wma_handle->psoc); - tgt_cfg->dynamic_pcie_gen_speed_change = - ucfg_pmo_get_dynamic_pcie_gen_switch_cfg(wma_handle->psoc); cfg_nan_get_max_ndi(wma_handle->psoc, &tgt_cfg->max_ndi);