Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6 (2d986010) · Commits · git / linux-net

Documentation/scsi/scsi_mid_low_api.txt

+0 −15

Original line number	Diff line number	Diff line
		@@ -388,7 +388,6 @@ Summary:
		scsi_remove_device - detach and remove a SCSI device
		scsi_remove_host - detach and remove all SCSI devices owned by host
		scsi_report_bus_reset - report scsi _bus_ reset observed
		scsi_set_device - place device reference in host structure
		scsi_track_queue_full - track successive QUEUE_FULL events
		scsi_unblock_requests - allow further commands to be queued to given host
		scsi_unregister - [calls scsi_host_put()]
		@@ -740,20 +739,6 @@ int scsi_remove_host(struct Scsi_Host *shost)
		void scsi_report_bus_reset(struct Scsi_Host * shost, int channel)


		/**
		* scsi_set_device - place device reference in host structure
		* @shost: a pointer to a scsi host instance
		* @pdev: pointer to device instance to assign
		*
		* Returns nothing
		*
		* Might block: no
		*
		* Defined in: include/scsi/scsi_host.h .
		**/
		void scsi_set_device(struct Scsi_Host * shost, struct device * dev)


		/**
		* scsi_track_queue_full - track successive QUEUE_FULL events on given
		* device to determine if and when there is a need

drivers/fc4/fc.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -365,6 +365,7 @@ void fcp_register(fc_channel *fc, u8 type, int unregister)
		kfree (fc->scsi_bitmap);
		kfree (fc->cmd_slots);
		FCND(("Unregistering\n"));
		#if 0
		if (fc->rst_pkt) {
		if (fc->rst_pkt->eh_state == SCSI_STATE_UNUSED)
		kfree(fc->rst_pkt);
		@@ -373,6 +374,7 @@ void fcp_register(fc_channel *fc, u8 type, int unregister)
		printk("FC: Reset in progress. Now?!");
		}
		}
		#endif
		FCND(("Unregistered\n"));
		}
		} else
		@@ -915,6 +917,7 @@ int fcp_scsi_abort(Scsi_Cmnd *SCpnt)
		}
		}

		#if 0
		void fcp_scsi_reset_done(Scsi_Cmnd *SCpnt)
		{
		fc_channel *fc = FC_SCMND(SCpnt);
		@@ -922,11 +925,13 @@ void fcp_scsi_reset_done(Scsi_Cmnd *SCpnt)
		fc->rst_pkt->eh_state = SCSI_STATE_FINISHED;
		up(fc->rst_pkt->device->host->eh_action);
		}
		#endif

		#define FCP_RESET_TIMEOUT (2*HZ)

		int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
		{
		#if 0 /* broken junk, but if davem wants to compile this driver, let him.. */
		unsigned long flags;
		fcp_cmd *cmd;
		fcp_cmnd *fcmd;
		@@ -1000,6 +1005,7 @@ int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
		}
		fc->rst_pkt->eh_state = SCSI_STATE_UNUSED;
		return SUCCESS;
		#endif
		}

		static int __fcp_scsi_host_reset(Scsi_Cmnd *SCpnt)

drivers/message/fusion/mptfc.c

+1 −18

