|
@@ -1990,7 +1990,7 @@ _base_enable_msix(struct MPT3SAS_ADAPTER *ioc)
|
|
ioc->cpu_count, max_msix_vectors);
|
|
ioc->cpu_count, max_msix_vectors);
|
|
|
|
|
|
if (!ioc->rdpq_array_enable && max_msix_vectors == -1)
|
|
if (!ioc->rdpq_array_enable && max_msix_vectors == -1)
|
|
- local_max_msix_vectors = 8;
|
|
|
|
|
|
+ local_max_msix_vectors = (reset_devices) ? 1 : 8;
|
|
else
|
|
else
|
|
local_max_msix_vectors = max_msix_vectors;
|
|
local_max_msix_vectors = max_msix_vectors;
|
|
|
|
|
|
@@ -3308,6 +3308,11 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc)
|
|
sg_tablesize = MPT3SAS_SG_DEPTH;
|
|
sg_tablesize = MPT3SAS_SG_DEPTH;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /* max sgl entries <= MPT_KDUMP_MIN_PHYS_SEGMENTS in KDUMP mode */
|
|
|
|
+ if (reset_devices)
|
|
|
|
+ sg_tablesize = min_t(unsigned short, sg_tablesize,
|
|
|
|
+ MPT_KDUMP_MIN_PHYS_SEGMENTS);
|
|
|
|
+
|
|
if (sg_tablesize < MPT_MIN_PHYS_SEGMENTS)
|
|
if (sg_tablesize < MPT_MIN_PHYS_SEGMENTS)
|
|
sg_tablesize = MPT_MIN_PHYS_SEGMENTS;
|
|
sg_tablesize = MPT_MIN_PHYS_SEGMENTS;
|
|
else if (sg_tablesize > MPT_MAX_PHYS_SEGMENTS) {
|
|
else if (sg_tablesize > MPT_MAX_PHYS_SEGMENTS) {
|
|
@@ -3340,7 +3345,10 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc)
|
|
ioc->internal_depth, facts->RequestCredit);
|
|
ioc->internal_depth, facts->RequestCredit);
|
|
if (max_request_credit > MAX_HBA_QUEUE_DEPTH)
|
|
if (max_request_credit > MAX_HBA_QUEUE_DEPTH)
|
|
max_request_credit = MAX_HBA_QUEUE_DEPTH;
|
|
max_request_credit = MAX_HBA_QUEUE_DEPTH;
|
|
- } else
|
|
|
|
|
|
+ } else if (reset_devices)
|
|
|
|
+ max_request_credit = min_t(u16, facts->RequestCredit,
|
|
|
|
+ (MPT3SAS_KDUMP_SCSI_IO_DEPTH + ioc->internal_depth));
|
|
|
|
+ else
|
|
max_request_credit = min_t(u16, facts->RequestCredit,
|
|
max_request_credit = min_t(u16, facts->RequestCredit,
|
|
MAX_HBA_QUEUE_DEPTH);
|
|
MAX_HBA_QUEUE_DEPTH);
|
|
|
|
|
|
@@ -4446,7 +4454,7 @@ _base_get_ioc_facts(struct MPT3SAS_ADAPTER *ioc)
|
|
if ((facts->IOCCapabilities & MPI2_IOCFACTS_CAPABILITY_INTEGRATED_RAID))
|
|
if ((facts->IOCCapabilities & MPI2_IOCFACTS_CAPABILITY_INTEGRATED_RAID))
|
|
ioc->ir_firmware = 1;
|
|
ioc->ir_firmware = 1;
|
|
if ((facts->IOCCapabilities &
|
|
if ((facts->IOCCapabilities &
|
|
- MPI2_IOCFACTS_CAPABILITY_RDPQ_ARRAY_CAPABLE))
|
|
|
|
|
|
+ MPI2_IOCFACTS_CAPABILITY_RDPQ_ARRAY_CAPABLE) && (!reset_devices))
|
|
ioc->rdpq_array_capable = 1;
|
|
ioc->rdpq_array_capable = 1;
|
|
if (facts->IOCCapabilities & MPI26_IOCFACTS_CAPABILITY_ATOMIC_REQ)
|
|
if (facts->IOCCapabilities & MPI26_IOCFACTS_CAPABILITY_ATOMIC_REQ)
|
|
ioc->atomic_desc_capable = 1;
|
|
ioc->atomic_desc_capable = 1;
|