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

Commit e708e46e authored by Roger Quadros's avatar Roger Quadros Committed by Tejun Heo
Browse files

ata: ahci_platform: runtime resume the device before use 



On OMAP platforms the device needs to be runtime resumed before it can
be accessed. The OMAP HWMOD framework takes care of enabling the
module and its resources based on the device's runtime PM state.

In this patch we runtime resume during .probe() and runtime suspend
after .remove().

We also update the runtime PM state during .resume().

CC: Balaji T K <balajitk@ti.com>
Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 21b5faee

drivers/ata/ahci.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -324,6 +324,7 @@ struct ahci_host_priv { 
	u32 			em_loc; /* enclosure management location */

	u32 			em_loc; /* enclosure management location */

	u32			em_buf_sz;	/* EM buffer size in byte */

	u32			em_buf_sz;	/* EM buffer size in byte */

	u32			em_msg_type;	/* EM message type */

	u32			em_msg_type;	/* EM message type */

	bool			got_runtime_pm; /* Did we do pm_runtime_get? */

	struct clk		*clks[AHCI_MAX_CLKS]; /* Optional */

	struct clk		*clks[AHCI_MAX_CLKS]; /* Optional */

	struct regulator	*target_pwr;	/* Optional */

	struct regulator	*target_pwr;	/* Optional */

	struct phy		*phy;		/* If platform uses phy */

	struct phy		*phy;		/* If platform uses phy */

drivers/ata/ahci_platform.c

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

#include <linux/libata.h>

#include <linux/ahci_platform.h>

#include <linux/ahci_platform.h>

#include <linux/phy/phy.h>

#include <linux/phy/phy.h>

#include <linux/pm_runtime.h>

#include "ahci.h"

#include "ahci.h"





static void ahci_host_stop(struct ata_host *host);

static void ahci_host_stop(struct ata_host *host);
@@ -216,6 +217,11 @@ static void ahci_platform_put_resources(struct device *dev, void *res) 
	struct ahci_host_priv *hpriv = res;

	struct ahci_host_priv *hpriv = res;

	int c;

	int c;





	if (hpriv->got_runtime_pm) {

		pm_runtime_put_sync(dev);

		pm_runtime_disable(dev);

	}



	for (c = 0; c < AHCI_MAX_CLKS && hpriv->clks[c]; c++)

	for (c = 0; c < AHCI_MAX_CLKS && hpriv->clks[c]; c++)

		clk_put(hpriv->clks[c]);

		clk_put(hpriv->clks[c]);

}

}
@@ -309,6 +315,10 @@ struct ahci_host_priv *ahci_platform_get_resources( 
		}

		}

	}

	}





	pm_runtime_enable(dev);

	pm_runtime_get_sync(dev);

	hpriv->got_runtime_pm = true;



	devres_remove_group(dev, NULL);

	devres_remove_group(dev, NULL);

	return hpriv;

	return hpriv;
@@ -603,6 +613,11 @@ int ahci_platform_resume(struct device *dev) 
	if (rc)

	if (rc)

		goto disable_resources;

		goto disable_resources;





	/* We resumed so update PM runtime state */

	pm_runtime_disable(dev);

	pm_runtime_set_active(dev);

	pm_runtime_enable(dev);



	return 0;

	return 0;





disable_resources:

disable_resources: