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

Commit 9b21493c authored by Lin Ming's avatar Lin Ming Committed by James Bottomley
Browse files

[SCSI] sd: use REQ_PM in sd's runtime suspend operation 



With the introduction of REQ_PM, modify sd's runtime suspend operation
functions to use that flag so that the operations to put the device into
runtime suspended state(i.e. sync cache and stop device) will not affect
its runtime PM status.

Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarAaron Lu <aaron.lu@intel.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent b8d4a5bf

drivers/scsi/scsi_lib.c

+4 −5
Original line number Diff line number Diff line
@@ -276,11 +276,10 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, 
}

EXPORT_SYMBOL(scsi_execute);





int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd,

int scsi_execute_req_flags(struct scsi_device *sdev, const unsigned char *cmd,

		     int data_direction, void *buffer, unsigned bufflen,

		     struct scsi_sense_hdr *sshdr, int timeout, int retries,

		     int *resid)

		     int *resid, int flags)

{

	char *sense = NULL;

	int result;
@@ -291,14 +290,14 @@ int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd, 
			return DRIVER_ERROR << 24;

	}

	result = scsi_execute(sdev, cmd, data_direction, buffer, bufflen,

			      sense, timeout, retries, 0, resid);

			      sense, timeout, retries, flags, resid);

	if (sshdr)

		scsi_normalize_sense(sense, SCSI_SENSE_BUFFERSIZE, sshdr);



	kfree(sense);

	return result;

}

EXPORT_SYMBOL(scsi_execute_req);

EXPORT_SYMBOL(scsi_execute_req_flags);



/*

 * Function:    scsi_init_cmd_errh()

drivers/scsi/sd.c

+5 −4
Original line number Diff line number Diff line
@@ -1424,8 +1424,9 @@ static int sd_sync_cache(struct scsi_disk *sdkp) 
		 * Leave the rest of the command zero to indicate

		 * flush everything.

		 */

		res = scsi_execute_req(sdp, cmd, DMA_NONE, NULL, 0, &sshdr,

				       SD_FLUSH_TIMEOUT, SD_MAX_RETRIES, NULL);

		res = scsi_execute_req_flags(sdp, cmd, DMA_NONE, NULL, 0,

					     &sshdr, SD_FLUSH_TIMEOUT,

					     SD_MAX_RETRIES, NULL, REQ_PM);

		if (res == 0)

			break;

	}
@@ -3021,8 +3022,8 @@ static int sd_start_stop_device(struct scsi_disk *sdkp, int start) 
	if (!scsi_device_online(sdp))

		return -ENODEV;



	res = scsi_execute_req(sdp, cmd, DMA_NONE, NULL, 0, &sshdr,

			       SD_TIMEOUT, SD_MAX_RETRIES, NULL);

	res = scsi_execute_req_flags(sdp, cmd, DMA_NONE, NULL, 0, &sshdr,

			       SD_TIMEOUT, SD_MAX_RETRIES, NULL, REQ_PM);

	if (res) {

		sd_printk(KERN_WARNING, sdkp, "START_STOP FAILED\n");

		sd_print_result(sdkp, res);

include/scsi/scsi_device.h

+12 −4
Original line number Diff line number Diff line
@@ -394,10 +394,18 @@ extern int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, 
			int data_direction, void *buffer, unsigned bufflen,

			unsigned char *sense, int timeout, int retries,

			int flag, int *resid);

extern int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd,

			    int data_direction, void *buffer, unsigned bufflen,

			    struct scsi_sense_hdr *, int timeout, int retries,

			    int *resid);

extern int scsi_execute_req_flags(struct scsi_device *sdev,

	const unsigned char *cmd, int data_direction, void *buffer,

	unsigned bufflen, struct scsi_sense_hdr *sshdr, int timeout,

	int retries, int *resid, int flags);

static inline int scsi_execute_req(struct scsi_device *sdev,

	const unsigned char *cmd, int data_direction, void *buffer,

	unsigned bufflen, struct scsi_sense_hdr *sshdr, int timeout,

	int retries, int *resid)

{

	return scsi_execute_req_flags(sdev, cmd, data_direction, buffer,

		bufflen, sshdr, timeout, retries, resid, 0);

}

extern void sdev_disable_disk_events(struct scsi_device *sdev);

extern void sdev_enable_disk_events(struct scsi_device *sdev);