linux 2.5.4-pre3 and IDE changes

linux 2.5.4-pre3 and IDE changes

[John Weber]

The address member of struct scatterlist appears to have been changed to 
dma_address.

A simple s/\.address/\.dma_address/ should fix this compile error.

ide-dma.c: In function `ide_raw_build_sglist':
ide-dma.c:269: structure has no member named `address'
ide-dma.c:276: structure has no member named `address'
make[3]: *** [ide-dma.o] Error 1
make[3]: Leaving directory `/usr/src/linux-2.5.4/drivers/ide'
make[2]: *** [first_rule] Error 2
make[2]: Leaving directory `/usr/src/linux-2.5.4/drivers/ide'
make[1]: *** [_subdir_ide] Error 2
make[1]: Leaving directory `/usr/src/linux-2.5.4/drivers'
make: *** [_dir_drivers] Error 2

Re: linux 2.5.4-pre3 and IDE changes

[flaniganr]

>>>>> "John" == John Weber <weber@nyc.rr.com> writes:

    John> The address member of struct scatterlist appears to have
    John> been changed to dma_address.

was is changed to dma_address or was it
removed completely?

struct scatterlist {
-       /* This will disappear in 2.5.x */
-       char *address;

ryan
-- 

Re: linux 2.5.4-pre3 and IDE changes

[Jeff Garzik]

[-- Attachment #1: Type: text/plain, Size: 926 bytes --]

John Weber wrote:
> 
> The address member of struct scatterlist appears to have been changed to
> dma_address.
> 
> A simple s/\.address/\.dma_address/ should fix this compile error.
> 
> ide-dma.c: In function `ide_raw_build_sglist':
> ide-dma.c:269: structure has no member named `address'
> ide-dma.c:276: structure has no member named `address'
> make[3]: *** [ide-dma.o] Error 1
> make[3]: Leaving directory `/usr/src/linux-2.5.4/drivers/ide'
> make[2]: *** [first_rule] Error 2
> make[2]: Leaving directory `/usr/src/linux-2.5.4/drivers/ide'
> make[1]: *** [_subdir_ide] Error 2
> make[1]: Leaving directory `/usr/src/linux-2.5.4/drivers'
> make: *** [_dir_drivers] Error 2

According to another poster on lkml, the attached patch from Jens is
needed.

-- 
Jeff Garzik      | "I went through my candy like hot oatmeal
Building 1024    |  through an internally-buttered weasel."
MandrakeSoft     |             - goats.com

[-- Attachment #2: ide-dma.patch --]
[-- Type: text/plain, Size: 779 bytes --]

diff -Nru a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
--- a/drivers/ide/ide-dma.c	Thu Feb  7 09:44:56 2002
+++ b/drivers/ide/ide-dma.c	Thu Feb  7 09:44:56 2002
@@ -266,14 +266,16 @@
 #if 1	
 	if (sector_count > 128) {
 		memset(&sg[nents], 0, sizeof(*sg));
-		sg[nents].address = virt_addr;
+		sg[nents].page = virt_to_page(virt_addr);
+		sg[nents].offset = (unsigned long) virt_addr & ~PAGE_MASK;
 		sg[nents].length = 128  * SECTOR_SIZE;
 		nents++;
 		virt_addr = virt_addr + (128 * SECTOR_SIZE);
 		sector_count -= 128;
 	}
 	memset(&sg[nents], 0, sizeof(*sg));
-	sg[nents].address = virt_addr;
+	sg[nents].page = virt_to_page(virt_addr);
+	sg[nents].offset = (unsigned long) virt_addr & ~PAGE_MASK;
 	sg[nents].length =  sector_count  * SECTOR_SIZE;
 	nents++;
  #endif

Re: linux 2.5.4-pre3 and IDE changes

[Andre Hedrick]

I repeat that is a diagnostic layer and is to never be called from the
kernel, it is a user-space only and will go away.

On Thu, 7 Feb 2002, John Weber wrote:

> The address member of struct scatterlist appears to have been changed to 
> dma_address.
> 
> A simple s/\.address/\.dma_address/ should fix this compile error.
> 
> ide-dma.c: In function `ide_raw_build_sglist':
> ide-dma.c:269: structure has no member named `address'
> ide-dma.c:276: structure has no member named `address'
> make[3]: *** [ide-dma.o] Error 1
> make[3]: Leaving directory `/usr/src/linux-2.5.4/drivers/ide'
> make[2]: *** [first_rule] Error 2
> make[2]: Leaving directory `/usr/src/linux-2.5.4/drivers/ide'
> make[1]: *** [_subdir_ide] Error 2
> make[1]: Leaving directory `/usr/src/linux-2.5.4/drivers'
> make: *** [_dir_drivers] Error 2
> 
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 

Andre Hedrick
Linux Disk Certification Project                Linux ATA Development

Re: linux 2.5.4-pre3 and IDE changes

[Skip Ford]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Andre Hedrick wrote:
> 
> I repeat that is a diagnostic layer and is to never be called from the
> kernel, it is a user-space only and will go away.

Maybe so, but I got pre3 to boot finally with that patch and it works
fine.

- -- 
Skip  ID: 0x7EDDDB0A
-----BEGIN PGP SIGNATURE-----

iEYEARECAAYFAjxja3oACgkQBMKxVH7d2wpoqQCgmvuwyMF+NtjgFP3zhZguLjMb
uiEAniwZm7fifpuvWjIdhUCNcbnI8JVM
=ACIo
-----END PGP SIGNATURE-----

Re: linux 2.5.4-pre3 and IDE changes

[Vojtech Pavlik]

On Thu, Feb 07, 2002 at 07:54:09PM -0800, Andre Hedrick wrote:
> 
> I repeat that is a diagnostic layer and is to never be called from the
> kernel, it is a user-space only and will go away.

But it should compile nevertheless, shouldn't it?

> 
> On Thu, 7 Feb 2002, John Weber wrote:
> 
> > The address member of struct scatterlist appears to have been changed to 
> > dma_address.
> > 
> > A simple s/\.address/\.dma_address/ should fix this compile error.
> > 
> > ide-dma.c: In function `ide_raw_build_sglist':
> > ide-dma.c:269: structure has no member named `address'
> > ide-dma.c:276: structure has no member named `address'
> > make[3]: *** [ide-dma.o] Error 1
> > make[3]: Leaving directory `/usr/src/linux-2.5.4/drivers/ide'
> > make[2]: *** [first_rule] Error 2
> > make[2]: Leaving directory `/usr/src/linux-2.5.4/drivers/ide'
> > make[1]: *** [_subdir_ide] Error 2
> > make[1]: Leaving directory `/usr/src/linux-2.5.4/drivers'
> > make: *** [_dir_drivers] Error 2
> > 
> > -
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at  http://www.tux.org/lkml/
> > 
> 
> Andre Hedrick
> Linux Disk Certification Project                Linux ATA Development
> 
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

-- 
Vojtech Pavlik
SuSE Labs

Re: linux 2.5.4-pre3 and IDE changes

[Skip Ford]

[-- Attachment #1: Type: text/plain, Size: 905 bytes --]

John Weber wrote:
> The address member of struct scatterlist appears to have been changed to 
> dma_address.
> 
> A simple s/\.address/\.dma_address/ should fix this compile error.
> 
> ide-dma.c: In function `ide_raw_build_sglist':
> ide-dma.c:269: structure has no member named `address'
> ide-dma.c:276: structure has no member named `address'
> make[3]: *** [ide-dma.o] Error 1
> make[3]: Leaving directory `/usr/src/linux-2.5.4/drivers/ide'
> make[2]: *** [first_rule] Error 2
> make[2]: Leaving directory `/usr/src/linux-2.5.4/drivers/ide'
> make[1]: *** [_subdir_ide] Error 2
> make[1]: Leaving directory `/usr/src/linux-2.5.4/drivers'
> make: *** [_dir_drivers] Error 2

This is the patch that Jens posted, though he posted it before this
kernel was even released.  His post said it fixed a compile error
in pre2, but pre2 compiled fine.  It _does_ fix the compile error in
pre3 though.

-- 
Skip

[-- Attachment #2: ide-dma.patch --]
[-- Type: text/plain, Size: 779 bytes --]

diff -Nru a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
--- a/drivers/ide/ide-dma.c	Thu Feb  7 09:44:56 2002
+++ b/drivers/ide/ide-dma.c	Thu Feb  7 09:44:56 2002
@@ -266,14 +266,16 @@
 #if 1	
 	if (sector_count > 128) {
 		memset(&sg[nents], 0, sizeof(*sg));
-		sg[nents].address = virt_addr;
+		sg[nents].page = virt_to_page(virt_addr);
+		sg[nents].offset = (unsigned long) virt_addr & ~PAGE_MASK;
 		sg[nents].length = 128  * SECTOR_SIZE;
 		nents++;
 		virt_addr = virt_addr + (128 * SECTOR_SIZE);
 		sector_count -= 128;
 	}
 	memset(&sg[nents], 0, sizeof(*sg));
-	sg[nents].address = virt_addr;
+	sg[nents].page = virt_to_page(virt_addr);
+	sg[nents].offset = (unsigned long) virt_addr & ~PAGE_MASK;
 	sg[nents].length =  sector_count  * SECTOR_SIZE;
 	nents++;
  #endif

Re: linux 2.5.4-pre3 and IDE changes

[Dave Jones]

On Thu, 7 Feb 2002, Skip Ford wrote:

> This is the patch that Jens posted, though he posted it before this
> kernel was even released.  His post said it fixed a compile error
> in pre2, but pre2 compiled fine.  It _does_ fix the compile error in
> pre3 though.

As more developers start pulling Linus' bitkeeper tree, you'll probably
see more bugs getting fixed before they're reported 8-)

-- 
| Dave Jones.        http://www.codemonkey.org.uk
| SuSE Labs

Re: linux 2.5.4-pre3 and IDE changes

[Anton Altaparmakov]

At 04:10 08/02/02, Dave Jones wrote:
>On Thu, 7 Feb 2002, Skip Ford wrote:
>
> > This is the patch that Jens posted, though he posted it before this
> > kernel was even released.  His post said it fixed a compile error
> > in pre2, but pre2 compiled fine.  It _does_ fix the compile error in
> > pre3 though.
>
>As more developers start pulling Linus' bitkeeper tree, you'll probably
>see more bugs getting fixed before they're reported 8-)

Ah, but taking this one step further, most people will never see the bugs 
as the fixes will be applied by Linus before he releases the pending pre 
kernel so the pre kernel won't have the bug. (-8

Only the bk changelog will tell us they ever existed... (-;

Anton


-- 
   "I've not lost my mind. It's backed up on tape somewhere." - Unknown
-- 
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Linux NTFS Maintainer / WWW: http://linux-ntfs.sf.net/
ICQ: 8561279 / WWW: http://www-stu.christs.cam.ac.uk/~aia21/

Re: linux 2.5.4-pre3 and IDE changes

[John Weber]

Skip Ford wrote:

> John Weber wrote:
> 
>>The address member of struct scatterlist appears to have been changed to 
>>dma_address.
>>
>>A simple s/\.address/\.dma_address/ should fix this compile error.
>>
>>ide-dma.c: In function `ide_raw_build_sglist':
>>ide-dma.c:269: structure has no member named `address'
>>ide-dma.c:276: structure has no member named `address'
>>make[3]: *** [ide-dma.o] Error 1
>>make[3]: Leaving directory `/usr/src/linux-2.5.4/drivers/ide'
>>make[2]: *** [first_rule] Error 2
>>make[2]: Leaving directory `/usr/src/linux-2.5.4/drivers/ide'
>>make[1]: *** [_subdir_ide] Error 2
>>make[1]: Leaving directory `/usr/src/linux-2.5.4/drivers'
>>make: *** [_dir_drivers] Error 2
>>
> 
> This is the patch that Jens posted, though he posted it before this
> kernel was even released.  His post said it fixed a compile error
> in pre2, but pre2 compiled fine.  It _does_ fix the compile error in
> pre3 though.


I thought I was going crazy.  Thanks!

What is the dma_address member for?