it8213/piix/slc90e66: "de-couple" PIO and UDMA modes

Don't force PIO4 when programming UDMA mode (suggested by Sergei).
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 3135469e
...@@ -93,7 +93,7 @@ static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed) ...@@ -93,7 +93,7 @@ static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed)
int w_flag = 0x10 << drive->dn; int w_flag = 0x10 << drive->dn;
int u_speed = 0; int u_speed = 0;
u16 reg4042, reg4a; u16 reg4042, reg4a;
u8 reg48, reg54, reg55, pio; u8 reg48, reg54, reg55;
pci_read_config_word(dev, maslave, &reg4042); pci_read_config_word(dev, maslave, &reg4042);
pci_read_config_byte(dev, 0x48, &reg48); pci_read_config_byte(dev, 0x48, &reg48);
...@@ -134,10 +134,9 @@ static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed) ...@@ -134,10 +134,9 @@ static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed)
pci_write_config_byte(dev, 0x54, reg54 | v_flag); pci_write_config_byte(dev, 0x54, reg54 | v_flag);
} else } else
pci_write_config_byte(dev, 0x54, reg54 & ~v_flag); pci_write_config_byte(dev, 0x54, reg54 & ~v_flag);
pio = 4;
} else { } else {
const u8 mwdma_to_pio[] = { 0, 3, 4 }; const u8 mwdma_to_pio[] = { 0, 3, 4 };
u8 pio;
if (reg48 & u_flag) if (reg48 & u_flag)
pci_write_config_byte(dev, 0x48, reg48 & ~u_flag); pci_write_config_byte(dev, 0x48, reg48 & ~u_flag);
...@@ -152,9 +151,9 @@ static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed) ...@@ -152,9 +151,9 @@ static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed)
pio = mwdma_to_pio[speed - XFER_MW_DMA_0]; pio = mwdma_to_pio[speed - XFER_MW_DMA_0];
else else
pio = 2; /* only SWDMA2 is allowed */ pio = 2; /* only SWDMA2 is allowed */
}
it8213_set_pio_mode(drive, pio); it8213_set_pio_mode(drive, pio);
}
} }
/** /**
......
/* /*
* linux/drivers/ide/pci/piix.c Version 0.52 Jul 14, 2007 * linux/drivers/ide/pci/piix.c Version 0.53 Aug 9, 2007
* *
* Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer * Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
* Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org> * Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
...@@ -194,7 +194,7 @@ static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed) ...@@ -194,7 +194,7 @@ static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed)
int u_speed = 0; int u_speed = 0;
int sitre; int sitre;
u16 reg4042, reg4a; u16 reg4042, reg4a;
u8 reg48, reg54, reg55, pio; u8 reg48, reg54, reg55;
pci_read_config_word(dev, maslave, &reg4042); pci_read_config_word(dev, maslave, &reg4042);
sitre = (reg4042 & 0x4000) ? 1 : 0; sitre = (reg4042 & 0x4000) ? 1 : 0;
...@@ -231,10 +231,9 @@ static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed) ...@@ -231,10 +231,9 @@ static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed)
pci_write_config_byte(dev, 0x54, reg54 | v_flag); pci_write_config_byte(dev, 0x54, reg54 | v_flag);
} else } else
pci_write_config_byte(dev, 0x54, reg54 & ~v_flag); pci_write_config_byte(dev, 0x54, reg54 & ~v_flag);
pio = 4;
} else { } else {
const u8 mwdma_to_pio[] = { 0, 3, 4 }; const u8 mwdma_to_pio[] = { 0, 3, 4 };
u8 pio;
if (reg48 & u_flag) if (reg48 & u_flag)
pci_write_config_byte(dev, 0x48, reg48 & ~u_flag); pci_write_config_byte(dev, 0x48, reg48 & ~u_flag);
...@@ -249,9 +248,9 @@ static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed) ...@@ -249,9 +248,9 @@ static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed)
pio = mwdma_to_pio[speed - XFER_MW_DMA_0]; pio = mwdma_to_pio[speed - XFER_MW_DMA_0];
else else
pio = 2; /* only SWDMA2 is allowed */ pio = 2; /* only SWDMA2 is allowed */
}
piix_set_pio_mode(drive, pio); piix_set_pio_mode(drive, pio);
}
} }
/** /**
......
/* /*
* linux/drivers/ide/pci/slc90e66.c Version 0.17 Aug 2, 2007 * linux/drivers/ide/pci/slc90e66.c Version 0.18 Aug 9, 2007
* *
* Copyright (C) 2000-2002 Andre Hedrick <andre@linux-ide.org> * Copyright (C) 2000-2002 Andre Hedrick <andre@linux-ide.org>
* Copyright (C) 2006-2007 MontaVista Software, Inc. <source@mvista.com> * Copyright (C) 2006-2007 MontaVista Software, Inc. <source@mvista.com>
...@@ -82,7 +82,6 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed) ...@@ -82,7 +82,6 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)
int sitre = 0, a_speed = 7 << (drive->dn * 4); int sitre = 0, a_speed = 7 << (drive->dn * 4);
int u_speed = 0, u_flag = 1 << drive->dn; int u_speed = 0, u_flag = 1 << drive->dn;
u16 reg4042, reg44, reg48, reg4a; u16 reg4042, reg44, reg48, reg4a;
u8 pio;
pci_read_config_word(dev, maslave, &reg4042); pci_read_config_word(dev, maslave, &reg4042);
sitre = (reg4042 & 0x4000) ? 1 : 0; sitre = (reg4042 & 0x4000) ? 1 : 0;
...@@ -111,10 +110,9 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed) ...@@ -111,10 +110,9 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)
pci_read_config_word(dev, 0x4a, &reg4a); pci_read_config_word(dev, 0x4a, &reg4a);
pci_write_config_word(dev, 0x4a, reg4a|u_speed); pci_write_config_word(dev, 0x4a, reg4a|u_speed);
} }
pio = 4;
} else { } else {
const u8 mwdma_to_pio[] = { 0, 3, 4 }; const u8 mwdma_to_pio[] = { 0, 3, 4 };
u8 pio;
if (reg48 & u_flag) if (reg48 & u_flag)
pci_write_config_word(dev, 0x48, reg48 & ~u_flag); pci_write_config_word(dev, 0x48, reg48 & ~u_flag);
...@@ -125,9 +123,9 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed) ...@@ -125,9 +123,9 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)
pio = mwdma_to_pio[speed - XFER_MW_DMA_0]; pio = mwdma_to_pio[speed - XFER_MW_DMA_0];
else else
pio = 2; /* only SWDMA2 is allowed */ pio = 2; /* only SWDMA2 is allowed */
}
slc90e66_set_pio_mode(drive, pio); slc90e66_set_pio_mode(drive, pio);
}
} }
static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif) static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment