p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remoteproc: q6v5: Move proxy unvote to handover irq handler 

Introduce interrupt handler for smp2p ready interrupt to
handle start completion. Move the proxy votes for clocks
and regulators to the handover interrupt context.

Signed-off-by: Sibi Sankar <sibis@codeaurora.org>
[bjorn: Only proxy unvote if handover irq has not fired]
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Sibi Sankar 2018-05-21 22:57:09 +05:30 committed by Bjorn Andersson
parent f4c428cfe4
commit 663e98453a
1 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/remoteproc/qcom_q6v5_pil.c
View File

@ -143,6 +143,10 @@ struct q6v5 {
struct qcom_smem_state *state; struct qcom_smem_state *state;
unsigned stop_bit; unsigned stop_bit;
int handover_irq;
bool proxy_unvoted;
struct clk *active_clks[8]; struct clk *active_clks[8];
struct clk *proxy_clks[4]; struct clk *proxy_clks[4];
int active_clk_count; int active_clk_count;
@ -727,11 +731,15 @@ static int q6v5_start(struct rproc *rproc)
int xfermemop_ret; int xfermemop_ret;
int ret; int ret;
qproc->proxy_unvoted = false;
enable_irq(qproc->handover_irq);
ret = q6v5_regulator_enable(qproc, qproc->proxy_regs, ret = q6v5_regulator_enable(qproc, qproc->proxy_regs,
qproc->proxy_reg_count); qproc->proxy_reg_count);
if (ret) { if (ret) {
dev_err(qproc->dev, "failed to enable proxy supplies\n"); dev_err(qproc->dev, "failed to enable proxy supplies\n");
return ret; goto disable_irqs;
} }
ret = q6v5_clk_enable(qproc->dev, qproc->proxy_clks, ret = q6v5_clk_enable(qproc->dev, qproc->proxy_clks,
@ -808,11 +816,6 @@ static int q6v5_start(struct rproc *rproc)
"Failed to reclaim mba buffer system may become unstable\n"); "Failed to reclaim mba buffer system may become unstable\n");
qproc->running = true; qproc->running = true;
q6v5_clk_disable(qproc->dev, qproc->proxy_clks,
qproc->proxy_clk_count);
q6v5_regulator_disable(qproc, qproc->proxy_regs,
qproc->proxy_reg_count);
return 0; return 0;
reclaim_mpss: reclaim_mpss:
@ -851,6 +854,9 @@ static int q6v5_start(struct rproc *rproc)
q6v5_regulator_disable(qproc, qproc->proxy_regs, q6v5_regulator_disable(qproc, qproc->proxy_regs,
qproc->proxy_reg_count); qproc->proxy_reg_count);
disable_irqs:
disable_irq(qproc->handover_irq);
return ret; return ret;
} }
@ -891,6 +897,16 @@ static int q6v5_stop(struct rproc *rproc)
WARN_ON(ret); WARN_ON(ret);
reset_control_assert(qproc->mss_restart); reset_control_assert(qproc->mss_restart);
disable_irq(qproc->handover_irq);
if (!qproc->proxy_unvoted) {
q6v5_clk_disable(qproc->dev, qproc->proxy_clks,
qproc->proxy_clk_count);
q6v5_regulator_disable(qproc, qproc->proxy_regs,
qproc->proxy_reg_count);
}
q6v5_clk_disable(qproc->dev, qproc->active_clks, q6v5_clk_disable(qproc->dev, qproc->active_clks,
qproc->active_clk_count); qproc->active_clk_count);
q6v5_regulator_disable(qproc, qproc->active_regs, q6v5_regulator_disable(qproc, qproc->active_regs,
@ -958,7 +974,7 @@ static irqreturn_t q6v5_fatal_interrupt(int irq, void *dev)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static irqreturn_t q6v5_handover_interrupt(int irq, void *dev) static irqreturn_t q6v5_ready_interrupt(int irq, void *dev)
{ {
struct q6v5 *qproc = dev; struct q6v5 *qproc = dev;
@ -966,6 +982,20 @@ static irqreturn_t q6v5_handover_interrupt(int irq, void *dev)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static irqreturn_t q6v5_handover_interrupt(int irq, void *dev)
{
struct q6v5 *qproc = dev;
q6v5_clk_disable(qproc->dev, qproc->proxy_clks,
qproc->proxy_clk_count);
q6v5_regulator_disable(qproc, qproc->proxy_regs,
qproc->proxy_reg_count);
qproc->proxy_unvoted = true;
return IRQ_HANDLED;
}
static irqreturn_t q6v5_stop_ack_interrupt(int irq, void *dev) static irqreturn_t q6v5_stop_ack_interrupt(int irq, void *dev)
{ {
struct q6v5 *qproc = dev; struct q6v5 *qproc = dev;
@ -1194,9 +1224,15 @@ static int q6v5_probe(struct platform_device *pdev)
if (ret < 0) if (ret < 0)
goto free_rproc; goto free_rproc;
ret = q6v5_request_irq(qproc, pdev, "ready", q6v5_ready_interrupt);
if (ret < 0)
goto free_rproc;
ret = q6v5_request_irq(qproc, pdev, "handover", q6v5_handover_interrupt); ret = q6v5_request_irq(qproc, pdev, "handover", q6v5_handover_interrupt);
if (ret < 0) if (ret < 0)
goto free_rproc; goto free_rproc;
qproc->handover_irq = ret;
disable_irq(qproc->handover_irq);
ret = q6v5_request_irq(qproc, pdev, "stop-ack", q6v5_stop_ack_interrupt); ret = q6v5_request_irq(qproc, pdev, "stop-ack", q6v5_stop_ack_interrupt);
if (ret < 0) if (ret < 0)