UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: smartpqi: workaround fw bug for oq deletion 

Skip deleting PQI operational queues when there is an error creating a
new queue group. It's not really necessary to delete the queues anyway
because they get deleted during the PQI reset that is part of the error
recovery path.

Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Kevin Barnett 2018-03-21 13:32:31 -05:00 committed by Martin K. Petersen
parent 45dce24df5
commit 339faa8150
1 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/scsi/smartpqi/smartpqi_init.c
View File

@ -3898,29 +3898,6 @@ static int pqi_validate_device_capability(struct pqi_ctrl_info *ctrl_info)
return 0; return 0;
} }
static int pqi_delete_operational_queue(struct pqi_ctrl_info *ctrl_info,
bool inbound_queue, u16 queue_id)
{
struct pqi_general_admin_request request;
struct pqi_general_admin_response response;
memset(&request, 0, sizeof(request));
request.header.iu_type = PQI_REQUEST_IU_GENERAL_ADMIN;
put_unaligned_le16(PQI_GENERAL_ADMIN_IU_LENGTH,
&request.header.iu_length);
if (inbound_queue)
request.function_code =
PQI_GENERAL_ADMIN_FUNCTION_DELETE_IQ;
else
request.function_code =
PQI_GENERAL_ADMIN_FUNCTION_DELETE_OQ;
put_unaligned_le16(queue_id,
&request.data.delete_operational_queue.queue_id);
return pqi_submit_admin_request_synchronous(ctrl_info, &request,
&response);
}
static int pqi_create_event_queue(struct pqi_ctrl_info *ctrl_info) static int pqi_create_event_queue(struct pqi_ctrl_info *ctrl_info)
{ {
int rc; int rc;
@ -4038,7 +4015,7 @@ static int pqi_create_queue_group(struct pqi_ctrl_info *ctrl_info,
if (rc) { if (rc) {
dev_err(&ctrl_info->pci_dev->dev, dev_err(&ctrl_info->pci_dev->dev,
"error creating inbound AIO queue\n"); "error creating inbound AIO queue\n");
goto delete_inbound_queue_raid; return rc;
} }
queue_group->iq_pi[AIO_PATH] = ctrl_info->iomem_base + queue_group->iq_pi[AIO_PATH] = ctrl_info->iomem_base +
@ -4066,7 +4043,7 @@ static int pqi_create_queue_group(struct pqi_ctrl_info *ctrl_info,
if (rc) { if (rc) {
dev_err(&ctrl_info->pci_dev->dev, dev_err(&ctrl_info->pci_dev->dev,
"error changing queue property\n"); "error changing queue property\n");
goto delete_inbound_queue_aio; return rc;
} }
/* /*
@ -4096,7 +4073,7 @@ static int pqi_create_queue_group(struct pqi_ctrl_info *ctrl_info,
if (rc) { if (rc) {
dev_err(&ctrl_info->pci_dev->dev, dev_err(&ctrl_info->pci_dev->dev,
"error creating outbound queue\n"); "error creating outbound queue\n");
goto delete_inbound_queue_aio; return rc;
} }
queue_group->oq_ci = ctrl_info->iomem_base + queue_group->oq_ci = ctrl_info->iomem_base +
@ -4105,16 +4082,6 @@ static int pqi_create_queue_group(struct pqi_ctrl_info *ctrl_info,
&response.data.create_operational_oq.oq_ci_offset); &response.data.create_operational_oq.oq_ci_offset);
return 0; return 0;
delete_inbound_queue_aio:
pqi_delete_operational_queue(ctrl_info, true,
queue_group->iq_id[AIO_PATH]);
delete_inbound_queue_raid:
pqi_delete_operational_queue(ctrl_info, true,
queue_group->iq_id[RAID_PATH]);
return rc;
} }
static int pqi_create_queues(struct pqi_ctrl_info *ctrl_info) static int pqi_create_queues(struct pqi_ctrl_info *ctrl_info)