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, 6 insertions, 3 deletions

diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 26263a189448..6f6fadf5a9d8 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -261,9 +261,8 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
                 return;
 
         hwif->ultra_mask = amd_config->udma_mask;
-        hwif->mwdma_mask = 0x07;
-        if ((amd_config->flags & AMD_BAD_SWDMA) == 0)
-                hwif->swdma_mask = 0x07;
+        if (amd_config->flags & AMD_BAD_SWDMA)
+                hwif->swdma_mask = 0x00;
 
         if (hwif->cbl != ATA_CBL_PATA40_SHORT) {
                 if ((amd_80w >> hwif->channel) & 1)
@@ -284,6 +283,8 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
                                   IDE_HFLAG_POST_SET_MODE |             \
                                   IDE_HFLAG_BOOTABLE,                   \
                 .pio_mask       = ATA_PIO5,                             \
+                .swdma_mask     = ATA_SWDMA2,                           \
+                .mwdma_mask     = ATA_MWDMA2,                           \
         }
 
 #define DECLARE_NV_DEV(name_str)                                        \
@@ -297,6 +298,8 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
                                   IDE_HFLAG_POST_SET_MODE |             \
                                   IDE_HFLAG_BOOTABLE,                   \
                 .pio_mask       = ATA_PIO5,                             \
+                .swdma_mask     = ATA_SWDMA2,                           \
+                .mwdma_mask     = ATA_MWDMA2,                           \
         }
 
 static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {