PERFORCE change 169061 for review

Alexander Motin mav at FreeBSD.org
Wed Sep 30 18:35:17 UTC 2009


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

Change 169061 by mav at mav_mavbook on 2009/09/30 18:34:24

	Rework old devices workaround.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#37 edit

Differences ...

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

@@ -668,9 +668,6 @@
 
 			path->device->flags |= CAM_DEV_IDENTIFY_DATA_VALID;
 			ata_device_transport(path);
-			/* Old PIO devices do not need mode setting. */
-			if ((ident_buf->capabilities1 & ATA_SUPPORT_IORDY) == 0)
-				goto modedone;
 			PROBE_SET_ACTION(softc, PROBE_SETMODE);
 			xpt_release_ccb(done_ccb);
 			xpt_schedule(periph, priority);
@@ -725,6 +722,10 @@
 			xpt_release_devq(done_ccb->ccb_h.path, /*count*/1,
 					 /*run_queue*/TRUE);
 		}
+		/* Old PIO2 devices may not support mode setting. */
+		if (ata_max_pmode(ident_buf) <= ATA_PIO2 &&
+		    (ident_buf->capabilities1 & ATA_SUPPORT_IORDY) == 0)
+			goto modedone;
 		goto device_fail;
 	}
 	case PROBE_INQUIRY:


More information about the p4-projects mailing list