diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 16:25:24 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 16:25:24 -0400 |
commit | 1fd1890594bd355a4217f5658a34763e77decee3 (patch) | |
tree | ee8bd668648a9d3db01a7c99d73eee7453efe98b /drivers/ide/pci | |
parent | 6c61064162e6a9965a062b445c6bd6c8ed019183 (diff) |
ide: add IDE_HFLAG_SERIALIZE_DMA host flag
* Add IDE_HFLAG_SERIALIZE_DMA host flag to serialize ports
if DMA is available and handle it in ide_init_port().
* Convert sl82c105 host driver to use this new flag.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci')
-rw-r--r-- | drivers/ide/pci/sl82c105.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c index 2c2fe59a0d9e..c2127cbdecd3 100644 --- a/drivers/ide/pci/sl82c105.c +++ b/drivers/ide/pci/sl82c105.c | |||
@@ -296,9 +296,6 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif) | |||
296 | hwif->dma_start = &sl82c105_dma_start; | 296 | hwif->dma_start = &sl82c105_dma_start; |
297 | hwif->ide_dma_end = &sl82c105_dma_end; | 297 | hwif->ide_dma_end = &sl82c105_dma_end; |
298 | hwif->dma_timeout = &sl82c105_dma_timeout; | 298 | hwif->dma_timeout = &sl82c105_dma_timeout; |
299 | |||
300 | if (hwif->mate) | ||
301 | hwif->serialized = hwif->mate->serialized = 1; | ||
302 | } | 299 | } |
303 | 300 | ||
304 | static const struct ide_port_ops sl82c105_port_ops = { | 301 | static const struct ide_port_ops sl82c105_port_ops = { |
@@ -319,6 +316,7 @@ static const struct ide_port_info sl82c105_chipset __devinitdata = { | |||
319 | #if defined(CONFIG_LOPEC) || defined(CONFIG_SANDPOINT) | 316 | #if defined(CONFIG_LOPEC) || defined(CONFIG_SANDPOINT) |
320 | IDE_HFLAG_FORCE_LEGACY_IRQS | | 317 | IDE_HFLAG_FORCE_LEGACY_IRQS | |
321 | #endif | 318 | #endif |
319 | IDE_HFLAG_SERIALIZE_DMA | | ||
322 | IDE_HFLAG_NO_AUTODMA, | 320 | IDE_HFLAG_NO_AUTODMA, |
323 | .pio_mask = ATA_PIO5, | 321 | .pio_mask = ATA_PIO5, |
324 | .mwdma_mask = ATA_MWDMA2, | 322 | .mwdma_mask = ATA_MWDMA2, |
@@ -338,6 +336,7 @@ static int __devinit sl82c105_init_one(struct pci_dev *dev, const struct pci_dev | |||
338 | "revision %d, BM-DMA disabled\n", rev); | 336 | "revision %d, BM-DMA disabled\n", rev); |
339 | d.init_hwif = NULL; | 337 | d.init_hwif = NULL; |
340 | d.mwdma_mask = 0; | 338 | d.mwdma_mask = 0; |
339 | d.host_flags &= ~IDE_HFLAG_SERIALIZE_DMA; | ||
341 | } | 340 | } |
342 | 341 | ||
343 | return ide_setup_pci_device(dev, &d); | 342 | return ide_setup_pci_device(dev, &d); |