from:"Philippe De Swert"

[PATCH 1/1] musb : remove generic_interrupt and have all drivers define the isr on their own. Remove some unneeded CONFIG_SOC_OMAP_3430 instances

2012-10-04 Thread Philippe De Swert

This patch is based on the discussion of a previous patch to fix an issue
where the omap2430 musb driver is not working for N9/N950.

Moving all the interrupt handling to the devices. Avoids inclusion of generic
interrupt and breakage due to sometimes misleading CONFIG options. This makes 
sure usb always works if on of the subdrivers is chosen. Tested on Nokia 
N9/N950. 

Partially clean up CONFIG_SOC_OMAP3430 which is not necessary in the cases
where I removed it. Also helps with the removal work of those options that 
Tony Lindgren predicted would happen at some point.

Signed-off-by: Philippe De Swert philippe.desw...@jollamobile.com
---
 drivers/usb/musb/musb_core.c |   31 ++-
 drivers/usb/musb/musbhsdma.h |4 
 drivers/usb/musb/omap2430.c  |   22 ++
 drivers/usb/musb/ux500.c |   22 ++
 4 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 26f1bef..37c770e 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1498,33 +1498,6 @@ static int __devinit musb_core_init(u16 musb_type, 
struct musb *musb)
 
 /*-*/
 
-#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430) || \
-   defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500)
-
-static irqreturn_t generic_interrupt(int irq, void *__hci)
-{
-   unsigned long   flags;
-   irqreturn_t retval = IRQ_NONE;
-   struct musb *musb = __hci;
-
-   spin_lock_irqsave(musb-lock, flags);
-
-   musb-int_usb = musb_readb(musb-mregs, MUSB_INTRUSB);
-   musb-int_tx = musb_readw(musb-mregs, MUSB_INTRTX);
-   musb-int_rx = musb_readw(musb-mregs, MUSB_INTRRX);
-
-   if (musb-int_usb || musb-int_tx || musb-int_rx)
-   retval = musb_interrupt(musb);
-
-   spin_unlock_irqrestore(musb-lock, flags);
-
-   return retval;
-}
-
-#else
-#define generic_interrupt  NULL
-#endif
-
 /*
  * handle all the irqs defined by the HDRC core. for now we expect:  other
  * irq sources (phy, dma, etc) will be handled first, musb-int_* values
@@ -1907,7 +1880,8 @@ musb_init_controller(struct device *dev, int nIrq, void 
__iomem *ctrl)
musb-ops = plat-platform_ops;
 
/* The musb_platform_init() call:
-*   - adjusts musb-mregs and musb-isr if needed,
+*   - adjusts musb-mregs
+*   - sets the musb-isr
 *   - may initialize an integrated tranceiver
 *   - initializes musb-xceiv, usually by otg_get_phy()
 *   - stops powering VBUS
@@ -1917,7 +1891,6 @@ musb_init_controller(struct device *dev, int nIrq, void 
__iomem *ctrl)
 * external/discrete ones in various flavors (twl4030 family,
 * isp1504, non-OTG, etc) mostly hooking up through ULPI.
 */
-   musb-isr = generic_interrupt;
status = musb_platform_init(musb);
if (status  0)
goto fail1;
diff --git a/drivers/usb/musb/musbhsdma.h b/drivers/usb/musb/musbhsdma.h
index 320fd4a..f7b13fd2 100644
--- a/drivers/usb/musb/musbhsdma.h
+++ b/drivers/usb/musb/musbhsdma.h
@@ -31,10 +31,6 @@
  *
  */
 
-#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430)
-#include omap2430.h
-#endif
-
 #ifndef CONFIG_BLACKFIN
 
 #define MUSB_HSDMA_BASE0x200
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 5fdb9da..c63aea8 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -306,6 +306,26 @@ static void omap_musb_mailbox_work(struct work_struct 
*mailbox_work)
omap_musb_set_mailbox(glue);
 }
 
