aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/megaraid/megaraid_sas.h
diff options
context:
space:
mode:
authorSumit.Saxena@avagotech.com <Sumit.Saxena@avagotech.com>2015-01-05 09:36:23 -0500
committerChristoph Hellwig <hch@lst.de>2015-01-09 09:44:36 -0500
commitae09a6c1fd421887fa4885adb7c55ccc8074c441 (patch)
tree1c7acea04f52f51992d24a29d5b758c0317d9966 /drivers/scsi/megaraid/megaraid_sas.h
parentc8dd61eff2780c481fcf919c1572e16e397c714e (diff)
megaraid_sas: reserve commands for IOCTLs and internal DCMDs
1) For fusion adapters, limit reserved frames for non SCSI commands to 8 (3 for parallel IOCTLs + 5 for driver's internal DCMDs). Earlier reserved commands for non SCSI IO frames was set to 32, so with this implementation, increased per controller "can_queue". Behavior of MFI controllers will remain unchanged. 2) Optimize the code related to per controller's 'can_queue' setting. Signed-off-by: Sumit Saxena <sumit.saxena@avagotech.com> Signed-off-by: Chaitra Basappa <chaitra.basappa@avagotech.com> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas.h')
-rw-r--r--drivers/scsi/megaraid/megaraid_sas.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index b8b378dec7ec..793b2b3552ff 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -1082,6 +1082,8 @@ enum MR_SCSI_CMD_TYPE {
1082 */ 1082 */
1083#define MEGASAS_INT_CMDS 32 1083#define MEGASAS_INT_CMDS 32
1084#define MEGASAS_SKINNY_INT_CMDS 5 1084#define MEGASAS_SKINNY_INT_CMDS 5
1085#define MEGASAS_FUSION_INTERNAL_CMDS 5
1086#define MEGASAS_FUSION_IOCTL_CMDS 3
1085 1087
1086#define MEGASAS_MAX_MSIX_QUEUES 128 1088#define MEGASAS_MAX_MSIX_QUEUES 128
1087/* 1089/*
@@ -1687,9 +1689,8 @@ struct megasas_instance {
1687 1689
1688 u16 max_num_sge; 1690 u16 max_num_sge;
1689 u16 max_fw_cmds; 1691 u16 max_fw_cmds;
1690 /* For Fusion its num IOCTL cmds, for others MFI based its
1691 max_fw_cmds */
1692 u16 max_mfi_cmds; 1692 u16 max_mfi_cmds;
1693 u16 max_scsi_cmds;
1693 u32 max_sectors_per_req; 1694 u32 max_sectors_per_req;
1694 struct megasas_aen_event *ev; 1695 struct megasas_aen_event *ev;
1695 1696
@@ -1765,7 +1766,7 @@ struct megasas_instance {
1765 u8 requestorId; 1766 u8 requestorId;
1766 char PlasmaFW111; 1767 char PlasmaFW111;
1767 char mpio; 1768 char mpio;
1768 int throttlequeuedepth; 1769 u16 throttlequeuedepth;
1769 u8 mask_interrupts; 1770 u8 mask_interrupts;
1770 u8 is_imr; 1771 u8 is_imr;
1771}; 1772};