[SCSI] zfcp: Update dbf calls
[safe/jmp/linux-2.6] / drivers / s390 / scsi / zfcp_fc.c
index 396f05e..309f1df 100644 (file)
@@ -3,7 +3,7 @@
  *
  * Fibre Channel related functions for the zfcp device driver.
  *
- * Copyright IBM Corporation 2008
+ * Copyright IBM Corporation 2008, 2009
  */
 
 #define KMSG_COMPONENT "zfcp"
@@ -25,14 +25,6 @@ static u32 rscn_range_mask[] = {
        [RSCN_FABRIC_ADDRESS]           = 0x000000,
 };
 
-struct ct_iu_gpn_ft_req {
-       struct ct_hdr header;
-       u8 flags;
-       u8 domain_id_scope;
-       u8 area_id_scope;
-       u8 fc4_type;
-} __attribute__ ((packed));
-
 struct gpn_ft_resp_acc {
        u8 control;
        u8 port_id[3];
@@ -40,9 +32,12 @@ struct gpn_ft_resp_acc {
        u64 wwpn;
 } __attribute__ ((packed));
 
-#define ZFCP_GPN_FT_ENTRIES ((PAGE_SIZE - sizeof(struct ct_hdr)) \
-                               / sizeof(struct gpn_ft_resp_acc))
+#define ZFCP_CT_SIZE_ONE_PAGE  (PAGE_SIZE - sizeof(struct ct_hdr))
+#define ZFCP_GPN_FT_ENTRIES    (ZFCP_CT_SIZE_ONE_PAGE \
+                                       / sizeof(struct gpn_ft_resp_acc))
 #define ZFCP_GPN_FT_BUFFERS 4