Original line number	Diff line number	Diff line
		@@ -83,19 +83,6 @@ static int mptfcDoneCtx = -1;
		static int mptfcTaskCtx = -1;
		static int mptfcInternalCtx = -1; /* Used only for internal commands */

		static struct device_attribute mptfc_queue_depth_attr = {
		.attr = {
		.name = "queue_depth",
		.mode = S_IWUSR,
		},
		.store = mptscsih_store_queue_depth,
		};

		static struct device_attribute *mptfc_dev_attrs[] = {
		&mptfc_queue_depth_attr,
		NULL,
		};

		static struct scsi_host_template mptfc_driver_template = {
		.proc_name = "mptfc",
		.proc_info = mptscsih_proc_info,
		@@ -105,6 +92,7 @@ static struct scsi_host_template mptfc_driver_template = {
		.slave_alloc = mptscsih_slave_alloc,
		.slave_configure = mptscsih_slave_configure,
		.slave_destroy = mptscsih_slave_destroy,
		.change_queue_depth = mptscsih_change_queue_depth,
		.eh_abort_handler = mptscsih_abort,
		.eh_device_reset_handler = mptscsih_dev_reset,
		.eh_bus_reset_handler = mptscsih_bus_reset,
		@@ -116,7 +104,6 @@ static struct scsi_host_template mptfc_driver_template = {
		.max_sectors = 8192,
		.cmd_per_lun = 7,
		.use_clustering = ENABLE_CLUSTERING,
		.sdev_attrs = mptfc_dev_attrs,
		};

		/****************************************************************************
		@@ -267,10 +254,6 @@ mptfc_probe(struct pci_dev pdev, const struct pci_device_id id)
		sh->sg_tablesize = numSGE;
		}

		/* Set the pci device pointer in Scsi_Host structure.
		*/
		scsi_set_device(sh, &ioc->pcidev->dev);

		spin_unlock_irqrestore(&ioc->FreeQlock, flags);

		hd = (MPT_SCSI_HOST *) sh->hostdata;

drivers/message/fusion/mptscsih.c

+21 −26

Original line number	Diff line number	Diff line
		@@ -2234,13 +2234,27 @@ mptscsih_slave_destroy(struct scsi_device *device)
		}
		}

		static void
		mptscsih_set_queue_depth(struct scsi_device device, MPT_SCSI_HOST hd,
		VirtDevice *pTarget, int qdepth)
		/=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=/
		/*
		* mptscsih_change_queue_depth - This function will set a devices queue depth
		* @sdev: per scsi_device pointer
		* @qdepth: requested queue depth
		*
		* Adding support for new 'change_queue_depth' api.
		*/
		int
		mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth)
		{
		MPT_SCSI_HOST hd = (MPT_SCSI_HOST )sdev->host->hostdata;
		VirtDevice *pTarget;
		int max_depth;
		int tagged;

		if (hd == NULL)
		return 0;
		if (!(pTarget = hd->Targets[sdev->id]))
		return 0;

		if (hd->ioc->bus_type == SCSI) {
		if (pTarget->tflags & MPT_TARGET_FLAGS_VALID_INQUIRY) {
		if (!(pTarget->tflags & MPT_TARGET_FLAGS_Q_YES))
		@@ -2264,10 +2278,10 @@ mptscsih_set_queue_depth(struct scsi_device device, MPT_SCSI_HOST hd,
		else
		tagged = MSG_SIMPLE_TAG;

		scsi_adjust_queue_depth(device, tagged, qdepth);
		scsi_adjust_queue_depth(sdev, tagged, qdepth);
		return sdev->queue_depth;
		}


		/*
		* OS entry point to adjust the queue_depths on a per-device basis.
		* Called once per device the bus scan. Use it to force the queue_depth
		@@ -2317,7 +2331,7 @@ mptscsih_slave_configure(struct scsi_device *device)

		mptscsih_initTarget(hd, device->channel, device->id, device->lun,
		device->inquiry, device->inquiry_len );
		mptscsih_set_queue_depth(device, hd, pTarget, MPT_SCSI_CMD_PER_DEV_HIGH);
		mptscsih_change_queue_depth(device, MPT_SCSI_CMD_PER_DEV_HIGH);

		dsprintk((MYIOC_s_INFO_FMT
		"Queue depth=%d, tflags=%x\n",
		@@ -2337,25 +2351,6 @@ mptscsih_slave_configure(struct scsi_device *device)
		return 0;
		}

		ssize_t
		mptscsih_store_queue_depth(struct device dev, struct device_attribute attr, const char *buf, size_t count)
		{
		int depth;
		struct scsi_device *sdev = to_scsi_device(dev);
		MPT_SCSI_HOST hd = (MPT_SCSI_HOST ) sdev->host->hostdata;
		VirtDevice *pTarget;

		depth = simple_strtoul(buf, NULL, 0);
		if (depth == 0)
		return -EINVAL;
		pTarget = hd->Targets[sdev->id];
		if (pTarget == NULL)
		return -EINVAL;
		mptscsih_set_queue_depth(sdev, (MPT_SCSI_HOST *) sdev->host->hostdata,
		pTarget, depth);
		return count;
		}

		/=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=/
		/*
		* Private routines...
		@@ -5586,7 +5581,7 @@ EXPORT_SYMBOL(mptscsih_taskmgmt_complete);
		EXPORT_SYMBOL(mptscsih_scandv_complete);
		EXPORT_SYMBOL(mptscsih_event_process);
		EXPORT_SYMBOL(mptscsih_ioc_reset);
		EXPORT_SYMBOL(mptscsih_store_queue_depth);
		EXPORT_SYMBOL(mptscsih_change_queue_depth);
		EXPORT_SYMBOL(mptscsih_timer_expired);

		/=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=/

drivers/message/fusion/mptscsih.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,5 +103,5 @@ extern int mptscsih_taskmgmt_complete(MPT_ADAPTER ioc, MPT_FRAME_HDR mf, MPT_F
		extern int mptscsih_scandv_complete(MPT_ADAPTER ioc, MPT_FRAME_HDR mf, MPT_FRAME_HDR *r);
		extern int mptscsih_event_process(MPT_ADAPTER ioc, EventNotificationReply_t pEvReply);
		extern int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset);
		extern ssize_t mptscsih_store_queue_depth(struct device dev, struct device_attribute attr, const char *buf, size_t count);
		extern int mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth);
		extern void mptscsih_timer_expired(unsigned long data);