[SCSI] lpfc 8.3.8: (BSG1) Update BSG infrastructure

Update BSG infrastructure to handle new vendor specific BSG commands.

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 197dc3e3bdc9c5f718acebbe07dd25b6243194e9..a40a45b8aede8e8d3be0092293648a4dbbf10f23 100644 (file)
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2009 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2010 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -451,6 +451,8 @@ struct unsol_rcv_ct_ctx {
        uint32_t ctxt_id;
        uint32_t SID;
        uint32_t oxid;
+       uint32_t flags;
+#define UNSOL_VALID    0x00000001
 };
 
 struct lpfc_hba {
@@ -793,7 +795,7 @@ struct lpfc_hba {
        uint16_t vlan_id;
        struct list_head fcf_conn_rec_list;
 
-       struct mutex ct_event_mutex; /* synchronize access to ct_ev_waiters */
+       spinlock_t ct_ev_lock; /* synchronize access to ct_ev_waiters */
        struct list_head ct_ev_waiters;
        struct unsol_rcv_ct_ctx ct_ctx[64];
        uint32_t ctx_idx;

diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index a5d9048235d989ffc0f86721ff334e6d70c7d589..dfb1f73252a18bcb3cf687346adaa8bfe23b9212 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2009 Emulex.  All rights reserved.                *
+ * Copyright (C) 2009-2010 Emulex.  All rights reserved.                *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -33,6 +33,7 @@
 #include "lpfc_sli.h"
 #include "lpfc_sli4.h"
 #include "lpfc_nl.h"
+#include "lpfc_bsg.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
@@ -476,7 +477,7 @@ enum ELX_LOOPBACK_CMD {
  * This function is called when an unsolicited CT command is received.  It
  * forwards the event to any processes registerd to receive CT events.
  */
-void
+int
 lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                        struct lpfc_iocbq *piocbq)
 {
@@ -496,6 +497,7 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        struct lpfc_dmabuf *bdeBuf2 = piocbq->context3;
        struct lpfc_hbq_entry *hbqe;
        struct lpfc_sli_ct_request *ct_req;
+       unsigned long flags;
 
        INIT_LIST_HEAD(&head);
        list_add_tail(&head, &piocbq->list);
@@ -519,7 +521,7 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        if (!(phba->sli3_options & LPFC_SLI3_HBQ_ENABLED))
                lpfc_sli_ringpostbuf_put(phba, pring, dmabuf);
 
-       mutex_lock(&phba->ct_event_mutex);
+       spin_lock_irqsave(&phba->ct_ev_lock, flags);
        list_for_each_entry(evt, &phba->ct_ev_waiters, node) {
                if (evt->req_id != evt_req_id)
                        continue;
@@ -535,7 +537,7 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                        break;
                }
 
-               mutex_unlock(&phba->ct_event_mutex);
+               spin_unlock_irqrestore(&phba->ct_ev_lock, flags);
 
                if (phba->sli3_options & LPFC_SLI3_HBQ_ENABLED) {
                        /* take accumulated byte count from the last iocbq */
@@ -556,9 +558,9 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                                        "CT event data, size %d\n",
                                        evt_dat->len);
                        kfree(evt_dat);
-                       mutex_lock(&phba->ct_event_mutex);
+                       spin_lock_irqsave(&phba->ct_ev_lock, flags);
                        lpfc_ct_event_unref(evt);
-                       mutex_unlock(&phba->ct_event_mutex);
+                       spin_unlock_irqrestore(&phba->ct_ev_lock, flags);
                        goto error_ct_unsol_exit;
                }
 
@@ -601,9 +603,11 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                                                iocbq);
                                        kfree(evt_dat->data);
                                        kfree(evt_dat);
-                                       mutex_lock(&phba->ct_event_mutex);
+                                       spin_lock_irqsave(&phba->ct_ev_lock,
+                                               flags);
                                        lpfc_ct_event_unref(evt);
-                                       mutex_unlock(&phba->ct_event_mutex);
+                                       spin_unlock_irqrestore(
+                                               &phba->ct_ev_lock, flags);
                                        goto error_ct_unsol_exit;
                                }
                                memcpy((char *)(evt_dat->data) + offset,
@@ -638,7 +642,7 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                        }
                }
 
-               mutex_lock(&phba->ct_event_mutex);
+               spin_lock_irqsave(&phba->ct_ev_lock, flags);
                if (phba->sli_rev == LPFC_SLI_REV4) {
                        evt_dat->immed_dat = phba->ctx_idx;
                        phba->ctx_idx = (phba->ctx_idx + 1) % 64;
@@ -656,13 +660,13 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                if (evt_req_id == SLI_CT_ELX_LOOPBACK)
                        break;
        }
