svn commit: r215454 - head/sys/cam/ata

[Alexander Motin]

Author: mav
Date: Thu Nov 18 13:38:33 2010
New Revision: 215454
URL: http://svn.freebsd.org/changeset/base/215454

Log:
  If HBA doesn't report user-enabled SATA capabilies (like ATA_CAM wrapper) -
  handle all of them as disabled. This was original cause of the problem,
  workarounded by r215453.
  
  MFC after:	1 week

Modified:
  head/sys/cam/ata/ata_xpt.c

Modified: head/sys/cam/ata/ata_xpt.c
==============================================================================
--- head/sys/cam/ata/ata_xpt.c	Thu Nov 18 11:58:17 2010	(r215453)
+++ head/sys/cam/ata/ata_xpt.c	Thu Nov 18 13:38:33 2010	(r215454)
@@ -963,6 +963,8 @@ noerror:
 		xpt_action((union ccb *)&cts);
 		if (cts.xport_specific.sata.valid & CTS_SATA_VALID_CAPS)
 			caps &= cts.xport_specific.sata.caps;
+		else
+			caps = 0;
 		/* Store result to SIM. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
@@ -1103,6 +1105,8 @@ notsata:
 		xpt_action((union ccb *)&cts);
 		if (cts.xport_specific.sata.valid & CTS_SATA_VALID_CAPS)
 			caps &= cts.xport_specific.sata.caps;
+		else
+			caps = 0;
 		/* Store result to SIM. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);