Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (170 commits)
  [SCSI] scsi_dh_rdac: Add MD36xxf into device list
  [SCSI] scsi_debug: add consecutive medium errors
  [SCSI] libsas: fix ata list corruption issue
  [SCSI] hpsa: export resettable host attribute
  [SCSI] hpsa: move device attributes to avoid forward declarations
  [SCSI] scsi_debug: Logical Block Provisioning (SBC3r26)
  [SCSI] sd: Logical Block Provisioning update
  [SCSI] Include protection operation in SCSI command trace
  [SCSI] hpsa: fix incorrect PCI IDs and add two new ones (2nd try)
  [SCSI] target: Fix volume size misreporting for volumes > 2TB
  [SCSI] bnx2fc: Broadcom FCoE offload driver
  [SCSI] fcoe: fix broken fcoe interface reset
  [SCSI] fcoe: precedence bug in fcoe_filter_frames()
  [SCSI] libfcoe: Remove stale fcoe-netdev entries
  [SCSI] libfcoe: Move FCOE_MTU definition from fcoe.h to libfcoe.h
  [SCSI] libfc: introduce __fc_fill_fc_hdr that accepts fc_hdr as an argument
  [SCSI] fcoe, libfc: initialize EM anchors list and then update npiv EMs
  [SCSI] Revert "[SCSI] libfc: fix exchange being deleted when the abort itself is timed out"
  [SCSI] libfc: Fixing a memory leak when destroying an interface
  [SCSI] megaraid_sas: Version and Changelog update
  ...

Fix up trivial conflicts due to whitespace differences in
drivers/scsi/libsas/{sas_ata.c,sas_scsi_host.c}

5 files changed, 56 insertions, 97 deletions

diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
index a129a170b47b..fc2cdb62f53b 100644
--- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
+++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
@@ -105,7 +105,7 @@ static struct iscsi_transport cxgb3i_iscsi_transport = {
         /* owner and name should be set already */
         .caps           = CAP_RECOVERY_L0 | CAP_MULTI_R2T | CAP_HDRDGST
                                 | CAP_DATADGST | CAP_DIGEST_OFFLOAD |
-                                CAP_PADDING_OFFLOAD,
+                                CAP_PADDING_OFFLOAD | CAP_TEXT_NEGO,
         .param_mask     = ISCSI_MAX_RECV_DLENGTH | ISCSI_MAX_XMIT_DLENGTH |
                                 ISCSI_HDRDGST_EN | ISCSI_DATADGST_EN |
                                 ISCSI_INITIAL_R2T_EN | ISCSI_MAX_R2T |
@@ -137,7 +137,7 @@ static struct iscsi_transport cxgb3i_iscsi_transport = {
         .destroy_conn   = iscsi_tcp_conn_teardown,
         .start_conn     = iscsi_conn_start,
         .stop_conn      = iscsi_conn_stop,
-        .get_conn_param = cxgbi_get_conn_param,
+        .get_conn_param = iscsi_conn_get_param,
         .set_param      = cxgbi_set_conn_param,
         .get_stats      = cxgbi_get_conn_stats,
         /* pdu xmit req from user space */
@@ -152,6 +152,7 @@ static struct iscsi_transport cxgb3i_iscsi_transport = {
         .xmit_pdu       = cxgbi_conn_xmit_pdu,
         .parse_pdu_itt  = cxgbi_parse_pdu_itt,
         /* TCP connect/disconnect */
+        .get_ep_param   = cxgbi_get_ep_param,
         .ep_connect     = cxgbi_ep_connect,
         .ep_poll        = cxgbi_ep_poll,
         .ep_disconnect  = cxgbi_ep_disconnect,
@@ -1108,10 +1109,11 @@ static int ddp_set_map(struct cxgbi_sock *csk, struct cxgbi_pagepod_hdr *hdr,
                 csk, idx, npods, gl);
 
         for (i = 0; i < npods; i++, idx++, pm_addr += PPOD_SIZE) {
-                struct sk_buff *skb = ddp->gl_skb[idx];
+                struct sk_buff *skb = alloc_wr(sizeof(struct ulp_mem_io) +
+                                                PPOD_SIZE, 0, GFP_ATOMIC);
 
-                /* hold on to the skb until we clear the ddp mapping */
-                skb_get(skb);
+                if (!skb)
+                        return -ENOMEM;
 
                 ulp_mem_io_set_hdr(skb, pm_addr);
                 cxgbi_ddp_ppod_set((struct cxgbi_pagepod *)(skb->head +
@@ -1136,56 +1138,20 @@ static void ddp_clear_map(struct cxgbi_hba *chba, unsigned int tag,
                 cdev, idx, npods, tag);
 
         for (i = 0; i < npods; i++, idx++, pm_addr += PPOD_SIZE) {
-                struct sk_buff *skb = ddp->gl_skb[idx];
+                struct sk_buff *skb = alloc_wr(sizeof(struct ulp_mem_io) +
+                                                PPOD_SIZE, 0, GFP_ATOMIC);
 
                 if (!skb) {
-                        pr_err("tag 0x%x, 0x%x, %d/%u, skb NULL.\n",
+                        pr_err("tag 0x%x, 0x%x, %d/%u, skb OOM.\n",
                                 tag, idx, i, npods);
                         continue;
                 }
-                ddp->gl_skb[idx] = NULL;
-                memset(skb->head + sizeof(struct ulp_mem_io), 0, PPOD_SIZE);
                 ulp_mem_io_set_hdr(skb, pm_addr);
                 skb->priority = CPL_PRIORITY_CONTROL;
                 cxgb3_ofld_send(cdev->lldev, skb);
         }
 }
 
-static void ddp_free_gl_skb(struct cxgbi_ddp_info *ddp, int idx, int cnt)
-{
-        int i;
-
-        log_debug(1 << CXGBI_DBG_DDP,
-                "ddp 0x%p, idx %d, cnt %d.\n", ddp, idx, cnt);
-
-        for (i = 0; i < cnt; i++, idx++)
-                if (ddp->gl_skb[idx]) {
-                        kfree_skb(ddp->gl_skb[idx]);
-                        ddp->gl_skb[idx] = NULL;
-                }
-}
-
-static int ddp_alloc_gl_skb(struct cxgbi_ddp_info *ddp, int idx,
-                                   int cnt, gfp_t gfp)
-{
-        int i;
-
-        log_debug(1 << CXGBI_DBG_DDP,
-                "ddp 0x%p, idx %d, cnt %d.\n", ddp, idx, cnt);
-
-        for (i = 0; i < cnt; i++) {
-                struct sk_buff *skb = alloc_wr(sizeof(struct ulp_mem_io) +
-                                                PPOD_SIZE, 0, gfp);
-                if (skb)
-                        ddp->gl_skb[idx + i] = skb;
-                else {
-                        ddp_free_gl_skb(ddp, idx, i);
-                        return -ENOMEM;
-                }
-        }
-        return 0;
-}
-
 static int ddp_setup_conn_pgidx(struct cxgbi_sock *csk,
                                        unsigned int tid, int pg_idx, bool reply)
 {
@@ -1316,8 +1282,6 @@ static int cxgb3i_ddp_init(struct cxgbi_device *cdev)
         }
         tdev->ulp_iscsi = ddp;
 
-        cdev->csk_ddp_free_gl_skb = ddp_free_gl_skb;
-        cdev->csk_ddp_alloc_gl_skb = ddp_alloc_gl_skb;
         cdev->csk_ddp_setup_digest = ddp_setup_conn_digest;
         cdev->csk_ddp_setup_pgidx = ddp_setup_conn_pgidx;
         cdev->csk_ddp_set = ddp_set_map;
diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.h b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.h
index 5f5e3394b594..20593fd69d8f 100644
--- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.h
+++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.h
@@ -24,10 +24,21 @@
 
 extern cxgb3_cpl_handler_func cxgb3i_cpl_handlers[NUM_CPL_CMDS];
 
-#define cxgb3i_get_private_ipv4addr(ndev) \
-        (((struct port_info *)(netdev_priv(ndev)))->iscsi_ipv4addr)
-#define cxgb3i_set_private_ipv4addr(ndev, addr) \
-        (((struct port_info *)(netdev_priv(ndev)))->iscsi_ipv4addr) = addr
+static inline unsigned int cxgb3i_get_private_ipv4addr(struct net_device *ndev)
+{
+        return ((struct port_info *)(netdev_priv(ndev)))->iscsi_ipv4addr;
+}
+
+static inline void cxgb3i_set_private_ipv4addr(struct net_device *ndev,
+                                                unsigned int addr)
+{
+        struct port_info *pi =  (struct port_info *)netdev_priv(ndev);
+
+        pi->iscsic.flags = addr ? 1 : 0;
+        pi->iscsi_ipv4addr = addr;
+        if (addr)
+                memcpy(pi->iscsic.mac_addr, ndev->dev_addr, ETH_ALEN);
+}
 
 struct cpl_iscsi_hdr_norss {
         union opcode_tid ot;
diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
index 8c04fada710b..f3a4cd7cf782 100644
--- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
+++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
@@ -106,7 +106,7 @@ static struct iscsi_transport cxgb4i_iscsi_transport = {
         .name           = DRV_MODULE_NAME,
         .caps           = CAP_RECOVERY_L0 | CAP_MULTI_R2T | CAP_HDRDGST |
                                 CAP_DATADGST | CAP_DIGEST_OFFLOAD |
-                                CAP_PADDING_OFFLOAD,
+                                CAP_PADDING_OFFLOAD | CAP_TEXT_NEGO,
         .param_mask     = ISCSI_MAX_RECV_DLENGTH | ISCSI_MAX_XMIT_DLENGTH |
                                 ISCSI_HDRDGST_EN | ISCSI_DATADGST_EN |
                                 ISCSI_INITIAL_R2T_EN | ISCSI_MAX_R2T |
@@ -138,7 +138,7 @@ static struct iscsi_transport cxgb4i_iscsi_transport = {
         .destroy_conn   = iscsi_tcp_conn_teardown,
         .start_conn             = iscsi_conn_start,
         .stop_conn              = iscsi_conn_stop,
-        .get_conn_param = cxgbi_get_conn_param,
+        .get_conn_param = iscsi_conn_get_param,
         .set_param      = cxgbi_set_conn_param,
         .get_stats      = cxgbi_get_conn_stats,
         /* pdu xmit req from user space */
@@ -153,6 +153,7 @@ static struct iscsi_transport cxgb4i_iscsi_transport = {
         .xmit_pdu       = cxgbi_conn_xmit_pdu,
         .parse_pdu_itt  = cxgbi_parse_pdu_itt,
         /* TCP connect/disconnect */
+        .get_ep_param   = cxgbi_get_ep_param,
         .ep_connect     = cxgbi_ep_connect,
         .ep_poll        = cxgbi_ep_poll,
         .ep_disconnect  = cxgbi_ep_disconnect,
@@ -1425,8 +1426,6 @@ static int cxgb4i_ddp_init(struct cxgbi_device *cdev)
         cxgbi_ddp_page_size_factor(pgsz_factor);
         cxgb4_iscsi_init(lldi->ports[0], tagmask, pgsz_factor);
 
-        cdev->csk_ddp_free_gl_skb = NULL;
-        cdev->csk_ddp_alloc_gl_skb = NULL;
         cdev->csk_ddp_setup_digest = ddp_setup_conn_digest;
         cdev->csk_ddp_setup_pgidx = ddp_setup_conn_pgidx;
         cdev->csk_ddp_set = ddp_set_map;
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index a24dff9f9163..de764ea7419d 100644
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -530,6 +530,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
         csk->dst = dst;
         csk->daddr.sin_addr.s_addr = daddr->sin_addr.s_addr;
         csk->daddr.sin_port = daddr->sin_port;
+        csk->daddr.sin_family = daddr->sin_family;
         csk->saddr.sin_addr.s_addr = rt->rt_src;
 
         return csk;
@@ -1264,12 +1265,6 @@ static int ddp_tag_reserve(struct cxgbi_sock *csk, unsigned int tid,
                 return idx;
         }
 
-        if (cdev->csk_ddp_alloc_gl_skb) {
-                err = cdev->csk_ddp_alloc_gl_skb(ddp, idx, npods, gfp);
-                if (err < 0)
-                        goto unmark_entries;
-        }
-
         tag = cxgbi_ddp_tag_base(tformat, sw_tag);
         tag |= idx << PPOD_IDX_SHIFT;
 
@@ -1280,11 +1275,8 @@ static int ddp_tag_reserve(struct cxgbi_sock *csk, unsigned int tid,
         hdr.page_offset = htonl(gl->offset);
 
         err = cdev->csk_ddp_set(csk, &hdr, idx, npods, gl);
-        if (err < 0) {
-                if (cdev->csk_ddp_free_gl_skb)
-                        cdev->csk_ddp_free_gl_skb(ddp, idx, npods);
+        if (err < 0)
                 goto unmark_entries;
-        }
 
         ddp->idx_last = idx;
         log_debug(1 << CXGBI_DBG_DDP,
@@ -1350,8 +1342,6 @@ static void ddp_destroy(struct kref *kref)
                                         >> PPOD_PAGES_SHIFT;
                         pr_info("cdev 0x%p, ddp %d + %d.\n", cdev, i, npods);
                         kfree(gl);
-                        if (cdev->csk_ddp_free_gl_skb)
-                                cdev->csk_ddp_free_gl_skb(ddp, i, npods);
                         i += npods;
                 } else
                         i++;
@@ -1394,8 +1384,6 @@ int cxgbi_ddp_init(struct cxgbi_device *cdev,
                 return -ENOMEM;
         }
         ddp->gl_map = (struct cxgbi_gather_list **)(ddp + 1);
-        ddp->gl_skb = (struct sk_buff **)(((char *)ddp->gl_map) +
-                                ppmax * sizeof(struct cxgbi_gather_list *));
         cdev->ddp = ddp;
 
         spin_lock_init(&ddp->map_lock);
@@ -1895,13 +1883,16 @@ EXPORT_SYMBOL_GPL(cxgbi_conn_alloc_pdu);
 
 static inline void tx_skb_setmode(struct sk_buff *skb, int hcrc, int dcrc)
 {
-        u8 submode = 0;
+        if (hcrc || dcrc) {
+                u8 submode = 0;
 
-        if (hcrc)
-                submode |= 1;
-        if (dcrc)
-                submode |= 2;
-        cxgbi_skcb_ulp_mode(skb) = (ULP2_MODE_ISCSI << 4) | submode;
+                if (hcrc)
+                        submode |= 1;
+                if (dcrc)
+                        submode |= 2;
+                cxgbi_skcb_ulp_mode(skb) = (ULP2_MODE_ISCSI << 4) | submode;
+        } else
+                cxgbi_skcb_ulp_mode(skb) = 0;
 }
 
 int cxgbi_conn_init_pdu(struct iscsi_task *task, unsigned int offset,
@@ -2197,32 +2188,34 @@ int cxgbi_set_conn_param(struct iscsi_cls_conn *cls_conn,
 }
 EXPORT_SYMBOL_GPL(cxgbi_set_conn_param);
 
-int cxgbi_get_conn_param(struct iscsi_cls_conn *cls_conn,
-                        enum iscsi_param param, char *buf)
+int cxgbi_get_ep_param(struct iscsi_endpoint *ep, enum iscsi_param param,
+                       char *buf)
 {
-        struct iscsi_conn *iconn = cls_conn->dd_data;
+        struct cxgbi_endpoint *cep = ep->dd_data;
+        struct cxgbi_sock *csk;
         int len;
 
         log_debug(1 << CXGBI_DBG_ISCSI,
-                "cls_conn 0x%p, param %d.\n", cls_conn, param);
+                "cls_conn 0x%p, param %d.\n", ep, param);
 
         switch (param) {
         case ISCSI_PARAM_CONN_PORT:
-                spin_lock_bh(&iconn->session->lock);
-                len = sprintf(buf, "%hu\n", iconn->portal_port);
-                spin_unlock_bh(&iconn->session->lock);
-                break;
         case ISCSI_PARAM_CONN_ADDRESS:
-                spin_lock_bh(&iconn->session->lock);
-                len = sprintf(buf, "%s\n", iconn->portal_address);
-                spin_unlock_bh(&iconn->session->lock);
-                break;
+                if (!cep)
+                        return -ENOTCONN;
+
+                csk = cep->csk;
+                if (!csk)
+                        return -ENOTCONN;
+
+                return iscsi_conn_get_addr_param((struct sockaddr_storage *)
+                                                 &csk->daddr, param, buf);
         default:
-                return iscsi_conn_get_param(cls_conn, param, buf);
+                return -ENOSYS;
         }
         return len;
 }
-EXPORT_SYMBOL_GPL(cxgbi_get_conn_param);
+EXPORT_SYMBOL_GPL(cxgbi_get_ep_param);
 
 struct iscsi_cls_conn *
 cxgbi_create_conn(struct iscsi_cls_session *cls_session, u32 cid)
@@ -2289,11 +2282,6 @@ int cxgbi_bind_conn(struct iscsi_cls_session *cls_session,
         cxgbi_conn_max_xmit_dlength(conn);
         cxgbi_conn_max_recv_dlength(conn);
 
-        spin_lock_bh(&conn->session->lock);
-        sprintf(conn->portal_address, "%pI4", &csk->daddr.sin_addr.s_addr);
-        conn->portal_port = ntohs(csk->daddr.sin_port);
-        spin_unlock_bh(&conn->session->lock);
-
         log_debug(1 << CXGBI_DBG_ISCSI,
                 "cls 0x%p,0x%p, ep 0x%p, cconn 0x%p, csk 0x%p.\n",
                 cls_session, cls_conn, ep, cconn, csk);
diff --git a/drivers/scsi/cxgbi/libcxgbi.h b/drivers/scsi/cxgbi/libcxgbi.h
index c57d59db000c..0a20fd5f7102 100644
--- a/drivers/scsi/cxgbi/libcxgbi.h
+++ b/drivers/scsi/cxgbi/libcxgbi.h
@@ -131,7 +131,6 @@ struct cxgbi_ddp_info {
         unsigned int rsvd_tag_mask;
         spinlock_t map_lock;
         struct cxgbi_gather_list **gl_map;
-        struct sk_buff **gl_skb;
 };
 
 #define DDP_PGIDX_MAX           4
@@ -536,8 +535,6 @@ struct cxgbi_device {
         struct cxgbi_ddp_info *ddp;
 
         void (*dev_ddp_cleanup)(struct cxgbi_device *);
-        void (*csk_ddp_free_gl_skb)(struct cxgbi_ddp_info *, int, int);
-        int (*csk_ddp_alloc_gl_skb)(struct cxgbi_ddp_info *, int, int, gfp_t);
         int (*csk_ddp_set)(struct cxgbi_sock *, struct cxgbi_pagepod_hdr *,
                                 unsigned int, unsigned int,
                                 struct cxgbi_gather_list *);
@@ -715,7 +712,7 @@ void cxgbi_cleanup_task(struct iscsi_task *task);
 void cxgbi_get_conn_stats(struct iscsi_cls_conn *, struct iscsi_stats *);
 int cxgbi_set_conn_param(struct iscsi_cls_conn *,
                         enum iscsi_param, char *, int);
-int cxgbi_get_conn_param(struct iscsi_cls_conn *, enum iscsi_param, char *);
+int cxgbi_get_ep_param(struct iscsi_endpoint *ep, enum iscsi_param, char *);
 struct iscsi_cls_conn *cxgbi_create_conn(struct iscsi_cls_session *, u32);
 int cxgbi_bind_conn(struct iscsi_cls_session *,
                         struct iscsi_cls_conn *, u64, int);