sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/power: Fix PM build failure with CONFIG_PM_GOVERNOR_MEMORY==1

Browse Source
This commit is contained in:
Juha Niskanen 2019-12-10 07:34:59 -06:00 committed by Gregory Nutt
parent 897378bc29
commit abdafaeccc
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/power/Kconfig
View File

@ -85,7 +85,7 @@ config PM_GOVERNOR_SLICEMS
interval is applied to an averaging algorithm to determine the interval is applied to an averaging algorithm to determine the
activity level. activity level.
CONFIG_GOVERNOR_PM_SLICEMS provides the duration of that time slice in CONFIG_PM_GOVERNOR_SLICEMS provides the duration of that time slice in
milliseconds. Default: 100 Milliseconds milliseconds. Default: 100 Milliseconds
config PM_GOVERNOR_MEMORY config PM_GOVERNOR_MEMORY
@ -99,54 +99,55 @@ config PM_GOVERNOR_MEMORY
activity. These weights may be negative and a limited to the activity. These weights may be negative and a limited to the
range of int16_t. range of int16_t.
CONFIG_PM_MEMORY provides the memory for the algorithm. Default: 2 CONFIG_PM_GOVERNOR_MEMORY provides the memory for the algorithm.
CONFIG_PM_COEFn provides weight for each sample. Default: 1 Default: 2
CONFIG_PM_GOVERNOR_COEFn provides weight for each sample. Default: 1
Setting CONFIG_PM_MEMORY=1 disables all smoothing. Setting CONFIG_PM_GOVERNOR_MEMORY=1 disables all smoothing.
config PM_GOVERNOR_COEFN config PM_GOVERNOR_COEFN
int "PM coefficient" int "PM coefficient"
default 1 default 1
---help--- ---help---
See help associated with CONFIG_PM_MEMORY. See help associated with CONFIG_PM_GOVERNOR_MEMORY.
config PM_GOVERNOR_COEF1 config PM_GOVERNOR_COEF1
int "PM coefficient 1" int "PM coefficient 1"
default 1 default 1
---help--- ---help---
See help associated with CONFIG_PM_MEMORY. See help associated with CONFIG_PM_GOVERNOR_MEMORY.
config PM_GOVERNOR_COEF2 config PM_GOVERNOR_COEF2
int "PM coefficient 2" int "PM coefficient 2"
default 1 default 1
---help--- ---help---
See help associated with CONFIG_PM_MEMORY See help associated with CONFIG_PM_GOVERNOR_MEMORY
Ignored if CONFIG_PM_MEMORY <= 2 Ignored if CONFIG_PM_GOVERNOR_MEMORY <= 2
config PM_GOVERNOR_COEF3 config PM_GOVERNOR_COEF3
int "PM coefficient 3" int "PM coefficient 3"
default 1 default 1
---help--- ---help---
See help associated with CONFIG_PM_MEMORY See help associated with CONFIG_PM_GOVERNOR_MEMORY
Ignored if CONFIG_PM_MEMORY <= 3 Ignored if CONFIG_PM_GOVERNOR_MEMORY <= 3
config PM_GOVERNOR_COEF4 config PM_GOVERNOR_COEF4
int "PM coefficient 4" int "PM coefficient 4"
default 1 default 1
---help--- ---help---
See help associated with CONFIG_PM_MEMORY See help associated with CONFIG_PM_GOVERNOR_MEMORY
Ignored if CONFIG_PM_MEMORY <= 4 Ignored if CONFIG_PM_GOVERNOR_MEMORY <= 4
config PM_GOVERNOR_COEF5 config PM_GOVERNOR_COEF5
int "PM coefficient 5" int "PM coefficient 5"
default 1 default 1
---help--- ---help---
See help associated with CONFIG_PM_MEMORY See help associated with CONFIG_PM_GOVERNOR_MEMORY
Ignored if CONFIG_PM_MEMORY <= 5 Ignored if CONFIG_PM_GOVERNOR_MEMORY <= 5
config PM_GOVERNOR_IDLEENTER_THRESH config PM_GOVERNOR_IDLEENTER_THRESH
int "PM IDLE enter threshold" int "PM IDLE enter threshold"
@ -159,7 +160,7 @@ config PM_GOVERNOR_IDLEENTER_THRESH
CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx. CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx.
Resuming to normal state, on the other hand, is usually immediate and Resuming to normal state, on the other hand, is usually immediate and
controlled by wakeup conditions established by the platform. The PM controlled by wakeup conditions established by the platform.
Default: <=1: Essentially no activity Default: <=1: Essentially no activity
@ -174,7 +175,7 @@ config PM_GOVERNOR_IDLEEXIT_THRESH
CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx. CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx.
Resuming to normal state, on the other hand, is usually immediate and Resuming to normal state, on the other hand, is usually immediate and
controlled by wakeup conditions established by the platform. The PM controlled by wakeup conditions established by the platform.
Default: >=2: Active Default: >=2: Active
@ -189,7 +190,7 @@ config PM_GOVERNOR_IDLEENTER_COUNT
CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx. CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx.
Resuming to normal state, on the other hand, is usually immediate and Resuming to normal state, on the other hand, is usually immediate and
controlled by wakeup conditions established by the platform. The PM controlled by wakeup conditions established by the platform.
Default: Thirty IDLE slices to enter IDLE mode from normal Default: Thirty IDLE slices to enter IDLE mode from normal
@ -204,7 +205,7 @@ config PM_GOVERNOR_STANDBYENTER_THRESH
CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx. CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx.
Resuming to normal state, on the other hand, is usually immediate and Resuming to normal state, on the other hand, is usually immediate and
controlled by wakeup conditions established by the platform. The PM controlled by wakeup conditions established by the platform.
Default: <=1: Essentially no activity Default: <=1: Essentially no activity
@ -219,7 +220,7 @@ config PM_GOVERNOR_STANDBYEXIT_THRESH
CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx. CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx.
Resuming to normal state, on the other hand, is usually immediate and Resuming to normal state, on the other hand, is usually immediate and
controlled by wakeup conditions established by the platform. The PM controlled by wakeup conditions established by the platform.
Default: >=2: Active Default: >=2: Active
@ -234,7 +235,7 @@ config PM_GOVERNOR_STANDBYENTER_COUNT
CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx. CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx.
Resuming to normal state, on the other hand, is usually immediate and Resuming to normal state, on the other hand, is usually immediate and
controlled by wakeup conditions established by the platform. The PM controlled by wakeup conditions established by the platform.
Default: Fifty IDLE slices to enter STANDBY mode from IDLE Default: Fifty IDLE slices to enter STANDBY mode from IDLE
@ -249,7 +250,7 @@ config PM_GOVERNOR_SLEEPENTER_THRESH
CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx. CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx.
Resuming to normal state, on the other hand, is usually immediate and Resuming to normal state, on the other hand, is usually immediate and
controlled by wakeup conditions established by the platform. The PM controlled by wakeup conditions established by the platform.
Default: <=1: Essentially no activity Default: <=1: Essentially no activity
@ -264,7 +265,7 @@ config PM_GOVERNOR_SLEEPEXIT_THRESH
CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx. CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx.
Resuming to normal state, on the other hand, is usually immediate and Resuming to normal state, on the other hand, is usually immediate and
controlled by wakeup conditions established by the platform. The PM controlled by wakeup conditions established by the platform.
Default: >=2: Active Default: >=2: Active
@ -279,7 +280,7 @@ config PM_GOVERNOR_SLEEPENTER_COUNT
CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx. CONFIG_PM_xxxENTER_COUNT is the count for entering state xxx.
Resuming to normal state, on the other hand, is usually immediate and Resuming to normal state, on the other hand, is usually immediate and
controlled by wakeup conditions established by the platform. The PM controlled by wakeup conditions established by the platform.
Default: Fifty IDLE slices to enter SLEEP mode from STANDBY Default: Fifty IDLE slices to enter SLEEP mode from STANDBY

