remoteproc: qcom: Wait for shutdown-ack/ind on sysmon shutdown
After sending a sysmon shutdown request to the SSCTL service on the subsystem, wait for the service to send shutdown-ack interrupt or an indication message to signal the completion of graceful shutdown. Signed-off-by: Sibi Sankar <sibis@codeaurora.org> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
parent
027045a6e2
commit
74f2720265
|
@ -36,6 +36,7 @@ struct qcom_sysmon {
|
|||
|
||||
struct rpmsg_endpoint *ept;
|
||||
struct completion comp;
|
||||
struct completion ind_comp;
|
||||
struct completion shutdown_comp;
|
||||
struct mutex lock;
|
||||
|
||||
|
@ -140,6 +141,7 @@ static int sysmon_callback(struct rpmsg_device *rpdev, void *data, int count,
|
|||
}
|
||||
|
||||
#define SSCTL_SHUTDOWN_REQ 0x21
|
||||
#define SSCTL_SHUTDOWN_READY_IND 0x21
|
||||
#define SSCTL_SUBSYS_EVENT_REQ 0x23
|
||||
|
||||
#define SSCTL_MAX_MSG_LEN 7
|
||||
|
@ -255,6 +257,29 @@ static struct qmi_elem_info ssctl_subsys_event_resp_ei[] = {
|
|||
{}
|
||||
};
|
||||
|
||||
static struct qmi_elem_info ssctl_shutdown_ind_ei[] = {
|
||||
{}
|
||||
};
|
||||
|
||||
static void sysmon_ind_cb(struct qmi_handle *qmi, struct sockaddr_qrtr *sq,
|
||||
struct qmi_txn *txn, const void *data)
|
||||
{
|
||||
struct qcom_sysmon *sysmon = container_of(qmi, struct qcom_sysmon, qmi);
|
||||
|
||||
complete(&sysmon->ind_comp);
|
||||
}
|
||||
|
||||
static struct qmi_msg_handler qmi_indication_handler[] = {
|
||||
{
|
||||
.type = QMI_INDICATION,
|
||||
.msg_id = SSCTL_SHUTDOWN_READY_IND,
|
||||
.ei = ssctl_shutdown_ind_ei,
|
||||
.decoded_size = 0,
|
||||
.fn = sysmon_ind_cb
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
/**
|
||||
* ssctl_request_shutdown() - request shutdown via SSCTL QMI service
|
||||
* @sysmon: sysmon context
|
||||
|
@ -265,6 +290,8 @@ static void ssctl_request_shutdown(struct qcom_sysmon *sysmon)
|
|||
struct qmi_txn txn;
|
||||
int ret;
|
||||
|
||||
reinit_completion(&sysmon->ind_comp);
|
||||
reinit_completion(&sysmon->shutdown_comp);
|
||||
ret = qmi_txn_init(&sysmon->qmi, &txn, ssctl_shutdown_resp_ei, &resp);
|
||||
if (ret < 0) {
|
||||
dev_err(sysmon->dev, "failed to allocate QMI txn\n");
|
||||
|
@ -286,6 +313,17 @@ static void ssctl_request_shutdown(struct qcom_sysmon *sysmon)
|
|||
dev_err(sysmon->dev, "shutdown request failed\n");
|
||||
else
|
||||
dev_dbg(sysmon->dev, "shutdown request completed\n");
|
||||
|
||||
if (sysmon->shutdown_irq > 0) {
|
||||
ret = wait_for_completion_timeout(&sysmon->shutdown_comp,
|
||||
10 * HZ);
|
||||
if (!ret) {
|
||||
ret = try_wait_for_completion(&sysmon->ind_comp);
|
||||
if (!ret)
|
||||
dev_err(sysmon->dev,
|
||||
"timeout waiting for shutdown ack\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -470,6 +508,7 @@ struct qcom_sysmon *qcom_add_sysmon_subdev(struct rproc *rproc,
|
|||
sysmon->ssctl_instance = ssctl_instance;
|
||||
|
||||
init_completion(&sysmon->comp);
|
||||
init_completion(&sysmon->ind_comp);
|
||||
init_completion(&sysmon->shutdown_comp);
|
||||
mutex_init(&sysmon->lock);
|
||||
|
||||
|
@ -494,7 +533,8 @@ struct qcom_sysmon *qcom_add_sysmon_subdev(struct rproc *rproc,
|
|||
}
|
||||
}
|
||||
|
||||
ret = qmi_handle_init(&sysmon->qmi, SSCTL_MAX_MSG_LEN, &ssctl_ops, NULL);
|
||||
ret = qmi_handle_init(&sysmon->qmi, SSCTL_MAX_MSG_LEN, &ssctl_ops,
|
||||
qmi_indication_handler);
|
||||
if (ret < 0) {
|
||||
dev_err(sysmon->dev, "failed to initialize qmi handle\n");
|
||||
kfree(sysmon);
|
||||
|
|
Loading…
Reference in a new issue