msm: pil-gss: Move to common proxy voting
Remove the boiler plate workqueue and proxy voting code and move
to the common proxy infrastructure that the core pil code
provides. This has the added benefit of fixing any issues where
suspend happens before the proxy vote is removed.
Change-Id: Idb7a73f21c1112d42e760d7249557b08755ddcbf
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
diff --git a/arch/arm/mach-msm/pil-gss.c b/arch/arm/mach-msm/pil-gss.c
index fa4f28c..f41a6e3 100644
--- a/arch/arm/mach-msm/pil-gss.c
+++ b/arch/arm/mach-msm/pil-gss.c
@@ -19,7 +19,6 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/platform_device.h>
-#include <linux/workqueue.h>
#include <linux/clk.h>
#include <linux/smp.h>
@@ -58,13 +57,10 @@
#define SLP_CLK_BRANCH_ENA BIT(4)
#define A5_RESET BIT(0)
-#define PROXY_VOTE_TIMEOUT 10000
-
struct gss_data {
void __iomem *base;
void __iomem *qgic2_base;
unsigned long start_addr;
- struct delayed_work work;
struct clk *xo;
struct pil_device *pil;
};
@@ -78,31 +74,25 @@
return 0;
}
-static int make_gss_proxy_votes(struct device *dev)
+static int make_gss_proxy_votes(struct pil_desc *pil)
{
int ret;
- struct gss_data *drv = dev_get_drvdata(dev);
+ struct gss_data *drv = dev_get_drvdata(pil->dev);
ret = clk_prepare_enable(drv->xo);
if (ret) {
- dev_err(dev, "Failed to enable XO\n");
+ dev_err(pil->dev, "Failed to enable XO\n");
return ret;
}
- schedule_delayed_work(&drv->work, msecs_to_jiffies(PROXY_VOTE_TIMEOUT));
return 0;
}
-static void remove_gss_proxy_votes(struct work_struct *work)
+static void remove_gss_proxy_votes(struct pil_desc *pil)
{
- struct gss_data *drv = container_of(work, struct gss_data, work.work);
+ struct gss_data *drv = dev_get_drvdata(pil->dev);
clk_disable_unprepare(drv->xo);
}
-static void remove_gss_proxy_votes_now(struct gss_data *drv)
-{
- flush_delayed_work(&drv->work);
-}
-
static void gss_init(struct gss_data *drv)
{
void __iomem *base = drv->base;
@@ -200,7 +190,6 @@
mb();
clk_disable_unprepare(drv->xo);
- remove_gss_proxy_votes_now(drv);
return 0;
}
@@ -212,15 +201,10 @@
unsigned long start_addr = drv->start_addr;
int ret;
- ret = make_gss_proxy_votes(pil->dev);
- if (ret)
- return ret;
-
/* Unhalt bus port. */
ret = msm_bus_axi_portunhalt(MSM_BUS_MASTER_GSS_NAV);
if (ret) {
dev_err(pil->dev, "Failed to unhalt bus port\n");
- remove_gss_proxy_votes_now(drv);
return ret;
}
@@ -262,6 +246,8 @@
.init_image = pil_gss_init_image,
.auth_and_reset = pil_gss_reset,
.shutdown = pil_gss_shutdown,
+ .proxy_vote = make_gss_proxy_votes,
+ .proxy_unvote = remove_gss_proxy_votes,
};
static int pil_gss_init_image_trusted(struct pil_desc *pil,
@@ -288,24 +274,18 @@
msm_bus_axi_porthalt(MSM_BUS_MASTER_GSS_NAV);
ret = pas_shutdown(PAS_GSS);
clk_disable_unprepare(drv->xo);
- remove_gss_proxy_votes_now(drv);
return ret;
}
static int pil_gss_reset_trusted(struct pil_desc *pil)
{
- struct gss_data *drv = dev_get_drvdata(pil->dev);
int err;
- err = make_gss_proxy_votes(pil->dev);
- if (err)
- goto out;
-
err = msm_bus_axi_portunhalt(MSM_BUS_MASTER_GSS_NAV);
if (err) {
dev_err(pil->dev, "Failed to unhalt bus port\n");
- goto remove_votes;
+ goto out;
}
err = pas_auth_and_reset(PAS_GSS);
@@ -316,8 +296,6 @@
halt_port:
msm_bus_axi_porthalt(MSM_BUS_MASTER_GSS_NAV);
-remove_votes:
- remove_gss_proxy_votes_now(drv);
out:
return err;
}
@@ -326,6 +304,8 @@
.init_image = pil_gss_init_image_trusted,
.auth_and_reset = pil_gss_reset_trusted,
.shutdown = pil_gss_shutdown_trusted,
+ .proxy_vote = make_gss_proxy_votes,
+ .proxy_unvote = remove_gss_proxy_votes,
};
static int __devinit pil_gss_probe(struct platform_device *pdev)
@@ -367,6 +347,7 @@
desc->name = "gss";
desc->dev = &pdev->dev;
desc->owner = THIS_MODULE;
+ desc->proxy_timeout = 10000;
if (pas_supported(PAS_GSS) > 0) {
desc->ops = &pil_gss_ops_trusted;
@@ -376,11 +357,8 @@
dev_info(&pdev->dev, "using non-secure boot\n");
}
- INIT_DELAYED_WORK(&drv->work, remove_gss_proxy_votes);
-
drv->pil = msm_pil_register(desc);
if (IS_ERR(drv->pil)) {
- flush_delayed_work_sync(&drv->work);
clk_put(drv->xo);
return PTR_ERR(drv->pil);
}
@@ -391,7 +369,6 @@
{
struct gss_data *drv = platform_get_drvdata(pdev);
msm_pil_unregister(drv->pil);
- flush_delayed_work_sync(&drv->work);
clk_put(drv->xo);
return 0;
}