13
drivers/power/activity_governor.c
View File

@ -78,7 +78,7 @@ struct pm_domain_state_s
/* recommended - The recommended state based on the governor policy /* recommended - The recommended state based on the governor policy
* mndex - The index to the next slot in the memory[] array to use. * mndex - The index to the next slot in the memory[] array to use.
* mcnt - A tiny counter used only at start up. The actual * mcnt - A tiny counter used only at start up. The actual
* algorithm cannot be applied until CONFIG_PM_MEMORY * algorithm cannot be applied until CONFIG_PM_GOVERNOR_MEMORY
* samples have been collected. * samples have been collected.
*/ */
@ -96,7 +96,8 @@ struct pm_domain_state_s
* length of the "memory", Ai is the weight applied to each value, and X is * length of the "memory", Ai is the weight applied to each value, and X is
* the current activity. * the current activity.
* *
* CONFIG_PM_MEMORY provides the memory for the algorithm. Default: 2 * CONFIG_PM_GOVERNOR_MEMORY provides the memory for the algorithm.
* Default: 2
* CONFIG_PM_COEFn provides weight for each sample. Default: 1 * CONFIG_PM_COEFn provides weight for each sample. Default: 1
*/ */
@ -136,9 +137,9 @@ struct pm_activity_governor_s
const int32_t pmexitthresh[3]; const int32_t pmexitthresh[3];
/* CONFIG_PM_MEMORY is the total number of time slices (including the /* CONFIG_PM_GOVERNOR_MEMORY is the total number of time slices (including
* current time slice). The history of previous values is then * the current time slice). The history of previous values is then
* CONFIG_PM_MEMORY-1. * CONFIG_PM_GOVERNOR_MEMORY-1.
*/ */
#if CONFIG_PM_GOVERNOR_MEMORY > 1 #if CONFIG_PM_GOVERNOR_MEMORY > 1
@ -393,7 +394,7 @@ static void governor_update(int domain, int16_t accum)
/* No smoothing */ /* No smoothing */
Y = accum; y = accum;
#endif #endif
/* First check if increased activity should cause us to return to the /* First check if increased activity should cause us to return to the