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

Commit 3bd46600 authored by Lin Ming's avatar Lin Ming Committed by Jeff Garzik
Browse files

libata-acpi: add ata port runtime D3Cold support 



ATA port may support runtime D3Cold state, for example, Zero-power ODD case.
This patch adds wakeup notifier and enable/disable run_wake during
supend/resume.

Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent febe53ba

drivers/acpi/sleep.c

+2 −0
Original line number Diff line number Diff line
@@ -795,6 +795,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p) 
		*d_min_p = d_min;

	return d_max;

}

EXPORT_SYMBOL(acpi_pm_device_sleep_state);

#endif /* CONFIG_PM */



#ifdef CONFIG_PM_SLEEP
@@ -831,6 +832,7 @@ int acpi_pm_device_run_wake(struct device *phys_dev, bool enable) 


	return 0;

}

EXPORT_SYMBOL(acpi_pm_device_run_wake);



/**

 *	acpi_pm_device_sleep_wake - enable or disable the system wake-up

drivers/ata/libata-acpi.c

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

#include <linux/pci.h>

#include <linux/slab.h>

#include <linux/pm_runtime.h>

#include <scsi/scsi_device.h>

#include "libata.h"
@@ -853,6 +854,7 @@ void ata_acpi_set_state(struct ata_port *ap, pm_message_t state) 
{

	struct ata_device *dev;

	acpi_handle handle;

	int acpi_state;



	/* channel first and then drives for power on and vica versa

	   for power off */
@@ -862,10 +864,23 @@ void ata_acpi_set_state(struct ata_port *ap, pm_message_t state) 


	ata_for_each_dev(dev, &ap->link, ENABLED) {

		handle = ata_dev_acpi_handle(dev);

		if (handle)

			acpi_bus_set_power(handle,

				state.event == PM_EVENT_ON ?

					ACPI_STATE_D0 : ACPI_STATE_D3);

		if (!handle)

			continue;



		if (state.event != PM_EVENT_ON) {

			acpi_state = acpi_pm_device_sleep_state(

				&dev->sdev->sdev_gendev, NULL);

			if (acpi_state > 0)

				acpi_bus_set_power(handle, acpi_state);

			/* TBD: need to check if it's runtime pm request */

			acpi_pm_device_run_wake(

				&dev->sdev->sdev_gendev, true);

		} else {

			/* Ditto */

			acpi_pm_device_run_wake(

				&dev->sdev->sdev_gendev, false);

			acpi_bus_set_power(handle, ACPI_STATE_D0);

		}

	}



	handle = ata_ap_acpi_handle(ap);
@@ -965,6 +980,61 @@ void ata_acpi_on_disable(struct ata_device *dev) 
	ata_acpi_clear_gtf(dev);

}



static void ata_acpi_wake_dev(acpi_handle handle, u32 event, void *context)

{

	struct ata_device *ata_dev = context;



	if (event == ACPI_NOTIFY_DEVICE_WAKE && ata_dev &&

			pm_runtime_suspended(&ata_dev->sdev->sdev_gendev))

		scsi_autopm_get_device(ata_dev->sdev);

}



static void ata_acpi_add_pm_notifier(struct ata_device *dev)

{

	struct acpi_device *acpi_dev;

	acpi_handle handle;

	acpi_status status;



	handle = ata_dev_acpi_handle(dev);

	if (!handle)

		return;



	status = acpi_bus_get_device(handle, &acpi_dev);

	if (ACPI_SUCCESS(status)) {

		acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,

			ata_acpi_wake_dev, dev);

		device_set_run_wake(&dev->sdev->sdev_gendev, true);

	}

}



static void ata_acpi_remove_pm_notifier(struct ata_device *dev)

{

	struct acpi_device *acpi_dev;

	acpi_handle handle;

	acpi_status status;



	handle = ata_dev_acpi_handle(dev);

	if (!handle)

		return;



	status = acpi_bus_get_device(handle, &acpi_dev);

	if (ACPI_SUCCESS(status)) {

		device_set_run_wake(&dev->sdev->sdev_gendev, false);

		acpi_remove_notify_handler(handle, ACPI_SYSTEM_NOTIFY,

			ata_acpi_wake_dev);

	}

}



void ata_acpi_bind(struct ata_device *dev)

{

	ata_acpi_add_pm_notifier(dev);

}



void ata_acpi_unbind(struct ata_device *dev)

{

	ata_acpi_remove_pm_notifier(dev);

}



static int compat_pci_ata(struct ata_port *ap)

{

	struct device *dev = ap->tdev.parent;

drivers/ata/libata-scsi.c

+3 −0
Original line number Diff line number Diff line
@@ -3445,6 +3445,7 @@ void ata_scsi_scan_host(struct ata_port *ap, int sync) 
			if (!IS_ERR(sdev)) {

				dev->sdev = sdev;

				scsi_device_put(sdev);

				ata_acpi_bind(dev);

			} else {

				dev->sdev = NULL;

			}
@@ -3541,6 +3542,8 @@ static void ata_scsi_remove_dev(struct ata_device *dev) 
	mutex_lock(&ap->scsi_host->scan_mutex);

	spin_lock_irqsave(ap->lock, flags);



	ata_acpi_unbind(dev);



	/* clearing dev->sdev is protected by host lock */

	sdev = dev->sdev;

	dev->sdev = NULL;

drivers/ata/libata.h

+4 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ extern void ata_acpi_on_disable(struct ata_device *dev); 
extern void ata_acpi_set_state(struct ata_port *ap, pm_message_t state);

extern int ata_acpi_register(void);

extern void ata_acpi_unregister(void);

extern void ata_acpi_bind(struct ata_device *dev);

extern void ata_acpi_unbind(struct ata_device *dev);

#else

static inline void ata_acpi_dissociate(struct ata_host *host) { }

static inline int ata_acpi_on_suspend(struct ata_port *ap) { return 0; }
@@ -130,6 +132,8 @@ static inline void ata_acpi_set_state(struct ata_port *ap, 
				      pm_message_t state) { }

static inline int ata_acpi_register(void) { return 0; }

static void ata_acpi_unregister(void) { }

static void ata_acpi_bind(struct ata_device *dev) { }

static void ata_acpi_unbind(struct ata_device *dev) { }

#endif



/* libata-scsi.c */