Add PCIe Active State Power Managment (may be irrelevant for many users); correctly set sysystemstate on throttlectl full/cut

3 files changed, 17 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce9e4831809c..e18277f1e121 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = throttlectl
 	pkgdesc = Command-line user discretion power managment utility
-	pkgver = 11
+	pkgver = 12
 	pkgrel = 1
 	url = https://bbs.archlinux.org/viewtopic.php?id=180762
 	arch = any
@@ -20,7 +20,7 @@ pkgbase = throttlectl
 	source = performance
 	source = systemstate
 	source = powermizer
-	sha512sums = 454afc229e60c64e74280c0eea64e5dd838f5c428c0aa13dd47e12c6b58d4477f7b2318a085bffc0b3df6550a80fc95d11f2b45aa64235b8fbb766c31d1a88d7
+	sha512sums = e4473785ffe7621b365581e90d81b7e89d6c44ec3a4af78cbf199d17b3573aa2ce7fcba90e67f2b89836d75d23cbd66859fa41bf55d9d49bc04f8e09f13532ce
 	sha512sums = 6254e73446a91ea7945b9e4db1a1047eb2055d93aee315006857711ab21cba140da3badcf5834d2628e4799494a069647d11aa378a9bac67691df8d8b3adc12f
 	sha512sums = 926f7c787aea8c1027f331fe2e9417ba8e4f15a79f51610baafeed5d0de86d8f41da92f4460c29a5ce251e7cc110e26c2c344931af91949dc529595cc18c0f0e
 	sha512sums = 5e9318698bac00e07680e58b8e1abdf93b38895f55040b68178cce0307a84624a1a9220470286b33219f1f16160c456fa4f016682c901d0e9bb7cf6c240458e8
diff --git a/PKGBUILD b/PKGBUILD
index 91a07da855c9..d3867eed0957 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Que Quotion <quequotion@mailinator.com>
 
 pkgname=throttlectl
-pkgver=11
+pkgver=12
 pkgrel=1
 pkgdesc="Command-line user discretion power managment utility"
 arch=('any')
@@ -16,7 +16,7 @@ source=('throttlectl'
         'performance'
         'systemstate'
         'powermizer')
-sha512sums=('454afc229e60c64e74280c0eea64e5dd838f5c428c0aa13dd47e12c6b58d4477f7b2318a085bffc0b3df6550a80fc95d11f2b45aa64235b8fbb766c31d1a88d7'
+sha512sums=('e4473785ffe7621b365581e90d81b7e89d6c44ec3a4af78cbf199d17b3573aa2ce7fcba90e67f2b89836d75d23cbd66859fa41bf55d9d49bc04f8e09f13532ce'
             '6254e73446a91ea7945b9e4db1a1047eb2055d93aee315006857711ab21cba140da3badcf5834d2628e4799494a069647d11aa378a9bac67691df8d8b3adc12f'
             '926f7c787aea8c1027f331fe2e9417ba8e4f15a79f51610baafeed5d0de86d8f41da92f4460c29a5ce251e7cc110e26c2c344931af91949dc529595cc18c0f0e'
             '5e9318698bac00e07680e58b8e1abdf93b38895f55040b68178cce0307a84624a1a9220470286b33219f1f16160c456fa4f016682c901d0e9bb7cf6c240458e8'
diff --git a/throttlectl b/throttlectl
index 924fcfd3c857..2d63b3e39625 100755
--- a/throttlectl
+++ b/throttlectl
@@ -30,6 +30,10 @@ config_help() {
 }
 
 throttle_system() {
+  # PCIe Active State Power Managment
+  [[-f /sys/module/pcie_aspm/parameters/policy ]] && \
+    printf "${PCIEASPMPOL}" > /sys/module/pcie_aspm/parameters/policy &
+
   # ENERGY_PERF_BIAS
   [[ -n "$(ls /sys/devices/system/cpu/cpu*/power/energy_perf_bias 2> /dev/null)" ]] && \
     printf "${ENERGYPERF}" | tee /sys/devices/system/cpu/cpu*/power/energy_perf_bias > /dev/null 2>&1 &
@@ -44,7 +48,7 @@ throttle_system() {
 
   # NMI watchdog
   [[ -f /proc/sys/kernel/watchdog ]] && \
-      printf "${NMIDOG}" > /proc/sys/kernel/watchdog &
+    printf "${NMIDOG}" > /proc/sys/kernel/watchdog &
 
   # SATA link power management
   [[ -n "$(ls /sys/class/scsi_host/host*/link_power_management_policy 2> /dev/null)" ]] && \
@@ -97,6 +101,10 @@ throttle_system() {
 }
 
 check_system() {
+  [[ -f /sys/module/pcie_aspm/parameters/policy ]] && \
+    echo -e "\nPCIe Active State Power Management\n"\
+            "/sys/module/pcie_aspm/parameters/policy\t$(cat /sys/module/pcie_aspm/parameters/policy)"
+
     printf "\nEnergy Perf Bias\n" && \
   for i in /sys/devices/system/cpu/cpu*/power/energy_perf_bias; do \
     printf " ${i}\n$(cat ${i})\n"; done | sed 's|/sys/devices/system/cpu/||g; s|/.*||g; N;s|\n|\t|'
@@ -230,7 +238,7 @@ while (( "$#" )); do
         check|status) check_system ;; esac
       [[ -n "$SYSTEM" ]] && throttle_system; shift "2"
       unset ENERGYPERF LAPTOP DIRTYWBC NMIDOG POLICY APM AAM CONTROL AUTOSUSPEND POWERSAVE CONTROLLER \
-            WLPOWERSAVE WOLA WOLB LEDBRIGHT SYSTEM
+            WLPOWERSAVE WOLA WOLB LEDBRIGHT SYSTEM PCIEASPMPOL
     ;;
     turbo)
       [[ -z "${XPSTURBO}" ]] && \
@@ -280,13 +288,13 @@ while (( "$#" )); do
     full|on|performance|start|cut|off|powersave|stop)
       case "${1}" in \
         cut|off|powersave|start) \
-          [[ -f /etc/throttle.d/powersave ]] && . /etc/throttle.d/powersave || config_help; SYSTEM="1" ;; \
+          [[ -f /etc/throttle.d/powersave ]] && . /etc/throttle.d/powersave || config_help; SYSTEM="0" ;; \
         full|on|performance|stop) \
-          [[ -f /etc/throttle.d/performance ]] && . /etc/throttle.d/performance || config_help; SYSTEM="0" ;; esac
+          [[ -f /etc/throttle.d/performance ]] && . /etc/throttle.d/performance || config_help; SYSTEM="1" ;; esac
       throttle_system; throttle_turbo; throttle_ht; throttle_gov; throttle_nvpm; throttle_backlight; shift
       unset GOVERNOR XPSTURBO HYPERTHREADS ENERGYPERF BACKLIGHT LAPTOP DIRTYWBC NMIDOG \
             POLICY APM AAM CONTROL{,S} AUTOSUSPEND{,S} POWERSAVE CONTROLLER \
-            WLPOWERSAVE WOLA WOLB LEDBRIGHT NVPM SYSTEM
+            WLPOWERSAVE WOLA WOLB LEDBRIGHT NVPM SYSTEM PCIEASPMPOL
     ;;
     check|status)
       check_system; check_turbo; check_ht; check_gov; check_nvpm; check_backlight; shift