+static irqreturn_t omap2430_musb_interrupt(int irq, void *__hci)
+{
+   unsigned long   flags;
+   irqreturn_t retval = IRQ_NONE;
+   struct musb *musb = __hci;
+
+   spin_lock_irqsave(musb-lock, flags);
+
+   musb-int_usb = musb_readb(musb-mregs, MUSB_INTRUSB);
+   musb-int_tx = musb_readw(musb-mregs, MUSB_INTRTX);
+   musb-int_rx = musb_readw(musb-mregs, MUSB_INTRRX);
+
+   if (musb-int_usb || musb-int_tx || musb-int_rx)
+   retval = musb_interrupt(musb);
+
+   spin_unlock_irqrestore(musb-lock, flags);
+
+   return retval;
+}
+
 static int omap2430_musb_init(struct musb *musb)
 {
u32 l;
@@ -325,6 +345,8 @@ static int omap2430_musb_init(struct musb *musb)
return -ENODEV;
}
 
+   musb-isr = omap2430_musb_interrupt;
+
status = pm_runtime_get_sync(dev);
if (status  0) {
dev_err(dev, pm_runtime_get_sync FAILED %d\n, status);
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c
index a8c0fad..bce5574 100644
--- a/drivers/usb/musb/ux500.c
+++ b/drivers/usb/musb/ux500.c
@@ -36,6 +36,26 @@ struct ux500_glue {
 };
 #define glue_to_musb(g)platform_get_drvdata(g-musb)
 
+static irqreturn_t ux500_musb_interrupt(int

RE: [PATCH 1/1] usb: Include generic_interrupt for OMAP2_PLUS

2012-10-03 Thread Philippe De Swert

Hi all,

On 26/09/2012, Philippe De Swert philippe.desw...@jollamobile.com wrote:
 Hi,
 
On Tue, Sep 25, 2012 at 2:39 PM, Philippe De Swert
 Then maybe it's best to just remove the ifdefs and always provide
 generic_interrupt() ?

 Anyone against it ?

Providing generic_interrupt seems fine.

 Well it seems there are only two drivers that use it omap2430 and
 ux500. Maybe we somehow link it to the drivers that need it? (I might
 have missed other drivers but it looks like it is just those two)

One way I see is that omap2430 and ux500 implement the isr handler
in platform glue driver and then call the musb_interrupt() as done in
daxxx, amxxx, ti8xxx platforms. Then generic_interrupt can be removed.
 
 So something along those lines? (If this is the right way I will resend as a
 real patch)

So any comments on the approach here (see patch kept below)? Or should I 
immediately send it as a new patch to get the comments? I sent it in this 
thread as it also solves the issue I have. 

BTW: CONFIG_SOC_OMAP3430 could be easily removed as it only changes minor 
things in the musb stack. It would clean up the code and get rid of this very 
misleading option as it has nothing to do with any OMAP3430 soc specific 
handling.

Regards,

Philippe

 
 From deae78e1084749f340ae8b8aaeca51818d5bfc55 Mon Sep 17 00:00:00 2001
 From: Philippe De Swert philippe.desw...@jollamobile.com
 Date: Wed, 26 Sep 2012 17:00:46 +0300
 Subject: [PATCH 1/1] musb: Move generic_interrupt out of the way
 
 Have all musb drivers define their own isr.
 
 Signed-off-by: Philippe De Swert philippe.desw...@jollamobile.com
 ---
  drivers/usb/musb/musb_core.c |   33 ++---
  drivers/usb/musb/omap2430.c  |   22 ++
  drivers/usb/musb/ux500.c |   21 +
  3 files changed, 45 insertions(+), 31 deletions(-)
 
 diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
 index 26f1bef..1d5ee34 100644
 --- a/drivers/usb/musb/musb_core.c
 +++ b/drivers/usb/musb/musb_core.c
 @@ -1496,35 +1496,6 @@ static int __devinit musb_core_init(u16 musb_type,
 struct musb *musb)
   return 0;
  }
  
 -/*-*/
 -
 -#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430) || \
 - defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500)
 -
 -static irqreturn_t generic_interrupt(int irq, void *__hci)
 -{
 - unsigned long   flags;
 - irqreturn_t retval = IRQ_NONE;
 - struct musb *musb = __hci;
 -
 - spin_lock_irqsave(musb-lock, flags);
 -
 - musb-int_usb = musb_readb(musb-mregs, MUSB_INTRUSB);
 - musb-int_tx = musb_readw(musb-mregs, MUSB_INTRTX);
 - musb-int_rx = musb_readw(musb-mregs, MUSB_INTRRX);
 -
 - if (musb-int_usb || musb-int_tx || musb-int_rx)
 - retval = musb_interrupt(musb);
 -
 - spin_unlock_irqrestore(musb-lock, flags);
 -
 - return retval;
 -}
 -
 -#else
 -#define generic_interruptNULL
 -#endif
 -
  /*
   * handle all the irqs defined by the HDRC core. for now we expect:  other
   * irq sources (phy, dma, etc) will be handled first, musb-int_* values
 @@ -1907,7 +1878,8 @@ musb_init_controller(struct device *dev, int nIrq,
 void __iomem *ctrl)
   musb-ops = plat-platform_ops;
  
   /* The musb_platform_init() call:
 -  *   - adjusts musb-mregs and musb-isr if needed,
 +  *   - adjusts musb-mregs if needed 
 +  *   - sets the musb-isr 
*   - may initialize an integrated tranceiver
*   - initializes musb-xceiv, usually by otg_get_phy()
*   - stops powering VBUS
 @@ -1917,7 +1889,6 @@ musb_init_controller(struct device *dev, int nIrq,
 void __iomem *ctrl)
* external/discrete ones in various flavors (twl4030 family,
* isp1504, non-OTG, etc) mostly hooking up through ULPI.
*/
 - musb-isr = generic_interrupt;
   status = musb_platform_init(musb);
   if (status  0)
   goto fail1;
 diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
 index 5fdb9da..5461619d 100644
 --- a/drivers/usb/musb/omap2430.c
 +++ b/drivers/usb/musb/omap2430.c
 @@ -306,6 +306,26 @@ static void omap_musb_mailbox_work(struct work_struct
 *mailbox_work)
   omap_musb_set_mailbox(glue);
  }
  
 +static irqreturn_t omap2430_musb_interrupt(int irq, void *__hci)
 +{
 +unsigned long   flags;
 +irqreturn_t retval = IRQ_NONE;
 +struct musb *musb = __hci;
 +
 +spin_lock_irqsave(musb-lock, flags);
 +
 +musb-int_usb = musb_readb(musb-mregs, MUSB_INTRUSB);
 +musb-int_tx = musb_readw(musb-mregs, MUSB_INTRTX);
 +musb-int_rx = musb_readw(musb-mregs, MUSB_INTRRX);
 +
 +if (musb-int_usb || musb-int_tx || musb-int_rx)
 +retval = musb_interrupt(musb);
 +
 +spin_unlock_irqrestore(musb-lock, flags);
 +
 +return retval;
 +}
 +
  static int

RE: [PATCH 1/1] usb: Include generic_interrupt for OMAP2_PLUS

2012-09-26 Thread Philippe De Swert

Hi,

On Tue, Sep 25, 2012 at 2:39 PM, Philippe De Swert
 Then maybe it's best to just remove the ifdefs and always provide
 generic_interrupt() ?

 Anyone against it ?

Providing generic_interrupt seems fine.

 Well it seems there are only two drivers that use it omap2430 and
 ux500. Maybe we somehow link it to the drivers that need it? (I might
 have missed other drivers but it looks like it is just those two)

One way I see is that omap2430 and ux500 implement the isr handler
in platform glue driver and then call the musb_interrupt() as done in
daxxx, amxxx, ti8xxx platforms. Then generic_interrupt can be removed.

So something along those lines? (If this is the right way I will resend as a 
real patch)

From deae78e1084749f340ae8b8aaeca51818d5bfc55 Mon Sep 17 00:00:00 2001
From: Philippe De Swert philippe.desw...@jollamobile.com
Date: Wed, 26 Sep 2012 17:00:46 +0300
Subject: [PATCH 1/1] musb: Move generic_interrupt out of the way

Have all musb drivers define their own isr.

Signed-off-by: Philippe De Swert philippe.desw...@jollamobile.com
---
 drivers/usb/musb/musb_core.c |   33 ++---
 drivers/usb/musb/omap2430.c  |   22 ++
 drivers/usb/musb/ux500.c |   21 +
 3 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 26f1bef..1d5ee34 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1496,35 +1496,6 @@ static int __devinit musb_core_init(u16 musb_type, 
struct musb *musb)
return 0;
 }
 
