diff options
| author |   Zhenzhong Duan <zhenzhong.duan@oracle.com> | 2019-10-18 08:49:29 +0800 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-10-22 11:43:17 +0200 |
| commit | 31d851407f90076c58291fb5eadc82c1dd613cee (patch) | |
| tree | 8c8174dfb72dcb51426db6f9650844c6041249a2 /drivers/cpuidle/cpuidle-haltpoll.c | |
| parent | Linux 5.4-rc4 (diff) | |
| download | linux-dev-31d851407f90076c58291fb5eadc82c1dd613cee.tar.xz linux-dev-31d851407f90076c58291fb5eadc82c1dd613cee.zip | |
cpuidle: haltpoll: Take 'idle=' override into account
Currenly haltpoll isn't aware of the 'idle=' override, the priority is
'idle=poll' > haltpoll > 'idle=halt'. When 'idle=poll' is used, cpuidle
driver is bypassed but current_driver in sys still shows 'haltpoll'.
When 'idle=halt' is used, haltpoll takes precedence and makes
'idle=halt' have no effect.
Add a check to prevent the haltpoll driver from loading if 'idle=' is
present.
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Co-developed-by: Joao Martins <joao.m.martins@oracle.com>
[ rjw: Subject ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpuidle/cpuidle-haltpoll.c')
| -rw-r--r-- | drivers/cpuidle/cpuidle-haltpoll.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/cpuidle/cpuidle-haltpoll.c b/drivers/cpuidle/cpuidle-haltpoll.c index 932390b028f1..b0ce9bc78113 100644 --- a/drivers/cpuidle/cpuidle-haltpoll.c +++ b/drivers/cpuidle/cpuidle-haltpoll.c @@ -95,6 +95,10 @@ static int __init haltpoll_init(void) int ret; struct cpuidle_driver *drv = &haltpoll_driver; + /* Do not load haltpoll if idle= is passed */ + if (boot_option_idle_override != IDLE_NO_OVERRIDE) + return -ENODEV; + cpuidle_poll_state_init(drv); if (!kvm_para_available() || |