Changeset 2960

Timestamp:

10/17/09 20:14:17 (4 years ago)

Author:

chrfranke

Message:

Add missing check for log page 0x11 support to smartctl
'-l sataphy' option.

Location:

trunk/smartmontools

Files:

• CHANGELOG (modified) (2 diffs)
• ataprint.cpp (modified) (3 diffs)

trunk/smartmontools/CHANGELOG

@@ -43 +43 @@
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [CF] Add missing check for log page 0x11 support to smartctl
+       '-l sataphy' option.
+
   [CF] Add USB ID of Freecom Hard Drive XS.
 
-  [AS] Linux: Autodetect DELL PERC and MegaRAID controllers. 
-       Hiding debug messages coming from megaraid code.  
+  [AS] Linux: Autodetect DELL PERC and MegaRAID controllers.
+       Hiding debug messages coming from megaraid code.
 
   [AS] Linux: Fixed SATA drives support on megaraid device (see ticket #15).
@@ -59 +62 @@
   [AS] FreeBSD: cam_get_umassno rewritten using XPT_PATH_INQ
 
-  [AS] FreeBSD: do not open/close cam device on every request for SCSI 
+  [AS] FreeBSD: do not open/close cam device on every request for SCSI
        disks. Use com->camdev both for SCSI and ATAPICAM.
 

trunk/smartmontools/ataprint.cpp

@@ -2052 +2052 @@
   const ata_smart_log_directory * smartlogdir = 0, * gplogdir = 0;
 
-  if (   options.gp_logdir || options.smart_logdir
-      || options.sataphy || options.smart_ext_error_log
+  if (   options.gp_logdir
+      || options.smart_logdir
+      || options.smart_ext_error_log
       || options.smart_ext_selftest_log
-      || !options.log_requests.empty()                 ) {
+      || options.sataphy
+      || !options.log_requests.empty() ) {
     PRINT_ON(con);
     if (isGeneralPurposeLoggingCapable(&drive))
@@ -2064 +2066 @@
     bool need_gp_logdir    = (   options.gp_logdir
                               || options.smart_ext_error_log
-                              || options.smart_ext_selftest_log);
+                              || options.smart_ext_selftest_log
+                              || options.sataphy               );
     unsigned i;
     for (i = 0; i < options.log_requests.size(); i++) {
@@ -2324 +2327 @@
   // Print SATA Phy Event Counters
   if (options.sataphy) {
-    unsigned char log_11[512] = {0, };
-    unsigned char features = (options.sataphy_reset ? 0x01 : 0x00);
-    if (!ataReadLogExt(device, 0x11, features, 0, log_11, 1))
-      failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
-    else
-      PrintSataPhyEventCounters(log_11, options.sataphy_reset);
+    unsigned nsectors = GetNumLogSectors(gplogdir, 0x11, true);
+    if (!nsectors)
+      pout("SATA Phy Event Counters (GP Log 0x11) not supported\n");
+    else if (nsectors != 1)
+      pout("SATA Phy Event Counters with %u sectors not supported\n", nsectors);
+    else {
+      unsigned char log_11[512] = {0, };
+      unsigned char features = (options.sataphy_reset ? 0x01 : 0x00);
+      if (!ataReadLogExt(device, 0x11, features, 0, log_11, 1))
+        failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
+      else
+        PrintSataPhyEventCounters(log_11, options.sataphy_reset);
+    }
   }