* ide-dma: fix ide_build_dmatable() for TRM290
@ 2008-09-28 18:41 Sergei Shtylylov
2008-10-03 16:50 ` Bartlomiej Zolnierkiewicz
2008-10-16 12:00 ` Sergei Shtylyov
0 siblings, 2 replies; 6+ messages in thread
From: Sergei Shtylylov @ 2008-09-28 18:41 UTC (permalink / raw)
To: bzolnier; +Cc: linux-ide
Apparently, 'xcount' being 0 does not mean 0 bytes for TRM290; it means 4 bytes,
judging from the code immediately preceding this check. So, we must never try
to "split" the PRD for TRM290.
This is probably never hit anyway -- with the DMA buffers aligned to at least
512 bytes and ATAPI DMA not being used for non block I/O commands...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
---
The patch is against the recent Linus' tree.
drivers/ide/ide-dma.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6/drivers/ide/ide-dma.c
===================================================================
--- linux-2.6.orig/drivers/ide/ide-dma.c
+++ linux-2.6/drivers/ide/ide-dma.c
@@ -211,7 +211,7 @@ int ide_build_dmatable (ide_drive_t *dri
xcount = bcount & 0xffff;
if (is_trm290)
xcount = ((xcount >> 2) - 1) << 16;
- if (xcount == 0x0000) {
+ else if (xcount == 0x0000) {
/*
* Most chipsets correctly interpret a length of 0x0000 as 64KB,
* but at least one (e.g. CS5530) misinterprets it as zero (!).
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: ide-dma: fix ide_build_dmatable() for TRM290
2008-09-28 18:41 ide-dma: fix ide_build_dmatable() for TRM290 Sergei Shtylylov
@ 2008-10-03 16:50 ` Bartlomiej Zolnierkiewicz
2008-10-16 12:00 ` Sergei Shtylyov
1 sibling, 0 replies; 6+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2008-10-03 16:50 UTC (permalink / raw)
To: Sergei Shtylylov; +Cc: linux-ide
On Sunday 28 September 2008, Sergei Shtylylov wrote:
> Apparently, 'xcount' being 0 does not mean 0 bytes for TRM290; it means 4 bytes,
> judging from the code immediately preceding this check. So, we must never try
> to "split" the PRD for TRM290.
>
> This is probably never hit anyway -- with the DMA buffers aligned to at least
> 512 bytes and ATAPI DMA not being used for non block I/O commands...
>
> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
applied, thanks
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: ide-dma: fix ide_build_dmatable() for TRM290
2008-09-28 18:41 ide-dma: fix ide_build_dmatable() for TRM290 Sergei Shtylylov
2008-10-03 16:50 ` Bartlomiej Zolnierkiewicz
@ 2008-10-16 12:00 ` Sergei Shtylyov
2008-10-16 12:20 ` Sergei Shtylyov
1 sibling, 1 reply; 6+ messages in thread
From: Sergei Shtylyov @ 2008-10-16 12:00 UTC (permalink / raw)
To: bzolnier; +Cc: linux-ide
Hello, I wrote:
> Apparently, 'xcount' being 0 does not mean 0 bytes for TRM290; it means 4 bytes,
> judging from the code immediately preceding this check. So, we must never try
> to "split" the PRD for TRM290.
>
> This is probably never hit anyway -- with the DMA buffers aligned to at least
> 512 bytes and ATAPI DMA not being used for non block I/O commands...
>
> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
>
Bart, unfortunately, drivers/ide/ide-dma-sff.c has the same mistake
-- you probably forgot to modify the patch splitting it from
ide-dma.c... :-/
MBR, Sergei
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: ide-dma: fix ide_build_dmatable() for TRM290
2008-10-16 12:00 ` Sergei Shtylyov
@ 2008-10-16 12:20 ` Sergei Shtylyov
2008-10-16 19:48 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 6+ messages in thread
From: Sergei Shtylyov @ 2008-10-16 12:20 UTC (permalink / raw)
To: bzolnier; +Cc: linux-ide
Hello, I wrote:
>> Apparently, 'xcount' being 0 does not mean 0 bytes for TRM290; it
>> means 4 bytes, judging from the code immediately preceding this
>> check. So, we must never try
>> to "split" the PRD for TRM290.
>>
>> This is probably never hit anyway -- with the DMA buffers aligned to
>> at least
>> 512 bytes and ATAPI DMA not being used for non block I/O commands...
>>
>> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
>>
>
> Bart, unfortunately, drivers/ide/ide-dma-sff.c has the same mistake
> -- you probably forgot to modify the patch splitting it from
> ide-dma.c... :-/
Even the one cleaning up ide_build_dmatable() actually...
MBR, Sergei
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: ide-dma: fix ide_build_dmatable() for TRM290
2008-10-16 12:20 ` Sergei Shtylyov
@ 2008-10-16 19:48 ` Bartlomiej Zolnierkiewicz
2008-10-16 22:50 ` Sergei Shtylyov
0 siblings, 1 reply; 6+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2008-10-16 19:48 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: linux-ide
On Thursday 16 October 2008, Sergei Shtylyov wrote:
> Hello, I wrote:
>
> >> Apparently, 'xcount' being 0 does not mean 0 bytes for TRM290; it
> >> means 4 bytes, judging from the code immediately preceding this
> >> check. So, we must never try
> >> to "split" the PRD for TRM290.
> >>
> >> This is probably never hit anyway -- with the DMA buffers aligned to
> >> at least
> >> 512 bytes and ATAPI DMA not being used for non block I/O commands...
> >>
> >> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
> >>
> >
> > Bart, unfortunately, drivers/ide/ide-dma-sff.c has the same mistake
> > -- you probably forgot to modify the patch splitting it from
> > ide-dma.c... :-/
>
> Even the one cleaning up ide_build_dmatable() actually...
Thanks for noticing and sorry for that.
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] ide: re-add TRM290 fix lost during ide_build_dmatable() cleanup
commit 14c123f37187aba0b4e0e893a969efc6820c4170 ("ide: cleanup
ide_build_dmatable()") accidentally reverted TRM290 fix introduced
by commit 22e05b4549bf2405d6aca128540b20cd2dd33f1f ("ide-dma: fix
ide_build_dmatable() for TRM290").
Reported-by: Sergei Shtylylov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/ide/ide-dma-sff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: b/drivers/ide/ide-dma-sff.c
===================================================================
--- a/drivers/ide/ide-dma-sff.c
+++ b/drivers/ide/ide-dma-sff.c
@@ -130,7 +130,7 @@ int ide_build_dmatable(ide_drive_t *driv
xcount = bcount & 0xffff;
if (is_trm290)
xcount = ((xcount >> 2) - 1) << 16;
- if (xcount == 0x0000) {
+ else if (xcount == 0x0000) {
if (count++ >= PRD_ENTRIES)
goto use_pio_instead;
*table++ = cpu_to_le32(0x8000);
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: ide-dma: fix ide_build_dmatable() for TRM290
2008-10-16 19:48 ` Bartlomiej Zolnierkiewicz
@ 2008-10-16 22:50 ` Sergei Shtylyov
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Shtylyov @ 2008-10-16 22:50 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-ide
Hello.
Bartlomiej Zolnierkiewicz wrote:
> Thanks for noticing and sorry for that.
>
Not that it was an important patch... :-)
> From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> Subject: [PATCH] ide: re-add TRM290 fix lost during ide_build_dmatable() cleanup
>
> commit 14c123f37187aba0b4e0e893a969efc6820c4170 ("ide: cleanup
> ide_build_dmatable()") accidentally reverted TRM290 fix introduced
> by commit 22e05b4549bf2405d6aca128540b20cd2dd33f1f ("ide-dma: fix
> ide_build_dmatable() for TRM290").
>
> Reported-by: Sergei Shtylylov <sshtylyov@ru.mvista.com>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
>
Acked-by: Sergei Shtylylov <sshtylyov@ru.mvista.com>
WBR, Sergei
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-10-16 22:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-28 18:41 ide-dma: fix ide_build_dmatable() for TRM290 Sergei Shtylylov
2008-10-03 16:50 ` Bartlomiej Zolnierkiewicz
2008-10-16 12:00 ` Sergei Shtylyov
2008-10-16 12:20 ` Sergei Shtylyov
2008-10-16 19:48 ` Bartlomiej Zolnierkiewicz
2008-10-16 22:50 ` Sergei Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).