Re: [patch 07/16] ide-disk: Fix LBA8 DMA

Re: [patch 07/16] ide-disk: Fix LBA8 DMA

[Chuck Ebbert]

On Wed, 25 May 2005 at 03:57:14 -0400, Chuck Ebbert wrote:

> On Mon, 23 May 2005 at 16:24:14 -0700, Chris Wright wrote:
> 
> > --- linux-2.6.11.10.orig/drivers/ide/ide-disk.c       2005-05-16 10:50:31.000000000 -0700
> > +++ linux-2.6.11.10/drivers/ide/ide-disk.c    2005-05-20 09:36:31.933319224 -0700
> > @@ -133,6 +133,8 @@
> >       if (hwif->no_lba48_dma && lba48 && dma) {
> >               if (block + rq->nr_sectors > 1ULL << 28)
> 
>                                            ^
> 
>   Maybe I'm an idiot, but shouldn't that be ">="?  Either that or it should be
> comparing to (1ULL < 28 - 1)?


  Oops, I forgot this was in my outbox and sent it before review.  This code
is fine... (block + rq->nr_sectors) is one past the actual end of the read.


> >                       dma = 0;
> > +               else
> > +                       lba48 = 0;
> 
>    ^^^^^^^^^^^^^^^^^^^^^^^
> 
>   Spaces instead of tabs?

  But the patch really does seem to be tabdamaged...




--
Chuck

Re: [patch 07/16] ide-disk: Fix LBA8 DMA

[Chris Wright]

* Chuck Ebbert (76306.1226@compuserve.com) wrote:
> > > +               else
> > > +                       lba48 = 0;
> > 
> >    ^^^^^^^^^^^^^^^^^^^^^^^
> > 
> >   Spaces instead of tabs?
> 
>   But the patch really does seem to be tabdamaged...
> 

Yes, I'll refresh, thanks.
-chris

Re: [patch 07/16] ide-disk: Fix LBA8 DMA

[Chuck Ebbert]

On Mon, 23 May 2005 at 16:24:14 -0700, Chris Wright wrote:

> --- linux-2.6.11.10.orig/drivers/ide/ide-disk.c       2005-05-16 10:50:31.000000000 -0700
> +++ linux-2.6.11.10/drivers/ide/ide-disk.c    2005-05-20 09:36:31.933319224 -0700
> @@ -133,6 +133,8 @@
>       if (hwif->no_lba48_dma && lba48 && dma) {
>               if (block + rq->nr_sectors > 1ULL << 28)

                                           ^

  Maybe I'm an idiot, but shouldn't that be ">="?  Either that or it should be
comparing to (1ULL < 28 - 1)?

>                       dma = 0;
> +               else
> +                       lba48 = 0;

   ^^^^^^^^^^^^^^^^^^^^^^^

  Spaces instead of tabs?

>       }
>  
>       if (!dma) {


--
Chuck

[00/16] -stable review

[Chris Wright]

This is the start of the stable review cycle for the 2.6.11.11 release.  There
are 16 patches in this series, all will be posted as a response to this one.
If anyone has any issues with these being applied, please let us know.  If
anyone is a maintainer of the proper subsystem, and wants to add a
signed-off-by: line to the patch, please respond with it.

These patches are sent out with a number of different people on the Cc: line.
If you wish to be a reviewer, please email stable@kernel.org to add your name to
the list.  If you want to be off the reviewer list, also email us.

Responses should be made by Wed, May 25, 23:00 UTC.  Anything received after
that time, might be too late.

thanks,

the -stable release team (i.e. the ones wearing the joker hat in the corner...)

[patch 07/16] ide-disk: Fix LBA8 DMA

[Chris Wright]

From: Daniel Drake <dsd@gentoo.org>

This is from Gentoo's 2.6.11 patchset. A problem was introduced in 2.6.10
where some users could not enable DMA on their disks (particularly ALi15x3
users). This was a small mistake with the no_lba48_dma flag.

I can't find the exact commit but this is definately included in 2.6.12-rc4.

From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>


---
 drivers/ide/ide-disk.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- linux-2.6.11.10.orig/drivers/ide/ide-disk.c	2005-05-16 10:50:31.000000000 -0700
+++ linux-2.6.11.10/drivers/ide/ide-disk.c	2005-05-20 09:36:31.933319224 -0700
@@ -133,6 +133,8 @@
 	if (hwif->no_lba48_dma && lba48 && dma) {
 		if (block + rq->nr_sectors > 1ULL << 28)
 			dma = 0;
+               else
+                       lba48 = 0;
 	}
 
 	if (!dma) {
@@ -146,7 +148,7 @@
 	/* FIXME: SELECT_MASK(drive, 0) ? */
 
 	if (drive->select.b.lba) {
-		if (drive->addressing == 1) {
+               if (lba48) {
 			task_ioreg_t tasklets[10];
 
 			pr_debug("%s: LBA=0x%012llx\n", drive->name, block);