[PATCH v3] ARM: davinci: map default_queue to edma channels

[PATCH v3] ARM: davinci: map default_queue to edma channels

[Heiko Schocher]

Default queue is expected to be a low-priority queue.
This way, long transfers on the default queue started
by the codec engine will not cause audio defects.

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: juha.kuikka at gmail.com
Reported-by: juha.kuikka at gmail.com
Acked-by: Rajashekhara, Sudhakar <sudhakar.raj@ti.com>
Cc: linux-mmc at vger.kernel.org
Cc: davinci-linux-open-source at linux.davincidsp.com
Cc: linux-arm-kernel at lists.infradead.org
Cc: Rajashekhara, Sudhakar <sudhakar.raj@ti.com>
Cc: Ido Yariv <ido@wizery.com>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Sergei Shtylyov <sshtylyov@mvista.com>

---
- changes for v2:
  - add comment from Sergei Shtylyov
    add in commit message the commit's summary in parens.
  - add comment from Ido Yariv:
    changed comment and commit message
  - added Acked-by from Rajashekhara, Sudhakar
- changes for v3:
  - add comments from Sekhar Nori <nsekhar@ti.com>:
    - add linux-arm-kernel at lists.infradead.org to Cc
    - simplify and move comment to
      arch/arm/mach-davinci/include/mach/edma.h
    - rework commit message
    - as the subject changed v2 can be found for example here:
      http://linux.davincidsp.com/pipermail/davinci-linux-open-source/2011-December/023606.html
    - checkpatch shows:
total: 0 errors, 0 warnings, 24 lines checked

temp/0001-ARM-davinci-map-default_queue-to-edma-channels.patch has no obvious style problems and is ready for submission.

 arch/arm/mach-davinci/dma.c               |    6 +-----
 arch/arm/mach-davinci/include/mach/edma.h |    5 +++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c
index da90103..fd33919 100644
--- a/arch/arm/mach-davinci/dma.c
+++ b/arch/arm/mach-davinci/dma.c
@@ -1508,12 +1508,8 @@ static int __init edma_probe(struct platform_device *pdev)
 			goto fail;
 		}
 
-		/* Everything lives on transfer controller 1 until otherwise
-		 * specified. This way, long transfers on the low priority queue
-		 * started by the codec engine will not cause audio defects.
-		 */
 		for (i = 0; i < edma_cc[j]->num_channels; i++)
-			map_dmach_queue(j, i, EVENTQ_1);
+			map_dmach_queue(j, i, info[j]->default_queue);
 
 		queue_tc_mapping = info[j]->queue_tc_mapping;
 		queue_priority_mapping = info[j]->queue_priority_mapping;
diff --git a/arch/arm/mach-davinci/include/mach/edma.h b/arch/arm/mach-davinci/include/mach/edma.h
index 20c77f2..7e84c90 100644
--- a/arch/arm/mach-davinci/include/mach/edma.h
+++ b/arch/arm/mach-davinci/include/mach/edma.h
@@ -250,6 +250,11 @@ struct edma_soc_info {
 	unsigned	n_slot;
 	unsigned	n_tc;
 	unsigned	n_cc;
+	/*
+	 * Default queue is expected to be a low-priority queue.
+	 * This way, long transfers on the default queue started
+	 * by the codec engine will not cause audio defects.
+	 */
 	enum dma_event_q	default_queue;
 
 	/* Resource reservation for other cores */
-- 
1.7.7.5

[PATCH v3] ARM: davinci: map default_queue to edma channels

[Nori, Sekhar]

Hi Heiko,

On Thu, Jan 19, 2012 at 12:35:21, Heiko Schocher wrote:
> Default queue is expected to be a low-priority queue.
> This way, long transfers on the default queue started
> by the codec engine will not cause audio defects.
> 
> Signed-off-by: Heiko Schocher <hs@denx.de>

> Signed-off-by: juha.kuikka at gmail.com
> Reported-by: juha.kuikka at gmail.com

Sign-off should include real name, so I changed these
two lines to:

    Signed-off-by: Juha Kuikka <juha.kuikka@gmail.com>
    Reported-by: Juha Kuikka <juha.kuikka@gmail.com>

before applying. Let me know if anyone has objections.

Thanks,
Sekhar

[PATCH v3] ARM: davinci: map default_queue to edma channels

[Heiko Schocher]

Hello Nori,

Nori, Sekhar wrote:
> Hi Heiko,
> 
> On Thu, Jan 19, 2012 at 12:35:21, Heiko Schocher wrote:
>> Default queue is expected to be a low-priority queue.
>> This way, long transfers on the default queue started
>> by the codec engine will not cause audio defects.
>>
>> Signed-off-by: Heiko Schocher <hs@denx.de>
> 
>> Signed-off-by: juha.kuikka at gmail.com
>> Reported-by: juha.kuikka at gmail.com
> 
> Sign-off should include real name, so I changed these
> two lines to:
> 
>     Signed-off-by: Juha Kuikka <juha.kuikka@gmail.com>
>     Reported-by: Juha Kuikka <juha.kuikka@gmail.com>

Thanks!

> before applying. Let me know if anyone has objections.

I saw no objections, so can this patch go in now?

Thanks!

bye,
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[PATCH v3] ARM: davinci: map default_queue to edma channels

[Nori, Sekhar]

Hi Heiko,

On Wed, Feb 01, 2012 at 12:10:24, Heiko Schocher wrote:
> Hello Nori,
> 
> Nori, Sekhar wrote:
> > Hi Heiko,
> > 
> > On Thu, Jan 19, 2012 at 12:35:21, Heiko Schocher wrote:
> >> Default queue is expected to be a low-priority queue.
> >> This way, long transfers on the default queue started
> >> by the codec engine will not cause audio defects.
> >>
> >> Signed-off-by: Heiko Schocher <hs@denx.de>
> > 
> >> Signed-off-by: juha.kuikka at gmail.com
> >> Reported-by: juha.kuikka at gmail.com
> > 
> > Sign-off should include real name, so I changed these
> > two lines to:
> > 
> >     Signed-off-by: Juha Kuikka <juha.kuikka@gmail.com>
> >     Reported-by: Juha Kuikka <juha.kuikka@gmail.com>
> 
> Thanks!
> 
> > before applying. Let me know if anyone has objections.
> 
> I saw no objections, so can this patch go in now?

Queuing this for v3.4. Thanks for the reminder.

Regards,
Sekhar