Commit e211e2c7 authored by Dan Williams's avatar Dan Williams Committed by James Bottomley
Browse files

[SCSI] mvsas: remove mvs_slave_{alloc|configure} 



libsas now handles:
1/ limiting ata scanning to lun0
2/ maximizing the queue_depth of sas devices (up to 256, mvsas only
   supports 64)
3/ changes to /sys/block/<sdX>/device/queue_depth for ata devices

Acked-by: default avatarXiangliang Yu <yuxiangl@marvell.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 97a1420d

drivers/scsi/mvsas/mv_init.c

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static struct scsi_host_template mvs_sht = { 
	.name			= DRV_NAME,

	.queuecommand		= sas_queuecommand,

	.target_alloc		= sas_target_alloc,

	.slave_configure	= mvs_slave_configure,

	.slave_configure	= sas_slave_configure,

	.slave_destroy		= sas_slave_destroy,

	.scan_finished		= mvs_scan_finished,

	.scan_start		= mvs_scan_start,
@@ -74,7 +74,7 @@ static struct scsi_host_template mvs_sht = { 
	.use_clustering		= ENABLE_CLUSTERING,

	.eh_device_reset_handler = sas_eh_device_reset_handler,

	.eh_bus_reset_handler	= sas_eh_bus_reset_handler,

	.slave_alloc		= mvs_slave_alloc,

	.slave_alloc		= sas_slave_alloc,

	.target_destroy		= sas_target_destroy,

	.ioctl			= sas_ioctl,

	.shost_attrs		= mvst_host_attrs,

drivers/scsi/mvsas/mv_sas.c

+0 −30
Original line number Diff line number Diff line
@@ -276,36 +276,6 @@ static void mvs_bytes_dmaed(struct mvs_info *mvi, int i) 
				   PORTE_BYTES_DMAED);

}



int mvs_slave_alloc(struct scsi_device *scsi_dev)

{

	struct domain_device *dev = sdev_to_domain_dev(scsi_dev);

	if (dev_is_sata(dev)) {

		/* We don't need to rescan targets

		 * if REPORT_LUNS request is failed

		 */

		if (scsi_dev->lun > 0)

			return -ENXIO;

		scsi_dev->tagged_supported = 1;

	}



	return sas_slave_alloc(scsi_dev);

}



int mvs_slave_configure(struct scsi_device *sdev)

{

	struct domain_device *dev = sdev_to_domain_dev(sdev);

	int ret = sas_slave_configure(sdev);



	if (ret)

		return ret;

	if (!dev_is_sata(dev)) {

		sas_change_queue_depth(sdev,

			MVS_QUEUE_SIZE,

			SCSI_QDEPTH_DEFAULT);

	}

	return 0;

}



void mvs_scan_start(struct Scsi_Host *shost)

{

	int i, j;

drivers/scsi/mvsas/mv_sas.h

+0 −2
Original line number Diff line number Diff line
@@ -459,8 +459,6 @@ int mvs_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func, 
			void *funcdata);

void __devinit mvs_set_sas_addr(struct mvs_info *mvi, int port_id,

				u32 off_lo, u32 off_hi, u64 sas_addr);

int mvs_slave_alloc(struct scsi_device *scsi_dev);

int mvs_slave_configure(struct scsi_device *sdev);

void mvs_scan_start(struct Scsi_Host *shost);

int mvs_scan_finished(struct Scsi_Host *shost, unsigned long time);

int mvs_queue_command(struct sas_task *task, const int num,

CRA Git | Maintained and supported by SUSTech CRA and CCSE