-/*-*/
-
-#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430) || \
-   defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500)
-
-static irqreturn_t generic_interrupt(int irq, void *__hci)
-{
-   unsigned long   flags;
-   irqreturn_t retval = IRQ_NONE;
-   struct musb *musb = __hci;
-
-   spin_lock_irqsave(musb-lock, flags);
-
-   musb-int_usb = musb_readb(musb-mregs, MUSB_INTRUSB);
-   musb-int_tx = musb_readw(musb-mregs, MUSB_INTRTX);
-   musb-int_rx = musb_readw(musb-mregs, MUSB_INTRRX);
-
-   if (musb-int_usb || musb-int_tx || musb-int_rx)
-   retval = musb_interrupt(musb);
-
-   spin_unlock_irqrestore(musb-lock, flags);
-
-   return retval;
-}
-
-#else
-#define generic_interrupt  NULL
-#endif
-
 /*
  * handle all the irqs defined by the HDRC core. for now we expect:  other
  * irq sources (phy, dma, etc) will be handled first, musb-int_* values
@@ -1907,7 +1878,8 @@ musb_init_controller(struct device *dev, int nIrq, void 
__iomem *ctrl)
musb-ops = plat-platform_ops;
 
/* The musb_platform_init() call:
-*   - adjusts musb-mregs and musb-isr if needed,
+*   - adjusts musb-mregs if needed 
+*   - sets the musb-isr 
 *   - may initialize an integrated tranceiver
 *   - initializes musb-xceiv, usually by otg_get_phy()
 *   - stops powering VBUS
@@ -1917,7 +1889,6 @@ musb_init_controller(struct device *dev, int nIrq, void 
__iomem *ctrl)
 * external/discrete ones in various flavors (twl4030 family,
 * isp1504, non-OTG, etc) mostly hooking up through ULPI.
 */
-   musb-isr = generic_interrupt;
status = musb_platform_init(musb);
if (status  0)
goto fail1;
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 5fdb9da..5461619d 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -306,6 +306,26 @@ static void omap_musb_mailbox_work(struct work_struct 
*mailbox_work)
omap_musb_set_mailbox(glue);
 }
 
+static irqreturn_t omap2430_musb_interrupt(int irq, void *__hci)
+{
+unsigned long   flags;
+irqreturn_t retval = IRQ_NONE;
+struct musb *musb = __hci;
+
+spin_lock_irqsave(musb-lock, flags);
+
+musb-int_usb = musb_readb(musb-mregs, MUSB_INTRUSB);
+musb-int_tx = musb_readw(musb-mregs, MUSB_INTRTX);
+musb-int_rx = musb_readw(musb-mregs, MUSB_INTRRX);
+
+if (musb-int_usb || musb-int_tx || musb-int_rx)
+retval = musb_interrupt(musb);
+
+spin_unlock_irqrestore(musb-lock, flags);
+
+return retval;
+}
+
 static int omap2430_musb_init(struct musb *musb)
 {
u32 l;
@@ -325,6 +345,8 @@ static int omap2430_musb_init(struct musb *musb)
return -ENODEV;
}
 
