Commit 149c5751 authored by Shivasharan S's avatar Shivasharan S Committed by Martin K. Petersen

scsi: megaraid_sas: Avoid firing DCMDs while OCR is in progress

Driver needs to avoid PCI writes while OCR is in progress.  Use
reset_mutex to synchronize between firing DCMDs MR_DCMD_PD_GET_INFO and
MR_DCMD_DRV_GET_TARGET_PROP while OCR is triggered.  Without this fix,
if Device/VD add/creation is in progress and at the same time MR
Firmware is going through OCR, user may see OCR never completed and it
may need system reboot.  This scenario is rare to occur. Fix is provided
as part of review.
Signed-off-by: default avatarSumit Saxena <sumit.saxena@broadcom.com>
Signed-off-by: default avatarShivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f3f7920b
...@@ -2188,7 +2188,6 @@ struct megasas_instance { ...@@ -2188,7 +2188,6 @@ struct megasas_instance {
struct megasas_evt_detail *evt_detail; struct megasas_evt_detail *evt_detail;
dma_addr_t evt_detail_h; dma_addr_t evt_detail_h;
struct megasas_cmd *aen_cmd; struct megasas_cmd *aen_cmd;
struct mutex hba_mutex;
struct semaphore ioctl_sem; struct semaphore ioctl_sem;
struct Scsi_Host *host; struct Scsi_Host *host;
......
...@@ -1952,7 +1952,7 @@ static int megasas_slave_configure(struct scsi_device *sdev) ...@@ -1952,7 +1952,7 @@ static int megasas_slave_configure(struct scsi_device *sdev)
} }
} }
mutex_lock(&instance->hba_mutex); mutex_lock(&instance->reset_mutex);
/* Send DCMD to Firmware and cache the information */ /* Send DCMD to Firmware and cache the information */
if ((instance->pd_info) && !MEGASAS_IS_LOGICAL(sdev)) if ((instance->pd_info) && !MEGASAS_IS_LOGICAL(sdev))
megasas_get_pd_info(instance, sdev); megasas_get_pd_info(instance, sdev);
...@@ -1966,7 +1966,7 @@ static int megasas_slave_configure(struct scsi_device *sdev) ...@@ -1966,7 +1966,7 @@ static int megasas_slave_configure(struct scsi_device *sdev)
is_target_prop = (ret_target_prop == DCMD_SUCCESS) ? true : false; is_target_prop = (ret_target_prop == DCMD_SUCCESS) ? true : false;
megasas_set_static_target_properties(sdev, is_target_prop); megasas_set_static_target_properties(sdev, is_target_prop);
mutex_unlock(&instance->hba_mutex); mutex_unlock(&instance->reset_mutex);
/* This sdev property may change post OCR */ /* This sdev property may change post OCR */
megasas_set_dynamic_target_properties(sdev); megasas_set_dynamic_target_properties(sdev);
...@@ -6350,7 +6350,6 @@ static inline void megasas_init_ctrl_params(struct megasas_instance *instance) ...@@ -6350,7 +6350,6 @@ static inline void megasas_init_ctrl_params(struct megasas_instance *instance)
spin_lock_init(&instance->stream_lock); spin_lock_init(&instance->stream_lock);
spin_lock_init(&instance->completion_lock); spin_lock_init(&instance->completion_lock);
mutex_init(&instance->hba_mutex);
mutex_init(&instance->reset_mutex); mutex_init(&instance->reset_mutex);
if ((instance->pdev->device == PCI_DEVICE_ID_LSI_SAS0073SKINNY) || if ((instance->pdev->device == PCI_DEVICE_ID_LSI_SAS0073SKINNY) ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment