mirror of https://gitee.com/openkylin/linux.git
ide: remove PIO "downgrade" quirk
No need for it nowadays so remove quirk code from ide_get_best_pio_mode() and IDE_HFLAG_PIO_DOWNGRADE host flag. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
00fe8b7ac2
commit
078fdf789c
|
@ -274,16 +274,6 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode)
|
||||||
if (overridden)
|
if (overridden)
|
||||||
printk(KERN_INFO "%s: tPIO > 2, assuming tPIO = 2\n",
|
printk(KERN_INFO "%s: tPIO > 2, assuming tPIO = 2\n",
|
||||||
drive->name);
|
drive->name);
|
||||||
|
|
||||||
/*
|
|
||||||
* Conservative "downgrade" for all pre-ATA2 drives
|
|
||||||
*/
|
|
||||||
if ((drive->hwif->host_flags & IDE_HFLAG_PIO_NO_DOWNGRADE) == 0 &&
|
|
||||||
pio_mode && pio_mode < 4) {
|
|
||||||
pio_mode--;
|
|
||||||
printk(KERN_INFO "%s: applying conservative "
|
|
||||||
"PIO \"downgrade\"\n", drive->name);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pio_mode > max_mode)
|
if (pio_mode > max_mode)
|
||||||
|
|
|
@ -219,7 +219,6 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
|
||||||
|
|
||||||
#define IDE_HFLAGS_AMD \
|
#define IDE_HFLAGS_AMD \
|
||||||
(IDE_HFLAG_PIO_NO_BLACKLIST | \
|
(IDE_HFLAG_PIO_NO_BLACKLIST | \
|
||||||
IDE_HFLAG_PIO_NO_DOWNGRADE | \
|
|
||||||
IDE_HFLAG_ABUSE_SET_DMA_MODE | \
|
IDE_HFLAG_ABUSE_SET_DMA_MODE | \
|
||||||
IDE_HFLAG_POST_SET_MODE | \
|
IDE_HFLAG_POST_SET_MODE | \
|
||||||
IDE_HFLAG_IO_32BIT | \
|
IDE_HFLAG_IO_32BIT | \
|
||||||
|
|
|
@ -429,7 +429,6 @@ static const struct ide_port_info via82cxxx_chipset __devinitdata = {
|
||||||
.init_hwif = init_hwif_via82cxxx,
|
.init_hwif = init_hwif_via82cxxx,
|
||||||
.enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
|
.enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
|
||||||
.host_flags = IDE_HFLAG_PIO_NO_BLACKLIST |
|
.host_flags = IDE_HFLAG_PIO_NO_BLACKLIST |
|
||||||
IDE_HFLAG_PIO_NO_DOWNGRADE |
|
|
||||||
IDE_HFLAG_ABUSE_SET_DMA_MODE |
|
IDE_HFLAG_ABUSE_SET_DMA_MODE |
|
||||||
IDE_HFLAG_POST_SET_MODE |
|
IDE_HFLAG_POST_SET_MODE |
|
||||||
IDE_HFLAG_IO_32BIT,
|
IDE_HFLAG_IO_32BIT,
|
||||||
|
|
|
@ -921,7 +921,6 @@ pmac_ide_do_resume(ide_hwif_t *hwif)
|
||||||
static const struct ide_port_info pmac_port_info = {
|
static const struct ide_port_info pmac_port_info = {
|
||||||
.chipset = ide_pmac,
|
.chipset = ide_pmac,
|
||||||
.host_flags = IDE_HFLAG_SET_PIO_MODE_KEEP_DMA |
|
.host_flags = IDE_HFLAG_SET_PIO_MODE_KEEP_DMA |
|
||||||
IDE_HFLAG_PIO_NO_DOWNGRADE |
|
|
||||||
IDE_HFLAG_POST_SET_MODE |
|
IDE_HFLAG_POST_SET_MODE |
|
||||||
IDE_HFLAG_NO_DMA | /* no SFF-style DMA */
|
IDE_HFLAG_NO_DMA | /* no SFF-style DMA */
|
||||||
IDE_HFLAG_UNMASK_IRQS,
|
IDE_HFLAG_UNMASK_IRQS,
|
||||||
|
|
|
@ -1027,8 +1027,6 @@ enum {
|
||||||
IDE_HFLAG_SINGLE = (1 << 1),
|
IDE_HFLAG_SINGLE = (1 << 1),
|
||||||
/* don't use legacy PIO blacklist */
|
/* don't use legacy PIO blacklist */
|
||||||
IDE_HFLAG_PIO_NO_BLACKLIST = (1 << 2),
|
IDE_HFLAG_PIO_NO_BLACKLIST = (1 << 2),
|
||||||
/* don't use conservative PIO "downgrade" */
|
|
||||||
IDE_HFLAG_PIO_NO_DOWNGRADE = (1 << 3),
|
|
||||||
/* use PIO8/9 for prefetch off/on */
|
/* use PIO8/9 for prefetch off/on */
|
||||||
IDE_HFLAG_ABUSE_PREFETCH = (1 << 4),
|
IDE_HFLAG_ABUSE_PREFETCH = (1 << 4),
|
||||||
/* use PIO6/7 for fast-devsel off/on */
|
/* use PIO6/7 for fast-devsel off/on */
|
||||||
|
|
Loading…
Reference in New Issue