From: Shivasharan S Date: Thu, 19 Oct 2017 09:49:04 +0000 (-0700) Subject: scsi: megaraid_sas: Do not limit queue_depth to 1k in non-RDPQ mode X-Git-Tag: v4.1.12-124.31.3~1037 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=47baf6fad864b440d2d8010325a1d2d3bb6f2bc7;p=users%2Fjedix%2Flinux-maple.git scsi: megaraid_sas: Do not limit queue_depth to 1k in non-RDPQ mode Driver load fails if memory allocation for request frame pool fails due to the higher queue_depth requirement. The driver now allows dynamically reducing queue_depth if memory allocations fail rather than failing load. With this, there is no need to limit queue_depth to 1K. Signed-off-by: Kashyap Desai Signed-off-by: Shivasharan S Signed-off-by: Martin K. Petersen Orabug: 27625001 Signed-off-by: Jack Vogel Reviewed-by: Martin K. Petersen --- diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index fb8c78bac933..9f733abc2929 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -273,10 +273,6 @@ megasas_fusion_update_can_queue(struct megasas_instance *instance, int fw_boot_c instance->max_fw_cmds = cur_max_fw_cmds; instance->ldio_threshold = ldio_threshold; - if (!instance->is_rdpq) - instance->max_fw_cmds = - min_t(u16, instance->max_fw_cmds, 1024); - if (reset_devices) instance->max_fw_cmds = min(instance->max_fw_cmds, (u16)MEGASAS_KDUMP_QUEUE_DEPTH);