RE: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to support OMAP4 mailbox
> -Original Message-
> From: Tony Lindgren [mailto:t...@atomide.com]
> Sent: Saturday, November 14, 2009 6:16 AM
> To: C.A, Subramaniam
> Cc: linux-omap@vger.kernel.org; Gupta, Ramesh; Kanigeri,
> Hari; Hiroshi DOYU
> Subject: Re: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds
> code changes to support OMAP4 mailbox
>
> Hi,
>
> Just noticed all the iffdef else stuff here, that should be
> easy to remove.
>
Hi Tony,
I will send a revised patch for this as 8/10 v2.
> * C.A, Subramaniam [091113 04:33]:
> > From 1a5865e67ce5fae94ae283882411cd01f48e07a7 Mon Sep 17
> 00:00:00 2001
> > From: C A Subramaniam
> > Date: Fri, 13 Nov 2009 16:42:40 +0530
> > Subject: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds
> code changes to support OMAP4 mailbox.
> >
> > This patch adds code changes in the mailbox driver module to add
> > support for OMAP4 mailbox.
> >
> > Signed-off-by: Hari Kanigeri
> > Signed-off-by: C A Subramaniam
> > Signed-off-by: Ramesh Gupta G
> > ---
> > arch/arm/mach-omap2/mailbox.c | 118
> +++--
> > arch/arm/plat-omap/mailbox.c | 25 +++--
> > 2 files changed, 122 insertions(+), 21 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/mailbox.c
> > b/arch/arm/mach-omap2/mailbox.c index 5ba3aa6..3b21a5d 100644
> > --- a/arch/arm/mach-omap2/mailbox.c
> > +++ b/arch/arm/mach-omap2/mailbox.c
> > @@ -18,17 +18,26 @@
> > #include
> > #include
> >
> > +#define DRV_NAME "omap2-mailbox"
> > +
> > #define MAILBOX_REVISION 0x000
> > #define MAILBOX_SYSCONFIG 0x010
> > #define MAILBOX_SYSSTATUS 0x014
> > #define MAILBOX_MESSAGE(m) (0x040 + 4 * (m))
> > #define MAILBOX_FIFOSTATUS(m) (0x080 + 4 * (m))
> > #define MAILBOX_MSGSTATUS(m) (0x0c0 + 4 * (m))
> > +
> > +#ifdef CONFIG_ARCH_OMAP4
> > +#define MAILBOX_IRQSTATUS(u) (0x104 + 10 * (u))
> > +#define MAILBOX_IRQENABLE(u) (0x108 + 10 * (u))
> > +#define MAILBOX_IRQENABLE_CLR(u) (0x10c + 10 * (u))
> > +#else
> > #define MAILBOX_IRQSTATUS(u) (0x100 + 8 * (u))
> > #define MAILBOX_IRQENABLE(u) (0x104 + 8 * (u))
> > +#endif
>
> How about just have separate defines for OMAP4:
>
> #define OMAP4_MAILBOX_IRQSTATUS(u) (0x104 + 10 * (u))
> #define OMAP4_MAILBOX_IRQENABLE(u) (0x108 + 10 * (u))
> #define OMAP4_MAILBOX_IRQENABLE_CLR(u) (0x10c + 10 * (u))
>
>
> > -#define MAILBOX_IRQ_NEWMSG(u) (1 << (2 * (u)))
> > -#define MAILBOX_IRQ_NOTFULL(u) (1 << (2 * (u) + 1))
> > +#define MAILBOX_IRQ_NEWMSG(m) (1 << (2 * (m)))
> > +#define MAILBOX_IRQ_NOTFULL(m) (1 << (2 * (m) + 1))
> >
> > /* SYSCONFIG: register bit definition */
> > #define AUTOIDLE (1 << 0)
> > @@ -38,7 +47,12 @@
> > /* SYSSTATUS: register bit definition */
> > #define RESETDONE (1 << 0)
> >
> > +#ifdef CONFIG_ARCH_OMAP4
> > +#define MBOX_REG_SIZE 0x130
> > +#else
> > #define MBOX_REG_SIZE 0x120
> > +#endif
> > +
>
> #define OMAP4_MBOX_REG_SIZE 0x130
>
>
> > #define MBOX_NR_REGS (MBOX_REG_SIZE
> / sizeof(u32))
> >
> > static void __iomem *mbox_base;
> > @@ -57,6 +71,9 @@ struct omap_mbox2_priv {
> > u32 newmsg_bit;
> > u32 notfull_bit;
> > u32 ctx[MBOX_NR_REGS];
> > +#ifdef CONFIG_ARCH_OMAP4
> > + unsigned long irqdisable;
> > +#endif
> > };
> >
> > static struct clk *mbox_ick_handle;
> > @@ -82,8 +99,9 @@ static int omap2_mbox_startup(struct omap_mbox
> > *mbox)
> >
> > mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
> > if (IS_ERR(mbox_ick_handle)) {
> > - pr_err("Can't get mailboxes_ick\n");
> > - return -ENODEV;
> > + printk(KERN_ERR "Could not get mailboxes_ick: %d\n",
> > + PTR_ERR(mbox_ick_handle));
> > + return PTR_ERR(mbox_ick_handle);
> > }
> > clk_enable(mbox_ick_handle);
> >
> > @@ -115,6 +133,7 @@ static void omap2_mbox_shutdown(struct
> omap_mbox
> > *mbox) {
> > clk_disable(mbox_ick_handle);
> > clk_put(mbox_ick_handle);
> > + mbox_ick_handle = NULL;
> > }
> >
> > /* Mailbox FIFO handle func
Re: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to support OMAP4 mailbox
Hi,
Just noticed all the iffdef else stuff here, that should be easy to
remove.
* C.A, Subramaniam [091113 04:33]:
> From 1a5865e67ce5fae94ae283882411cd01f48e07a7 Mon Sep 17 00:00:00 2001
> From: C A Subramaniam
> Date: Fri, 13 Nov 2009 16:42:40 +0530
> Subject: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to
> support OMAP4 mailbox.
>
> This patch adds code changes in the mailbox driver module to
> add support for OMAP4 mailbox.
>
> Signed-off-by: Hari Kanigeri
> Signed-off-by: C A Subramaniam
> Signed-off-by: Ramesh Gupta G
> ---
> arch/arm/mach-omap2/mailbox.c | 118
> +++--
> arch/arm/plat-omap/mailbox.c | 25 +++--
> 2 files changed, 122 insertions(+), 21 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
> index 5ba3aa6..3b21a5d 100644
> --- a/arch/arm/mach-omap2/mailbox.c
> +++ b/arch/arm/mach-omap2/mailbox.c
> @@ -18,17 +18,26 @@
> #include
> #include
>
> +#define DRV_NAME "omap2-mailbox"
> +
> #define MAILBOX_REVISION 0x000
> #define MAILBOX_SYSCONFIG0x010
> #define MAILBOX_SYSSTATUS0x014
> #define MAILBOX_MESSAGE(m) (0x040 + 4 * (m))
> #define MAILBOX_FIFOSTATUS(m)(0x080 + 4 * (m))
> #define MAILBOX_MSGSTATUS(m) (0x0c0 + 4 * (m))
> +
> +#ifdef CONFIG_ARCH_OMAP4
> +#define MAILBOX_IRQSTATUS(u) (0x104 + 10 * (u))
> +#define MAILBOX_IRQENABLE(u) (0x108 + 10 * (u))
> +#define MAILBOX_IRQENABLE_CLR(u) (0x10c + 10 * (u))
> +#else
> #define MAILBOX_IRQSTATUS(u) (0x100 + 8 * (u))
> #define MAILBOX_IRQENABLE(u) (0x104 + 8 * (u))
> +#endif
How about just have separate defines for OMAP4:
#define OMAP4_MAILBOX_IRQSTATUS(u) (0x104 + 10 * (u))
#define OMAP4_MAILBOX_IRQENABLE(u) (0x108 + 10 * (u))
#define OMAP4_MAILBOX_IRQENABLE_CLR(u) (0x10c + 10 * (u))
> -#define MAILBOX_IRQ_NEWMSG(u)(1 << (2 * (u)))
> -#define MAILBOX_IRQ_NOTFULL(u) (1 << (2 * (u) + 1))
> +#define MAILBOX_IRQ_NEWMSG(m)(1 << (2 * (m)))
> +#define MAILBOX_IRQ_NOTFULL(m) (1 << (2 * (m) + 1))
>
> /* SYSCONFIG: register bit definition */
> #define AUTOIDLE (1 << 0)
> @@ -38,7 +47,12 @@
> /* SYSSTATUS: register bit definition */
> #define RESETDONE(1 << 0)
>
> +#ifdef CONFIG_ARCH_OMAP4
> +#define MBOX_REG_SIZE0x130
> +#else
> #define MBOX_REG_SIZE0x120
> +#endif
> +
#define OMAP4_MBOX_REG_SIZE 0x130
> #define MBOX_NR_REGS (MBOX_REG_SIZE / sizeof(u32))
>
> static void __iomem *mbox_base;
> @@ -57,6 +71,9 @@ struct omap_mbox2_priv {
> u32 newmsg_bit;
> u32 notfull_bit;
> u32 ctx[MBOX_NR_REGS];
> +#ifdef CONFIG_ARCH_OMAP4
> + unsigned long irqdisable;
> +#endif
> };
>
> static struct clk *mbox_ick_handle;
> @@ -82,8 +99,9 @@ static int omap2_mbox_startup(struct omap_mbox *mbox)
>
> mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
> if (IS_ERR(mbox_ick_handle)) {
> - pr_err("Can't get mailboxes_ick\n");
> - return -ENODEV;
> + printk(KERN_ERR "Could not get mailboxes_ick: %d\n",
> + PTR_ERR(mbox_ick_handle));
> + return PTR_ERR(mbox_ick_handle);
> }
> clk_enable(mbox_ick_handle);
>
> @@ -115,6 +133,7 @@ static void omap2_mbox_shutdown(struct omap_mbox *mbox)
> {
> clk_disable(mbox_ick_handle);
> clk_put(mbox_ick_handle);
> + mbox_ick_handle = NULL;
> }
>
> /* Mailbox FIFO handle functions */
> @@ -143,7 +162,7 @@ static int omap2_mbox_fifo_full(struct omap_mbox *mbox)
> {
> struct omap_mbox2_fifo *fifo =
> &((struct omap_mbox2_priv *)mbox->priv)->tx_fifo;
> - return (mbox_read_reg(fifo->fifo_stat));
> + return mbox_read_reg(fifo->fifo_stat);
> }
>
> /* Mailbox IRQ handle functions */
> @@ -163,10 +182,9 @@ static void omap2_mbox_disable_irq(struct omap_mbox
> *mbox,
> {
> struct omap_mbox2_priv *p = (struct omap_mbox2_priv *)mbox->priv;
> u32 l, bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
> -
> - l = mbox_read_reg(p->irqenable);
> + l = mbox_read_reg(p->irqdisable);
> l &= ~bit;
> - mbox_write_reg(l, p->irqenable);
> + mbox_write_reg(l, p->irqdisable);
> }
>
> static void omap2_mbox_ack_irq(struct omap_mbox *mbox,
> @@ -189,7 +207,7 @@ s
[PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to support OMAP4 mailbox
>From 1a5865e67ce5fae94ae283882411cd01f48e07a7 Mon Sep 17 00:00:00 2001
From: C A Subramaniam
Date: Fri, 13 Nov 2009 16:42:40 +0530
Subject: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to
support OMAP4 mailbox.
This patch adds code changes in the mailbox driver module to
add support for OMAP4 mailbox.
Signed-off-by: Hari Kanigeri
Signed-off-by: C A Subramaniam
Signed-off-by: Ramesh Gupta G
---
arch/arm/mach-omap2/mailbox.c | 118 +++--
arch/arm/plat-omap/mailbox.c | 25 +++--
2 files changed, 122 insertions(+), 21 deletions(-)
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 5ba3aa6..3b21a5d 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -18,17 +18,26 @@
#include
#include
+#define DRV_NAME "omap2-mailbox"
+
#define MAILBOX_REVISION 0x000
#define MAILBOX_SYSCONFIG 0x010
#define MAILBOX_SYSSTATUS 0x014
#define MAILBOX_MESSAGE(m) (0x040 + 4 * (m))
#define MAILBOX_FIFOSTATUS(m) (0x080 + 4 * (m))
#define MAILBOX_MSGSTATUS(m) (0x0c0 + 4 * (m))
+
+#ifdef CONFIG_ARCH_OMAP4
+#define MAILBOX_IRQSTATUS(u) (0x104 + 10 * (u))
+#define MAILBOX_IRQENABLE(u) (0x108 + 10 * (u))
+#define MAILBOX_IRQENABLE_CLR(u) (0x10c + 10 * (u))
+#else
#define MAILBOX_IRQSTATUS(u) (0x100 + 8 * (u))
#define MAILBOX_IRQENABLE(u) (0x104 + 8 * (u))
+#endif
-#define MAILBOX_IRQ_NEWMSG(u) (1 << (2 * (u)))
-#define MAILBOX_IRQ_NOTFULL(u) (1 << (2 * (u) + 1))
+#define MAILBOX_IRQ_NEWMSG(m) (1 << (2 * (m)))
+#define MAILBOX_IRQ_NOTFULL(m) (1 << (2 * (m) + 1))
/* SYSCONFIG: register bit definition */
#define AUTOIDLE (1 << 0)
@@ -38,7 +47,12 @@
/* SYSSTATUS: register bit definition */
#define RESETDONE (1 << 0)
+#ifdef CONFIG_ARCH_OMAP4
+#define MBOX_REG_SIZE 0x130
+#else
#define MBOX_REG_SIZE 0x120
+#endif
+
#define MBOX_NR_REGS (MBOX_REG_SIZE / sizeof(u32))
static void __iomem *mbox_base;
@@ -57,6 +71,9 @@ struct omap_mbox2_priv {
u32 newmsg_bit;
u32 notfull_bit;
u32 ctx[MBOX_NR_REGS];
+#ifdef CONFIG_ARCH_OMAP4
+ unsigned long irqdisable;
+#endif
};
static struct clk *mbox_ick_handle;
@@ -82,8 +99,9 @@ static int omap2_mbox_startup(struct omap_mbox *mbox)
mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
if (IS_ERR(mbox_ick_handle)) {
- pr_err("Can't get mailboxes_ick\n");
- return -ENODEV;
+ printk(KERN_ERR "Could not get mailboxes_ick: %d\n",
+ PTR_ERR(mbox_ick_handle));
+ return PTR_ERR(mbox_ick_handle);
}
clk_enable(mbox_ick_handle);
@@ -115,6 +133,7 @@ static void omap2_mbox_shutdown(struct omap_mbox *mbox)
{
clk_disable(mbox_ick_handle);
clk_put(mbox_ick_handle);
+ mbox_ick_handle = NULL;
}
/* Mailbox FIFO handle functions */
@@ -143,7 +162,7 @@ static int omap2_mbox_fifo_full(struct omap_mbox *mbox)
{
struct omap_mbox2_fifo *fifo =
&((struct omap_mbox2_priv *)mbox->priv)->tx_fifo;
- return (mbox_read_reg(fifo->fifo_stat));
+ return mbox_read_reg(fifo->fifo_stat);
}
/* Mailbox IRQ handle functions */
@@ -163,10 +182,9 @@ static void omap2_mbox_disable_irq(struct omap_mbox *mbox,
{
struct omap_mbox2_priv *p = (struct omap_mbox2_priv *)mbox->priv;
u32 l, bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
-
- l = mbox_read_reg(p->irqenable);
+ l = mbox_read_reg(p->irqdisable);
l &= ~bit;
- mbox_write_reg(l, p->irqenable);
+ mbox_write_reg(l, p->irqdisable);
}
static void omap2_mbox_ack_irq(struct omap_mbox *mbox,
@@ -189,7 +207,7 @@ static int omap2_mbox_is_irq(struct omap_mbox *mbox,
u32 enable = mbox_read_reg(p->irqenable);
u32 status = mbox_read_reg(p->irqstatus);
- return (enable & status & bit);
+ return (int)(enable & status & bit);
}
static void omap2_mbox_save_ctx(struct omap_mbox *mbox)
@@ -242,9 +260,12 @@ static struct omap_mbox_ops omap2_mbox_ops = {
*/
/* FIXME: the following structs should be filled automatically by the user id
*/
-
+#ifdef CONFIG_ARCH_OMAP4
+static struct omap_mbox2_priv omap2_mbox_1_priv = {
+#else
/* DSP */
static struct omap_mbox2_priv omap2_mbox_dsp_priv = {
+#endif
.tx_fifo = {
.msg= MAILBOX_MESSAGE(0),
.fifo_stat = MAILBOX_FIFOSTATUS(0),
@@ -257,7 +278,19 @@ static struct omap_mbox2_priv omap2_mbox_dsp_priv = {
.irqstatus = MAILBOX_IRQSTATUS(0),
.notfull_bit= MAILBOX_IRQ_NOTFULL(0),
RE: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to support OMAP4 mailbox.
Hi Russell,
> -Original Message-
> From: Russell King [mailto:r...@arm.linux.org.uk]
> Sent: Wednesday, September 23, 2009 3:26 PM
> To: C.A, Subramaniam
> Cc: linux-omap@vger.kernel.org; Hiroshi DOYU;
> t...@atomide.com; Kanigeri, Hari; Gupta, Ramesh
> Subject: Re: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds
> code changes to support OMAP4 mailbox.
>
> On Tue, Sep 22, 2009 at 08:03:32PM +0530, C.A, Subramaniam wrote:
> > @@ -70,10 +88,9 @@ static inline void mbox_write_reg(u32
> val, size_t ofs)
> > static int omap2_mbox_startup(struct omap_mbox *mbox)
> > {
> > unsigned int l;
> > -
> > mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
> > if (IS_ERR(mbox_ick_handle)) {
> > - printk("Could not get mailboxes_ick\n");
> > + printk(KERN_ERR "Could not get mailboxes_ick\n");
> > return -ENODEV;
>
> Good idea: Print the error code so people can diagnose why
> things fail.
>
> printk(KERN_ERR "Could not get mailboxes_ick: %d\n",
> PTR_ERR(mbox_ick_handle));
>
> And wonder why this hasn't been spotted before.
>
> Rule: always propagate error codes when you have one to propagate.
>
> return PTR_ERR(mbox_ick_handle);
Thank you for your comments. I will send a revised patch.
Regards
Subbu--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to support OMAP4 mailbox.
On Tue, Sep 22, 2009 at 08:03:32PM +0530, C.A, Subramaniam wrote:
> @@ -70,10 +88,9 @@ static inline void mbox_write_reg(u32 val, size_t ofs)
> static int omap2_mbox_startup(struct omap_mbox *mbox)
> {
> unsigned int l;
> -
> mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
> if (IS_ERR(mbox_ick_handle)) {
> - printk("Could not get mailboxes_ick\n");
> + printk(KERN_ERR "Could not get mailboxes_ick\n");
> return -ENODEV;
Good idea: Print the error code so people can diagnose why things fail.
printk(KERN_ERR "Could not get mailboxes_ick: %d\n",
PTR_ERR(mbox_ick_handle));
And wonder why this hasn't been spotted before.
Rule: always propagate error codes when you have one to propagate.
return PTR_ERR(mbox_ick_handle);
BTW, in future, please post patches to my linux@ address, not my rmk@
address. Patches to my rmk@ address tend to be heavily buried.
--
Russell King
Linux kernel2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to support OMAP4 mailbox.
* Hiroshi DOYU [090922 08:12]:
> Hi Tony,
>
> From: "ext C.A, Subramaniam"
> Subject: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to
> support OMAP4 mailbox.
> Date: Tue, 22 Sep 2009 16:33:32 +0200
>
> > From 6e3100d338c37928724821cab460ced1437bfa59 Mon Sep 17 00:00:00 2001
> > From: C A Subramaniam
> > Date: Tue, 8 Sep 2009 22:36:20 +0530
> > Subject: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to
> > support OMAP4 mailbox.
> >
> > This patch adds code changes in the mailbox driver module to
> > add support for OMAP4 mailbox.
> >
> > Signed-off-by: Hari Kanigeri
> > Signed-off-by: C A Subramaniam
> > Signed-off-by: Ramesh Gupta G
> > ---
> > arch/arm/mach-omap2/mailbox.c | 120
> > +++--
> > arch/arm/plat-omap/mailbox.c | 25 +++--
> > 2 files changed, 123 insertions(+), 22 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
> > index 6f71f37..3d85807 100644
> > --- a/arch/arm/mach-omap2/mailbox.c
> > +++ b/arch/arm/mach-omap2/mailbox.c
>
> [...]
>
> > @@ -70,10 +88,9 @@ static inline void mbox_write_reg(u32 val, size_t ofs)
> > static int omap2_mbox_startup(struct omap_mbox *mbox)
> > {
> > unsigned int l;
> > -
> > mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
> > if (IS_ERR(mbox_ick_handle)) {
> > - printk("Could not get mailboxes_ick\n");
> > + printk(KERN_ERR "Could not get mailboxes_ick\n");
> > return -ENODEV;
> > }
> > clk_enable(mbox_ick_handle);
> > @@ -85,7 +102,6 @@ static int omap2_mbox_startup(struct omap_mbox *mbox)
> > l = mbox_read_reg(MAILBOX_SYSCONFIG);
> > l |= 0x0011;
> > mbox_write_reg(l, MAILBOX_SYSCONFIG);
> > -
> > omap2_mbox_enable_irq(mbox, IRQ_RX);
> >
> > return 0;
>
> The above may conflict with the following patch, but it won't be
> diffcult to solve the confliction.
>
> http://patchwork.kernel.org/patch/44224/
>
> Tony, can you get the above "softreset" patch in?
Added to omap-fixes.
> [...]
>
> > @@ -156,6 +172,8 @@ static void omap2_mbox_ack_irq(struct omap_mbox *mbox,
> > u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
> >
> > mbox_write_reg(bit, p->irqstatus);
> > + /* Flush post writing */
> > +mbox_read_reg(p->irqstatus);
> > }
>
> This is the same as the following patch:
>
> http://patchwork.kernel.org/patch/43740/
>
> Tony, can you get the above "flush posted write" patch in?
This too.
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to support OMAP4 mailbox.
Hi Tony,
From: "ext C.A, Subramaniam"
Subject: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to
support OMAP4 mailbox.
Date: Tue, 22 Sep 2009 16:33:32 +0200
> From 6e3100d338c37928724821cab460ced1437bfa59 Mon Sep 17 00:00:00 2001
> From: C A Subramaniam
> Date: Tue, 8 Sep 2009 22:36:20 +0530
> Subject: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to
> support OMAP4 mailbox.
>
> This patch adds code changes in the mailbox driver module to
> add support for OMAP4 mailbox.
>
> Signed-off-by: Hari Kanigeri
> Signed-off-by: C A Subramaniam
> Signed-off-by: Ramesh Gupta G
> ---
> arch/arm/mach-omap2/mailbox.c | 120
> +++--
> arch/arm/plat-omap/mailbox.c | 25 +++--
> 2 files changed, 123 insertions(+), 22 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
> index 6f71f37..3d85807 100644
> --- a/arch/arm/mach-omap2/mailbox.c
> +++ b/arch/arm/mach-omap2/mailbox.c
[...]
> @@ -70,10 +88,9 @@ static inline void mbox_write_reg(u32 val, size_t ofs)
> static int omap2_mbox_startup(struct omap_mbox *mbox)
> {
> unsigned int l;
> -
> mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
> if (IS_ERR(mbox_ick_handle)) {
> - printk("Could not get mailboxes_ick\n");
> + printk(KERN_ERR "Could not get mailboxes_ick\n");
> return -ENODEV;
> }
> clk_enable(mbox_ick_handle);
> @@ -85,7 +102,6 @@ static int omap2_mbox_startup(struct omap_mbox *mbox)
> l = mbox_read_reg(MAILBOX_SYSCONFIG);
> l |= 0x0011;
> mbox_write_reg(l, MAILBOX_SYSCONFIG);
> -
> omap2_mbox_enable_irq(mbox, IRQ_RX);
>
> return 0;
The above may conflict with the following patch, but it won't be
diffcult to solve the confliction.
http://patchwork.kernel.org/patch/44224/
Tony, can you get the above "softreset" patch in?
[...]
> @@ -156,6 +172,8 @@ static void omap2_mbox_ack_irq(struct omap_mbox *mbox,
> u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
>
> mbox_write_reg(bit, p->irqstatus);
> + /* Flush post writing */
> + mbox_read_reg(p->irqstatus);
> }
This is the same as the following patch:
http://patchwork.kernel.org/patch/43740/
Tony, can you get the above "flush posted write" patch in?
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to support OMAP4 mailbox.
>From 6e3100d338c37928724821cab460ced1437bfa59 Mon Sep 17 00:00:00 2001
From: C A Subramaniam
Date: Tue, 8 Sep 2009 22:36:20 +0530
Subject: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to
support OMAP4 mailbox.
This patch adds code changes in the mailbox driver module to
add support for OMAP4 mailbox.
Signed-off-by: Hari Kanigeri
Signed-off-by: C A Subramaniam
Signed-off-by: Ramesh Gupta G
---
arch/arm/mach-omap2/mailbox.c | 120 +++--
arch/arm/plat-omap/mailbox.c | 25 +++--
2 files changed, 123 insertions(+), 22 deletions(-)
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 6f71f37..3d85807 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -18,21 +18,36 @@
#include
#include
+#define DRV_NAME "omap2-mailbox"
+
#define MAILBOX_REVISION 0x000
#define MAILBOX_SYSCONFIG 0x010
#define MAILBOX_SYSSTATUS 0x014
#define MAILBOX_MESSAGE(m) (0x040 + 4 * (m))
#define MAILBOX_FIFOSTATUS(m) (0x080 + 4 * (m))
#define MAILBOX_MSGSTATUS(m) (0x0c0 + 4 * (m))
+
+#ifdef CONFIG_ARCH_OMAP4
+#define MAILBOX_IRQSTATUS(u) (0x104 + 10 * (u))
+#define MAILBOX_IRQENABLE(u) (0x108 + 10 * (u))
+#define MAILBOX_IRQENABLE_CLR(u) (0x10c + 10 * (u))
+#else
#define MAILBOX_IRQSTATUS(u) (0x100 + 8 * (u))
#define MAILBOX_IRQENABLE(u) (0x104 + 8 * (u))
+#endif
-#define MAILBOX_IRQ_NEWMSG(u) (1 << (2 * (u)))
-#define MAILBOX_IRQ_NOTFULL(u) (1 << (2 * (u) + 1))
+#define MAILBOX_IRQ_NEWMSG(m) (1 << (2 * (m)))
+#define MAILBOX_IRQ_NOTFULL(m) (1 << (2 * (m) + 1))
+#ifdef CONFIG_ARCH_OMAP4
+#define MBOX_REG_SIZE 0x130
+#else
#define MBOX_REG_SIZE 0x120
+#endif
+
#define MBOX_NR_REGS (MBOX_REG_SIZE / sizeof(u32))
+
static void __iomem *mbox_base;
struct omap_mbox2_fifo {
@@ -49,6 +64,9 @@ struct omap_mbox2_priv {
u32 newmsg_bit;
u32 notfull_bit;
u32 ctx[MBOX_NR_REGS];
+#ifdef CONFIG_ARCH_OMAP4
+ unsigned long irqdisable;
+#endif
};
static struct clk *mbox_ick_handle;
@@ -70,10 +88,9 @@ static inline void mbox_write_reg(u32 val, size_t ofs)
static int omap2_mbox_startup(struct omap_mbox *mbox)
{
unsigned int l;
-
mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
if (IS_ERR(mbox_ick_handle)) {
- printk("Could not get mailboxes_ick\n");
+ printk(KERN_ERR "Could not get mailboxes_ick\n");
return -ENODEV;
}
clk_enable(mbox_ick_handle);
@@ -85,7 +102,6 @@ static int omap2_mbox_startup(struct omap_mbox *mbox)
l = mbox_read_reg(MAILBOX_SYSCONFIG);
l |= 0x0011;
mbox_write_reg(l, MAILBOX_SYSCONFIG);
-
omap2_mbox_enable_irq(mbox, IRQ_RX);
return 0;
@@ -95,6 +111,7 @@ static void omap2_mbox_shutdown(struct omap_mbox *mbox)
{
clk_disable(mbox_ick_handle);
clk_put(mbox_ick_handle);
+ mbox_ick_handle = NULL;
}
/* Mailbox FIFO handle functions */
@@ -123,7 +140,7 @@ static int omap2_mbox_fifo_full(struct omap_mbox *mbox)
{
struct omap_mbox2_fifo *fifo =
&((struct omap_mbox2_priv *)mbox->priv)->tx_fifo;
- return (mbox_read_reg(fifo->fifo_stat));
+ return mbox_read_reg(fifo->fifo_stat);
}
/* Mailbox IRQ handle functions */
@@ -143,10 +160,9 @@ static void omap2_mbox_disable_irq(struct omap_mbox *mbox,
{
struct omap_mbox2_priv *p = (struct omap_mbox2_priv *)mbox->priv;
u32 l, bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
-
- l = mbox_read_reg(p->irqenable);
+ l = mbox_read_reg(p->irqdisable);
l &= ~bit;
- mbox_write_reg(l, p->irqenable);
+ mbox_write_reg(l, p->irqdisable);
}
static void omap2_mbox_ack_irq(struct omap_mbox *mbox,
@@ -156,6 +172,8 @@ static void omap2_mbox_ack_irq(struct omap_mbox *mbox,
u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
mbox_write_reg(bit, p->irqstatus);
+ /* Flush post writing */
+mbox_read_reg(p->irqstatus);
}
static int omap2_mbox_is_irq(struct omap_mbox *mbox,
@@ -166,7 +184,7 @@ static int omap2_mbox_is_irq(struct omap_mbox *mbox,
u32 enable = mbox_read_reg(p->irqenable);
u32 status = mbox_read_reg(p->irqstatus);
- return (enable & status & bit);
+ return (int)(enable & status & bit);
}
static void omap2_mbox_save_ctx(struct omap_mbox *mbox)
@@ -219,9 +237,12 @@ static struct omap_mbox_ops omap2_mbox_ops = {
*/
/* FIXME: the following structs should be filled automatically by the user id
*/
-
+#ifdef CONFIG_ARCH_OMAP4
+static struct omap_mbox2_priv om
RE: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to support OMAP4 mailbox.
Hi Russell,
Yes, that needs to be taken care of. Hiroshi has suggested that we move this
logic into the omap_mbox_get() function.
Will add code to protect from races conditions while making the change.
Thank you and Regards
Subbu
> -Original Message-
> From: Russell King [mailto:r...@arm.linux.org.uk]
> Sent: Monday, September 07, 2009 8:35 PM
> To: C.A, Subramaniam
> Cc: linux-omap@vger.kernel.org; t...@atomide.com;
> hiroshi.d...@nokia.com; Kanigeri, Hari; Gupta, Ramesh
> Subject: Re: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds
> code changes to support OMAP4 mailbox.
>
> On Fri, Sep 04, 2009 at 05:18:11PM +0530, C.A, Subramaniam wrote:
> > @@ -70,31 +89,37 @@ static inline void mbox_write_reg(u32
> val, size_t
> > ofs) static int omap2_mbox_startup(struct omap_mbox *mbox) {
> > unsigned int l;
> > + if (!mbox_configured) {
> > + mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
> > + if (IS_ERR(mbox_ick_handle)) {
> > + printk(KERN_ERR "Could not get
> mailboxes_ick\n");
> > + return -ENODEV;
> > + }
> > + clk_enable(mbox_ick_handle);
> >
> > - mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
> > - if (IS_ERR(mbox_ick_handle)) {
> > - printk("Could not get mailboxes_ick\n");
> > - return -ENODEV;
> > - }
> > - clk_enable(mbox_ick_handle);
> > -
> > - l = mbox_read_reg(MAILBOX_REVISION);
> > - pr_info("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4, (l
> & 0x0f));
> > -
> > - /* set smart-idle & autoidle */
> > - l = mbox_read_reg(MAILBOX_SYSCONFIG);
> > - l |= 0x0011;
> > - mbox_write_reg(l, MAILBOX_SYSCONFIG);
> > + l = mbox_read_reg(MAILBOX_REVISION);
> > + pr_info("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4,
> > + (l & 0x0f));
> >
> > + /* set smart-idle & autoidle */
> > + l = mbox_read_reg(MAILBOX_SYSCONFIG);
> > + l |= 0x0011;
> > + mbox_write_reg(l, MAILBOX_SYSCONFIG);
> > + }
> > + mbox_configured++;
>
> I assume you're doing this because this function can be
> called multiple times. What protects this against races?
>
> > omap2_mbox_enable_irq(mbox, IRQ_RX);
> >
> > return 0;
> > }
> >
> > static void omap2_mbox_shutdown(struct omap_mbox *mbox) -{
> > - clk_disable(mbox_ick_handle);
> > - clk_put(mbox_ick_handle);
> > +{ if (mbox_configured > 0)
> > + mbox_configured--;
> > + if (!mbox_configured) {
> > + clk_disable(mbox_ick_handle);
> > + clk_put(mbox_ick_handle);
> > + mbox_ick_handle = NULL;
> > + }
>
> Same concern - what protects mbox_configured and the
> associated code against races?
>
> --
> Russell King
> Linux kernel2.6 ARM Linux - http://www.arm.linux.org.uk/
> maintainer of:
>
> --
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to support OMAP4 mailbox.
On Fri, Sep 04, 2009 at 05:18:11PM +0530, C.A, Subramaniam wrote:
> @@ -70,31 +89,37 @@ static inline void mbox_write_reg(u32 val, size_t ofs)
> static int omap2_mbox_startup(struct omap_mbox *mbox)
> {
> unsigned int l;
> + if (!mbox_configured) {
> + mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
> + if (IS_ERR(mbox_ick_handle)) {
> + printk(KERN_ERR "Could not get mailboxes_ick\n");
> + return -ENODEV;
> + }
> + clk_enable(mbox_ick_handle);
>
> - mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
> - if (IS_ERR(mbox_ick_handle)) {
> - printk("Could not get mailboxes_ick\n");
> - return -ENODEV;
> - }
> - clk_enable(mbox_ick_handle);
> -
> - l = mbox_read_reg(MAILBOX_REVISION);
> - pr_info("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4, (l & 0x0f));
> -
> - /* set smart-idle & autoidle */
> - l = mbox_read_reg(MAILBOX_SYSCONFIG);
> - l |= 0x0011;
> - mbox_write_reg(l, MAILBOX_SYSCONFIG);
> + l = mbox_read_reg(MAILBOX_REVISION);
> + pr_info("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4,
> + (l & 0x0f));
>
> + /* set smart-idle & autoidle */
> + l = mbox_read_reg(MAILBOX_SYSCONFIG);
> + l |= 0x0011;
> + mbox_write_reg(l, MAILBOX_SYSCONFIG);
> + }
> + mbox_configured++;
I assume you're doing this because this function can be called multiple
times. What protects this against races?
> omap2_mbox_enable_irq(mbox, IRQ_RX);
>
> return 0;
> }
>
> static void omap2_mbox_shutdown(struct omap_mbox *mbox)
> -{
> - clk_disable(mbox_ick_handle);
> - clk_put(mbox_ick_handle);
> +{if (mbox_configured > 0)
> + mbox_configured--;
> + if (!mbox_configured) {
> + clk_disable(mbox_ick_handle);
> + clk_put(mbox_ick_handle);
> + mbox_ick_handle = NULL;
> + }
Same concern - what protects mbox_configured and the associated code against
races?
--
Russell King
Linux kernel2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to support OMAP4 mailbox.
Hi Subbu,
From: "ext C.A, Subramaniam"
Subject: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to
support OMAP4 mailbox.
Date: Fri, 4 Sep 2009 13:48:11 +0200
> From eeaa22aff9df8027f91884ee78328028bd5a6782 Mon Sep 17 00:00:00 2001
> From: C A Subramaniam
> Date: Thu, 3 Sep 2009 17:53:27 +0530
> Subject: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to
> support OMAP4 mailbox.
>
> This patch adds code changes in the mailbox driver module to
> add support for OMAP4 mailbox.
>
> Signed-off-by: Hari Kanigeri
> Signed-off-by: C A Subramaniam
> Signed-off-by: Ramesh Gupta G
> ---
> arch/arm/mach-omap2/mailbox.c | 156
> +
> 1 files changed, 125 insertions(+), 31 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
> index 6f71f37..4ab3e1d 100644
> --- a/arch/arm/mach-omap2/mailbox.c
> +++ b/arch/arm/mach-omap2/mailbox.c
> @@ -18,21 +18,36 @@
> #include
> #include
>
> +#define DRV_NAME "omap2-mailbox"
> +
> #define MAILBOX_REVISION 0x000
> #define MAILBOX_SYSCONFIG0x010
> #define MAILBOX_SYSSTATUS0x014
> #define MAILBOX_MESSAGE(m) (0x040 + 4 * (m))
> #define MAILBOX_FIFOSTATUS(m)(0x080 + 4 * (m))
> #define MAILBOX_MSGSTATUS(m) (0x0c0 + 4 * (m))
> +
> +#ifdef CONFIG_ARCH_OMAP4
> +#define MAILBOX_IRQSTATUS(u) (0x104 + 10 * (u))
> +#define MAILBOX_IRQENABLE(u) (0x108 + 10 * (u))
> +#define MAILBOX_IRQENABLE_CLR(u) (0x10c + 10 * (u))
> +#else
> #define MAILBOX_IRQSTATUS(u) (0x100 + 8 * (u))
> #define MAILBOX_IRQENABLE(u) (0x104 + 8 * (u))
> +#endif
>
> -#define MAILBOX_IRQ_NEWMSG(u)(1 << (2 * (u)))
> -#define MAILBOX_IRQ_NOTFULL(u) (1 << (2 * (u) + 1))
> +#define MAILBOX_IRQ_NEWMSG(m)(1 << (2 * (m)))
> +#define MAILBOX_IRQ_NOTFULL(m) (1 << (2 * (m) + 1))
>
> +#ifdef CONFIG_ARCH_OMAP4
> +#define MBOX_REG_SIZE0x130
> +#else
> #define MBOX_REG_SIZE0x120
> +#endif
> +
> #define MBOX_NR_REGS (MBOX_REG_SIZE / sizeof(u32))
>
> +
> static void __iomem *mbox_base;
>
> struct omap_mbox2_fifo {
> @@ -49,9 +64,13 @@ struct omap_mbox2_priv {
> u32 newmsg_bit;
> u32 notfull_bit;
> u32 ctx[MBOX_NR_REGS];
> +#ifdef CONFIG_ARCH_OMAP4
> + unsigned long irqdisable;
> +#endif
> };
>
> static struct clk *mbox_ick_handle;
> +static int mbox_configured;
>
> static void omap2_mbox_enable_irq(struct omap_mbox *mbox,
> omap_mbox_type_t irq);
> @@ -70,31 +89,37 @@ static inline void mbox_write_reg(u32 val, size_t ofs)
> static int omap2_mbox_startup(struct omap_mbox *mbox)
> {
> unsigned int l;
> + if (!mbox_configured) {
I think that this kind of checking can be done in "omap_mbox_get()" in
"plat-omap/mailbox.c" and it would be more logical since
"mach-omap2/mailbox.c" is supposed to provide quite bacic feature
simply which omap mailbox h/w has. So keeing this code simple, but
adding some logic onto "omap_mbox_get()" would make sense.
> + mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
> + if (IS_ERR(mbox_ick_handle)) {
> + printk(KERN_ERR "Could not get mailboxes_ick\n");
> + return -ENODEV;
> + }
> + clk_enable(mbox_ick_handle);
>
> - mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
> - if (IS_ERR(mbox_ick_handle)) {
> - printk("Could not get mailboxes_ick\n");
> - return -ENODEV;
> - }
> - clk_enable(mbox_ick_handle);
> -
> - l = mbox_read_reg(MAILBOX_REVISION);
> - pr_info("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4, (l & 0x0f));
> -
> - /* set smart-idle & autoidle */
> - l = mbox_read_reg(MAILBOX_SYSCONFIG);
> - l |= 0x0011;
> - mbox_write_reg(l, MAILBOX_SYSCONFIG);
> + l = mbox_read_reg(MAILBOX_REVISION);
> + pr_info("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4,
> + (l & 0x0f));
>
> + /* set smart-idle & autoidle */
> + l = mbox_read_reg(MAILBOX_SYSCONFIG);
> + l |= 0x0011;
> + mbox_write_reg(l, MAILBOX_SYSCONFIG);
> + }
> + mbox_configured++;
> omap2_mbox_enable_irq(mbox, IRQ_RX)
[PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to support OMAP4 mailbox.
>From eeaa22aff9df8027f91884ee78328028bd5a6782 Mon Sep 17 00:00:00 2001
From: C A Subramaniam
Date: Thu, 3 Sep 2009 17:53:27 +0530
Subject: [PATCH 8/10] omap mailbox: OMAP4-Mailbox - Adds code changes to
support OMAP4 mailbox.
This patch adds code changes in the mailbox driver module to
add support for OMAP4 mailbox.
Signed-off-by: Hari Kanigeri
Signed-off-by: C A Subramaniam
Signed-off-by: Ramesh Gupta G
---
arch/arm/mach-omap2/mailbox.c | 156 +
1 files changed, 125 insertions(+), 31 deletions(-)
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 6f71f37..4ab3e1d 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -18,21 +18,36 @@
#include
#include
+#define DRV_NAME "omap2-mailbox"
+
#define MAILBOX_REVISION 0x000
#define MAILBOX_SYSCONFIG 0x010
#define MAILBOX_SYSSTATUS 0x014
#define MAILBOX_MESSAGE(m) (0x040 + 4 * (m))
#define MAILBOX_FIFOSTATUS(m) (0x080 + 4 * (m))
#define MAILBOX_MSGSTATUS(m) (0x0c0 + 4 * (m))
+
+#ifdef CONFIG_ARCH_OMAP4
+#define MAILBOX_IRQSTATUS(u) (0x104 + 10 * (u))
+#define MAILBOX_IRQENABLE(u) (0x108 + 10 * (u))
+#define MAILBOX_IRQENABLE_CLR(u) (0x10c + 10 * (u))
+#else
#define MAILBOX_IRQSTATUS(u) (0x100 + 8 * (u))
#define MAILBOX_IRQENABLE(u) (0x104 + 8 * (u))
+#endif
-#define MAILBOX_IRQ_NEWMSG(u) (1 << (2 * (u)))
-#define MAILBOX_IRQ_NOTFULL(u) (1 << (2 * (u) + 1))
+#define MAILBOX_IRQ_NEWMSG(m) (1 << (2 * (m)))
+#define MAILBOX_IRQ_NOTFULL(m) (1 << (2 * (m) + 1))
+#ifdef CONFIG_ARCH_OMAP4
+#define MBOX_REG_SIZE 0x130
+#else
#define MBOX_REG_SIZE 0x120
+#endif
+
#define MBOX_NR_REGS (MBOX_REG_SIZE / sizeof(u32))
+
static void __iomem *mbox_base;
struct omap_mbox2_fifo {
@@ -49,9 +64,13 @@ struct omap_mbox2_priv {
u32 newmsg_bit;
u32 notfull_bit;
u32 ctx[MBOX_NR_REGS];
+#ifdef CONFIG_ARCH_OMAP4
+ unsigned long irqdisable;
+#endif
};
static struct clk *mbox_ick_handle;
+static int mbox_configured;
static void omap2_mbox_enable_irq(struct omap_mbox *mbox,
omap_mbox_type_t irq);
@@ -70,31 +89,37 @@ static inline void mbox_write_reg(u32 val, size_t ofs)
static int omap2_mbox_startup(struct omap_mbox *mbox)
{
unsigned int l;
+ if (!mbox_configured) {
+ mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
+ if (IS_ERR(mbox_ick_handle)) {
+ printk(KERN_ERR "Could not get mailboxes_ick\n");
+ return -ENODEV;
+ }
+ clk_enable(mbox_ick_handle);
- mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
- if (IS_ERR(mbox_ick_handle)) {
- printk("Could not get mailboxes_ick\n");
- return -ENODEV;
- }
- clk_enable(mbox_ick_handle);
-
- l = mbox_read_reg(MAILBOX_REVISION);
- pr_info("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4, (l & 0x0f));
-
- /* set smart-idle & autoidle */
- l = mbox_read_reg(MAILBOX_SYSCONFIG);
- l |= 0x0011;
- mbox_write_reg(l, MAILBOX_SYSCONFIG);
+ l = mbox_read_reg(MAILBOX_REVISION);
+ pr_info("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4,
+ (l & 0x0f));
+ /* set smart-idle & autoidle */
+ l = mbox_read_reg(MAILBOX_SYSCONFIG);
+ l |= 0x0011;
+ mbox_write_reg(l, MAILBOX_SYSCONFIG);
+ }
+ mbox_configured++;
omap2_mbox_enable_irq(mbox, IRQ_RX);
return 0;
}
static void omap2_mbox_shutdown(struct omap_mbox *mbox)
-{
- clk_disable(mbox_ick_handle);
- clk_put(mbox_ick_handle);
+{ if (mbox_configured > 0)
+ mbox_configured--;
+ if (!mbox_configured) {
+ clk_disable(mbox_ick_handle);
+ clk_put(mbox_ick_handle);
+ mbox_ick_handle = NULL;
+ }
}
/* Mailbox FIFO handle functions */
@@ -123,7 +148,7 @@ static int omap2_mbox_fifo_full(struct omap_mbox *mbox)
{
struct omap_mbox2_fifo *fifo =
&((struct omap_mbox2_priv *)mbox->priv)->tx_fifo;
- return (mbox_read_reg(fifo->fifo_stat));
+ return mbox_read_reg(fifo->fifo_stat);
}
/* Mailbox IRQ handle functions */
@@ -143,10 +168,9 @@ static void omap2_mbox_disable_irq(struct omap_mbox *mbox,
{
struct omap_mbox2_priv *p = (struct omap_mbox2_priv *)mbox->priv;
u32 l, bit = (irq == IRQ_TX) ? p->notfull_bit :
