[SCSI] core, classes, mpt2sas: have scsi_internal_device_unblock take new state (5d9fb5cc) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/scsi/mpt2sas/mpt2sas_base.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1158,6 +1158,7 @@ extern struct scsi_transport_template *mpt2sas_transport_template;
	extern int scsi_internal_device_block(struct scsi_device *sdev);		extern int scsi_internal_device_block(struct scsi_device *sdev);
	extern u8 mpt2sas_stm_zero_smid_handler(struct MPT2SAS_ADAPTER *ioc,		extern u8 mpt2sas_stm_zero_smid_handler(struct MPT2SAS_ADAPTER *ioc,
	u8 msix_index, u32 reply);		u8 msix_index, u32 reply);
	extern int scsi_internal_device_unblock(struct scsi_device *sdev);		extern int scsi_internal_device_unblock(struct scsi_device *sdev,
			enum scsi_device_state new_state);

	#endif /* MPT2SAS_BASE_H_INCLUDED */		#endif /* MPT2SAS_BASE_H_INCLUDED */

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2904,7 +2904,7 @@ _scsih_ublock_io_all_device(struct MPT2SAS_ADAPTER *ioc)
	dewtprintk(ioc, sdev_printk(KERN_INFO, sdev, "device_running, "		dewtprintk(ioc, sdev_printk(KERN_INFO, sdev, "device_running, "
	"handle(0x%04x)\n",		"handle(0x%04x)\n",
	sas_device_priv_data->sas_target->handle));		sas_device_priv_data->sas_target->handle));
	scsi_internal_device_unblock(sdev);		scsi_internal_device_unblock(sdev, SDEV_RUNNING);
	}		}
	}		}
	/**		/**
	@@ -2933,7 +2933,7 @@ _scsih_ublock_io_device(struct MPT2SAS_ADAPTER *ioc, u64 sas_address)
	"sas address(0x%016llx)\n", ioc->name,		"sas address(0x%016llx)\n", ioc->name,
	(unsigned long long)sas_address));		(unsigned long long)sas_address));
	sas_device_priv_data->block = 0;		sas_device_priv_data->block = 0;
	scsi_internal_device_unblock(sdev);		scsi_internal_device_unblock(sdev, SDEV_RUNNING);
	}		}
	}		}
	}		}

drivers/scsi/scsi_lib.c

+23 −17

Original line number	Original line	Diff line number	Diff line
	@@ -2444,6 +2444,7 @@ EXPORT_SYMBOL_GPL(scsi_internal_device_block);
	/**		/**
	* scsi_internal_device_unblock - resume a device after a block request		* scsi_internal_device_unblock - resume a device after a block request
	* @sdev: device to resume		* @sdev: device to resume
			* @new_state: state to set devices to after unblocking
	*		*
	* Called by scsi lld's or the midlayer to restart the device queue		* Called by scsi lld's or the midlayer to restart the device queue
	* for the previously suspended scsi device. Called from interrupt or		* for the previously suspended scsi device. Called from interrupt or
	@@ -2453,25 +2454,30 @@ EXPORT_SYMBOL_GPL(scsi_internal_device_block);
	*		*
	* Notes:		* Notes:
	* This routine transitions the device to the SDEV_RUNNING state		* This routine transitions the device to the SDEV_RUNNING state
	* (which must be a legal transition) allowing the midlayer to		* or to one of the offline states (which must be a legal transition)
	* goose the queue for this device. This routine assumes the		* allowing the midlayer to goose the queue for this device. This
	* host_lock is held upon entry.		* routine assumes the host_lock is held upon entry.
	*/		*/
	int		int
	scsi_internal_device_unblock(struct scsi_device *sdev)		scsi_internal_device_unblock(struct scsi_device *sdev,
			enum scsi_device_state new_state)
	{		{
	struct request_queue *q = sdev->request_queue;		struct request_queue *q = sdev->request_queue;
	unsigned long flags;		unsigned long flags;

	/*		/*
	* Try to transition the scsi device to SDEV_RUNNING		* Try to transition the scsi device to SDEV_RUNNING or one of the
	* and goose the device queue if successful.		* offlined states and goose the device queue if successful.
	*/		*/
	if (sdev->sdev_state == SDEV_BLOCK)		if (sdev->sdev_state == SDEV_BLOCK)
	sdev->sdev_state = SDEV_RUNNING;		sdev->sdev_state = new_state;
	else if (sdev->sdev_state == SDEV_CREATED_BLOCK)		else if (sdev->sdev_state == SDEV_CREATED_BLOCK) {
			if (new_state == SDEV_TRANSPORT_OFFLINE \|\|
			new_state == SDEV_OFFLINE)
			sdev->sdev_state = new_state;
			else
	sdev->sdev_state = SDEV_CREATED;		sdev->sdev_state = SDEV_CREATED;
	else if (sdev->sdev_state != SDEV_CANCEL &&		} else if (sdev->sdev_state != SDEV_CANCEL &&
	sdev->sdev_state != SDEV_OFFLINE)		sdev->sdev_state != SDEV_OFFLINE)
	return -EINVAL;		return -EINVAL;

	@@ -2512,26 +2518,26 @@ EXPORT_SYMBOL_GPL(scsi_target_block);
	static void		static void
	device_unblock(struct scsi_device sdev, void data)		device_unblock(struct scsi_device sdev, void data)
	{		{
	scsi_internal_device_unblock(sdev);		scsi_internal_device_unblock(sdev, (enum scsi_device_state )data);
	}		}

	static int		static int
	target_unblock(struct device dev, void data)		target_unblock(struct device dev, void data)
	{		{
	if (scsi_is_target_device(dev))		if (scsi_is_target_device(dev))
	starget_for_each_device(to_scsi_target(dev), NULL,		starget_for_each_device(to_scsi_target(dev), data,
	device_unblock);		device_unblock);
	return 0;		return 0;
	}		}

	void		void
	scsi_target_unblock(struct device *dev)		scsi_target_unblock(struct device *dev, enum scsi_device_state new_state)
	{		{
	if (scsi_is_target_device(dev))		if (scsi_is_target_device(dev))
	starget_for_each_device(to_scsi_target(dev), NULL,		starget_for_each_device(to_scsi_target(dev), &new_state,
	device_unblock);		device_unblock);
	else		else
	device_for_each_child(dev, NULL, target_unblock);		device_for_each_child(dev, &new_state, target_unblock);
	}		}
	EXPORT_SYMBOL_GPL(scsi_target_unblock);		EXPORT_SYMBOL_GPL(scsi_target_unblock);

drivers/scsi/scsi_priv.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2,6 +2,7 @@
	#define _SCSI_PRIV_H		#define _SCSI_PRIV_H

	#include <linux/device.h>		#include <linux/device.h>
			#include <scsi/scsi_device.h>

	struct request_queue;		struct request_queue;
	struct request;		struct request;
	@@ -172,6 +173,7 @@ extern struct list_head scsi_sd_probe_domain;

	#define SCSI_DEVICE_BLOCK_MAX_TIMEOUT 600 /* units in seconds */		#define SCSI_DEVICE_BLOCK_MAX_TIMEOUT 600 /* units in seconds */
	extern int scsi_internal_device_block(struct scsi_device *sdev);		extern int scsi_internal_device_block(struct scsi_device *sdev);
	extern int scsi_internal_device_unblock(struct scsi_device *sdev);		extern int scsi_internal_device_unblock(struct scsi_device *sdev,
			enum scsi_device_state new_state);

	#endif /* _SCSI_PRIV_H */		#endif /* _SCSI_PRIV_H */

drivers/scsi/scsi_transport_fc.c

+7 −9

Original line number	Original line	Diff line number	Diff line
	@@ -2495,11 +2495,9 @@ static void fc_terminate_rport_io(struct fc_rport *rport)
	i->f->terminate_rport_io(rport);		i->f->terminate_rport_io(rport);

	/*		/*
	* must unblock to flush queued IO. The caller will have set		* Must unblock to flush queued IO. scsi-ml will fail incoming reqs.
	* the port_state or flags, so that fc_remote_port_chkready will
	* fail IO.
	*/		*/
	scsi_target_unblock(&rport->dev);		scsi_target_unblock(&rport->dev, SDEV_TRANSPORT_OFFLINE);
	}		}

	/**		/**
	@@ -2830,8 +2828,8 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel,

	/* if target, initiate a scan */		/* if target, initiate a scan */
	if (rport->scsi_target_id != -1) {		if (rport->scsi_target_id != -1) {
	scsi_target_unblock(&rport->dev);		scsi_target_unblock(&rport->dev,
			SDEV_RUNNING);
	spin_lock_irqsave(shost->host_lock,		spin_lock_irqsave(shost->host_lock,
	flags);		flags);
	rport->flags \|= FC_RPORT_SCAN_PENDING;		rport->flags \|= FC_RPORT_SCAN_PENDING;
	@@ -2900,7 +2898,7 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel,
	spin_unlock_irqrestore(shost->host_lock, flags);		spin_unlock_irqrestore(shost->host_lock, flags);

	if (ids->roles & FC_PORT_ROLE_FCP_TARGET) {		if (ids->roles & FC_PORT_ROLE_FCP_TARGET) {
	scsi_target_unblock(&rport->dev);		scsi_target_unblock(&rport->dev, SDEV_RUNNING);

	/* initiate a scan of the target */		/* initiate a scan of the target */
	spin_lock_irqsave(shost->host_lock, flags);		spin_lock_irqsave(shost->host_lock, flags);
	@@ -3105,7 +3103,7 @@ fc_remote_port_rolechg(struct fc_rport *rport, u32 roles)
	/* ensure any stgt delete functions are done */		/* ensure any stgt delete functions are done */
	fc_flush_work(shost);		fc_flush_work(shost);

	scsi_target_unblock(&rport->dev);		scsi_target_unblock(&rport->dev, SDEV_RUNNING);
	/* initiate a scan of the target */		/* initiate a scan of the target */
	spin_lock_irqsave(shost->host_lock, flags);		spin_lock_irqsave(shost->host_lock, flags);
	rport->flags \|= FC_RPORT_SCAN_PENDING;		rport->flags \|= FC_RPORT_SCAN_PENDING;
	@@ -3149,7 +3147,7 @@ fc_timeout_deleted_rport(struct work_struct *work)
	"blocked FC remote port time out: no longer"		"blocked FC remote port time out: no longer"
	" a FCP target, removing starget\n");		" a FCP target, removing starget\n");
	spin_unlock_irqrestore(shost->host_lock, flags);		spin_unlock_irqrestore(shost->host_lock, flags);
	scsi_target_unblock(&rport->dev);		scsi_target_unblock(&rport->dev, SDEV_TRANSPORT_OFFLINE);
	fc_queue_work(shost, &rport->stgt_delete_work);		fc_queue_work(shost, &rport->stgt_delete_work);
	return;		return;
	}		}