-       mutex_unlock(&phba->ct_event_mutex);
+       spin_unlock_irqrestore(&phba->ct_ev_lock, flags);
 
 error_ct_unsol_exit:
        if (!list_empty(&head))
                list_del(&head);
 
-       return;
+       return 1;
 }
 
 /**
@@ -676,6 +680,7 @@ lpfc_bsg_set_event(struct fc_bsg_job *job)
        struct lpfc_hba *phba = vport->phba;
        struct set_ct_event *event_req;
        struct lpfc_ct_event *evt;
+       unsigned long flags;
        int rc = 0;
 
        if (job->request_len <
@@ -689,7 +694,7 @@ lpfc_bsg_set_event(struct fc_bsg_job *job)
        event_req = (struct set_ct_event *)
                job->request->rqst_data.h_vendor.vendor_cmd;
 
-       mutex_lock(&phba->ct_event_mutex);
+       spin_lock_irqsave(&phba->ct_ev_lock, flags);
        list_for_each_entry(evt, &phba->ct_ev_waiters, node) {
                if (evt->reg_id == event_req->ev_reg_id) {
                        lpfc_ct_event_ref(evt);
@@ -697,7 +702,7 @@ lpfc_bsg_set_event(struct fc_bsg_job *job)
                        break;
                }
        }
-       mutex_unlock(&phba->ct_event_mutex);
+       spin_unlock_irqrestore(&phba->ct_ev_lock, flags);
 
        if (&evt->node == &phba->ct_ev_waiters) {
                /* no event waiting struct yet - first call */
@@ -710,19 +715,19 @@ lpfc_bsg_set_event(struct fc_bsg_job *job)
                        return -ENOMEM;
                }
 
-               mutex_lock(&phba->ct_event_mutex);
+               spin_lock_irqsave(&phba->ct_ev_lock, flags);
                list_add(&evt->node, &phba->ct_ev_waiters);
                lpfc_ct_event_ref(evt);
-               mutex_unlock(&phba->ct_event_mutex);
+               spin_unlock_irqrestore(&phba->ct_ev_lock, flags);
        }
 
        evt->waiting = 1;
        if (wait_event_interruptible(evt->wq,
                                     !list_empty(&evt->events_to_see))) {
-               mutex_lock(&phba->ct_event_mutex);
+               spin_lock_irqsave(&phba->ct_ev_lock, flags);
                lpfc_ct_event_unref(evt); /* release ref */
                lpfc_ct_event_unref(evt); /* delete */
-               mutex_unlock(&phba->ct_event_mutex);
+               spin_unlock_irqrestore(&phba->ct_ev_lock, flags);
                rc = -EINTR;
                goto set_event_out;
        }
@@ -730,10 +735,10 @@ lpfc_bsg_set_event(struct fc_bsg_job *job)
        evt->wait_time_stamp = jiffies;
        evt->waiting = 0;
 
-       mutex_lock(&phba->ct_event_mutex);
+       spin_lock_irqsave(&phba->ct_ev_lock, flags);
        list_move(evt->events_to_see.prev, &evt->events_to_get);
        lpfc_ct_event_unref(evt); /* release ref */
-       mutex_unlock(&phba->ct_event_mutex);
+       spin_unlock_irqrestore(&phba->ct_ev_lock, flags);
 
 set_event_out:
        /* set_event carries no reply payload */
@@ -759,6 +764,7 @@ lpfc_bsg_get_event(struct fc_bsg_job *job)
        struct get_ct_event_reply *event_reply;
        struct lpfc_ct_event *evt;
        struct event_data *evt_dat = NULL;
