Merge branch '5.15/scsi-fixes' into 5.16/scsi-staging (ec65e6be) · Commits · EulixOS / Software / Kernel

MAINTAINERS

+0 −7

Original line number	Diff line number	Diff line
		@@ -16650,13 +16650,6 @@ M: Lubomir Rintel <lkundrak@v3.sk>
		S: Supported
		F: drivers/char/pcmcia/scr24x_cs.c

		SCSI CDROM DRIVER
		M: Jens Axboe <axboe@kernel.dk>
		L: linux-scsi@vger.kernel.org
		S: Maintained
		W: http://www.kernel.dk
		F: drivers/scsi/sr*

		SCSI RDMA PROTOCOL (SRP) INITIATOR
		M: Bart Van Assche <bvanassche@acm.org>
		L: linux-rdma@vger.kernel.org

block/bsg.c

+15 −8

Original line number	Diff line number	Diff line
		@@ -165,13 +165,20 @@ static const struct file_operations bsg_fops = {
		.llseek = default_llseek,
		};

		static void bsg_device_release(struct device *dev)
		{
		struct bsg_device *bd = container_of(dev, struct bsg_device, device);

		ida_simple_remove(&bsg_minor_ida, MINOR(bd->device.devt));
		kfree(bd);
		}

		void bsg_unregister_queue(struct bsg_device *bd)
		{
		if (bd->queue->kobj.sd)
		sysfs_remove_link(&bd->queue->kobj, "bsg");
		cdev_device_del(&bd->cdev, &bd->device);
		ida_simple_remove(&bsg_minor_ida, MINOR(bd->device.devt));
		kfree(bd);
		put_device(&bd->device);
		}
		EXPORT_SYMBOL_GPL(bsg_unregister_queue);

		@@ -193,11 +200,13 @@ struct bsg_device bsg_register_queue(struct request_queue q,
		if (ret < 0) {
		if (ret == -ENOSPC)
		dev_err(parent, "bsg: too many bsg devices\n");
		goto out_kfree;
		kfree(bd);
		return ERR_PTR(ret);
		}
		bd->device.devt = MKDEV(bsg_major, ret);
		bd->device.class = bsg_class;
		bd->device.parent = parent;
		bd->device.release = bsg_device_release;
		dev_set_name(&bd->device, "%s", name);
		device_initialize(&bd->device);

		@@ -205,7 +214,7 @@ struct bsg_device bsg_register_queue(struct request_queue q,
		bd->cdev.owner = THIS_MODULE;
		ret = cdev_device_add(&bd->cdev, &bd->device);
		if (ret)
		goto out_ida_remove;
		goto out_put_device;

		if (q->kobj.sd) {
		ret = sysfs_create_link(&q->kobj, &bd->device.kobj, "bsg");
		@@ -217,10 +226,8 @@ struct bsg_device bsg_register_queue(struct request_queue q,

		out_device_del:
		cdev_device_del(&bd->cdev, &bd->device);
		out_ida_remove:
		ida_simple_remove(&bsg_minor_ida, MINOR(bd->device.devt));
		out_kfree:
		kfree(bd);
		out_put_device:
		put_device(&bd->device);
		return ERR_PTR(ret);
		}
		EXPORT_SYMBOL_GPL(bsg_register_queue);

drivers/scsi/arm/Kconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -10,17 +10,6 @@ config SCSI_ACORNSCSI_3
		This enables support for the Acorn SCSI card (aka30). If you have an
		Acorn system with one of these, say Y. If unsure, say N.

		config SCSI_ACORNSCSI_TAGGED_QUEUE
		bool "Support SCSI 2 Tagged queueing"
		depends on SCSI_ACORNSCSI_3
		help
		Say Y here to enable tagged queuing support on the Acorn SCSI card.

		This is a feature of SCSI-2 which improves performance: the host
		adapter can send several SCSI commands to a device's queue even if
		previous commands haven't finished yet. Some SCSI devices don't
		implement this properly, so the safe answer is N.

		config SCSI_ACORNSCSI_SYNC
		bool "Support SCSI 2 Synchronous Transfers"
		depends on SCSI_ACORNSCSI_3

drivers/scsi/arm/acornscsi.c

+22 −81

Original line number	Diff line number	Diff line
		@@ -52,12 +52,8 @@
		* You can tell if you have a device that supports tagged queueing my
		* cating (eg) /proc/scsi/acornscsi/0 and see if the SCSI revision is reported
		* as '2 TAG'.
		*
		* Also note that CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE is normally set in the config
		* scripts, but disabled here. Once debugged, remove the #undef, otherwise to debug,
		* comment out the undef.
		*/
		#undef CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE

		/*
		* SCSI-II Synchronous transfer support.
		*
		@@ -171,7 +167,7 @@ static void acornscsi_done(AS_Host host, struct scsi_cmnd *SCpntp,
		unsigned int result);
		static int acornscsi_reconnect_finish(AS_Host *host);
		static void acornscsi_dma_cleanup(AS_Host *host);
		static void acornscsi_abortcmd(AS_Host *host, unsigned char tag);
		static void acornscsi_abortcmd(AS_Host *host);

		/* ====================================================================================
		* Miscellaneous
		@@ -741,17 +737,6 @@ intr_ret_t acornscsi_kick(AS_Host *host)
		#endif

		if (from_queue) {
		#ifdef CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE
		/*
		* tagged queueing - allocate a new tag to this command
		*/
		if (SCpnt->device->simple_tags) {
		SCpnt->device->current_tag += 1;
		if (SCpnt->device->current_tag == 0)
		SCpnt->device->current_tag = 1;
		SCpnt->tag = SCpnt->device->current_tag;
		} else
		#endif
		set_bit(SCpnt->device->id * 8 +
		(u8)(SCpnt->device->lun & 0x07), host->busyluns);

		@@ -1192,7 +1177,7 @@ void acornscsi_dma_intr(AS_Host *host)
		* the device recognises the attention.
		*/
		if (dmac_read(host, DMAC_STATUS) & STATUS_RQ0) {
		acornscsi_abortcmd(host, host->SCpnt->tag);
		acornscsi_abortcmd(host);

		dmac_write(host, DMAC_TXCNTLO, 0);
		dmac_write(host, DMAC_TXCNTHI, 0);
		@@ -1560,23 +1545,6 @@ void acornscsi_message(AS_Host *host)
		acornscsi_sbic_issuecmd(host, CMND_ASSERTATN);

		switch (host->scsi.last_message) {
		#ifdef CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE
		case HEAD_OF_QUEUE_TAG:
		case ORDERED_QUEUE_TAG:
		case SIMPLE_QUEUE_TAG:
		/*
		* ANSI standard says: (Section SCSI-2 Rev. 10c Sect 5.6.17)
		* If a target does not implement tagged queuing and a queue tag
		* message is received, it shall respond with a MESSAGE REJECT
		* message and accept the I/O process as if it were untagged.
		*/
		printk(KERN_NOTICE "scsi%d.%c: disabling tagged queueing\n",
		host->host->host_no, acornscsi_target(host));
		host->SCpnt->device->simple_tags = 0;
		set_bit(host->SCpnt->device->id * 8 +
		(u8)(host->SCpnt->device->lun & 0x7), host->busyluns);
		break;
		#endif
		case EXTENDED_MESSAGE \| (EXTENDED_SDTR << 8):
		/*
		* Target can't handle synchronous transfers
		@@ -1687,24 +1655,11 @@ void acornscsi_buildmessages(AS_Host *host)
		#if 0
		/* does the device need the current command aborted */
		if (cmd_aborted) {
		acornscsi_abortcmd(host->SCpnt->tag);
		acornscsi_abortcmd(host);
		return;
		}
		#endif

		#ifdef CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE
		if (host->SCpnt->tag) {
		unsigned int tag_type;

		if (host->SCpnt->cmnd[0] == REQUEST_SENSE \|\|
		host->SCpnt->cmnd[0] == TEST_UNIT_READY \|\|
		host->SCpnt->cmnd[0] == INQUIRY)
		tag_type = HEAD_OF_QUEUE_TAG;
		else
		tag_type = SIMPLE_QUEUE_TAG;
		msgqueue_addmsg(&host->scsi.msgs, 2, tag_type, host->SCpnt->tag);
		}
		#endif

		#ifdef CONFIG_SCSI_ACORNSCSI_SYNC
		if (host->device[host->SCpnt->device->id].sync_state == SYNC_NEGOCIATE) {
		@@ -1798,7 +1753,7 @@ int acornscsi_reconnect(AS_Host *host)
		"to reconnect with\n",
		host->host->host_no, '0' + target);
		acornscsi_dumplog(host, target);
		acornscsi_abortcmd(host, 0);
		acornscsi_abortcmd(host);
		if (host->SCpnt) {
		queue_add_cmd_tail(&host->queues.disconnected, host->SCpnt);
		host->SCpnt = NULL;
		@@ -1821,7 +1776,7 @@ int acornscsi_reconnect_finish(AS_Host *host)
		host->scsi.disconnectable = 0;
		if (host->SCpnt->device->id == host->scsi.reconnected.target &&
		host->SCpnt->device->lun == host->scsi.reconnected.lun &&
		host->SCpnt->tag == host->scsi.reconnected.tag) {
		scsi_cmd_to_rq(host->SCpnt)->tag == host->scsi.reconnected.tag) {
		#if (DEBUG & (DEBUG_QUEUES\|DEBUG_DISCON))
		DBG(host->SCpnt, printk("scsi%d.%c: reconnected",
		host->host->host_no, acornscsi_target(host)));
		@@ -1848,7 +1803,7 @@ int acornscsi_reconnect_finish(AS_Host *host)
		}

		if (!host->SCpnt)
		acornscsi_abortcmd(host, host->scsi.reconnected.tag);
		acornscsi_abortcmd(host);
		else {
		/*
		* Restore data pointer from SAVED pointers.
		@@ -1889,20 +1844,14 @@ void acornscsi_disconnect_unexpected(AS_Host *host)
		* Function: void acornscsi_abortcmd(AS_host *host, unsigned char tag)
		* Purpose : abort a currently executing command
		* Params : host - host with connected command to abort
		* tag - tag to abort
		*/
		static
		void acornscsi_abortcmd(AS_Host *host, unsigned char tag)
		void acornscsi_abortcmd(AS_Host *host)
		{
		host->scsi.phase = PHASE_ABORTED;
		sbic_arm_write(host, SBIC_CMND, CMND_ASSERTATN);

		msgqueue_flush(&host->scsi.msgs);
		#ifdef CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE
		if (tag)
		msgqueue_addmsg(&host->scsi.msgs, 2, ABORT_TAG, tag);
		else
		#endif
		msgqueue_addmsg(&host->scsi.msgs, 1, ABORT);
		}

		@@ -1993,7 +1942,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
		printk(KERN_ERR "scsi%d.%c: PHASE_CONNECTING, SSR %02X?\n",
		host->host->host_no, acornscsi_target(host), ssr);
		acornscsi_dumplog(host, host->SCpnt ? host->SCpnt->device->id : 8);
		acornscsi_abortcmd(host, host->SCpnt->tag);
		acornscsi_abortcmd(host);
		}
		return INTR_PROCESSING;

		@@ -2029,7 +1978,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
		printk(KERN_ERR "scsi%d.%c: PHASE_CONNECTED, SSR %02X?\n",
		host->host->host_no, acornscsi_target(host), ssr);
		acornscsi_dumplog(host, host->SCpnt ? host->SCpnt->device->id : 8);
		acornscsi_abortcmd(host, host->SCpnt->tag);
		acornscsi_abortcmd(host);
		}
		return INTR_PROCESSING;

		@@ -2075,20 +2024,20 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
		case 0x18: /* -> PHASE_DATAOUT */
		/* COMMAND -> DATA OUT */
		if (host->scsi.SCp.sent_command != host->SCpnt->cmd_len)
		acornscsi_abortcmd(host, host->SCpnt->tag);
		acornscsi_abortcmd(host);
		acornscsi_dma_setup(host, DMA_OUT);
		if (!acornscsi_starttransfer(host))
		acornscsi_abortcmd(host, host->SCpnt->tag);
		acornscsi_abortcmd(host);
		host->scsi.phase = PHASE_DATAOUT;
		return INTR_IDLE;

		case 0x19: /* -> PHASE_DATAIN */
		/* COMMAND -> DATA IN */
		if (host->scsi.SCp.sent_command != host->SCpnt->cmd_len)
		acornscsi_abortcmd(host, host->SCpnt->tag);
		acornscsi_abortcmd(host);
		acornscsi_dma_setup(host, DMA_IN);
		if (!acornscsi_starttransfer(host))
		acornscsi_abortcmd(host, host->SCpnt->tag);
		acornscsi_abortcmd(host);
		host->scsi.phase = PHASE_DATAIN;
		return INTR_IDLE;

		@@ -2156,7 +2105,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
		/* MESSAGE IN -> DATA OUT */
		acornscsi_dma_setup(host, DMA_OUT);
		if (!acornscsi_starttransfer(host))
		acornscsi_abortcmd(host, host->SCpnt->tag);
		acornscsi_abortcmd(host);
		host->scsi.phase = PHASE_DATAOUT;
		return INTR_IDLE;

		@@ -2165,7 +2114,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
		/* MESSAGE IN -> DATA IN */
		acornscsi_dma_setup(host, DMA_IN);
		if (!acornscsi_starttransfer(host))
		acornscsi_abortcmd(host, host->SCpnt->tag);
		acornscsi_abortcmd(host);
		host->scsi.phase = PHASE_DATAIN;
		return INTR_IDLE;

		@@ -2206,7 +2155,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
		switch (ssr) {
		case 0x19: /* -> PHASE_DATAIN */
		case 0x89: /* -> PHASE_DATAIN */
		acornscsi_abortcmd(host, host->SCpnt->tag);
		acornscsi_abortcmd(host);
		return INTR_IDLE;

		case 0x1b: /* -> PHASE_STATUSIN */
		@@ -2255,7 +2204,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
		switch (ssr) {
		case 0x18: /* -> PHASE_DATAOUT */
		case 0x88: /* -> PHASE_DATAOUT */
		acornscsi_abortcmd(host, host->SCpnt->tag);
		acornscsi_abortcmd(host);
		return INTR_IDLE;

		case 0x1b: /* -> PHASE_STATUSIN */
		@@ -2482,7 +2431,6 @@ static int acornscsi_queuecmd_lck(struct scsi_cmnd *SCpnt,
		SCpnt->scsi_done = done;
		SCpnt->host_scribble = NULL;
		SCpnt->result = 0;
		SCpnt->tag = 0;
		SCpnt->SCp.phase = (int)acornscsi_datadirection(SCpnt->cmnd[0]);
		SCpnt->SCp.sent_command = 0;
		SCpnt->SCp.scsi_xferred = 0;
		@@ -2581,7 +2529,7 @@ static enum res_abort acornscsi_do_abort(AS_Host host, struct scsi_cmnd SCpnt)
		break;

		default:
		acornscsi_abortcmd(host, host->SCpnt->tag);
		acornscsi_abortcmd(host);
		res = res_snooze;
		}
		local_irq_restore(flags);
		@@ -2747,9 +2695,6 @@ char acornscsi_info(struct Scsi_Host host)
		#ifdef CONFIG_SCSI_ACORNSCSI_SYNC
		" SYNC"
		#endif
		#ifdef CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE
		" TAG"
		#endif
		#if (DEBUG & DEBUG_NO_WRITE)
		" NOWRITE (" __stringify(NO_WRITE) ")"
		#endif
		@@ -2770,9 +2715,6 @@ static int acornscsi_show_info(struct seq_file m, struct Scsi_Host instance)
		#ifdef CONFIG_SCSI_ACORNSCSI_SYNC
		" SYNC"
		#endif
		#ifdef CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE
		" TAG"
		#endif
		#if (DEBUG & DEBUG_NO_WRITE)
		" NOWRITE (" __stringify(NO_WRITE) ")"
		#endif
		@@ -2827,9 +2769,8 @@ static int acornscsi_show_info(struct seq_file m, struct Scsi_Host instance)
		seq_printf(m, "Device/Lun TaggedQ Sync\n");
		seq_printf(m, " %d/%llu ", scd->id, scd->lun);
		if (scd->tagged_supported)
		seq_printf(m, "%3sabled(%3d) ",
		scd->simple_tags ? "en" : "dis",
		scd->current_tag);
		seq_printf(m, "%3sabled ",
		scd->simple_tags ? "en" : "dis");
		else
		seq_printf(m, "unsupported ");

drivers/scsi/arm/fas216.c

+8 −23

Original line number	Diff line number	Diff line
		@@ -77,7 +77,6 @@
		* I was thinking that this was a good chip until I found this restriction ;(
		*/
		#define SCSI2_SYNC
		#undef SCSI2_TAG

		#undef DEBUG_CONNECT
		#undef DEBUG_MESSAGES
		@@ -990,7 +989,7 @@ fas216_reselected_intr(FAS216_Info *info)
		info->scsi.disconnectable = 0;
		if (info->SCpnt->device->id == target &&
		info->SCpnt->device->lun == lun &&
		info->SCpnt->tag == tag) {
		scsi_cmd_to_rq(info->SCpnt)->tag == tag) {
		fas216_log(info, LOG_CONNECT, "reconnected previously executing command");
		} else {
		queue_add_cmd_tail(&info->queues.disconnected, info->SCpnt);
		@@ -1791,8 +1790,9 @@ static void fas216_start_command(FAS216_Info info, struct scsi_cmnd SCpnt)
		/*
		* add tag message if required
		*/
		if (SCpnt->tag)
		msgqueue_addmsg(&info->scsi.msgs, 2, SIMPLE_QUEUE_TAG, SCpnt->tag);
		if (SCpnt->device->simple_tags)
		msgqueue_addmsg(&info->scsi.msgs, 2, SIMPLE_QUEUE_TAG,
		scsi_cmd_to_rq(SCpnt)->tag);

		do {
		#ifdef SCSI2_SYNC
		@@ -1815,18 +1815,6 @@ static void fas216_start_command(FAS216_Info info, struct scsi_cmnd SCpnt)

		static void fas216_allocate_tag(FAS216_Info info, struct scsi_cmnd SCpnt)
		{
		#ifdef SCSI2_TAG
		/*
		* tagged queuing - allocate a new tag to this command
		*/
		if (SCpnt->device->simple_tags && SCpnt->cmnd[0] != REQUEST_SENSE &&
		SCpnt->cmnd[0] != INQUIRY) {
		SCpnt->device->current_tag += 1;
		if (SCpnt->device->current_tag == 0)
		SCpnt->device->current_tag = 1;
		SCpnt->tag = SCpnt->device->current_tag;
		} else
		#endif
		set_bit(SCpnt->device->id * 8 +
		(u8)(SCpnt->device->lun & 0x7), info->busyluns);

		@@ -2117,7 +2105,6 @@ fas216_std_done(FAS216_Info info, struct scsi_cmnd SCpnt, unsigned int result)
		init_SCp(SCpnt);
		SCpnt->SCp.Message = 0;
		SCpnt->SCp.Status = 0;
		SCpnt->tag = 0;
		SCpnt->host_scribble = (void *)fas216_rq_sns_done;

		/*
		@@ -2223,7 +2210,6 @@ static int fas216_queue_command_lck(struct scsi_cmnd *SCpnt,
		init_SCp(SCpnt);

		info->stats.queues += 1;
		SCpnt->tag = 0;

		spin_lock(&info->host_lock);

		@@ -3003,9 +2989,8 @@ void fas216_print_devices(FAS216_Info info, struct seq_file m)
		dev = &info->device[scd->id];
		seq_printf(m, " %d/%llu ", scd->id, scd->lun);
		if (scd->tagged_supported)
		seq_printf(m, "%3sabled(%3d) ",
		scd->simple_tags ? "en" : "dis",
		scd->current_tag);
		seq_printf(m, "%3sabled ",
		scd->simple_tags ? "en" : "dis");
		else
		seq_puts(m, "unsupported ");