Revert "remoteproc: pas: Check running ack for D0 transition"
This reverts commit a8ce5c2552
.
TCSR register read can be solely relied upon for D0 confirmation.
Change-Id: I9cb11a13313d2a9964efdc02a77b698b62268070
Signed-off-by: Kamati Srinivas <quic_kamasrin@quicinc.com>
This commit is contained in:
parent
96a17a0c73
commit
b8fcfd2679
@ -33,7 +33,6 @@ struct qcom_q6v5 {
|
||||
int ready_irq;
|
||||
int handover_irq;
|
||||
int stop_irq;
|
||||
int active_state_ack_irq;
|
||||
|
||||
struct rproc_subdev *ssr_subdev;
|
||||
|
||||
@ -43,7 +42,6 @@ struct qcom_q6v5 {
|
||||
|
||||
struct completion start_done;
|
||||
struct completion stop_done;
|
||||
struct completion running_ack;
|
||||
|
||||
int crash_reason;
|
||||
|
||||
|
@ -814,15 +814,6 @@ static int adsp_start(struct rproc *rproc)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static irqreturn_t soccp_running_ack(int irq, void *data)
|
||||
{
|
||||
struct qcom_q6v5 *q6v5 = data;
|
||||
|
||||
complete(&q6v5->running_ack);
|
||||
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
/**
|
||||
* rproc_config_check() - Check back the config register
|
||||
* @state: new state of the rproc
|
||||
@ -971,8 +962,6 @@ int rproc_set_state(struct rproc *rproc, bool state)
|
||||
goto soccp_out;
|
||||
}
|
||||
|
||||
reinit_completion(&(adsp->q6v5.running_ack));
|
||||
|
||||
ret = qcom_smem_state_update_bits(adsp->wake_state,
|
||||
SOCCP_STATE_MASK,
|
||||
BIT(adsp->wake_bit));
|
||||
@ -989,15 +978,6 @@ int rproc_set_state(struct rproc *rproc, bool state)
|
||||
goto soccp_out;
|
||||
}
|
||||
|
||||
ret = wait_for_completion_timeout(&adsp->q6v5.running_ack, msecs_to_jiffies(5));
|
||||
if (!ret) {
|
||||
dev_err(adsp->dev, "%s requested D3->D0: failed to get wake ack\n",
|
||||
current->comm);
|
||||
ret = -ETIMEDOUT;
|
||||
goto soccp_out;
|
||||
} else
|
||||
ret = 0;
|
||||
|
||||
adsp->current_users = 1;
|
||||
} else {
|
||||
if (users > 1) {
|
||||
@ -1736,26 +1716,9 @@ static int adsp_probe(struct platform_device *pdev)
|
||||
goto detach_proxy_pds;
|
||||
}
|
||||
|
||||
adsp->q6v5.active_state_ack_irq = platform_get_irq_byname(pdev, "wake-ack");
|
||||
if (adsp->q6v5.active_state_ack_irq < 0) {
|
||||
dev_err(&pdev->dev, "failed to acquire readyack irq\n");
|
||||
goto detach_proxy_pds;
|
||||
}
|
||||
|
||||
ret = devm_request_threaded_irq(&pdev->dev, adsp->q6v5.active_state_ack_irq,
|
||||
NULL, soccp_running_ack,
|
||||
IRQF_TRIGGER_RISING | IRQF_ONESHOT,
|
||||
"qcom_q6v5_pas", &adsp->q6v5);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "failed to acquire ready ack IRQ\n");
|
||||
goto detach_proxy_pds;
|
||||
}
|
||||
|
||||
mutex_init(&adsp->adsp_lock);
|
||||
|
||||
init_completion(&(adsp->q6v5.running_ack));
|
||||
adsp->current_users = 0;
|
||||
|
||||
}
|
||||
|
||||
qcom_q6v5_register_ssr_subdev(&adsp->q6v5, &adsp->ssr_subdev.subdev);
|
||||
|
Loading…
Reference in New Issue
Block a user