PERFORCE change 173273 for review

[Alexander Motin]

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

Change 173273 by mav at mav_mavtest on 2010/01/17 16:30:57

	Make ahci, siis and ata initiate bus rescan on SATA physical events.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#94 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#47 edit
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#34 edit

Differences ...

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

@@ -1117,6 +1117,8 @@
 
 	if ((serr & ATA_SE_PHY_CHANGED) && (ch->pm_level == 0)) {
 		u_int32_t status = ATA_INL(ch->r_mem, AHCI_P_SSTS);
+		union ccb *ccb;
+
 		if (((status & ATA_SS_DET_MASK) == ATA_SS_DET_PHY_ONLINE) &&
 		    ((status & ATA_SS_SPD_MASK) != ATA_SS_SPD_NO_SPEED) &&
 		    ((status & ATA_SS_IPM_MASK) == ATA_SS_IPM_ACTIVE)) {
@@ -1128,6 +1130,15 @@
 				device_printf(dev, "DISCONNECT requested\n");
 			ch->devices = 0;
 		}
+		if ((ccb = xpt_alloc_ccb_nowait()) == NULL)
+			return;
+		if (xpt_create_path(&ccb->ccb_h.path, NULL,
+		    cam_sim_path(ch->sim),
+		    CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
+			xpt_free_ccb(ccb);
+			return;
+		}
+		xpt_rescan(ccb);
 	}
 }
 

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#47 (text+ko) ====

@@ -55,7 +55,6 @@
 #include <cam/cam_ccb.h>
 #include <cam/cam_sim.h>
 #include <cam/cam_xpt_sim.h>
-#include <cam/cam_xpt_periph.h>
 #include <cam/cam_debug.h>
 #endif
 
@@ -289,12 +288,26 @@
 static void
 ata_conn_event(void *context, int dummy)
 {
-    device_t dev = (device_t)context;
-    struct ata_channel *ch = device_get_softc(dev);
+	device_t dev = (device_t)context;
+	struct ata_channel *ch = device_get_softc(dev);
+#ifdef ATA_CAM
+	union ccb *ccb;
+#endif
 
-    mtx_lock(&ch->state_mtx);
-    ata_reinit(dev);
-    mtx_unlock(&ch->state_mtx);
+	mtx_lock(&ch->state_mtx);
+	ata_reinit(dev);
+	mtx_unlock(&ch->state_mtx);
+#ifdef ATA_CAM
+	if ((ccb = xpt_alloc_ccb()) == NULL)
+		return;
+	if (xpt_create_path(&ccb->ccb_h.path, NULL,
+	    cam_sim_path(ch->sim),
+	    CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
+		xpt_free_ccb(ccb);
+		return;
+	}
+	xpt_rescan(ccb);
+#endif
 }
 
 int

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

@@ -739,6 +739,8 @@
 	/* If we have a connection event, deal with it */
 	if (ch->pm_level == 0) {
 		u_int32_t status = ATA_INL(ch->r_mem, SIIS_P_SSTS);
+		union ccb *ccb;
+
 		if (((status & ATA_SS_DET_MASK) == ATA_SS_DET_PHY_ONLINE) &&
 		    ((status & ATA_SS_SPD_MASK) != ATA_SS_SPD_NO_SPEED) &&
 		    ((status & ATA_SS_IPM_MASK) == ATA_SS_IPM_ACTIVE)) {
@@ -750,6 +752,15 @@
 				device_printf(dev, "DISCONNECT requested\n");
 			ch->devices = 0;
 		}
+		if ((ccb = xpt_alloc_ccb_nowait()) == NULL)
+			return;
+		if (xpt_create_path(&ccb->ccb_h.path, NULL,
+		    cam_sim_path(ch->sim),
+		    CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
+			xpt_free_ccb(ccb);
+			return;
+		}
+		xpt_rescan(ccb);
 	}
 }