Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4db90a14 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add IDE_HFLAG_ABUSE_SET_DMA_MODE host flag 



* Add IDE_HFLAG_ABUSE_SET_DMA_MODE host flag and use it to decide
  what to do with transfer modes < XFER_PIO_0 in ide_set_xfer_rate().

* Set IDE_HFLAG_ABUSE_SET_DMA_MODE in host drivers that need it
  (aec62xx, amd74xx, cs5520, cs5535, hpt34x, hpt366, pdc202xx_old,
  serverworks, tc86c001 and via82cxxx) and cleanup ->set_dma_mode
  methods in host drivers that don't (IDE core code guarantees that
  ->set_dma_mode will be called only for modes which are present
  in SWDMA/MWDMA/UDMA masks).

While at it:

* Add IDE_HFLAGS_HPT34X/HPT3XX/PDC202XX/SVWKS define in
  hpt34x/hpt366/pdc202xx_old/serverworks host driver.

There should be no functionality changes caused by this patch.

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 428c6440

drivers/ide/arm/icside.c

+0 −2
Original line number Diff line number Diff line
@@ -272,8 +272,6 @@ static void icside_set_dma_mode(ide_drive_t *drive, const u8 xfer_mode) 
	case XFER_SW_DMA_0:

		cycle_time = 480;

		break;

	default:

		return;

	}



	/*

drivers/ide/cris/ide-cris.c

+0 −2
Original line number Diff line number Diff line
@@ -747,8 +747,6 @@ static void cris_set_dma_mode(ide_drive_t *drive, const u8 speed) 
			strobe = ATA_DMA2_STROBE;

			hold = ATA_DMA2_HOLD;

			break;

		default:

			return;

	}



	if (speed >= XFER_UDMA_0)

drivers/ide/ide-lib.c

+6 −0
Original line number Diff line number Diff line
@@ -441,6 +441,12 @@ int ide_set_xfer_rate(ide_drive_t *drive, u8 rate) 
	 * case could happen iff the transfer mode has already been set on

	 * the device by ide-proc.c::set_xfer_rate()).

	 */

	if (rate < XFER_PIO_0) {

		if (hwif->host_flags & IDE_HFLAG_ABUSE_SET_DMA_MODE)

			return ide_set_dma_mode(drive, rate);

		else

			return ide_config_drive_speed(drive, rate);

	}



	return ide_set_dma_mode(drive, rate);

}

drivers/ide/mips/au1xxx-ide.c

+0 −2
Original line number Diff line number Diff line
@@ -198,8 +198,6 @@ static void auide_set_dma_mode(ide_drive_t *drive, const u8 speed) 


		break;

#endif

	default:

		return;

	}



	au_writel(mem_sttime,MEM_STTIME2);

drivers/ide/pci/aec62xx.c

+10 −3
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ static const struct ide_port_info aec62xx_chipsets[] __devinitdata = { 
		.enablebits	= {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},

		.host_flags	= IDE_HFLAG_SERIALIZE |

				  IDE_HFLAG_NO_ATAPI_DMA |

				  IDE_HFLAG_ABUSE_SET_DMA_MODE |

				  IDE_HFLAG_OFF_BOARD,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,
@@ -211,6 +212,7 @@ static const struct ide_port_info aec62xx_chipsets[] __devinitdata = { 
		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_NO_AUTODMA |

				  IDE_HFLAG_ABUSE_SET_DMA_MODE |

				  IDE_HFLAG_OFF_BOARD,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,
@@ -220,7 +222,8 @@ static const struct ide_port_info aec62xx_chipsets[] __devinitdata = { 
		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.enablebits	= {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA |

				  IDE_HFLAG_ABUSE_SET_DMA_MODE,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA4,
@@ -228,7 +231,9 @@ static const struct ide_port_info aec62xx_chipsets[] __devinitdata = { 
		.name		= "AEC6280",

		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA |

				  IDE_HFLAG_ABUSE_SET_DMA_MODE |

				  IDE_HFLAG_OFF_BOARD,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,
@@ -237,7 +242,9 @@ static const struct ide_port_info aec62xx_chipsets[] __devinitdata = { 
		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.enablebits	= {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA |

				  IDE_HFLAG_ABUSE_SET_DMA_MODE |

				  IDE_HFLAG_OFF_BOARD,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,