Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull final round of SCSI updates from James Bottomley:
 "This is primarily another round of driver updates (bnx2fc, qla2xxx,
  qla4xxx) including the target mode driver for qla2xxx.  We've also got
  a couple of regression fixes (async scanning, broken this merge window
  and a fix to a long standing break in the scsi_wait_scan module)."

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (45 commits)
  [SCSI] fix scsi_wait_scan
  [SCSI] fix async probe regression
  [SCSI] be2iscsi: fix dma free size mismatch regression
  [SCSI] qla4xxx: Update driver version to 5.02.00-k17
  [SCSI] qla4xxx: Capture minidump for ISP82XX on firmware failure
  [SCSI] qla4xxx: Add change_queue_depth API support
  [SCSI] qla4xxx: Fix clear ddb mbx command failure issue.
  [SCSI] qla4xxx: Fix kernel panic during discovery logout.
  [SCSI] qla4xxx: Correct early completion of pending mbox.
  [SCSI] fcoe, bnx2fc, libfcoe: SW FCoE and bnx2fc use FCoE Syfs
  [SCSI] libfcoe: Add fcoe_sysfs
  [SCSI] bnx2fc: Allocate fcoe_ctlr with bnx2fc_interface, not as a member
  [SCSI] fcoe: Allocate fcoe_ctlr with fcoe_interface, not as a member
  [SCSI] Fix dm-multipath starvation when scsi host is busy
  [SCSI] ufs: fix potential NULL pointer dereferencing error in ufshcd_prove.
  [SCSI] qla2xxx: don't free pool that wasn't allocated
  [SCSI] mptfusion: unlock on error in mpt_config()
  [SCSI] tcm_qla2xxx: Add >= 24xx series fabric module for target-core
  [SCSI] qla2xxx: Add LLD target-mode infrastructure for >= 24xx series
  [SCSI] Revert "qla2xxx: During loopdown perform Diagnostic loopback."
  ...

2 files changed, 151 insertions, 0 deletions

diff --git a/include/scsi/fcoe_sysfs.h b/include/scsi/fcoe_sysfs.h
new file mode 100644
index 000000000000..604cb9bb3e76
--- /dev/null
+++ b/include/scsi/fcoe_sysfs.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2011-2012 Intel Corporation.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+
+#ifndef FCOE_SYSFS
+#define FCOE_SYSFS
+
+#include <linux/if_ether.h>
+#include <linux/device.h>
+#include <scsi/fc/fc_fcoe.h>
+
+struct fcoe_ctlr_device;
+struct fcoe_fcf_device;
+
+struct fcoe_sysfs_function_template {
+        void (*get_fcoe_ctlr_link_fail)(struct fcoe_ctlr_device *);
+        void (*get_fcoe_ctlr_vlink_fail)(struct fcoe_ctlr_device *);
+        void (*get_fcoe_ctlr_miss_fka)(struct fcoe_ctlr_device *);
+        void (*get_fcoe_ctlr_symb_err)(struct fcoe_ctlr_device *);
+        void (*get_fcoe_ctlr_err_block)(struct fcoe_ctlr_device *);
+        void (*get_fcoe_ctlr_fcs_error)(struct fcoe_ctlr_device *);
+        void (*get_fcoe_ctlr_mode)(struct fcoe_ctlr_device *);
+        void (*get_fcoe_fcf_selected)(struct fcoe_fcf_device *);
+        void (*get_fcoe_fcf_vlan_id)(struct fcoe_fcf_device *);
+};
+
+#define dev_to_ctlr(d)                                  \
+        container_of((d), struct fcoe_ctlr_device, dev)
+
+enum fip_conn_type {
+        FIP_CONN_TYPE_UNKNOWN,
+        FIP_CONN_TYPE_FABRIC,
+        FIP_CONN_TYPE_VN2VN,
+};
+
+struct fcoe_ctlr_device {
+        u32                             id;
+
+        struct device                   dev;
+        struct fcoe_sysfs_function_template *f;
+
+        struct list_head                fcfs;
+        char                            work_q_name[20];
+        struct workqueue_struct         *work_q;
+        char                            devloss_work_q_name[20];
+        struct workqueue_struct         *devloss_work_q;
+        struct mutex                    lock;
+
+        int                             fcf_dev_loss_tmo;
+        enum fip_conn_type              mode;
+
+        /* expected in host order for displaying */
+        struct fcoe_fc_els_lesb         lesb;
+};
+
+static inline void *fcoe_ctlr_device_priv(const struct fcoe_ctlr_device *ctlr)
+{
+        return (void *)(ctlr + 1);
+}
+
+/* fcf states */
+enum fcf_state {
+        FCOE_FCF_STATE_UNKNOWN,
+        FCOE_FCF_STATE_DISCONNECTED,
+        FCOE_FCF_STATE_CONNECTED,
+        FCOE_FCF_STATE_DELETED,
+};
+
+struct fcoe_fcf_device {
+        u32                 id;
+        struct device       dev;
+        struct list_head    peers;
+        struct work_struct  delete_work;
+        struct delayed_work dev_loss_work;
+        u32                 dev_loss_tmo;
+        void                *priv;
+        enum fcf_state      state;
+
+        u64                 fabric_name;
+        u64                 switch_name;
+        u32                 fc_map;
+        u16                 vfid;
+        u8                  mac[ETH_ALEN];
+        u8                  priority;
+        u32                 fka_period;
+        u8                  selected;
+        u16                 vlan_id;
+};
+
+#define dev_to_fcf(d)                                   \
+        container_of((d), struct fcoe_fcf_device, dev)
+/* parentage should never be missing */
+#define fcoe_fcf_dev_to_ctlr_dev(x)             \
+        dev_to_ctlr((x)->dev.parent)
+#define fcoe_fcf_device_priv(x)                 \
+        ((x)->priv)
+
+struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
+                            struct fcoe_sysfs_function_template *f,
+                            int priv_size);
+void fcoe_ctlr_device_delete(struct fcoe_ctlr_device *);
+struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *,
+                                            struct fcoe_fcf_device *);
+void fcoe_fcf_device_delete(struct fcoe_fcf_device *);
+
+int __init fcoe_sysfs_setup(void);
+void __exit fcoe_sysfs_teardown(void);
+
+#endif /* FCOE_SYSFS */
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index cfdb55f0937e..22b07cc99808 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -29,6 +29,7 @@
 #include <linux/random.h>
 #include <scsi/fc/fc_fcoe.h>
 #include <scsi/libfc.h>
