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

Commit 082776e4 authored by Nigel Cunningham's avatar Nigel Cunningham Committed by Jeff Garzik
Browse files

[PATCH] Make libata not powerdown drivers on PM_EVENT_FREEZE. 



At the moment libata doesn't pass pm_message_t down ata_device_suspend.
This causes drives to be powered down when we just want a freeze,
causing unnecessary wear and tear. This patch gets pm_message_t passed
down so that it can be used to determine whether to power down the
drive.

Signed-off-by: default avatarNigel Cunningham <nigel@suspend2.net>

 drivers/scsi/libata-core.c |    5 +++--
 drivers/scsi/libata-scsi.c |    4 ++--
 drivers/scsi/scsi_sysfs.c  |    2 +-
 include/linux/libata.h     |    4 ++--
 include/scsi/scsi_host.h   |    2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 83206a29

drivers/scsi/libata-core.c

+3 −2
Original line number Diff line number Diff line
@@ -4336,13 +4336,14 @@ int ata_device_resume(struct ata_port *ap, struct ata_device *dev) 
 *	Flush the cache on the drive, if appropriate, then issue a

 *	standbynow command.

 */

int ata_device_suspend(struct ata_port *ap, struct ata_device *dev)

int ata_device_suspend(struct ata_port *ap, struct ata_device *dev, pm_message_t state)

{

	if (!ata_dev_present(dev))

		return 0;

	if (dev->class == ATA_DEV_ATA)

		ata_flush_cache(ap, dev);



	if (state.event != PM_EVENT_FREEZE)

		ata_standby_drive(ap, dev);

	ap->flags |= ATA_FLAG_SUSPENDED;

	return 0;

drivers/scsi/libata-scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -414,12 +414,12 @@ int ata_scsi_device_resume(struct scsi_device *sdev) 
	return ata_device_resume(ap, dev);

}



int ata_scsi_device_suspend(struct scsi_device *sdev)

int ata_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state)

{

	struct ata_port *ap = (struct ata_port *) &sdev->host->hostdata[0];

	struct ata_device *dev = &ap->device[sdev->id];



	return ata_device_suspend(ap, dev);

	return ata_device_suspend(ap, dev, state);

}



/**

drivers/scsi/scsi_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static int scsi_bus_suspend(struct device * dev, pm_message_t state) 
		return err;



	if (sht->suspend)

		err = sht->suspend(sdev);

		err = sht->suspend(sdev, state);



	return err;

}

include/linux/libata.h

+2 −2
Original line number Diff line number Diff line
@@ -520,9 +520,9 @@ extern void ata_eh_qc_retry(struct ata_queued_cmd *qc); 
extern int ata_scsi_release(struct Scsi_Host *host);

extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);

extern int ata_scsi_device_resume(struct scsi_device *);

extern int ata_scsi_device_suspend(struct scsi_device *);

extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t state);

extern int ata_device_resume(struct ata_port *, struct ata_device *);

extern int ata_device_suspend(struct ata_port *, struct ata_device *);

extern int ata_device_suspend(struct ata_port *, struct ata_device *, pm_message_t state);

extern int ata_ratelimit(void);

extern unsigned int ata_busy_sleep(struct ata_port *ap,

				   unsigned long timeout_pat,

include/scsi/scsi_host.h

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ struct scsi_host_template { 
	 * suspend support

	 */

	int (*resume)(struct scsi_device *);

	int (*suspend)(struct scsi_device *);

	int (*suspend)(struct scsi_device *, pm_message_t state);



	/*

	 * Name of proc directory