ide: add ->mwdma_mask and ->swdma_mask to ide_pci_device_t (take 2)

* Add ->mwdma_mask and ->swdma_mask to ide_pci_device_t.

* Set ide_hwif_t DMA masks using DMA masks from ide_pci_device_t in
  setup-pci.c::ide_pci_setup_ports() (iff DMA base is valid and ->init_hwif
  method may still override them).

* Convert IDE PCI host drivers to use ide_pci_device_t DMA masks.

While at it:

* Use ATA_{UDMA,MWDMA,SWDMA}* defines.

* hpt34x.c: add separate ide_pci_device_t instances for HPT343 and HPT345.

* serverworks.c: fix DMA masks being set before checking DMA base.

v2:
* Add missing masks to DECLARE_GENERIC_PCI_DEV() macro.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 558cab537db8..24059c1b21df 100644
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -332,12 +332,6 @@ static void __devinit init_hwif_opti621 (ide_hwif_t *hwif)
         hwif->drives[1].drive_data = PIO_DONT_KNOW;
 
         hwif->set_pio_mode = &opti621_set_pio_mode;
-
-        if (!(hwif->dma_base))
-                return;
-
-        hwif->mwdma_mask = 0x07;
-        hwif->swdma_mask = 0x07;
 }
 
 static ide_pci_device_t opti621_chipsets[] __devinitdata = {
@@ -348,6 +342,8 @@ static ide_pci_device_t opti621_chipsets[] __devinitdata = {
                 .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
                                   IDE_HFLAG_BOOTABLE,
                 .pio_mask       = ATA_PIO3,
+                .swdma_mask     = ATA_SWDMA2,
+                .mwdma_mask     = ATA_MWDMA2,
         },{     /* 1 */
                 .name           = "OPTI621X",
                 .init_hwif      = init_hwif_opti621,
@@ -355,6 +351,8 @@ static ide_pci_device_t opti621_chipsets[] __devinitdata = {
                 .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
                                   IDE_HFLAG_BOOTABLE,
                 .pio_mask       = ATA_PIO3,
+                .swdma_mask     = ATA_SWDMA2,
+                .mwdma_mask     = ATA_MWDMA2,
         }
 };