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, 2 deletions

diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 91bcb6be0d51..70e6c44ec699 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -444,8 +444,6 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
                 return;
 
         hwif->ultra_mask = vdev->via_config->udma_mask;
-        hwif->mwdma_mask = 0x07;
-        hwif->swdma_mask = 0x07;
 
         if (hwif->cbl != ATA_CBL_PATA40_SHORT)
                 hwif->cbl = via82cxxx_cable_detect(hwif);
@@ -463,6 +461,8 @@ static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
                                   IDE_HFLAG_NO_AUTODMA |
                                   IDE_HFLAG_BOOTABLE,
                 .pio_mask       = ATA_PIO5,
+                .swdma_mask     = ATA_SWDMA2,
+                .mwdma_mask     = ATA_MWDMA2,
         },{     /* 1 */
                 .name           = "VP_IDE",
                 .init_chipset   = init_chipset_via82cxxx,
@@ -473,6 +473,8 @@ static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
                                   IDE_HFLAG_POST_SET_MODE |
                                   IDE_HFLAG_BOOTABLE,
                 .pio_mask       = ATA_PIO5,
+                .swdma_mask     = ATA_SWDMA2,
+                .mwdma_mask     = ATA_MWDMA2,
         }
 };