openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: megaraid_sas: Do not use 32-bit atomic request descriptor for Ventura controllers 

Problem Statement: Sending I/O through 32 bit descriptors to Ventura series of
controller results in IO timeout on certain conditions.

This error only occurs on systems with high I/O activity on Ventura series
controllers.

Changes in this patch will prevent driver from using 32 bit descriptor and use
64 bit Descriptors.

Cc: <stable@vger.kernel.org>
Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Shivasharan S 2018-02-14 00:10:52 -08:00 committed by Martin K. Petersen
parent 1bc5ad3a6a
commit 9ff97fa8db
1 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/scsi/megaraid/megaraid_sas_fusion.c
View File

@ -216,36 +216,30 @@ inline void megasas_return_cmd_fusion(struct megasas_instance *instance,
/** /**
* megasas_fire_cmd_fusion - Sends command to the FW * megasas_fire_cmd_fusion - Sends command to the FW
* @instance: Adapter soft state * @instance: Adapter soft state
* @req_desc: 32bit or 64bit Request descriptor * @req_desc: 64bit Request descriptor
* *
* Perform PCI Write. Ventura supports 32 bit Descriptor. * Perform PCI Write.
* Prior to Ventura (12G) MR controller supports 64 bit Descriptor.
*/ */
static void static void
megasas_fire_cmd_fusion(struct megasas_instance *instance, megasas_fire_cmd_fusion(struct megasas_instance *instance,
union MEGASAS_REQUEST_DESCRIPTOR_UNION *req_desc) union MEGASAS_REQUEST_DESCRIPTOR_UNION *req_desc)
{ {
if (instance->adapter_type == VENTURA_SERIES)
writel(le32_to_cpu(req_desc->u.low),
&instance->reg_set->inbound_single_queue_port);
else {
#if defined(writeq) && defined(CONFIG_64BIT) #if defined(writeq) && defined(CONFIG_64BIT)
u64 req_data = (((u64)le32_to_cpu(req_desc->u.high) << 32) | u64 req_data = (((u64)le32_to_cpu(req_desc->u.high) << 32) |
le32_to_cpu(req_desc->u.low)); le32_to_cpu(req_desc->u.low));
writeq(req_data, &instance->reg_set->inbound_low_queue_port); writeq(req_data, &instance->reg_set->inbound_low_queue_port);
#else #else
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&instance->hba_lock, flags); spin_lock_irqsave(&instance->hba_lock, flags);
writel(le32_to_cpu(req_desc->u.low), writel(le32_to_cpu(req_desc->u.low),
&instance->reg_set->inbound_low_queue_port); &instance->reg_set->inbound_low_queue_port);
writel(le32_to_cpu(req_desc->u.high), writel(le32_to_cpu(req_desc->u.high),
&instance->reg_set->inbound_high_queue_port); &instance->reg_set->inbound_high_queue_port);
mmiowb(); mmiowb();
spin_unlock_irqrestore(&instance->hba_lock, flags); spin_unlock_irqrestore(&instance->hba_lock, flags);
#endif #endif
}
} }
/** /**
@ -982,7 +976,6 @@ megasas_ioc_init_fusion(struct megasas_instance *instance)
const char *sys_info; const char *sys_info;
MFI_CAPABILITIES *drv_ops; MFI_CAPABILITIES *drv_ops;
u32 scratch_pad_2; u32 scratch_pad_2;
unsigned long flags;
ktime_t time; ktime_t time;
bool cur_fw_64bit_dma_capable; bool cur_fw_64bit_dma_capable;
@ -1121,14 +1114,7 @@ megasas_ioc_init_fusion(struct megasas_instance *instance)
break; break;
} }
/* For Ventura also IOC INIT required 64 bit Descriptor write. */ megasas_fire_cmd_fusion(instance, &req_desc);
spin_lock_irqsave(&instance->hba_lock, flags);
writel(le32_to_cpu(req_desc.u.low),
&instance->reg_set->inbound_low_queue_port);
writel(le32_to_cpu(req_desc.u.high),
&instance->reg_set->inbound_high_queue_port);
mmiowb();
spin_unlock_irqrestore(&instance->hba_lock, flags);
wait_and_poll(instance, cmd, MFI_POLL_TIMEOUT_SECS); wait_and_poll(instance, cmd, MFI_POLL_TIMEOUT_SECS);