+   musb-isr = omap2430_musb_interrupt;
+
status = pm_runtime_get_sync(dev);
if (status  0) {
dev_err(dev, pm_runtime_get_sync FAILED %d\n, status);
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c
index a8c0fad..ec9aaec 100644
--- a/drivers/usb/musb/ux500.c
+++ b/drivers/usb/musb/ux500.c
@@ -36,6 +36,26 @@ struct ux500_glue {
 };
 #define glue_to_musb(g

Re: [PATCH 1/1] usb: Include generic_interrupt for OMAP2_PLUS

2012-09-25 Thread Philippe De Swert

Hi,
On 25/09/2012, Felipe Balbi ba...@ti.com wrote:
   Not a mention of CONFIG_SOC_OMAP2430 and  CONFIG_SOC_OMAP3430 did not
   get set (while it is not a 3430 but a 3630 I am using). Maybe
   CONFIG_ARCH_OMAP3 would have been a better choice then?
 
  that's quite f**ked up. Tony, why doesn't SOC_OMAP3430 get set for all
  OMAP3 boards ? And another question: why don't we have a matching
  SOC_OMAP3530, SOC_OMAP3630 and so on ?

 ARCH_OMAP3 will probably eventually just disappear and
 be replaced with ARCH_OMAP2PLUS + SOC_. But there's
 no need to do it right now as most of that should be
 internal to arch/arm/mach-omap2 anyways. I would just
 set the driver to depend on ARCH_OMAP2PLUS, and rely on
 the platform_data and DT to do something if specified.
 That means that on 2420 musb should not probe unless
 tusb6010 in specified.

 It seems that things like fifo_mode and generic_interrupt
 can all be set during the probe based on the platform_data
 or DT passed information?

 Then maybe it's best to just remove the ifdefs and always provide
 generic_interrupt() ?

 Anyone against it ?

Well it seems there are only two drivers that use it omap2430 and
ux500. Maybe we somehow link it to the drivers that need it? (I might
have missed other drivers but it looks like it is just those two)

Regards,

Philippe
--
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 1/1] usb: Include generic_interrupt for OMAP2_PLUS

2012-09-24 Thread Philippe De Swert

Hi,

On 24/09/2012, Felipe Balbi ba...@ti.com wrote:
 SoB's mail doesn't From mail.

Well still in the progress of migrating of my personal to work laptop.
Since the patch does not seem correct the replacement will have
matching addresses.

 /*-*/

  #if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430) || \
 -defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500)
 +defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500) || \
 +defined(CONFIG_ARCH_OMAP2PLUS)

 Weird, how can you build OMAP2PLUS without SOC_OMAP ??

It seems entirely possible. I quickly tried to look if it got defined
somewhere and it does not seem to be set anywhere.  That is why I got
the impression it was replaced by CONFIG_ARCH_OMAP2PLUS. I'll dig
deeper to find out why SOC_OMAP is not set if it should be.

From the .config I got (used menuconfig)

#
# TI OMAP2/3/4 Specific Features
#
CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
CONFIG_SOC_HAS_OMAP2_SDRC=y
# CONFIG_ARCH_OMAP2 is not set
CONFIG_ARCH_OMAP3=y
# CONFIG_ARCH_OMAP4 is not set
# CONFIG_SOC_OMAP5 is not set
# CONFIG_SOC_OMAP3430 is not set
# CONFIG_SOC_TI81XX is not set
# CONFIG_SOC_AM33XX is not set
CONFIG_OMAP_PACKAGE_CBB=y

Not a mention of CONFIG_SOC_OMAP2430 and  CONFIG_SOC_OMAP3430 did not
get set (while it is not a 3430 but a 3630 I am using). Maybe
CONFIG_ARCH_OMAP3 would have been a better choice then?

 BTW, this is also wrong as OMAP2PLUS is also used to enable AM3xxx and
 TI8xxx, and those platforms don't use generic_interrupt().

It would not break them from what I could see in musb_core.c

musb-isr = generic_interrupt;
status = musb_platform_init(musb); --- isr would be (re)set here
if (status  0)
goto fail1;

if (!musb-isr) {
status = -ENODEV;
goto fail2;
}

The two you mention set their own interrupt routines.
drivers/usb/musb/da8xx.c:   musb-isr = da8xx_musb_interrupt;
drivers/usb/musb/am35x.c:   musb-isr = am35x_musb_interrupt;


Regards,

Philippe
--
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 1/1] musb : remove generic_interrupt and have all drivers define the isr on their own. Remove some unneeded CONFIG_SOC_OMAP_3430 instances

RE: [PATCH 1/1] usb: Include generic_interrupt for OMAP2_PLUS

RE: [PATCH 1/1] usb: Include generic_interrupt for OMAP2_PLUS

Re: [PATCH 1/1] usb: Include generic_interrupt for OMAP2_PLUS

Re: [PATCH 1/1] usb: Include generic_interrupt for OMAP2_PLUS

5 matches

Site Navigation

Mail list logo

Footer information