--- drivers/scsi/mpt2sas/mpt2sas_base.c

+++ drivers/scsi/mpt2sas/mpt2sas_base.c

@@ -1947,9 +1947,9 @@ _base_allocate_memory_pools(struct MPT2S

/* adjust hba_queue_depth, reply_free_queue_depth,

* and queue_size

*/

- ioc->hba_queue_depth -= queue_diff;

- ioc->reply_free_queue_depth -= queue_diff;

- queue_size -= queue_diff;

+ ioc->hba_queue_depth -= (queue_diff / 2);

+ ioc->reply_free_queue_depth -= (queue_diff / 2);

+ queue_size = facts->MaxReplyDescriptorPostQueueDepth;

}

ioc->reply_post_queue_depth = queue_size;

@@ -3595,6 +3595,8 @@ mpt2sas_base_detach(struct MPT2SAS_ADAPT

static void

_base_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase)

{

+ mpt2sas_scsih_reset_handler(ioc, reset_phase);

+ mpt2sas_ctl_reset_handler(ioc, reset_phase);

switch (reset_phase) {

case MPT2_IOC_PRE_RESET:

dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: "

@@ -3625,8 +3627,6 @@ _base_reset_handler(struct MPT2SAS_ADAPT

"MPT2_IOC_DONE_RESET\n", ioc->name, __func__));

break;

}

- mpt2sas_scsih_reset_handler(ioc, reset_phase);

- mpt2sas_ctl_reset_handler(ioc, reset_phase);

}

/**

@@ -3680,6 +3680,7 @@ mpt2sas_base_hard_reset_handler(struct M

{

int r;

unsigned long flags;

+ u8 pe_complete = ioc->wait_for_port_enable_to_complete;

dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: enter\n", ioc->name,

__func__));

@@ -3701,6 +3702,14 @@ mpt2sas_base_hard_reset_handler(struct M

if (r)

goto out;

_base_reset_handler(ioc, MPT2_IOC_AFTER_RESET);

+

+ /* If this hard reset is called while port enable is active, then

+ * there is no reason to call make_ioc_operational

+ */

+ if (pe_complete) {

+ r = -EFAULT;

+ goto out;

+ }

r = _base_make_ioc_operational(ioc, sleep_flag);

if (!r)

_base_reset_handler(ioc, MPT2_IOC_DONE_RESET);