diff options
| author | Per Åstrand <per.astrand@arm.com> | 2020-10-12 13:37:16 +0200 |
|---|---|---|
| committer | Kristofer Jonsson <kristofer.jonsson@arm.com> | 2020-10-19 08:22:59 +0000 |
| commit | 8fac4a4d29a5e9792173d7f6db998115c809fde9 (patch) | |
| tree | 13c140775054b64cf0d7b2971514c5f1474722fe | |
| parent | bb4089d4a0d14ff88c5ce637806f10686c2188de (diff) | |
| download | ethos-u-linux-driver-stack-8fac4a4d29a5e9792173d7f6db998115c809fde9.tar.gz | |
mhuv2: Verifiy ACCESS_REQUEST on send_data
Change-Id: I8dc5cb43c8ea050c6881988e9dbd821e60f3c514
| -rw-r--r-- | mailbox/arm_mhu_v2.c | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/mailbox/arm_mhu_v2.c b/mailbox/arm_mhu_v2.c index 5bb943a..365715b 100644 --- a/mailbox/arm_mhu_v2.c +++ b/mailbox/arm_mhu_v2.c @@ -2,7 +2,7 @@ /* * Message Handling Unit version 2 controller driver - * Copyright (C) 2019 ARM Ltd. + * Copyright (C) 2019-2020 ARM Ltd. * * Based on drivers/mailbox/arm_mhu.c * @@ -78,11 +78,46 @@ static int mhuv2_send_data(struct mbox_chan *chan, void *data) { struct mhuv2_link *mlink = chan->con_priv; + struct arm_mhuv2 *mhuv2 = mbox_to_arm_mhuv2(chan->mbox); u32 *arg = data; + u32 tmo = 100000; + + /* If ACCESS_REQUEST is low, we have to wait for the other side + * to relase ACCESS_READY before continuing. */ + if (!readl_relaxed(mhuv2->base + MHU_V2_REG_ACC_REQ_OFS)) { + while (readl_relaxed(mhuv2->base + MHU_V2_REG_ACC_RDY_OFS) && + --tmo != 0) + continue; + + if (!tmo) + goto err; + + /* Request access and wait for other side to ack */ + writel_relaxed(0x1, mhuv2->base + MHU_V2_REG_ACC_REQ_OFS); + tmo = 100000; + while (!readl_relaxed(mhuv2->base + MHU_V2_REG_ACC_RDY_OFS) && + --tmo != 0) + continue; + + if (!tmo) + goto err; + } else { + while (!readl_relaxed(mhuv2->base + MHU_V2_REG_ACC_RDY_OFS) && + --tmo != 0) + continue; + + if (!tmo) + goto err; + } writel_relaxed(*arg, mlink->tx_reg + MHU_V2_REG_SET_OFS); return 0; + +err: + dev_err(chan->mbox->dev, "Failed to acquire access to mhu.\n"); + + return 1; } static int mhuv2_startup(struct mbox_chan *chan) |