# git rev-parse -q --verify 0a4ec6aa035a52c422eceb2ed51ed88392a3d6c2^{commit} 0a4ec6aa035a52c422eceb2ed51ed88392a3d6c2 already have revision, skipping fetch # git checkout -q -f -B kisskb 0a4ec6aa035a52c422eceb2ed51ed88392a3d6c2 # git clean -qxdf # < git log -1 # commit 0a4ec6aa035a52c422eceb2ed51ed88392a3d6c2 # Author: Gautham R. Shenoy # Date: Thu May 31 17:45:09 2018 +0530 # # cpuidle: powernv: Fix promotion from snooze if next state disabled # # The commit 78eaa10f027c ("cpuidle: powernv/pseries: Auto-promotion of # snooze to deeper idle state") introduced a timeout for the snooze idle # state so that it could be eventually be promoted to a deeper idle # state. The snooze timeout value is static and set to the target # residency of the next idle state, which would train the cpuidle # governor to pick the next idle state eventually. # # The unfortunate side-effect of this is that if the next idle state(s) # is disabled, the CPU will forever remain in snooze, despite the fact # that the system is completely idle, and other deeper idle states are # available. # # This patch fixes the issue by dynamically setting the snooze timeout # to the target residency of the next enabled state on the device. # # Before Patch: # POWER8 : Only nap disabled. # $ cpupower monitor sleep 30 # sleep took 30.01297 seconds and exited with status 0 # |Idle_Stats # PKG |CORE|CPU | snoo | Nap | Fast # 0| 8| 0| 96.41| 0.00| 0.00 # 0| 8| 1| 96.43| 0.00| 0.00 # 0| 8| 2| 96.47| 0.00| 0.00 # 0| 8| 3| 96.35| 0.00| 0.00 # 0| 8| 4| 96.37| 0.00| 0.00 # 0| 8| 5| 96.37| 0.00| 0.00 # 0| 8| 6| 96.47| 0.00| 0.00 # 0| 8| 7| 96.47| 0.00| 0.00 # # POWER9: Shallow states (stop0lite, stop1lite, stop2lite, stop0, stop1, # stop2) disabled: # $ cpupower monitor sleep 30 # sleep took 30.05033 seconds and exited with status 0 # |Idle_Stats # PKG |CORE|CPU | snoo | stop | stop | stop | stop | stop | stop | stop | stop # 0| 16| 0| 89.79| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 # 0| 16| 1| 90.12| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 # 0| 16| 2| 90.21| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 # 0| 16| 3| 90.29| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 # # After Patch: # POWER8 : Only nap disabled. # $ cpupower monitor sleep 30 # sleep took 30.01200 seconds and exited with status 0 # |Idle_Stats # PKG |CORE|CPU | snoo | Nap | Fast # 0| 8| 0| 16.58| 0.00| 77.21 # 0| 8| 1| 18.42| 0.00| 75.38 # 0| 8| 2| 4.70| 0.00| 94.09 # 0| 8| 3| 17.06| 0.00| 81.73 # 0| 8| 4| 3.06| 0.00| 95.73 # 0| 8| 5| 7.00| 0.00| 96.80 # 0| 8| 6| 1.00| 0.00| 98.79 # 0| 8| 7| 5.62| 0.00| 94.17 # # POWER9: Shallow states (stop0lite, stop1lite, stop2lite, stop0, stop1, # stop2) disabled: # # $ cpupower monitor sleep 30 # sleep took 30.02110 seconds and exited with status 0 # |Idle_Stats # PKG |CORE|CPU | snoo | stop | stop | stop | stop | stop | stop | stop | stop # 0| 0| 0| 0.69| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 9.39| 89.70 # 0| 0| 1| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.05| 93.21 # 0| 0| 2| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 89.93 # 0| 0| 3| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 93.26 # # Fixes: 78eaa10f027c ("cpuidle: powernv/pseries: Auto-promotion of snooze to deeper idle state") # Cc: stable@vger.kernel.org # v4.2+ # Signed-off-by: Gautham R. Shenoy # Reviewed-by: Balbir Singh # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < git log --format=%s --max-count=1 0a4ec6aa035a52c422eceb2ed51ed88392a3d6c2 # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-next_85xx_stx_gp3_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- 85xx/stx_gp3_defconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-next_85xx_stx_gp3_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- INFO: Uncompressed kernel (size 0x4e0918) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x500000) Image Name: Linux-4.17.0-rc3-g0a4ec6a Created: Wed Jun 6 02:22:50 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2557744 Bytes = 2497.80 kB = 2.44 MB Load Address: 00000000 Entry Point: 00000000 Completed OK # rm -rf /kisskb/build/powerpc-next_85xx_stx_gp3_defconfig_powerpc-5.3 # Build took: 0:00:53.301336