get:
Show a patch.

patch:
Update a patch.

put:
Update a patch.

GET /api/1.0/patches/2219256/?format=api
HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 2219256,
    "url": "http://patchwork.ozlabs.org/api/1.0/patches/2219256/?format=api",
    "project": {
        "id": 21,
        "url": "http://patchwork.ozlabs.org/api/1.0/projects/21/?format=api",
        "name": "Linux Tegra Development",
        "link_name": "linux-tegra",
        "list_id": "linux-tegra.vger.kernel.org",
        "list_email": "linux-tegra@vger.kernel.org",
        "web_url": null,
        "scm_url": null,
        "webscm_url": null
    },
    "msgid": "<20260402170641.2082547-2-joonwonkang@google.com>",
    "date": "2026-04-02T17:06:40",
    "name": "[v3,1/2] mailbox: Use per-thread completion to fix wrong completion order",
    "commit_ref": null,
    "pull_url": null,
    "state": "new",
    "archived": false,
    "hash": "ee8dbe49841f934af372a34c79e5e1682c4a320e",
    "submitter": {
        "id": 91088,
        "url": "http://patchwork.ozlabs.org/api/1.0/people/91088/?format=api",
        "name": "Joonwon Kang",
        "email": "joonwonkang@google.com"
    },
    "delegate": null,
    "mbox": "http://patchwork.ozlabs.org/project/linux-tegra/patch/20260402170641.2082547-2-joonwonkang@google.com/mbox/",
    "series": [
        {
            "id": 498517,
            "url": "http://patchwork.ozlabs.org/api/1.0/series/498517/?format=api",
            "date": "2026-04-02T17:06:41",
            "name": "mailbox: Fix wrong completion order and improper send result in the blocking mode send API",
            "version": 3,
            "mbox": "http://patchwork.ozlabs.org/series/498517/mbox/"
        }
    ],
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/2219256/checks/",
    "tags": {},
    "headers": {
        "Return-Path": "\n <linux-tegra+bounces-13542-incoming=patchwork.ozlabs.org@vger.kernel.org>",
        "X-Original-To": [
            "incoming@patchwork.ozlabs.org",
            "linux-tegra@vger.kernel.org"
        ],
        "Delivered-To": "patchwork-incoming@legolas.ozlabs.org",
        "Authentication-Results": [
            "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256\n header.s=20251104 header.b=jPS1WL29;\n\tdkim-atps=neutral",
            "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c0a:e001:db::12fc:5321; helo=sea.lore.kernel.org;\n envelope-from=linux-tegra+bounces-13542-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)",
            "smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=google.com header.i=@google.com\n header.b=\"jPS1WL29\"",
            "smtp.subspace.kernel.org;\n arc=none smtp.client-ip=209.85.216.73",
            "smtp.subspace.kernel.org;\n dmarc=pass (p=reject dis=none) header.from=google.com",
            "smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=flex--joonwonkang.bounces.google.com"
        ],
        "Received": [
            "from sea.lore.kernel.org (sea.lore.kernel.org\n [IPv6:2600:3c0a:e001:db::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fmpN91XnLz1yGH\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 03 Apr 2026 04:13:29 +1100 (AEDT)",
            "from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id A5B2D30CC5DE\n\tfor <incoming@patchwork.ozlabs.org>; Thu,  2 Apr 2026 17:07:50 +0000 (UTC)",
            "from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 257843AF64E;\n\tThu,  2 Apr 2026 17:07:50 +0000 (UTC)",
            "from mail-pj1-f73.google.com (mail-pj1-f73.google.com\n [209.85.216.73])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A99D361678\n\tfor <linux-tegra@vger.kernel.org>; Thu,  2 Apr 2026 17:07:41 +0000 (UTC)",
            "by mail-pj1-f73.google.com with SMTP id\n 98e67ed59e1d1-35c1874336aso2519480a91.3\n        for <linux-tegra@vger.kernel.org>;\n Thu, 02 Apr 2026 10:07:41 -0700 (PDT)"
        ],
        "ARC-Seal": "i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1775149668; cv=none;\n b=HdhDmbEnAv75A0itYakMtrIhGU4iOSXBEgGfn0Gt4yuLKL0XyXmXXIit6Uo0dsMGGnBwxh9syxpGiyIXYtz32QtPwv6dXdX0n+0J62kFGGyw4/kFC5NUjtzRVMreeTk4HG4/Kz9spwZSPVgINAfKBfxgNHXS4zDoArgXzBRoa38=",
        "ARC-Message-Signature": "i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1775149668; c=relaxed/simple;\n\tbh=iboUIMrr4ZTwXaB6GUMUN1CNFh7FqDUbG1ISIooTYNY=;\n\th=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From:\n\t To:Cc:Content-Type;\n b=XMw7h5e0arF8HMnO2x+OqvGNDmct51k2elDZ/+Hsod2XAGL1CJUSMboifWmfjzMCRBFMBhysPTepa7I3m5d684++5EpdXR+KYTz4N+Kppd2yv3r7cx9/ZsVPioC8bW1z4kCCDXSr6BLcOfwBGa5uzcIG2O0/VeKy7ik5Ig8mytI=",
        "ARC-Authentication-Results": "i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=reject dis=none) header.from=google.com;\n spf=pass smtp.mailfrom=flex--joonwonkang.bounces.google.com;\n dkim=pass (2048-bit key) header.d=google.com header.i=@google.com\n header.b=jPS1WL29; arc=none smtp.client-ip=209.85.216.73",
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n        d=google.com; s=20251104; t=1775149661; x=1775754461;\n darn=vger.kernel.org;\n        h=cc:to:from:subject:message-id:references:mime-version:in-reply-to\n         :date:from:to:cc:subject:date:message-id:reply-to;\n        bh=qe/ZA3cS06JPwazJ5lT2X5nq3OydOwSen9aJipTvAo8=;\n        b=jPS1WL29f9SHjnLowWyzlGHdFBOkTmMT5TYQQ2ay8qCl3RXGGXj7ZD2C5ihMdpdsEP\n         rpDLedBTSkB12gZ567FyKnGS0pA/TomU8kTLOyAVWY3wxgy5uJPD8uNQiDVgrM+NOXpY\n         puxEjssJaelwP+rtiOCvpIH5Il+rfuhAcoJ3goRIAg2DrsWOgJfD5V8j64zsod5TO7jG\n         C3h5L23NQAPW+7FGUil0h3s0+pKLADFv6SsnPE9Gmg+00pLKmr2CJLvYCxSChzLRxhDd\n         X+t1GnRbiea4kBpdAWtGC8wuBS64uhEm3kGABVViFYQmt1GdJZdMv+G4Rmy0kOWKSkQe\n         /dVQ==",
        "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n        d=1e100.net; s=20251104; t=1775149661; x=1775754461;\n        h=cc:to:from:subject:message-id:references:mime-version:in-reply-to\n         :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;\n        bh=qe/ZA3cS06JPwazJ5lT2X5nq3OydOwSen9aJipTvAo8=;\n        b=AY8BW8ilVW7JZU8zxEa5S/e40oCT1J3GkkN5J/sHusaA49NrpURSKFahcNit7n+oCL\n         ZaXiUsqy78NGIc1QZhCqtZvx3SyDoNiGf9QevP7j9Jqnxn1JE4YWBhGZiMhvsx/lIsXH\n         qqtGQrqeG1iwxiYSSrA0HeaocLo2T63Oau1BKq+C0xmqDwRYEm+8Y5KLonqnprHeOFPx\n         l4+G7DRGy6lsrBNWJkQlPGFjjGa9ceIwkc/xdTiIbyecfxg5/MeMwummkZK/mTAHR96J\n         7nzm4PlDNAHH3K+KMbPDsmKDzS6xuTzO9nbEEI/tISvAn/QAB/6emV6Zk2znyXNbS9z6\n         O44g==",
        "X-Forwarded-Encrypted": "i=1;\n AJvYcCXBbw6nZKFlBJcODk4bSN7S/4LREoCXDWS/rhPzdjFevbT6uzGZ1Qw/2wU9PBpRN8ObVfyHvEMfMjtv8Q==@vger.kernel.org",
        "X-Gm-Message-State": "AOJu0YxvOc+Lu8LRcCAdGjYak71N93kgTPic5WRtQoAVXiSGzDh30KB8\n\ttIefKkWwrNCHNRD/Z12PhD889LTvGtnprfWkrcs81ClTE3OY53+4J+AEGK2OtRRbdLNVcxCCCkO\n\tpOTXfi1Z8jxtHlbVz+tHSfTBU9g==",
        "X-Received": "from pgww5.prod.google.com ([2002:a05:6a02:2c85:b0:c73:9919:c4f8])\n (user=joonwonkang job=prod-delivery.src-stubby-dispatcher) by\n 2002:a05:6a21:32a0:b0:398:98ab:71a8 with SMTP id\n adf61e73a8af0-39ef773e0a1mr9207386637.47.1775149661098;\n Thu, 02 Apr 2026 10:07:41 -0700 (PDT)",
        "Date": "Thu,  2 Apr 2026 17:06:40 +0000",
        "In-Reply-To": "<20260402170641.2082547-1-joonwonkang@google.com>",
        "Precedence": "bulk",
        "X-Mailing-List": "linux-tegra@vger.kernel.org",
        "List-Id": "<linux-tegra.vger.kernel.org>",
        "List-Subscribe": "<mailto:linux-tegra+subscribe@vger.kernel.org>",
        "List-Unsubscribe": "<mailto:linux-tegra+unsubscribe@vger.kernel.org>",
        "Mime-Version": "1.0",
        "References": "<20260402170641.2082547-1-joonwonkang@google.com>",
        "X-Mailer": "git-send-email 2.53.0.1213.gd9a14994de-goog",
        "Message-ID": "<20260402170641.2082547-2-joonwonkang@google.com>",
        "Subject": "[PATCH v3 1/2] mailbox: Use per-thread completion to fix wrong\n completion order",
        "From": "Joonwon Kang <joonwonkang@google.com>",
        "To": "jassisinghbrar@gmail.com, matthias.bgg@gmail.com,\n\tangelogioacchino.delregno@collabora.com, thierry.reding@gmail.com,\n\tjonathanh@nvidia.com",
        "Cc": "linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,\n\tlinux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org,\n\tJoonwon Kang <joonwonkang@google.com>, stable@vger.kernel.org",
        "Content-Type": "text/plain; charset=\"UTF-8\""
    },
    "content": "Previously, a sender thread in mbox_send_message() could be woken up at\na wrong time in blocking mode. It is because there was only a single\ncompletion for a channel whereas messages from multiple threads could be\nsent in any order; since the shared completion could be signalled in any\norder, it could wake up a wrong sender thread.\n\nThis commit resolves the false wake-up issue with the following changes:\n- Completions are created just as many as the number of concurrent sender\n  threads\n- A completion is created on a sender thread's stack\n- Each slot of the message queue, i.e. `msg_data`, contains a pointer to\n  its target completion\n- tx_tick() signals the completion of the currently active slot of the\n  message queue\n\nCc: stable@vger.kernel.org\nLink: https://lore.kernel.org/all/1490809381-28869-1-git-send-email-jaswinder.singh@linaro.org\nSigned-off-by: Joonwon Kang <joonwonkang@google.com>\n---\n drivers/mailbox/mailbox.c          | 86 +++++++++++++++++++-----------\n drivers/mailbox/mtk-vcp-mailbox.c  |  2 +-\n drivers/mailbox/tegra-hsp.c        |  2 +-\n include/linux/mailbox_controller.h | 20 ++++---\n 4 files changed, 72 insertions(+), 38 deletions(-)",
    "diff": "diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c\nindex 138ffbcd4fde..d63386468982 100644\n--- a/drivers/mailbox/mailbox.c\n+++ b/drivers/mailbox/mailbox.c\n@@ -21,7 +21,7 @@\n static LIST_HEAD(mbox_cons);\n static DEFINE_MUTEX(con_mutex);\n \n-static int add_to_rbuf(struct mbox_chan *chan, void *mssg)\n+static int add_to_rbuf(struct mbox_chan *chan, void *mssg, struct completion *tx_complete)\n {\n \tint idx;\n \n@@ -32,7 +32,8 @@ static int add_to_rbuf(struct mbox_chan *chan, void *mssg)\n \t\treturn -ENOBUFS;\n \n \tidx = chan->msg_free;\n-\tchan->msg_data[idx] = mssg;\n+\tchan->msg_data[idx].data = mssg;\n+\tchan->msg_data[idx].tx_complete = tx_complete;\n \tchan->msg_count++;\n \n \tif (idx == MBOX_TX_QUEUE_LEN - 1)\n@@ -50,24 +51,33 @@ static void msg_submit(struct mbox_chan *chan)\n \tint err = -EBUSY;\n \n \tscoped_guard(spinlock_irqsave, &chan->lock) {\n-\t\tif (!chan->msg_count || chan->active_req != MBOX_NO_MSG)\n+\t\tif (chan->active_req >= 0)\n \t\t\tbreak;\n \n-\t\tcount = chan->msg_count;\n-\t\tidx = chan->msg_free;\n-\t\tif (idx >= count)\n-\t\t\tidx -= count;\n-\t\telse\n-\t\t\tidx += MBOX_TX_QUEUE_LEN - count;\n+\t\twhile (chan->msg_count > 0) {\n+\t\t\tcount = chan->msg_count;\n+\t\t\tidx = chan->msg_free;\n+\t\t\tif (idx >= count)\n+\t\t\t\tidx -= count;\n+\t\t\telse\n+\t\t\t\tidx += MBOX_TX_QUEUE_LEN - count;\n \n-\t\tdata = chan->msg_data[idx];\n+\t\t\tdata = chan->msg_data[idx].data;\n+\t\t\tif (data != MBOX_NO_MSG)\n+\t\t\t\tbreak;\n+\n+\t\t\tchan->msg_count--;\n+\t\t}\n+\n+\t\tif (!chan->msg_count)\n+\t\t\tbreak;\n \n \t\tif (chan->cl->tx_prepare)\n \t\t\tchan->cl->tx_prepare(chan->cl, data);\n \t\t/* Try to submit a message to the MBOX controller */\n \t\terr = chan->mbox->ops->send_data(chan, data);\n \t\tif (!err) {\n-\t\t\tchan->active_req = data;\n+\t\t\tchan->active_req = idx;\n \t\t\tchan->msg_count--;\n \t\t}\n \t}\n@@ -79,27 +89,35 @@ static void msg_submit(struct mbox_chan *chan)\n \t}\n }\n \n-static void tx_tick(struct mbox_chan *chan, int r)\n+static void tx_tick(struct mbox_chan *chan, int r, int idx)\n {\n-\tvoid *mssg;\n+\tstruct mbox_message mssg = {MBOX_NO_MSG, NULL};\n \n \tscoped_guard(spinlock_irqsave, &chan->lock) {\n-\t\tmssg = chan->active_req;\n-\t\tchan->active_req = MBOX_NO_MSG;\n+\t\tif (idx >= 0 && idx != chan->active_req) {\n+\t\t\tchan->msg_data[idx].data = MBOX_NO_MSG;\n+\t\t\tchan->msg_data[idx].tx_complete = NULL;\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tif (chan->active_req >= 0) {\n+\t\t\tmssg = chan->msg_data[chan->active_req];\n+\t\t\tchan->active_req = -1;\n+\t\t}\n \t}\n \n \t/* Submit next message */\n \tmsg_submit(chan);\n \n-\tif (mssg == MBOX_NO_MSG)\n+\tif (mssg.data == MBOX_NO_MSG)\n \t\treturn;\n \n \t/* Notify the client */\n \tif (chan->cl->tx_done)\n-\t\tchan->cl->tx_done(chan->cl, mssg, r);\n+\t\tchan->cl->tx_done(chan->cl, mssg.data, r);\n \n \tif (r != -ETIME && chan->cl->tx_block)\n-\t\tcomplete(&chan->tx_complete);\n+\t\tcomplete(mssg.tx_complete);\n }\n \n static enum hrtimer_restart txdone_hrtimer(struct hrtimer *hrtimer)\n@@ -112,10 +130,10 @@ static enum hrtimer_restart txdone_hrtimer(struct hrtimer *hrtimer)\n \tfor (i = 0; i < mbox->num_chans; i++) {\n \t\tstruct mbox_chan *chan = &mbox->chans[i];\n \n-\t\tif (chan->active_req != MBOX_NO_MSG && chan->cl) {\n+\t\tif (chan->active_req >= 0 && chan->cl) {\n \t\t\ttxdone = chan->mbox->ops->last_tx_done(chan);\n \t\t\tif (txdone)\n-\t\t\t\ttx_tick(chan, 0);\n+\t\t\t\ttx_tick(chan, 0, -1);\n \t\t\telse\n \t\t\t\tresched = true;\n \t\t}\n@@ -168,7 +186,7 @@ void mbox_chan_txdone(struct mbox_chan *chan, int r)\n \t\treturn;\n \t}\n \n-\ttx_tick(chan, r);\n+\ttx_tick(chan, r, -1);\n }\n EXPORT_SYMBOL_GPL(mbox_chan_txdone);\n \n@@ -188,7 +206,7 @@ void mbox_client_txdone(struct mbox_chan *chan, int r)\n \t\treturn;\n \t}\n \n-\ttx_tick(chan, r);\n+\ttx_tick(chan, r, -1);\n }\n EXPORT_SYMBOL_GPL(mbox_client_txdone);\n \n@@ -266,11 +284,19 @@ EXPORT_SYMBOL_GPL(mbox_chan_tx_slots_available);\n int mbox_send_message(struct mbox_chan *chan, void *mssg)\n {\n \tint t;\n+\tint idx;\n+\tstruct completion tx_complete;\n \n \tif (!chan || !chan->cl || mssg == MBOX_NO_MSG)\n \t\treturn -EINVAL;\n \n-\tt = add_to_rbuf(chan, mssg);\n+\tif (chan->cl->tx_block) {\n+\t\tinit_completion(&tx_complete);\n+\t\tt = add_to_rbuf(chan, mssg, &tx_complete);\n+\t} else {\n+\t\tt = add_to_rbuf(chan, mssg, NULL);\n+\t}\n+\n \tif (t < 0) {\n \t\tdev_err(chan->mbox->dev, \"Try increasing MBOX_TX_QUEUE_LEN\\n\");\n \t\treturn t;\n@@ -287,10 +313,11 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg)\n \t\telse\n \t\t\twait = msecs_to_jiffies(chan->cl->tx_tout);\n \n-\t\tret = wait_for_completion_timeout(&chan->tx_complete, wait);\n+\t\tret = wait_for_completion_timeout(&tx_complete, wait);\n \t\tif (ret == 0) {\n+\t\t\tidx = t;\n \t\t\tt = -ETIME;\n-\t\t\ttx_tick(chan, t);\n+\t\t\ttx_tick(chan, t, idx);\n \t\t}\n \t}\n \n@@ -321,7 +348,7 @@ int mbox_flush(struct mbox_chan *chan, unsigned long timeout)\n \n \tret = chan->mbox->ops->flush(chan, timeout);\n \tif (ret < 0)\n-\t\ttx_tick(chan, ret);\n+\t\ttx_tick(chan, ret, -1);\n \n \treturn ret;\n }\n@@ -340,9 +367,8 @@ static int __mbox_bind_client(struct mbox_chan *chan, struct mbox_client *cl)\n \tscoped_guard(spinlock_irqsave, &chan->lock) {\n \t\tchan->msg_free = 0;\n \t\tchan->msg_count = 0;\n-\t\tchan->active_req = MBOX_NO_MSG;\n+\t\tchan->active_req = -1;\n \t\tchan->cl = cl;\n-\t\tinit_completion(&chan->tx_complete);\n \n \t\tif (chan->txdone_method\t== TXDONE_BY_POLL && cl->knows_txdone)\n \t\t\tchan->txdone_method = TXDONE_BY_ACK;\n@@ -498,7 +524,7 @@ void mbox_free_channel(struct mbox_chan *chan)\n \t/* The queued TX requests are simply aborted, no callbacks are made */\n \tscoped_guard(spinlock_irqsave, &chan->lock) {\n \t\tchan->cl = NULL;\n-\t\tchan->active_req = MBOX_NO_MSG;\n+\t\tchan->active_req = -1;\n \t\tif (chan->txdone_method == TXDONE_BY_ACK)\n \t\t\tchan->txdone_method = TXDONE_BY_POLL;\n \t}\n@@ -553,7 +579,7 @@ int mbox_controller_register(struct mbox_controller *mbox)\n \n \t\tchan->cl = NULL;\n \t\tchan->mbox = mbox;\n-\t\tchan->active_req = MBOX_NO_MSG;\n+\t\tchan->active_req = -1;\n \t\tchan->txdone_method = txdone;\n \t\tspin_lock_init(&chan->lock);\n \t}\ndiff --git a/drivers/mailbox/mtk-vcp-mailbox.c b/drivers/mailbox/mtk-vcp-mailbox.c\nindex 1b291b8ea15a..a7bab06ac686 100644\n--- a/drivers/mailbox/mtk-vcp-mailbox.c\n+++ b/drivers/mailbox/mtk-vcp-mailbox.c\n@@ -84,7 +84,7 @@ static int mtk_vcp_mbox_send_data(struct mbox_chan *chan, void *data)\n \n static bool mtk_vcp_mbox_last_tx_done(struct mbox_chan *chan)\n {\n-\tstruct mtk_ipi_info *ipi_info = chan->active_req;\n+\tstruct mtk_ipi_info *ipi_info = chan->msg_data[chan->active_req].data;\n \tstruct mtk_vcp_mbox *priv = chan->con_priv;\n \n \treturn !(readl(priv->base + priv->cfg->set_in) & BIT(ipi_info->index));\ndiff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c\nindex 7b1e1b83ea29..efe0033cb5c5 100644\n--- a/drivers/mailbox/tegra-hsp.c\n+++ b/drivers/mailbox/tegra-hsp.c\n@@ -495,7 +495,7 @@ static int tegra_hsp_mailbox_flush(struct mbox_chan *chan,\n \t\t\tmbox_chan_txdone(chan, 0);\n \n \t\t\t/* Wait until channel is empty */\n-\t\t\tif (chan->active_req != MBOX_NO_MSG)\n+\t\t\tif (chan->active_req >= 0)\n \t\t\t\tcontinue;\n \n \t\t\treturn 0;\ndiff --git a/include/linux/mailbox_controller.h b/include/linux/mailbox_controller.h\nindex e3896b08f22e..912499ad08ed 100644\n--- a/include/linux/mailbox_controller.h\n+++ b/include/linux/mailbox_controller.h\n@@ -113,16 +113,25 @@ struct mbox_controller {\n  */\n #define MBOX_TX_QUEUE_LEN\t20\n \n+/**\n+ * struct mbox_message - Internal representation of a mailbox message\n+ * @data:\t\tData packet\n+ * @tx_complete:\tPointer to the transmission completion\n+ */\n+struct mbox_message {\n+\tvoid *data;\n+\tstruct completion *tx_complete;\n+};\n+\n /**\n  * struct mbox_chan - s/w representation of a communication chan\n  * @mbox:\t\tPointer to the parent/provider of this channel\n  * @txdone_method:\tWay to detect TXDone chosen by the API\n  * @cl:\t\t\tPointer to the current owner of this channel\n- * @tx_complete:\tTransmission completion\n- * @active_req:\t\tCurrently active request hook\n+ * @active_req:\t\tIndex of the currently active slot in the queue\n  * @msg_count:\t\tNo. of mssg currently queued\n  * @msg_free:\t\tIndex of next available mssg slot\n- * @msg_data:\t\tHook for data packet\n+ * @msg_data:\t\tQueue of data packets\n  * @lock:\t\tSerialise access to the channel\n  * @con_priv:\t\tHook for controller driver to attach private data\n  */\n@@ -130,10 +139,9 @@ struct mbox_chan {\n \tstruct mbox_controller *mbox;\n \tunsigned txdone_method;\n \tstruct mbox_client *cl;\n-\tstruct completion tx_complete;\n-\tvoid *active_req;\n+\tint active_req;\n \tunsigned msg_count, msg_free;\n-\tvoid *msg_data[MBOX_TX_QUEUE_LEN];\n+\tstruct mbox_message msg_data[MBOX_TX_QUEUE_LEN];\n \tspinlock_t lock; /* Serialise access to the channel */\n \tvoid *con_priv;\n };\n",
    "prefixes": [
        "v3",
        "1/2"
    ]
}