Commit 2e4ac7cc authored by Kevin Wangtao's avatar Kevin Wangtao Committed by Jassi Brar
Browse files

mailbox: Hi3660: Fixup mailbox state machine malfunction issue 



Current mailbox driver of Hi3660 release the mailbox directly
before sending a new message which may cause last message lost
and next message sending doesn't take effect actually.

This patch fixs this issue by following the right progress below,
each time before sending a message, mailbox driver will check
whether the mailbox is in ready state, if last message has been
acknowledged, the mailbox driver will clear the ack state to turn
the mailbox to ready state again.

Signed-off-by: default avatarKevin Wangtao <kevin.wangtao@hisilicon.com>
Reviewed-and-tested-by: default avatarLeo Yan <leo.yan@linaro.org>
Tested-by: default avatarValentin Schneider <valentin.schneider@arm.com>
Signed-off-by: default avatarJassi Brar <jaswinder.singh@linaro.org>
parent b5452838

drivers/mailbox/hi3660-mailbox.c

+10 −12
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#define MBOX_AUTOMATIC_ACK		1



#define MBOX_STATE_IDLE			BIT(4)

#define MBOX_STATE_READY		BIT(5)

#define MBOX_STATE_ACK			BIT(7)



#define MBOX_MSG_LEN			8
@@ -91,8 +92,8 @@ static int hi3660_mbox_check_state(struct mbox_chan *chan) 
	unsigned long val;

	unsigned int ret;



	/* Mailbox is idle so directly bail out */

	if (readl(base + MBOX_MODE_REG) & MBOX_STATE_IDLE)

	/* Mailbox is ready to use */

	if (readl(base + MBOX_MODE_REG) & MBOX_STATE_READY)

		return 0;



	/* Wait for acknowledge from remote */
@@ -103,9 +104,9 @@ static int hi3660_mbox_check_state(struct mbox_chan *chan) 
		return ret;

	}



	/* Ensure channel is released */

	writel(0xffffffff, base + MBOX_IMASK_REG);

	writel(BIT(mchan->ack_irq), base + MBOX_SRC_REG);

	/* clear ack state, mailbox will get back to ready state */

	writel(BIT(mchan->ack_irq), base + MBOX_ICLR_REG);



	return 0;

}
@@ -160,10 +161,6 @@ static int hi3660_mbox_startup(struct mbox_chan *chan) 
{

	int ret;



	ret = hi3660_mbox_check_state(chan);

	if (ret)

		return ret;



	ret = hi3660_mbox_unlock(chan);

	if (ret)

		return ret;
@@ -183,10 +180,11 @@ static int hi3660_mbox_send_data(struct mbox_chan *chan, void *msg) 
	void __iomem *base = MBOX_BASE(mbox, ch);

	u32 *buf = msg;

	unsigned int i;

	int ret;



	/* Ensure channel is released */

	writel_relaxed(0xffffffff, base + MBOX_IMASK_REG);

	writel_relaxed(BIT(mchan->ack_irq), base + MBOX_SRC_REG);

	ret = hi3660_mbox_check_state(chan);

	if (ret)

		return ret;



	/* Clear mask for destination interrupt */

	writel_relaxed(~BIT(mchan->dst_irq), base + MBOX_IMASK_REG);

CRA Git | Maintained and supported by SUSTech CRA and CCSE