Commit 77668f41 authored by Kevin Barnett's avatar Kevin Barnett Committed by Martin K. Petersen

scsi: smartpqi: simplify spanning

Removed the workaround for the transition to spanning.
Reviewed-by: default avatarScott Teel <scott.teel@microsemi.com>
Reviewed-by: default avatarScott Benesh <scott.benesh@microsemi.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarKevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: default avatarDon Brace <don.brace@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b17f0486
......@@ -3663,6 +3663,18 @@ static int pqi_validate_device_capability(struct pqi_ctrl_info *ctrl_info)
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;
}
......@@ -4138,15 +4150,6 @@ static void pqi_calculate_queue_resources(struct pqi_ctrl_info *ctrl_info)
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
* 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 /
PQI_OPERATIONAL_IQ_ELEMENT_LENGTH) *
PQI_OPERATIONAL_IQ_ELEMENT_LENGTH;
}
num_elements_per_iq =
(ctrl_info->max_inbound_iu_length /
......
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