diff options
| author | James Smart <james.smart@emulex.com> | 2012-08-03 12:35:54 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-09-14 14:39:22 +0100 |
| commit | 2a76a28314993d27668fc7f9d5b6427facce4318 (patch) | |
| tree | 4d05de5a9562632c4536e1ee9f7c87d964d70e2a /drivers/scsi/lpfc/lpfc_sli.h | |
| parent | 027140eab7d45f406e3397cc9373767d191ac6b4 (diff) | |
| download | linux-2a76a28314993d27668fc7f9d5b6427facce4318.tar.bz2 | |
[SCSI] lpfc 8.3.33: Parallelize SLI-4 Q distribution
Commonize SLI-3/4 Ring/Queue framework, to keep SLI-3 compatibility
Parallelize SLI-4 Q distribution - to use multiple posting/completion queues
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_sli.h')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_sli.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/lpfc/lpfc_sli.h b/drivers/scsi/lpfc/lpfc_sli.h index 2d64a2bab36a..4b9b44e8e064 100644 --- a/drivers/scsi/lpfc/lpfc_sli.h +++ b/drivers/scsi/lpfc/lpfc_sli.h @@ -131,7 +131,9 @@ typedef struct lpfcMboxq { #define LPFC_MAX_RING_MASK 5 /* max num of rctl/type masks allowed per ring */ -#define LPFC_MAX_RING 4 /* max num of SLI rings used by driver */ +#define LPFC_SLI3_MAX_RING 4 /* Max num of SLI3 rings used by driver. + For SLI4, an additional ring for each + FCP WQ will be allocated. */ struct lpfc_sli_ring; @@ -172,7 +174,7 @@ struct lpfc_sli3_ring { }; struct lpfc_sli4_ring { - void *wqp; /* Pointer to associated WQ */ + struct lpfc_queue *wqp; /* Pointer to associated WQ */ }; @@ -284,7 +286,7 @@ struct lpfc_sli { #define LPFC_MENLO_MAINT 0x1000 /* need for menl fw download */ #define LPFC_SLI_ASYNC_MBX_BLK 0x2000 /* Async mailbox is blocked */ - struct lpfc_sli_ring ring[LPFC_MAX_RING]; + struct lpfc_sli_ring *ring; int fcp_ring; /* ring used for FCP initiator commands */ int next_ring; |