+       unsigned long flags;
        int rc = 0;
 
        if (job->request_len <
@@ -775,7 +781,7 @@ lpfc_bsg_get_event(struct fc_bsg_job *job)
        event_reply = (struct get_ct_event_reply *)
                job->reply->reply_data.vendor_reply.vendor_rsp;
 
-       mutex_lock(&phba->ct_event_mutex);
+       spin_lock_irqsave(&phba->ct_ev_lock, flags);
        list_for_each_entry(evt, &phba->ct_ev_waiters, node) {
                if (evt->reg_id == event_req->ev_reg_id) {
                        if (list_empty(&evt->events_to_get))
@@ -788,7 +794,7 @@ lpfc_bsg_get_event(struct fc_bsg_job *job)
                        break;
                }
        }
-       mutex_unlock(&phba->ct_event_mutex);
+       spin_unlock_irqrestore(&phba->ct_ev_lock, flags);
 
        if (!evt_dat) {
                job->reply->reply_payload_rcv_len = 0;
@@ -818,9 +824,9 @@ lpfc_bsg_get_event(struct fc_bsg_job *job)
        if (evt_dat)
                kfree(evt_dat->data);
        kfree(evt_dat);
-       mutex_lock(&phba->ct_event_mutex);
+       spin_lock_irqsave(&phba->ct_ev_lock, flags);
        lpfc_ct_event_unref(evt);
-       mutex_unlock(&phba->ct_event_mutex);
+       spin_unlock_irqrestore(&phba->ct_ev_lock, flags);
 
 error_get_event_exit:
        /* make error code available to userspace */

diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h
index b9e8cd5b818ad39aee93b1836523f7c4f73eead9..107899dc3f3e4375d9966b52f1408a0697dc6871 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_crtn.h
+++ b/drivers/scsi/lpfc/lpfc_crtn.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2010 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -383,5 +383,5 @@ struct lpfc_vport *lpfc_find_vport_by_vpid(struct lpfc_hba *, uint16_t);
 /* functions to support SGIOv4/bsg interface */
 int lpfc_bsg_request(struct fc_bsg_job *);
 int lpfc_bsg_timeout(struct fc_bsg_job *);
-void lpfc_bsg_ct_unsol_event(struct lpfc_hba *, struct lpfc_sli_ring *,
+int lpfc_bsg_ct_unsol_event(struct lpfc_hba *, struct lpfc_sli_ring *,
                             struct lpfc_iocbq *);

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index bf7bf62e81ebf5267e1f241e78398a3e69d1067f..c7e921973f66adedf93bb087f229b4e3fc2485ea 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2009 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2010 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -97,7 +97,8 @@ lpfc_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        struct list_head head;
        struct lpfc_dmabuf *bdeBuf;
 
-       lpfc_bsg_ct_unsol_event(phba, pring, piocbq);
+       if (lpfc_bsg_ct_unsol_event(phba, pring, piocbq) == 0)
+               return;
 
        if (unlikely(icmd->ulpStatus == IOSTAT_NEED_BUFFER)) {
                lpfc_sli_hbqbuf_add_hbqs(phba, LPFC_ELS_HBQ);
@@ -181,7 +182,8 @@ lpfc_sli4_ct_abort_unsol_event(struct lpfc_hba *phba,
        uint32_t size;
 
        /* Forward abort event to any process registered to receive ct event */
-       lpfc_bsg_ct_unsol_event(phba, pring, piocbq);
+       if (lpfc_bsg_ct_unsol_event(phba, pring, piocbq) == 0)
+               return;
 
        /* If there is no BDE associated with IOCB, there is nothing to do */
        if (icmd->ulpBdeCount == 0)

diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h
index 44c258730b074366b6ed50c1c6368719ac19fcfe..89ff7c09e298cbaefa63a16e5b2da5853c34e510 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hw.h
+++ b/drivers/scsi/lpfc/lpfc_hw.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2009 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2010 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -1346,6 +1346,9 @@ typedef struct {          /* FireFly BIU registers */
 #define MBX_HEARTBEAT       0x31
 #define MBX_WRITE_VPARMS    0x32
 #define MBX_ASYNCEVT_ENABLE 0x33
+#define MBX_READ_EVENT_LOG_STATUS 0x37
+#define MBX_READ_EVENT_LOG  0x38
+#define MBX_WRITE_EVENT_LOG 0x39
 
 #define MBX_PORT_CAPABILITIES 0x3B
 #define MBX_PORT_IOV_CONTROL 0x3C

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index e80e95d95cdec201755c4f127dda81edba990609..52fc758b8f7788fe3f0fe4a668574664f3d86f32 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2009 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2010 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -4331,7 +4331,7 @@ lpfc_hba_alloc(struct pci_dev *pdev)
                return NULL;
        }
 
-       mutex_init(&phba->ct_event_mutex);
+       spin_lock_init(&phba->ct_ev_lock);
        INIT_LIST_HEAD(&phba->ct_ev_waiters);
 
        return phba;

diff --git a/drivers/scsi/lpfc/lpfc_nl.h b/drivers/scsi/lpfc/lpfc_nl.h
index d655ed3eebef7fe78b714b4f6f7ac81ac0099645..f3cfbe2ce98697c22c4fa3970b30fb5cd8eededc 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nl.h
+++ b/drivers/scsi/lpfc/lpfc_nl.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2008 Emulex.  All rights reserved.                *
+ * Copyright (C) 2010 Emulex.  All rights reserved.                *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -177,23 +177,3 @@ struct temp_event {
        uint32_t data;
 };
 
-/* bsg definitions */
-#define LPFC_BSG_VENDOR_SET_CT_EVENT   1
-#define LPFC_BSG_VENDOR_GET_CT_EVENT   2
-
-struct set_ct_event {
-       uint32_t command;
-       uint32_t ev_req_id;
-       uint32_t ev_reg_id;
-};
-
-struct get_ct_event {
-       uint32_t command;
-       uint32_t ev_reg_id;
-       uint32_t ev_req_id;
-};
-
-struct get_ct_event_reply {
-       uint32_t immed_data;
-       uint32_t type;
-};