Merge ~cyruslien/pc-enablement/+git/oem-fix-misc-cnl-tlp-estar-conf:master into ~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-tlp-estar-conf:master

[Cyrus Lien]

Spin down hard disk: APM level=1, timeout=5s

[Alex Tu (alextu)]

see comment inline:

from /etc/tlp.conf , it's only 2 parameters, why
# Disk advanced power management level: 1..254, 255 (max saving, min, off).
# Levels 1..127 may spin down the disk; 255 allowable on most drives.
# Separate values for multiple disks with spaces. Use the special value 'keep'
# to keep the hardware default for the particular disk.
# Default: 254 (AC), 128 (BAT)

#DISK_APM_LEVEL_ON_AC="254 254"
#DISK_APM_LEVEL_ON_BAT="128 128"

# Hard disk spin down timeout:
# 0: spin down disabled
# 1..240: timeouts from 5s to 20min (in units of 5s)
# 241..251: timeouts from 30min to 5.5 hours (in units of 30min)
# See 'man hdparm' for details.
# Separate values for multiple disks with spaces. Use the special value 'keep'
# to keep the hardware default for the particular disk.
# Default: <none>

#DISK_SPINDOWN_TIMEOUT_ON_AC="0 0"
#DISK_SPINDOWN_TIMEOUT_ON_BAT="0 0"

review: Needs Fixing

[Cyrus Lien (cyruslien)]

> see comment inline:
>
> from /etc/tlp.conf , it's only 2 parameters, why

Because there are 5 disks defined in 50-estar-default.conf:
DISK_DEVICES="mmcblk0 nvme0n1 sda sdb sdc"

> # Disk advanced power management level: 1..254, 255 (max saving, min, off).
> # Levels 1..127 may spin down the disk; 255 allowable on most drives.
> # Separate values for multiple disks with spaces. Use the special value 'keep'
> # to keep the hardware default for the particular disk.
> # Default: 254 (AC), 128 (BAT)
>
> #DISK_APM_LEVEL_ON_AC="254 254"
> #DISK_APM_LEVEL_ON_BAT="128 128"
>
> # Hard disk spin down timeout:
> # 0: spin down disabled
> # 1..240: timeouts from 5s to 20min (in units of 5s)
> # 241..251: timeouts from 30min to 5.5 hours (in units of 30min)
> # See 'man hdparm' for details.
> # Separate values for multiple disks with spaces. Use the special value 'keep'
> # to keep the hardware default for the particular disk.
> # Default: <none>
>
> #DISK_SPINDOWN_TIMEOUT_ON_AC="0 0"
> #DISK_SPINDOWN_TIMEOUT_ON_BAT="0 0"

diff --git a/debian/changelog b/debian/changelog
index debf25e..5ef9966 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+oem-fix-misc-cnl-tlp-estar-conf (5.0.3.3) focal; urgency=medium
+
+  * Add 70-hard-disk-spin-down.conf for power saving.
+
+ -- Cyrus Lien <[e-mail]>  Tue, 02 Jun 2020 19:25:41 +0800
+
 oem-fix-misc-cnl-tlp-estar-conf (5.0.3.2) focal; urgency=medium
 
   * rename 61-oem-usb-blacklist.conf to keep consistency.
diff --git a/etc/tlp.d/70-hard-disk-spin-down.conf b/etc/tlp.d/70-hard-disk-spin-down.conf
new file mode 100644
index 0000000..b869cc0
--- /dev/null
+++ b/etc/tlp.d/70-hard-disk-spin-down.conf
@@ -0,0 +1,6 @@
+
+DISK_APM_LEVEL_ON_AC="1 1 1 1 1"
+DISK_APM_LEVEL_ON_BAT="1 1 1 1 1"
+
+DISK_SPINDOWN_TIMEOUT_ON_AC="1 1 1 1 1"
+DISK_SPINDOWN_TIMEOUT_ON_BAT="1 1 1 1 1"