Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 816aa907 authored by Moore, Eric's avatar Moore, Eric Committed by James Bottomley
Browse files

[SCSI] fusion - adding raid support in mptsas 



The SAS RAID volumes are reported beyond the expected number of phys.

Signed-off-by: default avatarEric Moore <Eric.Moore@lsil.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent e02f3f59

drivers/message/fusion/mptbase.h

+1 −0
Original line number Diff line number Diff line
@@ -630,6 +630,7 @@ typedef struct _MPT_ADAPTER 
	struct list_head	 sas_topology;

	struct mutex		 sas_topology_mutex;

	MPT_SAS_MGMT		 sas_mgmt;

	int			 num_ports;



	struct list_head	 fc_rports;

	spinlock_t		 fc_rport_lock; /* list and ri flags */

drivers/message/fusion/mptsas.c

+26 −1
Original line number Diff line number Diff line
@@ -274,6 +274,16 @@ mptsas_slave_alloc(struct scsi_device *sdev) 
		hd->Targets[sdev->id] = vtarget;

	}



	/*

	  RAID volumes placed beyond the last expected port.

	*/

	if (sdev->channel == hd->ioc->num_ports) {

		vdev->target_id = sdev->id;

		vdev->bus_id = 0;

		vdev->lun = 0;

		goto out;

	}



	rphy = dev_to_rphy(sdev->sdev_target->dev.parent);

	mutex_lock(&hd->ioc->sas_topology_mutex);

	list_for_each_entry(p, &hd->ioc->sas_topology, list) {
@@ -284,6 +294,7 @@ mptsas_slave_alloc(struct scsi_device *sdev) 
					p->phy_info[i].attached.id;

				vdev->bus_id = p->phy_info[i].attached.channel;

				vdev->lun = sdev->lun;

 	mutex_unlock(&hd->ioc->sas_topology_mutex);

				goto out;

			}

		}
@@ -295,7 +306,6 @@ mptsas_slave_alloc(struct scsi_device *sdev) 
	return -ENODEV;



 out:

	mutex_unlock(&hd->ioc->sas_topology_mutex);

	vtarget->ioc_id = vdev->ioc_id;

	vtarget->target_id = vdev->target_id;

	vtarget->bus_id = vdev->bus_id;
@@ -1051,6 +1061,7 @@ mptsas_probe_hba_phys(MPT_ADAPTER *ioc, int *index) 
	if (error)

		goto out_free_port_info;



	ioc->num_ports = port_info->num_phys;

	mutex_lock(&ioc->sas_topology_mutex);

	list_add_tail(&port_info->list, &ioc->sas_topology);

	mutex_unlock(&ioc->sas_topology_mutex);
@@ -1585,6 +1596,20 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	mptsas_scan_sas_topology(ioc);



	/*

	  Reporting RAID volumes.

	*/

	if (!ioc->raid_data.pIocPg2)

		return 0;

	if (!ioc->raid_data.pIocPg2->NumActiveVolumes)

		return 0;

	for (ii=0;ii<ioc->raid_data.pIocPg2->NumActiveVolumes;ii++) {

		scsi_add_device(sh,

			ioc->num_ports,

			ioc->raid_data.pIocPg2->RaidVolume[ii].VolumeID,

			0);

	}



	return 0;



out_mptsas_probe: