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

Commit 9ee4f393 authored by Lin Ming's avatar Lin Ming Committed by Jeff Garzik
Browse files

ata: add ata port runtime PM callbacks 



Add ata port runtime suspend/resume/idle callbacks.
Set ->eh_noresume to skip the runtime PM calls on scsi host
in the error handler to avoid dead lock.

Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 5ef41082

drivers/ata/libata-core.c

+10 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
#include <asm/byteorder.h>

#include <linux/cdrom.h>

#include <linux/ratelimit.h>

#include <linux/pm_runtime.h>



#include "libata.h"

#include "libata-transport.h"
@@ -5307,9 +5308,18 @@ static int ata_port_resume(struct device *dev) 
	return rc;

}



static int ata_port_runtime_idle(struct device *dev)

{

	return pm_runtime_suspend(dev);

}



static const struct dev_pm_ops ata_port_pm_ops = {

	.suspend = ata_port_suspend,

	.resume = ata_port_resume,



	.runtime_suspend = ata_port_suspend_common,

	.runtime_resume = ata_port_resume,

	.runtime_idle = ata_port_runtime_idle,

};



/**

drivers/ata/libata-scsi.c

+1 −0
Original line number Diff line number Diff line
@@ -3381,6 +3381,7 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht) 
		if (!shost)

			goto err_alloc;



		shost->eh_noresume = 1;

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

		ap->scsi_host = shost;

drivers/ata/libata-transport.c

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/libata.h>

#include <linux/hdreg.h>

#include <linux/uaccess.h>

#include <linux/pm_runtime.h>



#include "libata.h"

#include "libata-transport.h"
@@ -290,6 +291,9 @@ int ata_tport_add(struct device *parent, 
		goto tport_err;

	}



	pm_runtime_set_active(dev);

	pm_runtime_enable(dev);



	transport_add_device(dev);

	transport_configure_device(dev);