UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] Fix sgiioc4 DMA timeout problem with 64KiB s/g elements. 

Problem caused by the fact that the code used to only pick the low 16
bits of the bytecount.  That may be how some controllers act on it (byte
count of 0 means 0x10000), but not for this particular hardware.

Signed-off-by: Jeremy Higdon <jeremy@sgi.com>
Acked-by: Jes Sorensen <jes@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jeremy Higdon 2006-02-02 00:00:46 -08:00 committed by Linus Torvalds
parent b4103333d7
commit 0271fc2db6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/ide/pci/sgiioc4.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. * Copyright (c) 2003-2006 Silicon Graphics, Inc. All Rights Reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License * under the terms of version 2 of the GNU General Public License
@ -510,7 +510,7 @@ sgiioc4_build_dma_table(ide_drive_t * drive, struct request *rq, int ddir)
drive->name); drive->name);
goto use_pio_instead; goto use_pio_instead;
} else { } else {
u32 xcount, bcount = u32 bcount =
0x10000 - (cur_addr & 0xffff); 0x10000 - (cur_addr & 0xffff);
if (bcount > cur_len) if (bcount > cur_len)
@ -525,8 +525,7 @@ sgiioc4_build_dma_table(ide_drive_t * drive, struct request *rq, int ddir)
*table = 0x0; *table = 0x0;
table++; table++;
xcount = bcount & 0xffff; *table = cpu_to_be32(bcount);
*table = cpu_to_be32(xcount);
table++; table++;
cur_addr += bcount; cur_addr += bcount;
@ -680,7 +679,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t * d)
return -EIO; return -EIO;
/* Create /proc/ide entries */ /* Create /proc/ide entries */
create_proc_ide_interfaces(); create_proc_ide_interfaces();
return 0; return 0;
} }