[PATCH 2/4] fusion: fibre channel: properly wait for firmware target discovery to complete

[Michael Reed <mdr@sgi.com>]

[-- Attachment #1: Type: text/plain, Size: 250 bytes --]

Based upon a conversation I had with LSI's fibre channel firmware guru,
this patch adds another condition under which the driver waits for the
firmware link initialization / target discovery to complete.

Signed-off-by: Michael Reed <mdr@sgi.com>




[-- Attachment #2: fusion_target_discovery.patch --]
[-- Type: text/x-patch, Size: 685 bytes --]

--- srfu/drivers/message/fusion/mptfc.c	2006-07-28 16:17:04.022434296 -0500
+++ srf/drivers/message/fusion/mptfc.c	2006-07-28 16:18:50.190272034 -0500
@@ -675,7 +675,10 @@ mptfc_GetFcPortPage0(MPT_ADAPTER *ioc, i
 			 * if still doing discovery,
 			 * hang loose a while until finished
 			 */
-			if (pp0dest->PortState == MPI_FCPORTPAGE0_PORTSTATE_UNKNOWN) {
+			if ((pp0dest->PortState == MPI_FCPORTPAGE0_PORTSTATE_UNKNOWN) ||
+			    (pp0dest->PortState == MPI_FCPORTPAGE0_PORTSTATE_ONLINE &&
+			     (pp0dest->Flags & MPI_FCPORTPAGE0_FLAGS_ATTACH_TYPE_MASK)
+			      == MPI_FCPORTPAGE0_FLAGS_ATTACH_NO_INIT)) {
 				if (count-- > 0) {
 					msleep(100);
 					goto try_again;