| Message ID | 1389927565-22477-2-git-send-email-voice.shen@atmel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 17/01/2014 03:59, Bo Shen : > When the SoC is earlier than sama5d3 SoC, which have the same number > endpoints and DMAs. However for sama5d3 SoC, it has different number > for endpoints and DMAs. So, define USBA_NR_DMAs for DMA channels > > Signed-off-by: Bo Shen <voice.shen@atmel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > > drivers/usb/gadget/atmel_usba_udc.c | 2 +- > drivers/usb/gadget/atmel_usba_udc.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c > index 7e67a81..5cded1c 100644 > --- a/drivers/usb/gadget/atmel_usba_udc.c > +++ b/drivers/usb/gadget/atmel_usba_udc.c > @@ -1661,7 +1661,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid) > if (dma_status) { > int i; > > - for (i = 1; i < USBA_NR_ENDPOINTS; i++) > + for (i = 1; i < USBA_NR_DMAS; i++) > if (dma_status & (1 << i)) > usba_dma_irq(udc, &udc->usba_ep[i]); > } > diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h > index 2922db5..a70706e 100644 > --- a/drivers/usb/gadget/atmel_usba_udc.h > +++ b/drivers/usb/gadget/atmel_usba_udc.h > @@ -210,7 +210,7 @@ > #define USBA_FIFO_BASE(x) ((x) << 16) > > /* Synth parameters */ > -#define USBA_NR_ENDPOINTS 7 > +#define USBA_NR_DMAS 7 > > #define EP0_FIFO_SIZE 64 > #define EP0_EPT_SIZE USBA_EPT_SIZE_64 >
On Fri, Jan 17, 2014 at 10:59:25AM +0800, Bo Shen wrote: > When the SoC is earlier than sama5d3 SoC, which have the same number > endpoints and DMAs. However for sama5d3 SoC, it has different number > for endpoints and DMAs. So, define USBA_NR_DMAs for DMA channels > > Signed-off-by: Bo Shen <voice.shen@atmel.com> > --- > > drivers/usb/gadget/atmel_usba_udc.c | 2 +- > drivers/usb/gadget/atmel_usba_udc.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c > index 7e67a81..5cded1c 100644 > --- a/drivers/usb/gadget/atmel_usba_udc.c > +++ b/drivers/usb/gadget/atmel_usba_udc.c > @@ -1661,7 +1661,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid) > if (dma_status) { > int i; > > - for (i = 1; i < USBA_NR_ENDPOINTS; i++) > + for (i = 1; i < USBA_NR_DMAS; i++) > if (dma_status & (1 << i)) > usba_dma_irq(udc, &udc->usba_ep[i]); > } > diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h > index 2922db5..a70706e 100644 > --- a/drivers/usb/gadget/atmel_usba_udc.h > +++ b/drivers/usb/gadget/atmel_usba_udc.h > @@ -210,7 +210,7 @@ > #define USBA_FIFO_BASE(x) ((x) << 16) > > /* Synth parameters */ > -#define USBA_NR_ENDPOINTS 7 > +#define USBA_NR_DMAS 7 what's the difference ? You just renamed this macro. Also, please clarify a bit your commit log.
Hi Felipe Balbi, On 02/19/2014 12:19 AM, Felipe Balbi wrote: > On Fri, Jan 17, 2014 at 10:59:25AM +0800, Bo Shen wrote: >> When the SoC is earlier than sama5d3 SoC, which have the same number >> endpoints and DMAs. However for sama5d3 SoC, it has different number >> for endpoints and DMAs. So, define USBA_NR_DMAs for DMA channels >> >> Signed-off-by: Bo Shen <voice.shen@atmel.com> >> --- >> >> drivers/usb/gadget/atmel_usba_udc.c | 2 +- >> drivers/usb/gadget/atmel_usba_udc.h | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c >> index 7e67a81..5cded1c 100644 >> --- a/drivers/usb/gadget/atmel_usba_udc.c >> +++ b/drivers/usb/gadget/atmel_usba_udc.c >> @@ -1661,7 +1661,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid) >> if (dma_status) { >> int i; >> >> - for (i = 1; i < USBA_NR_ENDPOINTS; i++) >> + for (i = 1; i < USBA_NR_DMAS; i++) >> if (dma_status & (1 << i)) >> usba_dma_irq(udc, &udc->usba_ep[i]); >> } >> diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h >> index 2922db5..a70706e 100644 >> --- a/drivers/usb/gadget/atmel_usba_udc.h >> +++ b/drivers/usb/gadget/atmel_usba_udc.h >> @@ -210,7 +210,7 @@ >> #define USBA_FIFO_BASE(x) ((x) << 16) >> >> /* Synth parameters */ >> -#define USBA_NR_ENDPOINTS 7 >> +#define USBA_NR_DMAS 7 > > what's the difference ? You just renamed this macro. Also, please > clarify a bit your commit log. As commit message said, the SoC before sama5d3, the endpoint number is the same as DMA channel number, so use endpoints definition for DMA channel number, however after sama5d3, the endpoints is not the same as DMA channel, so use DMA micro for DMA channels. Best Regards, Bo Shen
On Wed, Feb 19, 2014 at 09:14:58AM +0800, Bo Shen wrote: > Hi Felipe Balbi, > > On 02/19/2014 12:19 AM, Felipe Balbi wrote: > >On Fri, Jan 17, 2014 at 10:59:25AM +0800, Bo Shen wrote: > >>When the SoC is earlier than sama5d3 SoC, which have the same number > >>endpoints and DMAs. However for sama5d3 SoC, it has different number > >>for endpoints and DMAs. So, define USBA_NR_DMAs for DMA channels > >> > >>Signed-off-by: Bo Shen <voice.shen@atmel.com> > >>--- > >> > >> drivers/usb/gadget/atmel_usba_udc.c | 2 +- > >> drivers/usb/gadget/atmel_usba_udc.h | 2 +- > >> 2 files changed, 2 insertions(+), 2 deletions(-) > >> > >>diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c > >>index 7e67a81..5cded1c 100644 > >>--- a/drivers/usb/gadget/atmel_usba_udc.c > >>+++ b/drivers/usb/gadget/atmel_usba_udc.c > >>@@ -1661,7 +1661,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid) > >> if (dma_status) { > >> int i; > >> > >>- for (i = 1; i < USBA_NR_ENDPOINTS; i++) > >>+ for (i = 1; i < USBA_NR_DMAS; i++) > >> if (dma_status & (1 << i)) > >> usba_dma_irq(udc, &udc->usba_ep[i]); > >> } > >>diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h > >>index 2922db5..a70706e 100644 > >>--- a/drivers/usb/gadget/atmel_usba_udc.h > >>+++ b/drivers/usb/gadget/atmel_usba_udc.h > >>@@ -210,7 +210,7 @@ > >> #define USBA_FIFO_BASE(x) ((x) << 16) > >> > >> /* Synth parameters */ > >>-#define USBA_NR_ENDPOINTS 7 > >>+#define USBA_NR_DMAS 7 > > > >what's the difference ? You just renamed this macro. Also, please > >clarify a bit your commit log. > > As commit message said, the SoC before sama5d3, the endpoint number > is the same as DMA channel number, so use endpoints definition for > DMA channel number, however after sama5d3, the endpoints is not the > same as DMA channel, so use DMA micro for DMA channels. which means you're just renaming the macro for the sake of clarity. That's fine, just needs to be clearer in commit message.
On 02/19/2014 09:22 AM, Felipe Balbi wrote: > On Wed, Feb 19, 2014 at 09:14:58AM +0800, Bo Shen wrote: >> Hi Felipe Balbi, >> >> On 02/19/2014 12:19 AM, Felipe Balbi wrote: >>> On Fri, Jan 17, 2014 at 10:59:25AM +0800, Bo Shen wrote: >>>> When the SoC is earlier than sama5d3 SoC, which have the same number >>>> endpoints and DMAs. However for sama5d3 SoC, it has different number >>>> for endpoints and DMAs. So, define USBA_NR_DMAs for DMA channels >>>> >>>> Signed-off-by: Bo Shen <voice.shen@atmel.com> >>>> --- >>>> >>>> drivers/usb/gadget/atmel_usba_udc.c | 2 +- >>>> drivers/usb/gadget/atmel_usba_udc.h | 2 +- >>>> 2 files changed, 2 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c >>>> index 7e67a81..5cded1c 100644 >>>> --- a/drivers/usb/gadget/atmel_usba_udc.c >>>> +++ b/drivers/usb/gadget/atmel_usba_udc.c >>>> @@ -1661,7 +1661,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid) >>>> if (dma_status) { >>>> int i; >>>> >>>> - for (i = 1; i < USBA_NR_ENDPOINTS; i++) >>>> + for (i = 1; i < USBA_NR_DMAS; i++) >>>> if (dma_status & (1 << i)) >>>> usba_dma_irq(udc, &udc->usba_ep[i]); >>>> } >>>> diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h >>>> index 2922db5..a70706e 100644 >>>> --- a/drivers/usb/gadget/atmel_usba_udc.h >>>> +++ b/drivers/usb/gadget/atmel_usba_udc.h >>>> @@ -210,7 +210,7 @@ >>>> #define USBA_FIFO_BASE(x) ((x) << 16) >>>> >>>> /* Synth parameters */ >>>> -#define USBA_NR_ENDPOINTS 7 >>>> +#define USBA_NR_DMAS 7 >>> >>> what's the difference ? You just renamed this macro. Also, please >>> clarify a bit your commit log. >> >> As commit message said, the SoC before sama5d3, the endpoint number >> is the same as DMA channel number, so use endpoints definition for >> DMA channel number, however after sama5d3, the endpoints is not the >> same as DMA channel, so use DMA micro for DMA channels. > > which means you're just renaming the macro for the sake of clarity. > That's fine, just needs to be clearer in commit message. Thanks, I will send v2 to make the commit message more clearer. Best Regards, Bo Shen
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index 7e67a81..5cded1c 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -1661,7 +1661,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid) if (dma_status) { int i; - for (i = 1; i < USBA_NR_ENDPOINTS; i++) + for (i = 1; i < USBA_NR_DMAS; i++) if (dma_status & (1 << i)) usba_dma_irq(udc, &udc->usba_ep[i]); } diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h index 2922db5..a70706e 100644 --- a/drivers/usb/gadget/atmel_usba_udc.h +++ b/drivers/usb/gadget/atmel_usba_udc.h @@ -210,7 +210,7 @@ #define USBA_FIFO_BASE(x) ((x) << 16) /* Synth parameters */ -#define USBA_NR_ENDPOINTS 7 +#define USBA_NR_DMAS 7 #define EP0_FIFO_SIZE 64 #define EP0_EPT_SIZE USBA_EPT_SIZE_64
When the SoC is earlier than sama5d3 SoC, which have the same number endpoints and DMAs. However for sama5d3 SoC, it has different number for endpoints and DMAs. So, define USBA_NR_DMAs for DMA channels Signed-off-by: Bo Shen <voice.shen@atmel.com> --- drivers/usb/gadget/atmel_usba_udc.c | 2 +- drivers/usb/gadget/atmel_usba_udc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)