[SCSI] fcoe: fix broken fcoe interface reset

Vasu Dev · James Bottomley · commit d2f809528a35 · 2011-02-28T18:34:18.000-06:00
Reset using "fcoeadm -r" also needs to restart FIP before
doing libfc lport reset, this is needed for new switch firmware
requiring FIP solicitation before doing FLOGI again during reset.
So this patch does this by doing fcoe_ctlr_link_down and then
fcoe_ctlr_link_up to reset the interface.

The fcoe_ctlr_link_down call path also does lport reset
and then fcoe_ctlr_link_up re-starts the fabric login after
doing FIP solicitation first to get reset feature working
again.

Signed-off-by: Vasu Dev &lt;vasu.dev@intel.com&gt;
Tested-by: Ross Brattain &lt;ross.b.brattain@intel.com&gt;
Signed-off-by: Robert Love &lt;robert.w.love@intel.com&gt;
Signed-off-by: James Bottomley &lt;James.Bottomley@suse.de&gt;
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
@@ -2130,7 +2130,13 @@ void fcoe_percpu_clean(struct fc_lport *lport)
 int fcoe_reset(struct Scsi_Host *shost)
 {
 	struct fc_lport *lport = shost_priv(shost);
-	fc_lport_reset(lport);
+	struct fcoe_port *port = lport_priv(lport);
+	struct fcoe_interface *fcoe = port->priv;
+
+	fcoe_ctlr_link_down(&fcoe->ctlr);
+	fcoe_clean_pending_queue(fcoe->ctlr.lp);
+	if (!fcoe_link_ok(fcoe->ctlr.lp))
+		fcoe_ctlr_link_up(&fcoe->ctlr);
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2130,7 +2130,13 @@ void fcoe_percpu_clean(struct fc_lport *lport)`
`2130`	`2130`	`int fcoe_reset(struct Scsi_Host *shost)`
`2131`	`2131`	`{`
`2132`	`2132`	`struct fc_lport *lport = shost_priv(shost);`
`2133`		`- fc_lport_reset(lport);`
	`2133`	`+ struct fcoe_port *port = lport_priv(lport);`
	`2134`	`+ struct fcoe_interface *fcoe = port->priv;`
	`2135`	`+`
	`2136`	`+ fcoe_ctlr_link_down(&fcoe->ctlr);`
	`2137`	`+ fcoe_clean_pending_queue(fcoe->ctlr.lp);`
	`2138`	`+ if (!fcoe_link_ok(fcoe->ctlr.lp))`
	`2139`	`+ fcoe_ctlr_link_up(&fcoe->ctlr);`
`2134`	`2140`	`return 0;`
`2135`	`2141`	`}`
`2136`	`2142`