+#include <scsi/fcoe_sysfs.h>
 
 #define FCOE_MAX_CMD_LEN        16      /* Supported CDB length */
 
@@ -159,8 +160,24 @@ struct fcoe_ctlr {
 };
 
 /**
+ * fcoe_ctlr_priv() - Return the private data from a fcoe_ctlr
+ * @cltr: The fcoe_ctlr whose private data will be returned
+ */
+static inline void *fcoe_ctlr_priv(const struct fcoe_ctlr *ctlr)
+{
+        return (void *)(ctlr + 1);
+}
+
+#define fcoe_ctlr_to_ctlr_dev(x)                                        \
+        (struct fcoe_ctlr_device *)(((struct fcoe_ctlr_device *)(x)) - 1)
+
+/**
  * struct fcoe_fcf - Fibre-Channel Forwarder
  * @list:        list linkage
+ * @event_work:  Work for FC Transport actions queue
+ * @event:       The event to be processed
+ * @fip:         The controller that the FCF was discovered on
+ * @fcf_dev:     The associated fcoe_fcf_device instance
  * @time:        system time (jiffies) when an advertisement was last received
  * @switch_name: WWN of switch from advertisement
  * @fabric_name: WWN of fabric from advertisement
@@ -182,6 +199,9 @@ struct fcoe_ctlr {
  */
 struct fcoe_fcf {
         struct list_head list;
+        struct work_struct event_work;
+        struct fcoe_ctlr *fip;
+        struct fcoe_fcf_device *fcf_dev;
         unsigned long time;
 
         u64 switch_name;
@@ -198,6 +218,9 @@ struct fcoe_fcf {
         u8 fd_flags:1;
 };
 
+#define fcoe_fcf_to_fcf_dev(x)                  \
+        ((x)->fcf_dev)
+
 /**
  * struct fcoe_rport - VN2VN remote port
  * @time:       time of create or last beacon packet received from node
@@ -333,6 +356,10 @@ void fcoe_queue_timer(ulong lport);
 int fcoe_get_paged_crc_eof(struct sk_buff *skb, int tlen,
                            struct fcoe_percpu_s *fps);
 
+/* FCoE Sysfs helpers */
+void fcoe_fcf_get_selected(struct fcoe_fcf_device *);
+void fcoe_ctlr_get_fip_mode(struct fcoe_ctlr_device *);
+
 /**
  * struct netdev_list
  * A mapping from netdevice to fcoe_transport