PERFORCE change 173321 for review

[Alexander Motin]

http://p4web.freebsd.org/chv.cgi?CH=173321

Change 173321 by mav at mav_mavtest on 2010/01/18 15:39:43

	Freeze simq while doing reset.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#95 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#95 (text+ko) ====

@@ -1949,6 +1949,7 @@
 	struct ahci_controller *ctlr = device_get_softc(device_get_parent(dev));
 	int i;
 
+	xpt_freeze_simq(ch->sim, 1);
 	if (bootverbose)
 		device_printf(dev, "AHCI reset...\n");
 	/* Requeue freezed command. */
@@ -1991,6 +1992,7 @@
 		/* Enable wanted port interrupts */
 		ATA_OUTL(ch->r_mem, AHCI_P_IE,
 		    (AHCI_P_IX_CPD | AHCI_P_IX_PRC | AHCI_P_IX_PC));
+		xpt_release_simq(ch->sim, TRUE);
 		return;
 	}
 	/* Wait for clearing busy status. */
@@ -2009,6 +2011,7 @@
 	      AHCI_P_IX_DS | AHCI_P_IX_PS | (ctlr->ccc ? 0 : AHCI_P_IX_DHR)));
 	if (bootverbose)
 		device_printf(dev, "AHCI reset done: device found\n");
+	xpt_release_simq(ch->sim, TRUE);
 }
 
 static int