leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

omap mailbox: convert sequence bit checking to module paramter

Browse Source 
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
This commit is contained in:
Hiroshi DOYU 2009-03-23 18:07:31 -07:00 committed by Tony Lindgren
parent 9ae0ee0076
commit 7a781afde6
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
arch/arm/plat-omap/mailbox.c
View File

@ -32,30 +32,34 @@
#include <linux/io.h> #include <linux/io.h>
#include <mach/mailbox.h> #include <mach/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 struct omap_mbox *mboxes;
static DEFINE_RWLOCK(mboxes_lock); static DEFINE_RWLOCK(mboxes_lock);
/* /*
* Mailbox sequence bit API * Mailbox sequence bit API
*/ */
#if defined(CONFIG_ARCH_OMAP1)
# define MBOX_USE_SEQ_BIT
#elif defined(CONFIG_ARCH_OMAP2)
# define MBOX_USE_SEQ_BIT
#endif
#ifdef MBOX_USE_SEQ_BIT
/* seq_rcv should be initialized with any value other than /* seq_rcv should be initialized with any value other than
* 0 and 1 << 31, to allow either value for the first * 0 and 1 << 31, to allow either value for the first
* message. */ * message. */
static inline void mbox_seq_init(struct omap_mbox *mbox) static inline void mbox_seq_init(struct omap_mbox *mbox)
{ {
if (!enable_seq_bit)
return;
/* any value other than 0 and 1 << 31 */ /* any value other than 0 and 1 << 31 */
mbox->seq_rcv = 0xffffffff; mbox->seq_rcv = 0xffffffff;
} }
static inline void mbox_seq_toggle(struct omap_mbox *mbox, mbox_msg_t * msg) static inline void mbox_seq_toggle(struct omap_mbox *mbox, mbox_msg_t * msg)
{ {
if (!enable_seq_bit)
return;
/* add seq_snd to msg */ /* add seq_snd to msg */
*msg = (*msg & 0x7fffffff) | mbox->seq_snd; *msg = (*msg & 0x7fffffff) | mbox->seq_snd;
/* flip seq_snd */ /* flip seq_snd */
@ -64,24 +68,17 @@ static inline void mbox_seq_toggle(struct omap_mbox *mbox, mbox_msg_t * msg)
static inline int mbox_seq_test(struct omap_mbox *mbox, mbox_msg_t msg) static inline int mbox_seq_test(struct omap_mbox *mbox, mbox_msg_t msg)
{ {
mbox_msg_t seq = msg & (1 << 31); mbox_msg_t seq;
if (!enable_seq_bit)
return 0;
seq = msg & (1 << 31);
if (seq == mbox->seq_rcv) if (seq == mbox->seq_rcv)
return -1; return -1;
mbox->seq_rcv = seq; mbox->seq_rcv = seq;
return 0; return 0;
} }
#else
static inline void mbox_seq_init(struct omap_mbox *mbox)
{
}
static inline void mbox_seq_toggle(struct omap_mbox *mbox, mbox_msg_t * msg)
{
}
static inline int mbox_seq_test(struct omap_mbox *mbox, mbox_msg_t msg)
{
return 0;
}
#endif
/* Mailbox FIFO handle functions */ /* Mailbox FIFO handle functions */
static inline mbox_msg_t mbox_fifo_read(struct omap_mbox *mbox) static inline mbox_msg_t mbox_fifo_read(struct omap_mbox *mbox)