Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-01 08:31:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

dtc2278: fix ->io_32bit handling

Browse Source 
On DTC2278 32-bit I/O has to be enabled for both devices on the port
so always enable it during init time and disallow further changes.

Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-02-02 19:56:28 +01:00
parent ae9458d6a0
commit 36e9dc469b
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ide/ide.c
View File

@ -791,10 +791,6 @@ int set_io_32bit(ide_drive_t *drive, int arg)
return -EBUSY; return -EBUSY;
drive->io_32bit = arg; drive->io_32bit = arg;
#ifdef CONFIG_BLK_DEV_DTC2278
if (HWIF(drive)->chipset == ide_dtc2278)
HWIF(drive)->drives[!drive->select.b.unit].io_32bit = arg;
#endif /* CONFIG_BLK_DEV_DTC2278 */
spin_unlock_irq(&ide_lock); spin_unlock_irq(&ide_lock);

12
drivers/ide/legacy/dtc2278.c
View File

@ -84,12 +84,6 @@ static void dtc2278_set_pio_mode(ide_drive_t *drive, const u8 pio)
/* Actually we do - there is a data sheet available for the /* Actually we do - there is a data sheet available for the
Winbond but does anyone actually care */ Winbond but does anyone actually care */
} }
/*
* 32bit I/O has to be enabled for *both* drives at the same time.
*/
drive->io_32bit = 1;
HWIF(drive)->drives[!drive->select.b.unit].io_32bit = 1;
} }
static int __init dtc2278_probe(void) static int __init dtc2278_probe(void)
@ -123,18 +117,24 @@ static int __init dtc2278_probe(void)
local_irq_restore(flags); local_irq_restore(flags);
hwif->serialized = 1; hwif->serialized = 1;
hwif->no_io_32bit = 1; /* disallow ->io_32bit changes */
hwif->chipset = ide_dtc2278; hwif->chipset = ide_dtc2278;
hwif->pio_mask = ATA_PIO4; hwif->pio_mask = ATA_PIO4;
hwif->set_pio_mode = &dtc2278_set_pio_mode; hwif->set_pio_mode = &dtc2278_set_pio_mode;
hwif->drives[0].no_unmask = 1; hwif->drives[0].no_unmask = 1;
hwif->drives[1].no_unmask = 1; hwif->drives[1].no_unmask = 1;
hwif->drives[0].io_32bit = 1;
hwif->drives[1].io_32bit = 1;
hwif->mate = mate; hwif->mate = mate;
mate->serialized = 1; mate->serialized = 1;
mate->no_io_32bit = 1;
mate->chipset = ide_dtc2278; mate->chipset = ide_dtc2278;
mate->pio_mask = ATA_PIO4; mate->pio_mask = ATA_PIO4;
mate->drives[0].no_unmask = 1; mate->drives[0].no_unmask = 1;
mate->drives[1].no_unmask = 1; mate->drives[1].no_unmask = 1;
mate->drives[0].io_32bit = 1;
mate->drives[1].io_32bit = 1;
mate->mate = hwif; mate->mate = hwif;
mate->channel = 1; mate->channel = 1;