qcacld-3.0: Rename gEnablePowerSaveOffload to gAdvancedPowerSaveMode

gEnablePowerSaveOffload is confusing, so change it to
gAdvancedPowerSaveMode.

Value 0: Disable advanced power save
Value 1: Enable advanced power save

Change-Id: Ib5593ef31eedacdc232ffbad183974e2cd847e83
CRs-Fixed: 2676664
This commit is contained in:
Alan Chen
2020-04-01 18:06:25 -07:00
committato da nshrivas
parent 5e6cdf7b3c
commit 06551ba572
14 ha cambiato i file con 96 aggiunte e 230 eliminazioni

Vedi File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
* Copyright (c) 2017-2018, 2020 The Linux Foundation. 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
@@ -216,45 +216,6 @@ pmo_core_psoc_get_power_save_mode(struct wlan_objmgr_psoc *psoc)
return value;
}
/**
* pmo_core_psoc_get_qpower_config() - get qpower configuration
* @psoc: objmgr psoc handle
*
* Power Save Offload configuration:
* 0 -> Power save offload is disabled
* 1 -> Legacy Power save enabled + Deep sleep Disabled
* 2 -> QPower enabled + Deep sleep Disabled
* 3 -> Legacy Power save enabled + Deep sleep Enabled
* 4 -> QPower enabled + Deep sleep Enabled
* 5 -> Duty cycling QPower enabled
*
* Return: enum powersave_qpower_mode with below values
* QPOWER_DISABLED if QPOWER is disabled
* QPOWER_ENABLED if QPOWER is enabled
* QPOWER_DUTY_CYCLING if DUTY CYCLING QPOWER is enabled
*/
static inline
enum pmo_power_save_qpower_mode pmo_core_psoc_get_qpower_config(
struct wlan_objmgr_psoc *psoc)
{
uint8_t ps_mode = pmo_core_psoc_get_power_save_mode(psoc);
switch (ps_mode) {
case pmo_ps_qpower_no_deep_sleep:
case pmo_ps_qpower_deep_sleep:
pmo_debug("QPOWER is enabled in power save mode %d", ps_mode);
return pmo_qpower_enabled;
case pmo_ps_duty_cycling_qpower:
pmo_debug("DUTY cycling QPOWER is enabled in power save mode %d",
ps_mode);
return pmo_qpower_duty_cycling;
default:
pmo_debug("QPOWER is disabled in power save mode %d",
ps_mode);
return pmo_qpower_disabled;
}
}
/**
* pmo_core_vdev_get_pause_bitmap() - Get vdev pause bitmap
* @psoc_ctx: psoc priv ctx

Vedi File

@@ -183,7 +183,7 @@ static void wlan_pmo_init_cfg(struct wlan_objmgr_psoc *psoc,
psoc_cfg->sta_dynamic_dtim = cfg_get(psoc, CFG_PMO_ENABLE_DYNAMIC_DTIM);
psoc_cfg->sta_mod_dtim = cfg_get(psoc, CFG_PMO_ENABLE_MODULATED_DTIM);
psoc_cfg->enable_mc_list = cfg_get(psoc, CFG_PMO_MC_ADDR_LIST_ENABLE);
psoc_cfg->power_save_mode = cfg_get(psoc, CFG_PMO_POWERSAVE_OFFLOAD);
psoc_cfg->power_save_mode = cfg_get(psoc, CFG_PMO_POWERSAVE_MODE);
psoc_cfg->max_ps_poll = cfg_get(psoc, CFG_PMO_MAX_PS_POLL);
psoc_cfg->wow_enable = cfg_get(psoc, CFG_PMO_WOW_ENABLE);

Vedi File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2020 The Linux Foundation. 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
@@ -193,35 +193,31 @@
/*
* <ini>
* gEnablePowerSaveOffload - Enable Power Save Offload
* gAdvancedPowerSaveMode - Advanced Power Save Mode
* @Min: 0
* @Max: 5
* @Default: 2
* @Max: 1
* @Default: 1
*
* This ini is used to set Power Save Offload configuration:
* Current values of gEnablePowerSaveOffload:
* 0 -> Power save offload is disabled
* 1 -> Legacy Power save enabled + Deep sleep Disabled
* 2 -> QPower enabled + Deep sleep Disabled
* 3 -> Legacy Power save enabled + Deep sleep Enabled
* 4 -> QPower enabled + Deep sleep Enabled
* 5 -> Duty cycling QPower enabled
* This ini is used to set Advanced Power Save Mode configuration:
* Current values of gAdvancedPowerSaveMode:
* 0 -> Disable advanced power save
* 1 -> Enable advanced power save
*
* Related: None
*
* Supported Feature: Power Save
* Supported Feature: Advanced Power Save
*
* Usage: External
*
* </ini>
*/
#define CFG_PMO_POWERSAVE_OFFLOAD CFG_INI_UINT( \
"gEnablePowerSaveOffload", \
#define CFG_PMO_POWERSAVE_MODE CFG_INI_UINT( \
"gAdvancedPowerSaveMode", \
0, \
5, \
2, \
1, \
1, \
CFG_VALUE_OR_DEFAULT, \
"Enable Power Save Offload")
"Advanced Power Save Mode")
/*
* <ini>
@@ -429,7 +425,7 @@
CFG(CFG_PMO_ENABLE_DYNAMIC_DTIM) \
CFG(CFG_PMO_ENABLE_MODULATED_DTIM) \
CFG(CFG_PMO_MC_ADDR_LIST_ENABLE) \
CFG(CFG_PMO_POWERSAVE_OFFLOAD) \
CFG(CFG_PMO_POWERSAVE_MODE) \
CFG(CFG_PMO_MAX_PS_POLL) \
CFG(CFG_PMO_WOWLAN_DEAUTH_ENABLE) \
CFG(CFG_PMO_WOWLAN_DISASSOC_ENABLE) \

Vedi File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.
* Copyright (c) 2017-2020 The Linux Foundation. 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
@@ -85,11 +85,11 @@ enum pmo_beacon_dtim_policy {
* @pmo_sta_ps_param_inactivity_time: TX/RX inactivity time in msec before
going to sleep.
* @pmo_sta_ps_param_uapsd: Set uapsd configuration.
* @pmo_sta_ps_param_qpower_pspoll_count: No of PS-Poll to send before
STA wakes up in QPower Mode.
* @pmo_sta_ps_enable_qpower: Enable QPower
* @pmo_sta_ps_param_qpower_max_tx_before_wake: Number of TX frames before the
entering the Active state
* @pmo_sta_ps_param_advanced_power_pspoll_count: No of PS-Poll to send before
STA wakes up in Advanced Power Save Mode.
* @pmo_sta_ps_enable_advanced_power: Enable Advanced Power Save
* @pmo_sta_ps_param_advanced_power_max_tx_before_wake: Number of TX frames
before the entering the Active state
* @pmo_sta_ps_param_ito_repeat_count: Indicates ito repeated count
*/
enum pmo_sta_powersave_param {
@@ -98,42 +98,12 @@ enum pmo_sta_powersave_param {
pmo_sta_ps_param_pspoll_count = 2,
pmo_sta_ps_param_inactivity_time = 3,
pmo_sta_ps_param_uapsd = 4,
pmo_sta_ps_param_qpower_pspoll_count = 5,
pmo_sta_ps_enable_qpower = 6,
pmo_sta_ps_param_qpower_max_tx_before_wake = 7,
pmo_sta_ps_param_advanced_power_pspoll_count = 5,
pmo_sta_ps_enable_advanced_power = 6,
pmo_sta_ps_param_advanced_power_max_tx_before_wake = 7,
pmo_sta_ps_param_ito_repeat_count = 8,
};
/**
* enum powersave_qpower_mode: QPOWER modes
* @pmo_qpower_disabled: Qpower is disabled
* @pmo_qpower_enabled: Qpower is enabled
* @pmo_qpower_duty_cycling: Qpower is enabled with duty cycling
*/
enum pmo_power_save_qpower_mode {
pmo_qpower_disabled = 0,
pmo_qpower_enabled = 1,
pmo_qpower_duty_cycling = 2
};
/**
* enum powersave_qpower_mode: powersave_mode
* @pmo_ps_not_supported: Power save is not supported
* @pmo_ps_legacy_no_deep_sleep: Legacy pwr save enabled and deep sleep disabled
* @pmo_ps_qpower_no_deep_sleep: QPOWER enabled and deep sleep disabled
* @pmo_ps_legacy_deep_sleep: Legacy power save enabled and deep sleep enabled
* @pmo_ps_qpower_deep_sleep: QPOWER enabled and deep sleep enabled
* @pmo_ps_duty_cycling_qpower: QPOWER enabled in duty cycling mode
*/
enum pmo_powersave_mode {
pmo_ps_not_supported = 0,
pmo_ps_legacy_no_deep_sleep = 1,
pmo_ps_qpower_no_deep_sleep = 2,
pmo_ps_legacy_deep_sleep = 3,
pmo_ps_qpower_deep_sleep = 4,
pmo_ps_duty_cycling_qpower = 5
};
/**
* enum wow_resume_trigger - resume trigger override setting values
* @PMO_WOW_RESUME_TRIGGER_DEFAULT: fw to use platform default resume trigger
@@ -183,21 +153,13 @@ enum pmo_wow_enable_type {
};
/**
* enum powersave_qpower_mode: powersave_mode
* @PS_NOT_SUPPORTED: Power save is not supported
* @PS_LEGACY_NODEEPSLEEP: Legacy power save enabled and deep sleep disabled
* @PS_QPOWER_NODEEPSLEEP: QPOWER enabled and deep sleep disabled
* @PS_LEGACY_DEEPSLEEP: Legacy power save enabled and deep sleep enabled
* @PS_QPOWER_DEEPSLEEP: QPOWER enabled and deep sleep enabled
* @PS_DUTY_CYCLING_QPOWER: QPOWER enabled in duty cycling mode
* enum powersave_mode - powersave_mode
* @PMO_PS_ADVANCED_POWER_SAVE_DISABLE: Disable advanced power save mode
* @PMO_PS_ADVANCED_POWER_SAVE_ENABLE: Enable power save mode
*/
enum powersave_mode {
PS_NOT_SUPPORTED = 0,
PS_LEGACY_NODEEPSLEEP = 1,
PS_QPOWER_NODEEPSLEEP = 2,
PS_LEGACY_DEEPSLEEP = 3,
PS_QPOWER_DEEPSLEEP = 4,
PS_DUTY_CYCLING_QPOWER = 5
PMO_PS_ADVANCED_POWER_SAVE_DISABLE = 0,
PMO_PS_ADVANCED_POWER_SAVE_ENABLE = 1
};
#define PMO_TARGET_SUSPEND_TIMEOUT 6000

Vedi File

@@ -713,20 +713,13 @@ ucfg_pmo_get_max_ps_poll(struct wlan_objmgr_psoc *psoc)
uint8_t
ucfg_pmo_power_save_offload_enabled(struct wlan_objmgr_psoc *psoc)
{
uint8_t powersave_offload_enabled;
uint8_t powersave_offload_enabled = PMO_PS_ADVANCED_POWER_SAVE_ENABLE;
struct pmo_psoc_priv_obj *pmo_psoc_ctx = pmo_psoc_get_priv(psoc);
if (!pmo_psoc_ctx->psoc_cfg.max_ps_poll ||
!pmo_psoc_ctx->psoc_cfg.power_save_mode)
powersave_offload_enabled =
pmo_psoc_ctx->psoc_cfg.power_save_mode;
else if ((pmo_psoc_ctx->psoc_cfg.power_save_mode ==
PS_QPOWER_NODEEPSLEEP) ||
(pmo_psoc_ctx->psoc_cfg.power_save_mode ==
PS_LEGACY_NODEEPSLEEP))
powersave_offload_enabled = PS_LEGACY_NODEEPSLEEP;
else
powersave_offload_enabled = PS_LEGACY_DEEPSLEEP;
pmo_debug("powersave offload enabled type:%d",
powersave_offload_enabled);