+#define ZFCP_GPN_FT_MAX_SIZE (ZFCP_GPN_FT_BUFFERS * PAGE_SIZE \
+                               - sizeof(struct ct_hdr))
 #define ZFCP_GPN_FT_MAX_ENTRIES ZFCP_GPN_FT_BUFFERS * (ZFCP_GPN_FT_ENTRIES + 1)
 
 struct ct_iu_gpn_ft_resp {
@@ -76,11 +71,9 @@ static int zfcp_wka_port_get(struct zfcp_wka_port *wka_port)
 
        mutex_unlock(&wka_port->mutex);
 
-       wait_event_timeout(
-               wka_port->completion_wq,
-               wka_port->status == ZFCP_WKA_PORT_ONLINE ||
-               wka_port->status == ZFCP_WKA_PORT_OFFLINE,
-               HZ >> 1);
+       wait_event(wka_port->completion_wq,
+                  wka_port->status == ZFCP_WKA_PORT_ONLINE ||
+                  wka_port->status == ZFCP_WKA_PORT_OFFLINE);
 
        if (wka_port->status == ZFCP_WKA_PORT_ONLINE) {
                atomic_inc(&wka_port->refcount);
@@ -91,13 +84,10 @@ static int zfcp_wka_port_get(struct zfcp_wka_port *wka_port)
 
 static void zfcp_wka_port_offline(struct work_struct *work)
 {
-       struct delayed_work *dw = container_of(work, struct delayed_work, work);
+       struct delayed_work *dw = to_delayed_work(work);
        struct zfcp_wka_port *wka_port =
                        container_of(dw, struct zfcp_wka_port, work);
 
-       wait_event(wka_port->completion_wq,
-                       atomic_read(&wka_port->refcount) == 0);
-
        mutex_lock(&wka_port->mutex);
        if ((atomic_read(&wka_port->refcount) != 0) ||
            (wka_port->status != ZFCP_WKA_PORT_ONLINE))
@@ -116,18 +106,17 @@ static void zfcp_wka_port_put(struct zfcp_wka_port *wka_port)
 {
        if (atomic_dec_return(&wka_port->refcount) != 0)
                return;
-       /* wait 10 miliseconds, other reqs might pop in */
+       /* wait 10 milliseconds, other reqs might pop in */
        schedule_delayed_work(&wka_port->work, HZ / 100);
 }
 
-void zfcp_fc_nameserver_init(struct zfcp_adapter *adapter)
+static void zfcp_fc_wka_port_init(struct zfcp_wka_port *wka_port, u32 d_id,
+                                 struct zfcp_adapter *adapter)
 {
-       struct zfcp_wka_port *wka_port = &adapter->nsp;
-
        init_waitqueue_head(&wka_port->completion_wq);
 
        wka_port->adapter = adapter;
-       wka_port->d_id = ZFCP_DID_DIRECTORY_SERVICE;
+       wka_port->d_id = d_id;
 
        wka_port->status = ZFCP_WKA_PORT_OFFLINE;
        atomic_set(&wka_port->refcount, 0);
@@ -135,6 +124,34 @@ void zfcp_fc_nameserver_init(struct zfcp_adapter *adapter)
        INIT_DELAYED_WORK(&wka_port->work, zfcp_wka_port_offline);
 }
 
+static void zfcp_fc_wka_port_force_offline(struct zfcp_wka_port *wka)
+{
+       cancel_delayed_work_sync(&wka->work);
+       mutex_lock(&wka->mutex);
+       wka->status = ZFCP_WKA_PORT_OFFLINE;
+       mutex_unlock(&wka->mutex);
+}
+
+void zfcp_fc_wka_ports_force_offline(struct zfcp_wka_ports *gs)
+{
+       zfcp_fc_wka_port_force_offline(&gs->ms);
+       zfcp_fc_wka_port_force_offline(&gs->ts);
+       zfcp_fc_wka_port_force_offline(&gs->ds);
+       zfcp_fc_wka_port_force_offline(&gs->as);
+       zfcp_fc_wka_port_force_offline(&gs->ks);
+}
+
+void zfcp_fc_wka_ports_init(struct zfcp_adapter *adapter)
+{
+       struct zfcp_wka_ports *gs = adapter->gs;
+
+       zfcp_fc_wka_port_init(&gs->ms, FC_FID_MGMT_SERV, adapter);
+       zfcp_fc_wka_port_init(&gs->ts, FC_FID_TIME_SERV, adapter);
+       zfcp_fc_wka_port_init(&gs->ds, FC_FID_DIR_SERV, adapter);
+       zfcp_fc_wka_port_init(&gs->as, FC_FID_ALIASES, adapter);
+       zfcp_fc_wka_port_init(&gs->ks, FC_FID_SEC_KEY, adapter);
+}
+
 static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,
                                   struct fcp_rscn_element *elem)
 {
@@ -143,15 +160,14 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,
 
        read_lock_irqsave(&zfcp_data.config_lock, flags);
        list_for_each_entry(port, &fsf_req->adapter->port_list_head, list) {
-               if (!(atomic_read(&port->status) & ZFCP_STATUS_PORT_PHYS_OPEN))
-                       /* Try to connect to unused ports anyway. */
+               if ((port->d_id & range) == (elem->nport_did & range))
+                       zfcp_test_link(port);
+               if (!port->d_id)
                        zfcp_erp_port_reopen(port,
                                             ZFCP_STATUS_COMMON_ERP_FAILED,
-                                            82, fsf_req);
-               else if ((port->d_id & range) == (elem->nport_did & range))
-                       /* Check connection status for connected ports */
-                       zfcp_test_link(port);
+                                            "fcrscn1", NULL);
        }
+
        read_unlock_irqrestore(&zfcp_data.config_lock, flags);
 }
 
@@ -193,7 +209,7 @@ static void zfcp_fc_incoming_wwpn(struct zfcp_fsf_req *req, u64 wwpn)
        read_unlock_irqrestore(&zfcp_data.config_lock, flags);
 
        if (port && (port->wwpn == wwpn))
-               zfcp_erp_port_forced_reopen(port, 0, 83, req);
+               zfcp_erp_port_forced_reopen(port, 0, "fciwwp1", req);
 }
 
 static void zfcp_fc_incoming_plogi(struct zfcp_fsf_req *req)
@@ -226,7 +242,7 @@ void zfcp_fc_incoming_els(struct zfcp_fsf_req *fsf_req)
                (struct fsf_status_read_buffer *) fsf_req->data;
        unsigned int els_type = status_buffer->payload.data[0];
 
-       zfcp_san_dbf_event_incoming_els(fsf_req);
+       zfcp_dbf_san_incoming_els(fsf_req);
        if (els_type == LS_PLOGI)
                zfcp_fc_incoming_plogi(fsf_req);
        else if (els_type == LS_LOGO)
