PERFORCE change 163301 for review

[Alexander Motin]

http://perforce.freebsd.org/chv.cgi?CH=163301

Change 163301 by mav at mav_mavbook on 2009/06/01 20:18:12

	Do not use NCQ if we are not sure that controller supports it.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#6 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#6 (text+ko) ====

@@ -620,12 +620,13 @@
 	else
 		softc->quirks = DA_Q_NONE;
 
-	/* Check if the SIM does not want 6 byte commands */
+	/* Check if the SIM does not want queued commands */
 	xpt_setup_ccb(&cpi.ccb_h, periph->path, /*priority*/1);
 	cpi.ccb_h.func_code = XPT_PATH_INQ;
 	xpt_action((union ccb *)&cpi);
-	if (cpi.ccb_h.status == CAM_REQ_CMP && (cpi.hba_misc & PIM_NO_6_BYTE))
-		softc->quirks |= DA_Q_NO_6_BYTE;
+	if (cpi.ccb_h.status != CAM_REQ_CMP ||
+	    (cpi.hba_inquiry & PI_TAG_ABLE) == 0)
+		softc->flags &= ~DA_FLAG_CAN_NCQ;
 
 	TASK_INIT(&softc->sysctl_task, 0, dasysctlinit, periph);