aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2021-02-23 19:33:26 +0000
committerWarner Losh <imp@FreeBSD.org>2021-02-23 19:56:15 +0000
commit6b7580f7b1b66134286813b971ab575862b95426 (patch)
treebff27f2f9381a9fd8e9a600e5df5e148da81702c
parentef1a1fc7e828d640790fe849487221ef370a410a (diff)
downloadsrc-6b7580f7b1b66134286813b971ab575862b95426.tar.gz
src-6b7580f7b1b66134286813b971ab575862b95426.zip
camcontrol: change hueristic for I/O-less devtype
Some SATA drives have 'config' set to 0 in the identify block. Rather than rely on it, use the strings windows uses to display the drive since they are supposed to be space padded and will always be non-zero.
-rw-r--r--sbin/camcontrol/camcontrol.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index cc21a109343c..27d545d924b3 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -5520,9 +5520,14 @@ get_device_type(struct cam_device *dev, int retry_count, int timeout,
* For a retry count of -1, used only the cached data to avoid
* I/O to the drive. Sending the identify command to the drive
* can cause issues for SATL attachaed drives since identify is
- * not an NCQ command.
+ * not an NCQ command. We check for the strings that windows
+ * displays since those will not be NULs (they are supposed
+ * to be space padded). We could check other bits, but anything
+ * non-zero implies SATL.
*/
- if (cgd.ident_data.config != 0)
+ if (cgd.ident_data.serial[0] != 0 ||
+ cgd.ident_data.revision[0] != 0 ||
+ cgd.ident_data.model[0] != 0)
*devtype = CC_DT_SATL;
else
*devtype = CC_DT_SCSI;