Merge tag 'selinux-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / mailbox / mtk-cmdq-mailbox.c

diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
index 5665b6ea8119f1fe4714b329188c81735aeeb5b1..67a42b514429ef4c7e6f77128097692a7601a525 100644 (file)
--- a/drivers/mailbox/mtk-cmdq-mailbox.c
+++ b/drivers/mailbox/mtk-cmdq-mailbox.c
@@ -180,7 +180,7 @@ static bool cmdq_thread_is_in_wfe(struct cmdq_thread *thread)
        return readl(thread->base + CMDQ_THR_WAIT_TOKEN) & CMDQ_THR_IS_WAITING;
 }
 
-static void cmdq_task_exec_done(struct cmdq_task *task, enum cmdq_cb_status sta)
+static void cmdq_task_exec_done(struct cmdq_task *task, int sta)
 {
        struct cmdq_task_cb *cb = &task->pkt->async_cb;
        struct cmdq_cb_data data;
@@ -188,7 +188,11 @@ static void cmdq_task_exec_done(struct cmdq_task *task, enum cmdq_cb_status sta)
        WARN_ON(cb->cb == (cmdq_async_flush_cb)NULL);
        data.sta = sta;
        data.data = cb->data;
-       cb->cb(data);
+       data.pkt = task->pkt;
+       if (cb->cb)
+               cb->cb(data);
+
+       mbox_chan_received_data(task->thread->chan, &data);
 
        list_del(&task->list_entry);
 }
@@ -244,10 +248,10 @@ static void cmdq_thread_irq_handler(struct cmdq *cmdq,
                        curr_task = task;
 
                if (!curr_task || curr_pa == task_end_pa - CMDQ_INST_SIZE) {
-                       cmdq_task_exec_done(task, CMDQ_CB_NORMAL);
+                       cmdq_task_exec_done(task, 0);
                        kfree(task);
                } else if (err) {
-                       cmdq_task_exec_done(task, CMDQ_CB_ERROR);
+                       cmdq_task_exec_done(task, -ENOEXEC);
                        cmdq_task_handle_error(curr_task);
                        kfree(task);
                }
@@ -415,7 +419,7 @@ static void cmdq_mbox_shutdown(struct mbox_chan *chan)
 
        list_for_each_entry_safe(task, tmp, &thread->task_busy_list,
                                 list_entry) {
-               cmdq_task_exec_done(task, CMDQ_CB_ERROR);
+               cmdq_task_exec_done(task, -ECONNABORTED);
                kfree(task);
        }
 
@@ -452,11 +456,13 @@ static int cmdq_mbox_flush(struct mbox_chan *chan, unsigned long timeout)
        list_for_each_entry_safe(task, tmp, &thread->task_busy_list,
                                 list_entry) {
                cb = &task->pkt->async_cb;
-               if (cb->cb) {
-                       data.sta = CMDQ_CB_ERROR;
-                       data.data = cb->data;
+               data.sta = -ECONNABORTED;
+               data.data = cb->data;
+               data.pkt = task->pkt;
+               if (cb->cb)
                        cb->cb(data);
-               }
+
+               mbox_chan_received_data(task->thread->chan, &data);
                list_del(&task->list_entry);
                kfree(task);
        }
@@ -519,10 +525,8 @@ static int cmdq_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        cmdq->base = devm_ioremap_resource(dev, res);
-       if (IS_ERR(cmdq->base)) {
-               dev_err(dev, "failed to ioremap gce\n");
+       if (IS_ERR(cmdq->base))
                return PTR_ERR(cmdq->base);
-       }
 
        cmdq->irq = platform_get_irq(pdev, 0);
        if (cmdq->irq < 0)