p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scsi: smartpqi: simplify spanning 

Removed the workaround for the transition to spanning.

Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
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 2016-08-31 14:54:23 -05:00 committed by Martin K. Petersen
parent b17f048658
commit 77668f412d
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3663,6 +3663,18 @@ static int pqi_validate_device_capability(struct pqi_ctrl_info *ctrl_info)
return -EINVAL; return -EINVAL;
} }
if (!ctrl_info->inbound_spanning_supported) {
dev_err(&ctrl_info->pci_dev->dev,
"the controller does not support inbound spanning\n");
return -EINVAL;
}
if (ctrl_info->outbound_spanning_supported) {
dev_err(&ctrl_info->pci_dev->dev,
"the controller supports outbound spanning but this driver does not\n");
return -EINVAL;
}
return 0; return 0;
} }
@ -4138,15 +4150,6 @@ static void pqi_calculate_queue_resources(struct pqi_ctrl_info *ctrl_info)
ctrl_info->num_queue_groups = num_queue_groups; ctrl_info->num_queue_groups = num_queue_groups;
if (ctrl_info->max_inbound_iu_length_per_firmware == 256 &&
ctrl_info->outbound_spanning_supported) {
/*
* TEMPHACK
* This is older f/w that doesn't actually support spanning.
*/
ctrl_info->max_inbound_iu_length =
PQI_OPERATIONAL_IQ_ELEMENT_LENGTH;
} else {
/* /*
* Make sure that the max. inbound IU length is an even multiple * Make sure that the max. inbound IU length is an even multiple
* of our inbound element length. * of our inbound element length.
@ -4155,7 +4158,6 @@ static void pqi_calculate_queue_resources(struct pqi_ctrl_info *ctrl_info)
(ctrl_info->max_inbound_iu_length_per_firmware / (ctrl_info->max_inbound_iu_length_per_firmware /
PQI_OPERATIONAL_IQ_ELEMENT_LENGTH) * PQI_OPERATIONAL_IQ_ELEMENT_LENGTH) *
PQI_OPERATIONAL_IQ_ELEMENT_LENGTH; PQI_OPERATIONAL_IQ_ELEMENT_LENGTH;
}
num_elements_per_iq = num_elements_per_iq =
(ctrl_info->max_inbound_iu_length / (ctrl_info->max_inbound_iu_length /