Commit bfe1f6ac authored by Hiroshi DOYU's avatar Hiroshi DOYU Committed by Tony Lindgren
Browse files

omap: mailbox: remove sequence bit checking 



Any protocol should be handled in the upper layer and mailbox driver
shouldn't care about the contents of messages.

Signed-off-by: default avatarHiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 454bf340

arch/arm/plat-omap/mailbox.c

+4 −66
Original line number Diff line number Diff line
@@ -28,54 +28,9 @@ 


#include <plat/mailbox.h>



static int enable_seq_bit;

module_param(enable_seq_bit, bool, 0);

MODULE_PARM_DESC(enable_seq_bit, "Enable sequence bit checking.");



static struct omap_mbox *mboxes;

static DEFINE_RWLOCK(mboxes_lock);



/*

 * Mailbox sequence bit API

 */



/* seq_rcv should be initialized with any value other than

 * 0 and 1 << 31, to allow either value for the first

 * message.  */

static inline void mbox_seq_init(struct omap_mbox *mbox)

{

	if (!enable_seq_bit)

		return;



	/* any value other than 0 and 1 << 31 */

	mbox->seq_rcv = 0xffffffff;

}



static inline void mbox_seq_toggle(struct omap_mbox *mbox, mbox_msg_t * msg)

{

	if (!enable_seq_bit)

		return;



	/* add seq_snd to msg */

	*msg = (*msg & 0x7fffffff) | mbox->seq_snd;

	/* flip seq_snd */

	mbox->seq_snd ^= 1 << 31;

}



static inline int mbox_seq_test(struct omap_mbox *mbox, mbox_msg_t msg)

{

	mbox_msg_t seq;



	if (!enable_seq_bit)

		return 0;



	seq = msg & (1 << 31);

	if (seq == mbox->seq_rcv)

		return -1;

	mbox->seq_rcv = seq;

	return 0;

}



/* Mailbox FIFO handle functions */

static inline mbox_msg_t mbox_fifo_read(struct omap_mbox *mbox)

{
@@ -113,13 +68,6 @@ static inline int is_mbox_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq) 
	return mbox->ops->is_irq(mbox, irq);

}



/* Mailbox Sequence Bit function */

void omap_mbox_init_seq(struct omap_mbox *mbox)

{

	mbox_seq_init(mbox);

}

EXPORT_SYMBOL(omap_mbox_init_seq);



/*

 * message sender

 */
@@ -141,7 +89,6 @@ static int __mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg, void *arg) 
			goto out;

	}



	mbox_seq_toggle(mbox, &msg);

	mbox_fifo_write(mbox, msg);

 out:

	return ret;
@@ -284,11 +231,6 @@ static void __mbox_rx_interrupt(struct omap_mbox *mbox) 


		msg = mbox_fifo_read(mbox);



		if (unlikely(mbox_seq_test(mbox, msg))) {

			pr_info("mbox: Illegal seq bit!(%08x)\n", msg);

			if (mbox->err_notify)

				mbox->err_notify();

		}



		blk_insert_request(q, rq, 0, (void *)msg);

		if (mbox->ops->type == OMAP_MBOX_TYPE1)
@@ -357,10 +299,6 @@ omap_mbox_read(struct device *dev, struct device_attribute *attr, char *buf) 


		blk_end_request_all(rq, 0);



		if (unlikely(mbox_seq_test(mbox, *p))) {

			pr_info("mbox: Illegal seq bit!(%08x) ignored\n", *p);

			continue;

		}

		p++;

	}