omap: mailbox: reorganize init
Subsystems (4)
cover omap: mailbox: reorganize init
Hi,
The main purpose of this patch series is to be able to compile mach platform data as built-in. Otherwise, client modules such as bridgedriver will load the platform code, but not the mach code when mailbox is built as a module.
Unfortunately, there's no easy way to do that since plat and mach code are deepely interrelated. So the first patches try to separate the mailbox registering through a defined omap_mbox_platform_data.
Also, it's worth noting that mailboxes are not a one-to-one mapping to resources; that is, some resources belong to multiple mboxes. So it's best to think of mailboxes as fake devices. That is why custom platform_data is required.
Finally, a bunch of cleaning up is done in the very first patches, specially for OMAP1.
The initial RFC included comments from Felipe Balbi, and this proposal includes comments from Tony Lindgren.
Tested on OMAP3 (beagleboard), and compiled-tested for OMAP1.
Felipe Contreras (15):
omap: mailbox: trivial cleanups
omap: mailbox: reorganize structures
omap: mailbox: 2420 should be detected at run-time
omap: mailbox: use correct config for omap1
omap: mailbox: update omap1 probing
omap: mailbox: reorganize registering
omap: mailbox: only compile for configured archs
omap: mailbox: reorganize omap platform_device
omap: mailbox: move more stuff to omap_mbox_init()
omap: mailbox: trivial sync between omap1 and 2
omap: mailbox: split platform driver
omap: mailbox: always built-in platform data
omap: mailbox: reorganize headers
omap: mailbox: don't export unecessary symbols
omap: mailbox: mark some resources as __initdata
arch/arm/mach-omap1/Makefile | 6 +- arch/arm/mach-omap1/devices.c | 40 ----- arch/arm/mach-omap1/mailbox.c | 114 ++++++++----- arch/arm/mach-omap2/Makefile | 5 +- arch/arm/mach-omap2/devices.c | 74 -------- arch/arm/mach-omap2/mailbox.c | 259 ++++++++++++++++------------- arch/arm/plat-omap/include/plat/mailbox.h | 7 +- arch/arm/plat-omap/mailbox.c | 53 +++++- 8 files changed, 275 insertions(+), 283 deletions(-)
PATCH 1/15 omap: mailbox: trivial cleanups
And fix a few compilation warnings.
--- arch/arm/mach-omap1/devices.c | 6 ++---- arch/arm/mach-omap1/mailbox.c | 3 +-- arch/arm/mach-omap2/mailbox.c | 7 +++---- arch/arm/plat-omap/mailbox.c | 2 -- 4 files changed, 6 insertions(+), 12 deletions(-)
arch/arm/mach-omap1/devices.c +2 -4
@@ -73,12 +73,10 @@ static inline void omap_init_rtc(void) {}# define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1#endif -#define OMAP1_MBOX_BASE OMAP1_IO_ADDRESS(OMAP16XX_MAILBOX_BASE) -static struct resource mbox_resources[] = { { - .start =OMAP1_MBOX_BASE , - .end =OMAP1_MBOX_BASE +OMAP1_MBOX_SIZE , + .start =OMAP16XX_MAILBOX_BASE , + .end =OMAP16XX_MAILBOX_BASE +OMAP1_MBOX_SIZE , .flags =IORESOURCE_MEM , }, {
arch/arm/mach-omap1/mailbox.c +1 -2
@@ -146,7 +146,6 @@ EXPORT_SYMBOL(mbox_dsp_info);static int __devinit omap1_mbox_probe (struct platform_device *pdev) {struct resource *res; -int ret =0 ;if (pdev->num_resources !=2 ) { dev_err(&pdev->dev, "invalid number of resources: %d\n",
@@ -160,7 +159,7 @@ static int __devinit omap1_mbox_probe(struct platform_device *pdev)dev_err (&pdev->dev,"invalid mem resource\n" );return -ENODEV ; } - mbox_base = res->start; + mbox_base =OMAP1_IO_ADDRESS (res->start);/* DSP IRQ */ res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 );
arch/arm/mach-omap2/mailbox.c +3 -4
@@ -93,7 +93,7 @@ static int omap2_mbox_startup(struct omap_mbox *mbox) mbox_ick_handle =clk_get (NULL ,"mailboxes_ick" );if (IS_ERR (mbox_ick_handle)) { -printk (KERN_ERR "Could not get mailboxes_ick: %d\n" , +printk (KERN_ERR "Could not get mailboxes_ick: %ld\n" ,PTR_ERR (mbox_ick_handle));return PTR_ERR (mbox_ick_handle); }
@@ -279,8 +279,6 @@ static struct omap_mbox2_priv omap2_mbox_dsp_priv = { .irqdisable = MAILBOX_IRQENABLE(0), }; - -/* OMAP4 specific data structure. Use the cpu_is_omap4xxx() to use this*/ static struct omap_mbox2_priv omap2_mbox_1_priv = {
@@ -336,7 +334,6 @@ struct omap_mbox mbox_2_info = { };EXPORT_SYMBOL (mbox_2_info); - #if defined(CONFIG_ARCH_OMAP2420) /* IVA */ static struct omap_mbox2_priv omap2_mbox_iva_priv = { .tx_fifo = {
@@ -419,8 +416,10 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)#endif return 0 ; +#if defined(CONFIG_ARCH_OMAP2420 )/* IVA */ err_iva1:omap_mbox_unregister (&mbox_dsp_info); +#endif err_dsp:iounmap (mbox_base);
arch/arm/plat-omap/mailbox.c +0 -2
@@ -82,7 +82,6 @@ static int __mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg)return ret; } -int omap_mbox_msg_send (struct omap_mbox *mbox,mbox_msg_t msg) {
@@ -108,7 +107,6 @@ static void mbox_tx_tasklet(unsigned long tx_data)struct request_queue *q = mbox->txq->queue;while (1 ) { - rq =blk_fetch_request (q);if (!rq)
Signature · 1 line
1.7.1
PATCH 2/15 omap: mailbox: reorganize structures
In reply to Felipe ContrerasOMAP4 ones messed up the organization.
--- arch/arm/mach-omap2/mailbox.c | 68 +++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 33 deletions(-)
arch/arm/mach-omap2/mailbox.c +35 -33
@@ -262,6 +262,7 @@ static struct omap_mbox_ops omap2_mbox_ops = {*/ /* FIXME: the following structs should be filled automatically by the user id */ +/* DSP */ static struct omap_mbox2_priv omap2_mbox_dsp_priv = { .tx_fifo = {
@@ -279,8 +280,40 @@ static struct omap_mbox2_priv omap2_mbox_dsp_priv = { .irqdisable = MAILBOX_IRQENABLE(0), }; -/* OMAP4 specific data structure. Use the cpu_is_omap4xxx() -to use this*/ +struct omap_mbox mbox_dsp_info = { + .name ="dsp" , + .ops = &omap2_mbox_ops, + .priv = &omap2_mbox_dsp_priv, +}; +EXPORT_SYMBOL (mbox_dsp_info); + +#if defined(CONFIG_ARCH_OMAP2420 ) + +/* IVA */ +static struct omap_mbox2_priv omap2_mbox_iva_priv = { + .tx_fifo = { + .msg =MAILBOX_MESSAGE (2 ), + .fifo_stat =MAILBOX_FIFOSTATUS (2 ), + }, + .rx_fifo = { + .msg =MAILBOX_MESSAGE (3 ), + .msg_stat =MAILBOX_MSGSTATUS (3 ), + }, + .irqenable =MAILBOX_IRQENABLE (3 ), + .irqstatus =MAILBOX_IRQSTATUS (3 ), + .notfull_bit =MAILBOX_IRQ_NOTFULL (2 ), + .newmsg_bit =MAILBOX_IRQ_NEWMSG (3 ), + .irqdisable =MAILBOX_IRQENABLE (3 ), +}; + +static struct omap_mbox mbox_iva_info = { + .name ="iva" , + .ops = &omap2_mbox_ops, + .priv = &omap2_mbox_iva_priv, +}; +#endif + +/* OMAP4 */ static struct omap_mbox2_priv omap2_mbox_1_priv = { .tx_fifo = { .msg =MAILBOX_MESSAGE (0 ),
@@ -304,13 +337,6 @@ struct omap_mbox mbox_1_info = { };EXPORT_SYMBOL (mbox_1_info); -struct omap_mbox mbox_dsp_info = { - .name ="dsp" , - .ops = &omap2_mbox_ops, - .priv = &omap2_mbox_dsp_priv, -}; -EXPORT_SYMBOL (mbox_dsp_info); -static struct omap_mbox2_priv omap2_mbox_2_priv = { .tx_fifo = { .msg =MAILBOX_MESSAGE (3 ),
@@ -334,30 +360,6 @@ struct omap_mbox mbox_2_info = { };EXPORT_SYMBOL (mbox_2_info); -#if defined(CONFIG_ARCH_OMAP2420 )/* IVA */ -static struct omap_mbox2_priv omap2_mbox_iva_priv = { - .tx_fifo = { - .msg =MAILBOX_MESSAGE (2 ), - .fifo_stat =MAILBOX_FIFOSTATUS (2 ), - }, - .rx_fifo = { - .msg =MAILBOX_MESSAGE (3 ), - .msg_stat =MAILBOX_MSGSTATUS (3 ), - }, - .irqenable =MAILBOX_IRQENABLE (3 ), - .irqstatus =MAILBOX_IRQSTATUS (3 ), - .notfull_bit =MAILBOX_IRQ_NOTFULL (2 ), - .newmsg_bit =MAILBOX_IRQ_NEWMSG (3 ), - .irqdisable =MAILBOX_IRQENABLE (3 ), -}; - -static struct omap_mbox mbox_iva_info = { - .name ="iva" , - .ops = &omap2_mbox_ops, - .priv = &omap2_mbox_iva_priv, -}; -#endif -static int __devinit omap2_mbox_probe (struct platform_device *pdev) {struct resource *res;
Signature · 1 line
1.7.1
PATCH 3/15 omap: mailbox: 2420 should be detected at run-time
In reply to Felipe Contreras--- arch/arm/mach-omap2/mailbox.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/mailbox.c +2 -1
@@ -431,7 +431,8 @@ err_dsp: static int __devexit omap2_mbox_remove(struct platform_device *pdev) {#if defined(CONFIG_ARCH_OMAP2420 ) -omap_mbox_unregister (&mbox_iva_info); +if (cpu_is_omap2420 ()) +omap_mbox_unregister (&mbox_iva_info);#endif if (cpu_is_omap44xx ()) {
Signature · 1 line
1.7.1
PATCH 3/15 omap: mailbox: 2420 should be detected at run-time
Hello.
Quoted 10 lines · Felipe Contreras
Signed-off-by Felipe Contreras <[email protected]>--- arch/arm/mach-omap2/mailbox.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)arch/arm/mach-omap2/mailbox.c +0
-0
arch/arm/mach-omap2/mailbox.c err_dsp: · line 436
Quoted 7 lines
arch/arm/mach-omap2/mailbox.c +2
-1@@ -431,7 +431,8 @@ err_dsp: static int __devexit omap2_mbox_remove(struct platform_device *pdev) {#if defined(CONFIG_ARCH_OMAP2420 ) -omap_mbox_unregister (&mbox_iva_info); +if (cpu_is_omap2420 ()) +omap_mbox_unregister (&mbox_iva_info);#endif
Shouldn't #ifdef be remove then?
WBR, Sergei
PATCH 3/15 omap: mailbox: 2420 should be detected at run-time
Hi,
Quoted 7 lines · Sergei Shtylyov
Quoted 5 lines · Felipe Contreras
Signed-off-by Felipe Contreras <[email protected]>---
?arch/arm/mach-omap2/mailbox.c | ? ?3 ++-
?1 files changed, 2 insertions(+), 1 deletions(-)
Quoted 14 lines
Quoted 11 lines
arch/arm/mach-omap2/mailbox.c +2
-1@@ -431,7 +431,8 @@ err_dsp: ?static int __devexit omap2_mbox_remove(struct platform_device *pdev) ?{ ?#if defined(CONFIG_ARCH_OMAP2420) - ? ? ? omap_mbox_unregister(&mbox_iva_info); + ? ? ? if (cpu_is_omap2420()) + ? ? ? ? ? ? ? omap_mbox_unregister(&mbox_iva_info);Quoted 1 line
?#endif
? Shouldn't #ifdef be remove then?
My first patch did that, but now mbox_iva_info is only available when ARCH_OMAP2420=y to save space when building for a specific OMAP.
Signature · 1 line
Felipe Contreras
PATCH 4/15 omap: mailbox: use correct config for omap1
In reply to Felipe ContrerasCONFIG_OMAP_DSP is not in mainline, CONFIG_OMAP_MBOX_FWK is.
--- arch/arm/mach-omap1/devices.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap1/devices.c +1 -1
@@ -63,7 +63,7 @@ static void omap_init_rtc(void)static inline void omap_init_rtc (void ) {}#endif -#if defined(CONFIG_OMAP_DSP ) || defined(CONFIG_OMAP_DSP_MODULE ) +#if defined(CONFIG_OMAP_MBOX_FWK ) || defined(CONFIG_OMAP_MBOX_FWK_MODULE )#if defined(CONFIG_ARCH_OMAP15XX )# define OMAP1_MBOX_SIZE 0x23
Signature · 1 line
1.7.1
PATCH 5/15 omap: mailbox: update omap1 probing
In reply to Felipe ContrerasBased on omap2 code.
--- arch/arm/mach-omap1/mailbox.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-)
arch/arm/mach-omap1/mailbox.c +15 -10
@@ -146,12 +146,7 @@ EXPORT_SYMBOL(mbox_dsp_info);static int __devinit omap1_mbox_probe (struct platform_device *pdev) {struct resource *res; - -if (pdev->num_resources !=2 ) { -dev_err (&pdev->dev,"invalid number of resources: %d\n" , - pdev->num_resources); -return -ENODEV ; - } +int ret;/* MBOX base */ res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
@@ -159,23 +154,33 @@ static int __devinit omap1_mbox_probe(struct platform_device *pdev)dev_err (&pdev->dev,"invalid mem resource\n" );return -ENODEV ; } - mbox_base =OMAP1_IO_ADDRESS (res->start); + mbox_base =ioremap (res->start,resource_size (res)); +if (!mbox_base) +return -ENOMEM ;/* DSP IRQ */ res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 );if (unlikely (!res)) {dev_err (&pdev->dev,"invalid irq resource\n" ); -return -ENODEV ; + ret = -ENODEV ; + goto err_out; } mbox_dsp_info.irq = res->start; -return omap_mbox_register (&pdev->dev, &mbox_dsp_info); + ret =omap_mbox_register (&pdev->dev, &mbox_dsp_info); +if (ret) + goto err_out; +return 0 ; + +err_out: +iounmap (mbox_base); +return ret; } static int __devexit omap1_mbox_remove(struct platform_device *pdev) {omap_mbox_unregister (&mbox_dsp_info); - +iounmap (mbox_base);return 0 ; }
Signature · 1 line
1.7.1
PATCH 6/15 omap: mailbox: reorganize registering
In reply to Felipe ContrerasThis is a step forward to split the mbox registers.
--- arch/arm/mach-omap1/mailbox.c | 42 +++++++++-------- arch/arm/mach-omap2/mailbox.c | 99 +++++++++++++++++----------------------- 2 files changed, 65 insertions(+), 76 deletions(-)
arch/arm/mach-omap1/mailbox.c +23 -19
@@ -29,6 +29,8 @@static void __iomem *mbox_base; +static struct omap_mbox **list; +struct omap_mbox1_fifo {unsigned long cmd;unsigned long data;
@@ -143,43 +145,45 @@ struct omap_mbox mbox_dsp_info = { };EXPORT_SYMBOL (mbox_dsp_info); +struct omap_mbox *omap1_mboxes[] = { &mbox_dsp_info,NULL }; +static int __devinit omap1_mbox_probe (struct platform_device *pdev) {struct resource *res;int ret; +int i; -/* MBOX base */ - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (unlikely (!res)) { -dev_err (&pdev->dev,"invalid mem resource\n" ); -return -ENODEV ; - } - mbox_base =ioremap (res->start,resource_size (res)); + res = pdev->resource; + + mbox_base =ioremap (res[0 ].start,resource_size (&res[0 ]));if (!mbox_base)return -ENOMEM ; -/* DSP IRQ */ - res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 ); -if (unlikely (!res)) { -dev_err (&pdev->dev,"invalid irq resource\n" ); - ret = -ENODEV ; - goto err_out; - } - mbox_dsp_info.irq = res->start; + list = omap1_mboxes; - ret =omap_mbox_register (&pdev->dev, &mbox_dsp_info); -if (ret) - goto err_out; + list[0 ]->irq = res[1 ].start; + +for (i =0 ; list[i]; i++) { + ret =omap_mbox_register (&pdev->dev, list[i]); +if (ret) + goto err_out; + }return 0 ; err_out: +while (i--) +omap_mbox_unregister (list[i]);iounmap (mbox_base);return ret; } static int __devexit omap1_mbox_remove(struct platform_device *pdev) { -omap_mbox_unregister (&mbox_dsp_info); +int i; + +for (i =0 ; list[i]; i++) +omap_mbox_unregister (list[i]); +iounmap (mbox_base);return 0 ; }
arch/arm/mach-omap2/mailbox.c +42 -57
146 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH 7/15 omap: mailbox: only compile for configured archs
In reply to Felipe Contreras--- arch/arm/mach-omap2/mailbox.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/mailbox.c +13 -2
@@ -265,6 +265,7 @@ static struct omap_mbox_ops omap2_mbox_ops = {/* FIXME: the following structs should be filled automatically by the user id */ +#if defined(CONFIG_ARCH_OMAP3430) || defined(CONFIG_ARCH_OMAP2420) /* DSP */ static struct omap_mbox2_priv omap2_mbox_dsp_priv = { .tx_fifo = {
@@ -288,11 +289,13 @@ struct omap_mbox mbox_dsp_info = { .priv = &omap2_mbox_dsp_priv, };EXPORT_SYMBOL (mbox_dsp_info); +#endif +#if defined(CONFIG_ARCH_OMAP3430 )struct omap_mbox *omap3_mboxes[] = { &mbox_dsp_info,NULL }; +#endif #if defined(CONFIG_ARCH_OMAP2420) - /* IVA */ static struct omap_mbox2_priv omap2_mbox_iva_priv = { .tx_fifo = {
@@ -319,6 +322,7 @@ static struct omap_mbox mbox_iva_info = {struct omap_mbox *omap2_mboxes[] = { &mbox_iva_info, &mbox_dsp_info,NULL };#endif +#if defined(CONFIG_ARCH_OMAP4) /* OMAP4 */ static struct omap_mbox2_priv omap2_mbox_1_priv = { .tx_fifo = {
@@ -367,6 +371,7 @@ struct omap_mbox mbox_2_info = {EXPORT_SYMBOL (mbox_2_info);struct omap_mbox *omap4_mboxes[] = { &mbox_1_info, &mbox_2_info,NULL }; +#endif static int __devinit omap2_mbox_probe (struct platform_device *pdev) {
@@ -380,11 +385,15 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)if (!mbox_base)return -ENOMEM ; -if (cpu_is_omap3430 ()) { +if (false) { + } +#if defined(CONFIG_ARCH_OMAP3430 ) + else if (cpu_is_omap3430()) { list = omap3_mboxes; list[0 ]->irq = res[1 ].start; } +#endif #if defined(CONFIG_ARCH_OMAP2420 ) else if (cpu_is_omap2420()) { list = omap2_mboxes;
@@ -393,12 +402,14 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev) list[1 ]->irq = res[2 ].start; }#endif +#if defined(CONFIG_ARCH_OMAP4 ) else if (cpu_is_omap44xx()) { list = omap4_mboxes; list[0 ]->irq = res[1 ].start; list[1 ]->irq = res[1 ].start; } +#endif else {pr_err ("%s: platform not supported\n" , __func__);return -ENODEV ;
Signature · 1 line
1.7.1
PATCH 8/15 omap: mailbox: reorganize omap platform_device
In reply to Felipe ContrerasMakes more sense to register in the mach file, plus it will allow more functionality later on.
Also, this probably enables multi-omap for real.
--- arch/arm/mach-omap1/devices.c | 38 ---------------- arch/arm/mach-omap1/mailbox.c | 57 ++++++++++++++++++++++++ arch/arm/mach-omap2/devices.c | 74 ------------------------------- arch/arm/mach-omap2/mailbox.c | 97 +++++++++++++++++++++++++++++++++++++++-- 4 files changed, 150 insertions(+), 116 deletions(-)
arch/arm/mach-omap1/devices.c +0 -38
@@ -63,43 +63,6 @@ static void omap_init_rtc(void)static inline void omap_init_rtc (void ) {}#endif -#if defined(CONFIG_OMAP_MBOX_FWK ) || defined(CONFIG_OMAP_MBOX_FWK_MODULE ) - -#if defined(CONFIG_ARCH_OMAP15XX ) -# define OMAP1_MBOX_SIZE 0x23 -# define INT_DSP_MAILBOX1 INT_1510_DSP_MAILBOX1 -#elif defined(CONFIG_ARCH_OMAP16XX ) -# define OMAP1_MBOX_SIZE 0x2f -# define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1 -#endif - -static struct resource mbox_resources[] = { - { - .start =OMAP16XX_MAILBOX_BASE , - .end =OMAP16XX_MAILBOX_BASE +OMAP1_MBOX_SIZE , - .flags =IORESOURCE_MEM , - }, - { - .start =INT_DSP_MAILBOX1 , - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device mbox_device = { - .name ="omap1-mailbox" , - .id =-1 , - .num_resources =ARRAY_SIZE (mbox_resources), - .resource = mbox_resources, -}; - -static inline void omap_init_mbox (void ) -{ -platform_device_register (&mbox_device); -} -#else -static inline void omap_init_mbox (void ) { } -#endif -/*-------------------------------------------------------------------------*/ #if defined(CONFIG_MMC_OMAP ) || defined(CONFIG_MMC_OMAP_MODULE )
@@ -293,7 +256,6 @@ static int __init omap1_init_devices(void)* in alphabetical order so they're easier to sort through. */ -omap_init_mbox ();omap_init_rtc ();omap_init_spi100k ();omap_init_sti ();
arch/arm/mach-omap1/mailbox.c +57 -0
70 lines not on this page · raw message
arch/arm/mach-omap2/devices.c +0 -74
86 lines not on this page · raw message
arch/arm/mach-omap2/mailbox.c +93 -4
116 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH 9/15 omap: mailbox: move more stuff to omap_mbox_init()
In reply to Felipe ContrerasWill be needed to split the platform_driver.
--- arch/arm/mach-omap1/mailbox.c | 23 ++++++++++-------- arch/arm/mach-omap2/mailbox.c | 50 ++++++++++++++-------------------------- 2 files changed, 31 insertions(+), 42 deletions(-)
arch/arm/mach-omap1/mailbox.c +13 -10
@@ -169,14 +169,6 @@ static int __devinit omap1_mbox_probe(struct platform_device *pdev) res = pdev->resource; - mbox_base =ioremap (res[0 ].start,resource_size (&res[0 ])); -if (!mbox_base) -return -ENOMEM ; - - list = omap1_mboxes; - - list[0 ]->irq = res[1 ].start; -for (i =0 ; list[i]; i++) { ret =omap_mbox_register (&pdev->dev, list[i]);if (ret)
@@ -187,7 +179,6 @@ static int __devinit omap1_mbox_probe(struct platform_device *pdev) err_out:while (i--)omap_mbox_unregister (list[i]); -iounmap (mbox_base);return ret; }
@@ -198,7 +189,6 @@ static int __devexit omap1_mbox_remove(struct platform_device *pdev)for (i =0 ; list[i]; i++)omap_mbox_unregister (list[i]); -iounmap (mbox_base);return 0 ; }
@@ -223,14 +213,20 @@ static int __init omap1_mbox_init(void) else if (cpu_is_omap15xx()) { res = omap1_mbox_resources; num =ARRAY_SIZE (omap1_mbox_resources); + list = omap1_mboxes; + res[1 ].end +=0x23 ; + list[0 ]->irq = res[1 ].start; }#endif #if defined(CONFIG_ARCH_OMAP16XX ) else if (cpu_is_omap16xx()) { res = omap1_mbox_resources; num =ARRAY_SIZE (omap1_mbox_resources); + list = omap1_mboxes; + res[1 ].end +=0x2f ; + list[0 ]->irq = res[1 ].start; }#endif else {
@@ -252,6 +248,12 @@ static int __init omap1_mbox_init(void)if (err) goto err_out; + mbox_base =ioremap (res[0 ].start,resource_size (&res[0 ])); +if (!mbox_base) { +platform_device_put (pdev); +return -ENOMEM ; + } +return platform_driver_register (&omap1_mbox_driver); err_out:
@@ -261,6 +263,7 @@ err_out: static void __exit omap1_mbox_exit(void) {platform_driver_unregister (&omap1_mbox_driver); +iounmap (mbox_base); }module_init (omap1_mbox_init);
arch/arm/mach-omap2/mailbox.c +18 -32
98 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH 10/15 omap: mailbox: trivial sync between omap1 and 2
In reply to Felipe Contreras--- arch/arm/mach-omap1/mailbox.c | 2 +- arch/arm/mach-omap2/mailbox.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-)
arch/arm/mach-omap1/mailbox.c +1 -1
@@ -1,5 +1,5 @@/* -* Mailbox reservation modules for DSP +* Mailbox reservation modules for OMAP1 * * Copyright (C) 2006-2009 Nokia Corporation * Written by: Hiroshi DOYU <[email protected]>
arch/arm/mach-omap2/mailbox.c +2 -4
@@ -18,8 +18,6 @@#include <plat/mailbox.h> #include <mach/irqs.h> -#define DRV_NAME "omap2-mailbox" -#define MAILBOX_REVISION 0x000#define MAILBOX_SYSCONFIG 0x010#define MAILBOX_SYSSTATUS 0x014
@@ -454,7 +452,7 @@ static struct platform_driver omap2_mbox_driver = { .probe = omap2_mbox_probe, .remove = __devexit_p(omap2_mbox_remove), .driver = { - .name = DRV_NAME, + .name = "omap2-mailbox", }, };
@@ -539,4 +537,4 @@ module_exit(omap2_mbox_exit);MODULE_LICENSE ("GPL v2" );MODULE_DESCRIPTION ("omap mailbox: omap2/3/4 architecture specific functions" );MODULE_AUTHOR ("Hiroshi DOYU <[email protected]>, Paul Mundt" ); -MODULE_ALIAS ("platform:" DRV_NAME ); +MODULE_ALIAS ("platform:omap2-mailbox" );
Signature · 1 line
1.7.1
PATCH 11/15 omap: mailbox: split platform driver
In reply to Felipe ContrerasThis will allow the current 'mailbox_mach' to be built-in.
--- arch/arm/mach-omap1/mailbox.c | 50 +++++------------------------ arch/arm/mach-omap2/mailbox.c | 50 +++++------------------------ arch/arm/plat-omap/include/plat/mailbox.h | 4 ++ arch/arm/plat-omap/mailbox.c | 45 +++++++++++++++++++++++++- 4 files changed, 64 insertions(+), 85 deletions(-)
arch/arm/mach-omap1/mailbox.c +8 -42
@@ -161,51 +161,13 @@ static struct resource omap1_mbox_resources[] = { };#endif -static int __devinit omap1_mbox_probe (struct platform_device *pdev) -{ -struct resource *res; -int ret; -int i; - - res = pdev->resource; - -for (i =0 ; list[i]; i++) { - ret =omap_mbox_register (&pdev->dev, list[i]); -if (ret) - goto err_out; - } -return 0 ; - -err_out: -while (i--) -omap_mbox_unregister (list[i]); -return ret; -} - -static int __devexit omap1_mbox_remove(struct platform_device *pdev) -{ -int i; - -for (i =0 ; list[i]; i++) -omap_mbox_unregister (list[i]); - -return 0 ; -} - -static struct platform_driver omap1_mbox_driver = { - .probe = omap1_mbox_probe, - .remove =__devexit_p (omap1_mbox_remove), - .driver = { - .name ="omap1-mailbox" , - }, -}; -static int __init omap1_mbox_init (void ) {int err;struct platform_device *pdev;struct resource *res;unsigned num; +struct omap_mbox_platform_data pdata;if (false) { }
@@ -234,7 +196,7 @@ static int __init omap1_mbox_init(void)return -ENODEV ; } - pdev =platform_device_alloc ("omap1-mailbox" ,-1 ); + pdev =platform_device_alloc ("omap-mailbox" ,-1 );if (!pdev) { err = -ENOMEM ; goto err_out;
@@ -244,6 +206,11 @@ static int __init omap1_mbox_init(void)if (err) goto err_out; + pdata.list = list; + err =platform_device_add_data (pdev, &pdata,sizeof (pdata)); +if (err) + goto err_out; + err =platform_device_add (pdev);if (err) goto err_out;
@@ -254,7 +221,7 @@ static int __init omap1_mbox_init(void)return -ENOMEM ; } -return platform_driver_register (&omap1_mbox_driver); +return 0 ; err_out:return err;
@@ -262,7 +229,6 @@ err_out: static void __exit omap1_mbox_exit(void) { -platform_driver_unregister (&omap1_mbox_driver);iounmap (mbox_base); }
arch/arm/mach-omap2/mailbox.c +8 -42
86 lines not on this page · raw message
arch/arm/plat-omap/include/plat/mailbox.h +4 -0
@@ -67,6 +67,10 @@ struct omap_mbox {void (*err_notify)(void ); }; +struct omap_mbox_platform_data { +struct omap_mbox **list; +}; +int omap_mbox_msg_send (struct omap_mbox *,mbox_msg_t msg);void omap_mbox_init_seq (struct omap_mbox *);
arch/arm/plat-omap/mailbox.c +44 -1
64 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH 12/15 omap: mailbox: always built-in platform data
In reply to Felipe Contreras--- arch/arm/mach-omap1/Makefile | 6 +++--- arch/arm/mach-omap2/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-)
arch/arm/mach-omap1/Makefile +3 -3
@@ -14,9 +14,9 @@ obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o # Power Management obj-$(CONFIG_PM) += pm.o sleep.o -# DSP -obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o -mailbox_mach-objs := mailbox.o +ifneq ($(CONFIG_OMAP_MBOX_FWK),) +obj-y += mailbox.o +endif i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o obj-y += $(i2c-omap-m) $(i2c-omap-y)
arch/arm/mach-omap2/Makefile +3 -2
@@ -56,8 +56,9 @@ obj-$(CONFIG_ARCH_OMAP4) += clock44xx.o clock44xx_data.o # EMU peripherals obj-$(CONFIG_OMAP3_EMU) += emu.o -obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o -mailbox_mach-objs := mailbox.o +ifneq ($(CONFIG_OMAP_MBOX_FWK),) +obj-y += mailbox.o +endif iommu-y += iommu2.o iommu-$(CONFIG_ARCH_OMAP3) += omap3-iommu.o
Signature · 1 line
1.7.1
PATCH 13/15 omap: mailbox: reorganize headers
In reply to Felipe Contreras--- arch/arm/mach-omap1/mailbox.c | 5 +---- arch/arm/mach-omap2/mailbox.c | 7 +++---- arch/arm/plat-omap/include/plat/mailbox.h | 3 --- arch/arm/plat-omap/mailbox.c | 6 +++--- 4 files changed, 7 insertions(+), 14 deletions(-)
arch/arm/mach-omap1/mailbox.c +1 -4
@@ -9,13 +9,10 @@* for more details. */ -#include <linux/kernel.h> -#include <linux/resource.h> -#include <linux/interrupt.h> #include <linux/platform_device.h> #include <linux/io.h> +#include <plat/mailbox.h> -#include <mach/irqs.h> #define MAILBOX_ARM2DSP1 0x00#define MAILBOX_ARM2DSP1b 0x04
arch/arm/mach-omap2/mailbox.c +3 -4
@@ -10,13 +10,12 @@* for more details. */ -#include <linux/kernel.h> -#include <linux/clk.h> -#include <linux/err.h> #include <linux/platform_device.h> +#include <linux/clk.h> #include <linux/io.h> +#include <linux/err.h> +#include <plat/mailbox.h> -#include <mach/irqs.h> #define MAILBOX_REVISION 0x000#define MAILBOX_SYSCONFIG 0x010
arch/arm/plat-omap/include/plat/mailbox.h +0 -3
@@ -3,9 +3,6 @@#ifndef MAILBOX_H #define MAILBOX_H -#include <linux/wait.h> -#include <linux/workqueue.h> -#include <linux/blkdev.h> #include <linux/interrupt.h> typedef u32 mbox_msg_t ;
arch/arm/plat-omap/mailbox.c +3 -3
@@ -21,11 +21,11 @@* */ -#include <linux/module.h> -#include <linux/interrupt.h> -#include <linux/device.h> +#include <linux/spinlock_types.h> +#include <linux/mutex.h> #include <linux/delay.h> #include <linux/platform_device.h> +#include <linux/blkdev.h> #include <plat/mailbox.h>
Signature · 1 line
1.7.1
PATCH 14/15 omap: mailbox: don't export unecessary symbols
In reply to Felipe Contreras--- arch/arm/mach-omap1/mailbox.c | 1 - arch/arm/mach-omap2/mailbox.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-)
arch/arm/mach-omap1/mailbox.c +0 -1
@@ -140,7 +140,6 @@ struct omap_mbox mbox_dsp_info = { .ops = &omap1_mbox_ops, .priv = &omap1_mbox_dsp_priv, }; -EXPORT_SYMBOL (mbox_dsp_info);struct omap_mbox *omap1_mboxes[] = { &mbox_dsp_info,NULL };
arch/arm/mach-omap2/mailbox.c +0 -3
@@ -285,7 +285,6 @@ struct omap_mbox mbox_dsp_info = { .ops = &omap2_mbox_ops, .priv = &omap2_mbox_dsp_priv, }; -EXPORT_SYMBOL (mbox_dsp_info);#endif #if defined(CONFIG_ARCH_OMAP3430 )
@@ -342,7 +341,6 @@ struct omap_mbox mbox_1_info = { .ops = &omap2_mbox_ops, .priv = &omap2_mbox_1_priv, }; -EXPORT_SYMBOL (mbox_1_info);static struct omap_mbox2_priv omap2_mbox_2_priv = { .tx_fifo = {
@@ -365,7 +363,6 @@ struct omap_mbox mbox_2_info = { .ops = &omap2_mbox_ops, .priv = &omap2_mbox_2_priv, }; -EXPORT_SYMBOL (mbox_2_info);struct omap_mbox *omap4_mboxes[] = { &mbox_1_info, &mbox_2_info,NULL };#endif
Signature · 1 line
1.7.1
PATCH 15/15 omap: mailbox: mark some resources as __initdata
In reply to Felipe Contreras--- arch/arm/mach-omap1/mailbox.c | 2 +- arch/arm/mach-omap2/mailbox.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-omap1/mailbox.c +1 -1
@@ -144,7 +144,7 @@ struct omap_mbox mbox_dsp_info = {struct omap_mbox *omap1_mboxes[] = { &mbox_dsp_info,NULL }; #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) -static struct resource omap1_mbox_resources[] = { +static struct resource __initdata omap1_mbox_resources[] = { { .start = OMAP16XX_MAILBOX_BASE, .end = OMAP16XX_MAILBOX_BASE, /* to be updated */
arch/arm/mach-omap2/mailbox.c +3 -3
@@ -368,7 +368,7 @@ struct omap_mbox *omap4_mboxes[] = { &mbox_1_info, &mbox_2_info, NULL };#endif #ifdef CONFIG_ARCH_OMAP2420 -static struct resource omap2_mbox_resources[] = { +static struct resource __initdata omap2_mbox_resources[] = { { .start = OMAP24XX_MAILBOX_BASE, .end = OMAP24XX_MAILBOX_BASE + MBOX_REG_SIZE - 1,
@@ -386,7 +386,7 @@ static struct resource omap2_mbox_resources[] = {#endif #ifdef CONFIG_ARCH_OMAP3430 -static struct resource omap3_mbox_resources[] = { +static struct resource __initdata omap3_mbox_resources[] = { { .start = OMAP34XX_MAILBOX_BASE, .end = OMAP34XX_MAILBOX_BASE + MBOX_REG_SIZE - 1,
@@ -400,7 +400,7 @@ static struct resource omap3_mbox_resources[] = {#endif #ifdef CONFIG_ARCH_OMAP4 -static struct resource omap4_mbox_resources[] = { +static struct resource __initdata omap4_mbox_resources[] = { { .start = OMAP44XX_MAILBOX_BASE, .end = OMAP44XX_MAILBOX_BASE + OMAP4_MBOX_REG_SIZE - 1,
Signature · 1 line
1.7.1
cover omap: mailbox: reorganize init
In reply to Felipe ContrerasHi Felipe,
From: ext Felipe Contreras <[email protected]>
Subject: [PATCH 00/15] omap: mailbox: reorganize init
Date: Thu, 13 May 2010 19:47:21 +0200
Quoted 10 lines
Hi,
The main purpose of this patch series is to be able to compile mach platform data as built-in. Otherwise, client modules such as bridgedriver will load the platform code, but not the mach code when mailbox is built as a module.
Unfortunately, there's no easy way to do that since plat and mach code are deepely interrelated. So the first patches try to separate the mailbox registering through a defined
omap_mbox_platform_data.
Quoted 6 lines
Also, it's worth noting that mailboxes are not a one-to-one mapping to resources; that is, some resources belong to multiple mboxes. So it's best to think of mailboxes as fake devices. That is why custom
platform_datais required.Finally, a bunch of cleaning up is done in the very first patches, specially for OMAP1.
Can you rebase them against the following?
git://gitorious.org/~doyu/lk/mainline.git v2.6.34-rc7.mailbox
The above includes the unmerged patches for omap mailbox, and it seems that yours can be applied to neither v2.6.34-rc7 or omap/master now.
cover omap: mailbox: reorganize init
Quoted 3 lines · Hiroshi DOYU
Can you rebase them against the following?
?git://gitorious.org/~doyu/lk/mainline.git v2.6.34-rc7.mailbox
Done.
Quoted 2 lines
The above includes the unmerged patches for omap mailbox, and it seems that yours can be applied to neither v2.6.34-rc7 or omap/master now.
Yeah, I didn't know where to rebase to, so I just used what I was
running: v2.6.33.
Signature · 1 line
Felipe Contreras