tlp-stat -d: distinguish SATA from ATA(IDE) disks

9base · Nov 7, 2020 · 2440277 · 2440277
1 parent 2278e6d
commit 2440277
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/changelog b/changelog
@@ -12,6 +12,7 @@
       - Discharge malfunction: hint to check battery, charger
     Disks:
       - tlp-stat -d
+        - Distinguish SATA from ATA(IDE) disks
         - Show disks attached to SATA links/ports
         - Show a disk's host
         - Show ALPM state in the sysfs directory of the AHCI host

diff --git a/func.d/15-tlp-func-disk b/func.d/15-tlp-func-disk
@@ -26,7 +26,7 @@ readonly DISK_NOP_WORDS="_ keep"
 get_disk_dev () { # translate disk id to device (sdX)
     # $1: id or device (sans /dev)
     # retval: $_disk_dev, $_disk_id, $_disk_type
-    local bus dpath path
+    local bus dpath dpath2 path
 
     if [ -h /dev/disk/by-id/$1 ]; then
         # $1 is disk id
@@ -66,6 +66,15 @@ get_disk_dev () { # translate disk id to device (sdX)
                     ;;
             esac
         esac
+
+        if [ "$_disk_type" = "ata" ]; then
+            # distinguish sata from ata(ide) disks
+            dpath2="$($UDEVADM info -q property /dev/$_disk_dev 2>/dev/null | sed -n 's/^DEVPATH=/\/sys/; s/\/target.*//p')"
+            if ls ${dpath2}/scsi_host/host*/link_power_management_policy > /dev/null 2>&1; then
+                _disk_type=sata
+            fi
+        fi
+
         echo_debug "disk" "get_disk_dev($1): dev=$_disk_dev; type=$_disk_type; path=$path; bus=$bus; dpath=$dpath"
         return 0
     else
@@ -356,7 +365,7 @@ set_ahci_disk_runtime_pm () { # set runtime power management for ahci disks
             devbn=${device##/*/}
             get_disk_dev $devbn
             # consider only ahci == ata disks
-            if [ "$_disk_type" = "ata" ]; then
+            if [ "$_disk_type" = "sata" ] || [ "$_disk_type" = "ata" ]; then
                 # write timeout first because writing "auto" with the default
                 # timeout -1 still active will lockup the machine!
                 rc=0

diff --git a/func.d/tlp-func-stat b/func.d/tlp-func-stat
@@ -386,7 +386,7 @@ show_disk_data () { # formatted output of NVMe / SATA disk data
             # TODO: more features?
             ;;
 
-        ata|usb|ieee1394)
+        sata|ata|usb|ieee1394)
             # ATA/USB/IEEE1394 disk
             printf     "\n%s:\n" /dev/$_disk_dev
             [ -n "$_disk_id" ] && printf "  Disk ID    = %s\n" $_disk_id
@@ -427,7 +427,7 @@ show_disk_data () { # formatted output of NVMe / SATA disk data
                 1) printf "  TRIM       = supported\n" ;;
             esac
 
-            if [ "$_disk_type" = "ata" ]; then
+            if [ "$_disk_type" = "sata" ] || [ "$_disk_type" = "ata" ]; then
                 get_ahci_host $_disk_dev && printf    "  Host       = %s\n" $_ahci_host
             fi
 
@@ -472,7 +472,7 @@ show_disk_data () { # formatted output of NVMe / SATA disk data
                     sed 's/^/    /'
             ;;
 
-        ata|usb)
+        sata|ata|usb)
             printf "\n  SMART info:\n"
             $SMARTCTL -A /dev/$_disk_dev | grep -v '<==' | \
                 awk -F ' ' '$2 ~ /Power_Cycle_Count|Start_Stop_Count|Load_Cycle_Count|Reallocated_Sector_Ct/ \

diff --git a/tlp-stat.in b/tlp-stat.in
@@ -585,7 +585,7 @@ if [ "$show_disk" = "1" ] || [ "$show_all" = "1" ]; then
 
     # --- show sata alpm mode
     if stat -t ${ALPMD}/link_power_management_policy > /dev/null 2>&1; then
-        echo "+++ AHCI Link Power Management (ALPM) :: SATA Links"
+        echo "+++ AHCI Link Power Management (ALPM) :: Links"
         for i in ${ALPMD} ; do
             printparm_ahci $i/link_power_management_policy
         done
@@ -594,7 +594,7 @@ if [ "$show_disk" = "1" ] || [ "$show_all" = "1" ]; then
 
     # --- show ahci runtime pm
     if stat -t ${AHCID}/power > /dev/null 2>&1; then
-        echo "+++ AHCI Port Runtime Power Management :: SATA Ports"
+        echo "+++ AHCI Port Runtime Power Management :: Ports"
         for dev in ${AHCID}/power ; do
             printparm_ahci $dev/control
         done