[SCSI] fcoe: fix broken fcoe interface reset
authorVasu Dev <vasu.dev@intel.com>
Fri, 25 Feb 2011 23:03:28 +0000 (15:03 -0800)
committerJames Bottomley <James.Bottomley@suse.de>
Tue, 1 Mar 2011 00:34:18 +0000 (18:34 -0600)
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 <vasu.dev@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
drivers/scsi/fcoe/fcoe.c

index 0b44d05..94fb480 100644 (file)
@@ -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;
 }