Apply this instead of ac6 to fix the broken dma_base problem referred to
below.
The bus speed is, however, still reported at 33MHz where it used, in
2.3.99pre3,
to be reported as 40MHz. Additionally and irrespective of this measure,
I can no
longer mount udf CDs on /dev/hdc (ide1).
diff -u --new-file --recursive --exclude-from /usr/src/exclude
linux.vanilla/drivers/ide/ide-dma.c linux.ac/drivers/ide/ide-dma.c
--- linux.vanilla/drivers/ide/ide-dma.c Thu May 25 17:38:11 2000
+++ linux.ac/drivers/ide/ide-dma.c Tue May 30 15:17:17 2000
@@ -570,8 +570,8 @@
if (hwif->mate && hwif->mate->dma_base) {
dma_base = hwif->mate->dma_base - (hwif->channel ? 0 : 8);
} else {
- dma_base = dev->resource[4].start;
- if (!dma_base || dma_base == PCI_BASE_ADDRESS_IO_MASK) {
+ dma_base = pci_resource_start(dev, 4);
+ if (!dma_base /*|| (pci_resource_flags(dev, 4) & IORESOURCE_IO)*/) {
/* remove call to pci_resource_flags */
printk("%s: dma_base is invalid (0x%04lx)\n", name, dma_base);
dma_base = 0;
}
syslog from 2.4.0test1-ac6 (patch above fixes the invalid notice but
does not return the
bus speed to 40 MHz)
May 31 23:49:15 turbocharged kernel: ide: Assuming 33MHz system bus
speed for PIO modes; override with idebus=xx
May 31 23:49:15 turbocharged kernel: PIIX4: IDE controller on PCI bus 00
dev 39
May 31 23:49:15 turbocharged kernel: PIIX4: chipset revision 1
May 31 23:49:15 turbocharged kernel: PIIX4: not 100% native mode: will
probe irqs later
May 31 23:49:15 turbocharged kernel: PIIX4: dma_base is invalid (0xfcf0)
May 31 23:49:15 turbocharged kernel: ide0: PIIX4 Bus-Master DMA disabled
(BIOS)
May 31 23:49:15 turbocharged kernel: PIIX4: dma_base is invalid (0xfcf0)
May 31 23:49:15 turbocharged kernel: ide1: PIIX4 Bus-Master DMA disabled
(BIOS)
May 31 23:49:15 turbocharged kernel: hda: IBM-DBCA-206480, ATA DISK
drive
May 31 23:49:15 turbocharged kernel: hdc: TOSHIBA DVD-ROM SD-C2202,
ATAPI CDROM drive
May 31 23:49:15 turbocharged kernel: ide0 at 0x1f0-0x1f7,0x3f6 on irq 14
May 31 23:49:15 turbocharged kernel: ide1 at 0x170-0x177,0x376 on irq 15
Richard
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Jun 07 2000 - 21:00:24 EST