@@ -256,35 +272,31 @@ static void zfcp_fc_ns_gid_pn_eval(unsigned long data)
 
        if (ct->status)
                return;
-       if (ct_iu_resp->header.cmd_rsp_code != ZFCP_CT_ACCEPT) {
-               atomic_set_mask(ZFCP_STATUS_PORT_INVALID_WWPN, &port->status);
+       if (ct_iu_resp->header.cmd_rsp_code != ZFCP_CT_ACCEPT)
                return;
-       }
+
        /* paranoia */
        if (ct_iu_req->wwpn != port->wwpn)
                return;
        /* looks like a valid d_id */
        port->d_id = ct_iu_resp->d_id & ZFCP_DID_MASK;
-       atomic_set_mask(ZFCP_STATUS_PORT_DID_DID, &port->status);
 }
 
-int static zfcp_fc_ns_gid_pn_request(struct zfcp_erp_action *erp_action,
+static int zfcp_fc_ns_gid_pn_request(struct zfcp_port *port,
                                     struct zfcp_gid_pn_data *gid_pn)
 {
-       struct zfcp_adapter *adapter = erp_action->adapter;
+       struct zfcp_adapter *adapter = port->adapter;
        struct zfcp_fc_ns_handler_data compl_rec;
        int ret;
 
        /* setup parameters for send generic command */
-       gid_pn->port = erp_action->port;
-       gid_pn->ct.wka_port = &adapter->nsp;
+       gid_pn->port = port;
+       gid_pn->ct.wka_port = &adapter->gs->ds;
        gid_pn->ct.handler = zfcp_fc_ns_handler;
        gid_pn->ct.handler_data = (unsigned long) &compl_rec;
        gid_pn->ct.timeout = ZFCP_NS_GID_PN_TIMEOUT;
        gid_pn->ct.req = &gid_pn->req;
        gid_pn->ct.resp = &gid_pn->resp;
-       gid_pn->ct.req_count = 1;
-       gid_pn->ct.resp_count = 1;
        sg_init_one(&gid_pn->req, &gid_pn->ct_iu_req,
                    sizeof(struct ct_iu_gid_pn_req));
        sg_init_one(&gid_pn->resp, &gid_pn->ct_iu_resp,
@@ -296,14 +308,13 @@ int static zfcp_fc_ns_gid_pn_request(struct zfcp_erp_action *erp_action,
        gid_pn->ct_iu_req.header.gs_subtype = ZFCP_CT_NAME_SERVER;
        gid_pn->ct_iu_req.header.options = ZFCP_CT_SYNCHRONOUS;
        gid_pn->ct_iu_req.header.cmd_rsp_code = ZFCP_CT_GID_PN;
-       gid_pn->ct_iu_req.header.max_res_size = ZFCP_CT_MAX_SIZE;
-       gid_pn->ct_iu_req.wwpn = erp_action->port->wwpn;
+       gid_pn->ct_iu_req.header.max_res_size = ZFCP_CT_SIZE_ONE_PAGE / 4;
+       gid_pn->ct_iu_req.wwpn = port->wwpn;
 
        init_completion(&compl_rec.done);
        compl_rec.handler = zfcp_fc_ns_gid_pn_eval;
        compl_rec.handler_data = (unsigned long) gid_pn;
-       ret = zfcp_fsf_send_ct(&gid_pn->ct, adapter->pool.fsf_req_erp,
-                              erp_action);
+       ret = zfcp_fsf_send_ct(&gid_pn->ct, adapter->pool.gid_pn_req);
        if (!ret)
                wait_for_completion(&compl_rec.done);
        return ret;
@@ -311,33 +322,56 @@ int static zfcp_fc_ns_gid_pn_request(struct zfcp_erp_action *erp_action,
 
 /**
  * zfcp_fc_ns_gid_pn_request - initiate GID_PN nameserver request
- * @erp_action: pointer to zfcp_erp_action where GID_PN request is needed
+ * @port: port where GID_PN request is needed
  * return: -ENOMEM on error, 0 otherwise
  */
-int zfcp_fc_ns_gid_pn(struct zfcp_erp_action *erp_action)
+static int zfcp_fc_ns_gid_pn(struct zfcp_port *port)
 {
        int ret;
        struct zfcp_gid_pn_data *gid_pn;
-       struct zfcp_adapter *adapter = erp_action->adapter;
+       struct zfcp_adapter *adapter = port->adapter;
 
-       gid_pn = mempool_alloc(adapter->pool.data_gid_pn, GFP_ATOMIC);
+       gid_pn = mempool_alloc(adapter->pool.gid_pn_data, GFP_ATOMIC);
        if (!gid_pn)
                return -ENOMEM;
 
        memset(gid_pn, 0, sizeof(*gid_pn));
 
-       ret = zfcp_wka_port_get(&adapter->nsp);
+       ret = zfcp_wka_port_get(&adapter->gs->ds);
        if (ret)
                goto out;
 
-       ret = zfcp_fc_ns_gid_pn_request(erp_action, gid_pn);
+       ret = zfcp_fc_ns_gid_pn_request(port, gid_pn);
 
-       zfcp_wka_port_put(&adapter->nsp);
+       zfcp_wka_port_put(&adapter->gs->ds);
 out:
-       mempool_free(gid_pn, adapter->pool.data_gid_pn);
+       mempool_free(gid_pn, adapter->pool.gid_pn_data);
        return ret;
 }
 
+void zfcp_fc_port_did_lookup(struct work_struct *work)
+{
+       int ret;
+       struct zfcp_port *port = container_of(work, struct zfcp_port,
+                                             gid_pn_work);
+
+       ret = zfcp_fc_ns_gid_pn(port);
+       if (ret) {
+               /* could not issue gid_pn for some reason */
+               zfcp_erp_adapter_reopen(port->adapter, 0, "fcgpn_1", NULL);
+               goto out;
+       }
+
+       if (!port->d_id) {
+               zfcp_erp_port_failed(port, "fcgpn_2", NULL);
+               goto out;
+       }
+
+       zfcp_erp_port_reopen(port, 0, "fcgpn_3", NULL);
+out:
+       zfcp_port_put(port);
+}
+
 /**
  * zfcp_fc_plogi_evaluate - evaluate PLOGI playload
  * @port: zfcp_port structure
@@ -375,17 +409,25 @@ static void zfcp_fc_adisc_handler(unsigned long data)
 
        if (adisc->els.status) {
                /* request rejected or timed out */
-               zfcp_erp_port_forced_reopen(port, 0, 63, NULL);
+               zfcp_erp_port_forced_reopen(port, ZFCP_STATUS_COMMON_ERP_FAILED,
+                                           "fcadh_1", NULL);
                goto out;
        }
 
        if (!port->wwnn)
                port->wwnn = ls_adisc->wwnn;
 
-       if (port->wwpn != ls_adisc->wwpn)
-               zfcp_erp_port_reopen(port, 0, 64, NULL);
+       if ((port->wwpn != ls_adisc->wwpn) ||
+           !(atomic_read(&port->status) & ZFCP_STATUS_COMMON_OPEN)) {
+               zfcp_erp_port_reopen(port, ZFCP_STATUS_COMMON_ERP_FAILED,
+                                    "fcadh_2", NULL);
+               goto out;
+       }
 
+       /* port is good, unblock rport without going through erp */
+       zfcp_scsi_schedule_rport_register(port);
  out:
+       atomic_clear_mask(ZFCP_STATUS_PORT_LINK_TEST, &port->status);
        zfcp_port_put(port);
        kfree(adisc);
 }
@@ -406,8 +448,6 @@ static int zfcp_fc_adisc(struct zfcp_port *port)
        sg_init_one(adisc->els.resp, &adisc->ls_adisc_acc,
                    sizeof(struct zfcp_ls_adisc));
 
-       adisc->els.req_count = 1;
-       adisc->els.resp_count = 1;
        adisc->els.adapter = adapter;
        adisc->els.port = port;
        adisc->els.d_id = port->d_id;
@@ -424,6 +464,34 @@ static int zfcp_fc_adisc(struct zfcp_port *port)
        return zfcp_fsf_send_els(&adisc->els);
 }
 
+void zfcp_fc_link_test_work(struct work_struct *work)
+{
+       struct zfcp_port *port =
+               container_of(work, struct zfcp_port, test_link_work);
+       int retval;
+
+       zfcp_port_get(port);
+       port->rport_task = RPORT_DEL;
+       zfcp_scsi_rport_work(&port->rport_work);
+
+       /* only issue one test command at one time per port */
+       if (atomic_read(&port->status) & ZFCP_STATUS_PORT_LINK_TEST)
+               goto out;
+
+       atomic_set_mask(ZFCP_STATUS_PORT_LINK_TEST, &port->status);
+
+       retval = zfcp_fc_adisc(port);
+       if (retval == 0)
+               return;
+
+       /* send of ADISC was not possible */
+       atomic_clear_mask(ZFCP_STATUS_PORT_LINK_TEST, &port->status);
+       zfcp_erp_port_forced_reopen(port, 0, "fcltwk1", NULL);
+
+out:
+       zfcp_port_put(port);
+}
+
 /**
  * zfcp_test_link - lightweight link test procedure
  * @port: port to be tested
@@ -434,30 +502,22 @@ static int zfcp_fc_adisc(struct zfcp_port *port)
  */
 void zfcp_test_link(struct zfcp_port *port)
 {
-       int retval;
-
        zfcp_port_get(port);
-       retval = zfcp_fc_adisc(port);
-       if (retval == 0)
-               return;
-
-       /* send of ADISC was not possible */
-       zfcp_port_put(port);
-       if (retval != -EBUSY)
-               zfcp_erp_port_forced_reopen(port, 0, 65, NULL);
+       if (!queue_work(port->adapter->work_queue, &port->test_link_work))
+               zfcp_port_put(port);
 }
 
-static void zfcp_free_sg_env(struct zfcp_gpn_ft *gpn_ft)
+static void zfcp_free_sg_env(struct zfcp_gpn_ft *gpn_ft, int buf_num)
 {
        struct scatterlist *sg = &gpn_ft->sg_req;
 
-       kfree(sg_virt(sg)); /* free request buffer */
-       zfcp_sg_free_table(gpn_ft->sg_resp, ZFCP_GPN_FT_BUFFERS);
+       kmem_cache_free(zfcp_data.gpn_ft_cache, sg_virt(sg));
+       zfcp_sg_free_table(gpn_ft->sg_resp, buf_num);
 
        kfree(gpn_ft);
 }
 
-static struct zfcp_gpn_ft *zfcp_alloc_sg_env(void)
+static struct zfcp_gpn_ft *zfcp_alloc_sg_env(int buf_num)
 {
        struct zfcp_gpn_ft *gpn_ft;
        struct ct_iu_gpn_ft_req *req;
@@ -466,7 +526,7 @@ static struct zfcp_gpn_ft *zfcp_alloc_sg_env(void)
        if (!gpn_ft)
                return NULL;
 
-       req = kzalloc(sizeof(struct ct_iu_gpn_ft_req), GFP_KERNEL);
+       req = kmem_cache_alloc(zfcp_data.gpn_ft_cache, GFP_KERNEL);
        if (!req) {
                kfree(gpn_ft);
                gpn_ft = NULL;
@@ -474,8 +534,8 @@ static struct zfcp_gpn_ft *zfcp_alloc_sg_env(void)
        }
        sg_init_one(&gpn_ft->sg_req, req, sizeof(*req));
 
-       if (zfcp_sg_setup_table(gpn_ft->sg_resp, ZFCP_GPN_FT_BUFFERS)) {
-               zfcp_free_sg_env(gpn_ft);
+       if (zfcp_sg_setup_table(gpn_ft->sg_resp, buf_num)) {
+               zfcp_free_sg_env(gpn_ft, buf_num);
                gpn_ft = NULL;
        }
 out:
@@ -484,7 +544,8 @@ out:
 
 
 static int zfcp_scan_issue_gpn_ft(struct zfcp_gpn_ft *gpn_ft,
-                                 struct zfcp_adapter *adapter)
+                                 struct zfcp_adapter *adapter,
+                                 int max_bytes)
 {
        struct zfcp_send_ct *ct = &gpn_ft->ct;
        struct ct_iu_gpn_ft_req *req = sg_virt(&gpn_ft->sg_req);
@@ -497,26 +558,23 @@ static int zfcp_scan_issue_gpn_ft(struct zfcp_gpn_ft *gpn_ft,
        req->header.gs_subtype = ZFCP_CT_NAME_SERVER;
        req->header.options = ZFCP_CT_SYNCHRONOUS;
        req->header.cmd_rsp_code = ZFCP_CT_GPN_FT;
-       req->header.max_res_size = (sizeof(struct gpn_ft_resp_acc) *
-                                       (ZFCP_GPN_FT_MAX_ENTRIES - 1)) >> 2;
+       req->header.max_res_size = max_bytes / 4;
        req->flags = 0;
        req->domain_id_scope = 0;
        req->area_id_scope = 0;
        req->fc4_type = ZFCP_CT_SCSI_FCP;
 
        /* prepare zfcp_send_ct */
-       ct->wka_port = &adapter->nsp;
+       ct->wka_port = &adapter->gs->ds;
        ct->handler = zfcp_fc_ns_handler;
        ct->handler_data = (unsigned long)&compl_rec;
        ct->timeout = 10;
        ct->req = &gpn_ft->sg_req;
        ct->resp = gpn_ft->sg_resp;
-       ct->req_count = 1;
-       ct->resp_count = ZFCP_GPN_FT_BUFFERS;
 
        init_completion(&compl_rec.done);
        compl_rec.handler = NULL;
-       ret = zfcp_fsf_send_ct(ct, NULL, NULL);
+       ret = zfcp_fsf_send_ct(ct, NULL);
        if (!ret)
                wait_for_completion(&compl_rec.done);
        return ret;
@@ -526,6 +584,9 @@ static void zfcp_validate_port(struct zfcp_port *port)
 {
        struct zfcp_adapter *adapter = port->adapter;
 
+       if (!(atomic_read(&port->status) & ZFCP_STATUS_COMMON_NOESC))
+               return;
+
        atomic_clear_mask(ZFCP_STATUS_COMMON_NOESC, &port->status);
 
        if ((port->supported_classes != 0) ||
@@ -533,13 +594,13 @@ static void zfcp_validate_port(struct zfcp_port *port)
                zfcp_port_put(port);
                return;
        }
-       zfcp_erp_port_shutdown(port, 0, 151, NULL);
+       zfcp_erp_port_shutdown(port, 0, "fcpval1", NULL);
        zfcp_erp_wait(adapter);
        zfcp_port_put(port);
        zfcp_port_dequeue(port);
 }
 
-static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)
+static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft, int max_entries)
 {
        struct zfcp_send_ct *ct = &gpn_ft->ct;
        struct scatterlist *sg = gpn_ft->sg_resp;
@@ -559,13 +620,17 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)
                return -EIO;
        }
 
-       if (hdr->max_res_size)
+       if (hdr->max_res_size) {
+               dev_warn(&adapter->ccw_device->dev,
+                        "The name server reported %d words residual data\n",
+                        hdr->max_res_size);
                return -E2BIG;
+       }
 
        down(&zfcp_data.config_sema);
 
        /* first entry is the header */
-       for (x = 1; x < ZFCP_GPN_FT_MAX_ENTRIES && !last; x++) {
+       for (x = 1; x < max_entries && !last; x++) {
                if (x % (ZFCP_GPN_FT_ENTRIES + 1))
                        acc++;
                else
@@ -582,18 +647,15 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)
                if (acc->wwpn == fc_host_port_name(adapter->scsi_host))
                        continue;
                port = zfcp_get_port_by_wwpn(adapter, acc->wwpn);
-               if (port) {
-                       zfcp_port_get(port);
+               if (port)
                        continue;
-               }
 
                port = zfcp_port_enqueue(adapter, acc->wwpn,
-                                        ZFCP_STATUS_PORT_DID_DID |
                                         ZFCP_STATUS_COMMON_NOESC, d_id);
                if (IS_ERR(port))
                        ret = PTR_ERR(port);
                else
-                       zfcp_erp_port_reopen(port, 0, 149, NULL);
+                       zfcp_erp_port_reopen(port, 0, "fcegpf1", NULL);
        }
 
        zfcp_erp_wait(adapter);
@@ -611,33 +673,40 @@ int zfcp_scan_ports(struct zfcp_adapter *adapter)
 {
        int ret, i;
        struct zfcp_gpn_ft *gpn_ft;
+       int chain, max_entries, buf_num, max_bytes;
 
-       if (fc_host_port_type(adapter->scsi_host) != FC_PORTTYPE_NPORT)
+       chain = adapter->adapter_features & FSF_FEATURE_ELS_CT_CHAINED_SBALS;
+       buf_num = chain ? ZFCP_GPN_FT_BUFFERS : 1;
+       max_entries = chain ? ZFCP_GPN_FT_MAX_ENTRIES : ZFCP_GPN_FT_ENTRIES;
+       max_bytes = chain ? ZFCP_GPN_FT_MAX_SIZE : ZFCP_CT_SIZE_ONE_PAGE;
+
+       if (fc_host_port_type(adapter->scsi_host) != FC_PORTTYPE_NPORT &&
+           fc_host_port_type(adapter->scsi_host) != FC_PORTTYPE_NPIV)
                return 0;
 
-       ret = zfcp_wka_port_get(&adapter->nsp);
+       ret = zfcp_wka_port_get(&adapter->gs->ds);
        if (ret)
                return ret;
 
-       gpn_ft = zfcp_alloc_sg_env();
+       gpn_ft = zfcp_alloc_sg_env(buf_num);
        if (!gpn_ft) {
                ret = -ENOMEM;
                goto out;
        }
 
        for (i = 0; i < 3; i++) {
-               ret = zfcp_scan_issue_gpn_ft(gpn_ft, adapter);
+               ret = zfcp_scan_issue_gpn_ft(gpn_ft, adapter, max_bytes);
                if (!ret) {
-                       ret = zfcp_scan_eval_gpn_ft(gpn_ft);
+                       ret = zfcp_scan_eval_gpn_ft(gpn_ft, max_entries);
                        if (ret == -EAGAIN)
                                ssleep(1);
                        else
                                break;
                }
        }
-       zfcp_free_sg_env(gpn_ft);
+       zfcp_free_sg_env(gpn_ft, buf_num);
 out:
-       zfcp_wka_port_put(&adapter->nsp);
+       zfcp_wka_port_put(&adapter->gs->ds);
        return ret;
 }
 
@@ -646,3 +715,158 @@ void _zfcp_scan_ports_later(struct work_struct *work)
 {
        zfcp_scan_ports(container_of(work, struct zfcp_adapter, scan_work));
 }
+
+struct zfcp_els_fc_job {
+       struct zfcp_send_els els;
+       struct fc_bsg_job *job;
+};
+
+static void zfcp_fc_generic_els_handler(unsigned long data)
+{
+       struct zfcp_els_fc_job *els_fc_job = (struct zfcp_els_fc_job *) data;
+       struct fc_bsg_job *job = els_fc_job->job;
+       struct fc_bsg_reply *reply = job->reply;
+
+       if (els_fc_job->els.status) {
+               /* request rejected or timed out */
+               reply->reply_data.ctels_reply.status = FC_CTELS_STATUS_REJECT;
+               goto out;
+       }
+
+       reply->reply_data.ctels_reply.status = FC_CTELS_STATUS_OK;
+       reply->reply_payload_rcv_len = job->reply_payload.payload_len;
+
+out:
+       job->state_flags = FC_RQST_STATE_DONE;
+       job->job_done(job);
+       kfree(els_fc_job);
+}
+
+int zfcp_fc_execute_els_fc_job(struct fc_bsg_job *job)
+{
+       struct zfcp_els_fc_job *els_fc_job;
+       struct fc_rport *rport = job->rport;
+       struct Scsi_Host *shost;
+       struct zfcp_adapter *adapter;
+       struct zfcp_port *port;
+       u8 *port_did;
+
+       shost = rport ? rport_to_shost(rport) : job->shost;
+       adapter = (struct zfcp_adapter *)shost->hostdata[0];
+
+       if (!(atomic_read(&adapter->status) & ZFCP_STATUS_COMMON_OPEN))
+               return -EINVAL;
+
+       els_fc_job = kzalloc(sizeof(struct zfcp_els_fc_job), GFP_KERNEL);
+       if (!els_fc_job)
+               return -ENOMEM;
+
+       els_fc_job->els.adapter = adapter;
+       if (rport) {
+               read_lock_irq(&zfcp_data.config_lock);
+               port = rport->dd_data;
+               if (port)
+                       els_fc_job->els.d_id = port->d_id;
+               read_unlock_irq(&zfcp_data.config_lock);
+               if (!port) {
+                       kfree(els_fc_job);
+                       return -EINVAL;
+               }
+       } else {
+               port_did = job->request->rqst_data.h_els.port_id;
+               els_fc_job->els.d_id = (port_did[0] << 16) +
+                                       (port_did[1] << 8) + port_did[2];
+       }
+
+       els_fc_job->els.req = job->request_payload.sg_list;
+       els_fc_job->els.resp = job->reply_payload.sg_list;
+       els_fc_job->els.handler = zfcp_fc_generic_els_handler;
+       els_fc_job->els.handler_data = (unsigned long) els_fc_job;
+       els_fc_job->job = job;
+
+       return zfcp_fsf_send_els(&els_fc_job->els);
+}
+
+struct zfcp_ct_fc_job {
+       struct zfcp_send_ct ct;
+       struct fc_bsg_job *job;
+};
+
+static void zfcp_fc_generic_ct_handler(unsigned long data)
+{
+       struct zfcp_ct_fc_job *ct_fc_job = (struct zfcp_ct_fc_job *) data;
+       struct fc_bsg_job *job = ct_fc_job->job;
+
+       job->reply->reply_data.ctels_reply.status = ct_fc_job->ct.status ?
+                               FC_CTELS_STATUS_REJECT : FC_CTELS_STATUS_OK;
+       job->reply->reply_payload_rcv_len = job->reply_payload.payload_len;
+       job->state_flags = FC_RQST_STATE_DONE;
+       job->job_done(job);
+
+       zfcp_wka_port_put(ct_fc_job->ct.wka_port);
+
+       kfree(ct_fc_job);
+}
+
+int zfcp_fc_execute_ct_fc_job(struct fc_bsg_job *job)
+{
+       int ret;
+       u8 gs_type;
+       struct fc_rport *rport = job->rport;
+       struct Scsi_Host *shost;
+       struct zfcp_adapter *adapter;
+       struct zfcp_ct_fc_job *ct_fc_job;
+       u32 preamble_word1;
+
+       shost = rport ? rport_to_shost(rport) : job->shost;
+
+       adapter = (struct zfcp_adapter *)shost->hostdata[0];
+       if (!(atomic_read(&adapter->status) & ZFCP_STATUS_COMMON_OPEN))
+               return -EINVAL;
+
+       ct_fc_job = kzalloc(sizeof(struct zfcp_ct_fc_job), GFP_KERNEL);
+       if (!ct_fc_job)
+               return -ENOMEM;
+
+       preamble_word1 = job->request->rqst_data.r_ct.preamble_word1;
+       gs_type = (preamble_word1 & 0xff000000) >> 24;
+
+       switch (gs_type) {
+       case FC_FST_ALIAS:
+               ct_fc_job->ct.wka_port = &adapter->gs->as;
+               break;
+       case FC_FST_MGMT:
+               ct_fc_job->ct.wka_port = &adapter->gs->ms;
+               break;
+       case FC_FST_TIME:
+               ct_fc_job->ct.wka_port = &adapter->gs->ts;
+               break;
+       case FC_FST_DIR:
+               ct_fc_job->ct.wka_port = &adapter->gs->ds;
+               break;
+       default:
+               kfree(ct_fc_job);
+               return -EINVAL; /* no such service */
+       }
+
+       ret = zfcp_wka_port_get(ct_fc_job->ct.wka_port);
+       if (ret) {
+               kfree(ct_fc_job);
+               return ret;
+       }
+
+       ct_fc_job->ct.req = job->request_payload.sg_list;
+       ct_fc_job->ct.resp = job->reply_payload.sg_list;
+       ct_fc_job->ct.timeout = ZFCP_FSF_REQUEST_TIMEOUT;
+       ct_fc_job->ct.handler = zfcp_fc_generic_ct_handler;
+       ct_fc_job->ct.handler_data = (unsigned long) ct_fc_job;
+       ct_fc_job->ct.completion = NULL;
+       ct_fc_job->job = job;
+
+       ret = zfcp_fsf_send_ct(&ct_fc_job->ct, NULL);
+       if (ret) {
+               kfree(ct_fc_job);
+               zfcp_wka_port_put(ct_fc_job->ct.wka_port);
+       }
+       return ret;
+}