Moore, Eric wrote:
>>On Tuesday, March 04, 2008 9:51 AM, Michael Reed wrote:
<snip>
>>
>> The fix is simple. Fusion SAS and Fibre Channel (subject to
>> same bug) should just leave "this_id" initialized to "-1".
>>
>> Applies to 2.6.25-rc3-git5.
>>
>> Signed-off-by: Michael Reed <mdr@xxxxxxx>
>>
>> --
>>
<snip>
>
> This looks good. I had deleted setting this_id in mptsas internal
> sources long ago. In addition to this change, we need to fix
> mptscsih_slave_configure so it doesn't set the queue depth to 1 for SAS
> protocal when sdev->id is greater than sh->max_id. The sas transport
> layer assigns the target ids, incrementing with each hotplug add, with
> large topologies, it doesn't take long to hit this threshold.
>
> Eric
Adjusting the patch to reflect Eric's comments. The change WRT
max_id is from Hannes. FC should also be subject to the same issue.
Signed-off-by: Michael Reed <mdr@xxxxxxx>
--- gitu/drivers/message/fusion/mptfc.c 2008-01-24 14:58:37.000000000 -0800
+++ git/drivers/message/fusion/mptfc.c 2008-03-13 12:37:52.176015612 -0700
@@ -1238,8 +1238,6 @@ mptfc_probe(struct pci_dev *pdev, const
sh->max_id = ioc->pfacts->MaxDevices;
sh->max_lun = max_lun;
- sh->this_id = ioc->pfacts[0].PortSCSIID;
-
/* Required entry.
*/
sh->unique_id = ioc->id;
--- gitu/drivers/message/fusion/mptsas.c 2008-03-10 13:23:46.000000000 -0700
+++ git/drivers/message/fusion/mptsas.c 2008-03-13 12:38:01.912440308 -0700
@@ -3181,8 +3181,6 @@ mptsas_probe(struct pci_dev *pdev, const
sh->transportt = mptsas_transport_template;
- sh->this_id = ioc->pfacts[0].PortSCSIID;
-
/* Required entry.
*/
sh->unique_id = ioc->id;
--- gitu/drivers/message/fusion/mptscsih.c 2008-03-10 13:20:30.000000000 -0700
+++ git/drivers/message/fusion/mptscsih.c 2008-03-13 12:38:38.070017332 -0700
@@ -2442,12 +2442,6 @@ mptscsih_slave_configure(struct scsi_dev
ioc->name, sdev->sdtr, sdev->wdtr,
sdev->ppr, sdev->inquiry_len));
- if (sdev->id > sh->max_id) {
- /* error case, should never happen */
- scsi_adjust_queue_depth(sdev, 0, 1);
- goto slave_configure_exit;
- }
-
vdevice->configured_lun = 1;
mptscsih_change_queue_depth(sdev, MPT_SCSI_CMD_PER_DEV_HIGH);
@@ -2461,8 +2455,6 @@ mptscsih_slave_configure(struct scsi_dev
ioc->name, vtarget->negoFlags, vtarget->maxOffset,
vtarget->minSyncFactor));
-slave_configure_exit:
-
dsprintk(ioc, printk(MYIOC_s_DEBUG_FMT
"tagged %d, simple %d, ordered %d\n",
ioc->name,sdev->tagged_supported, sdev->simple_tags,
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
