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

diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 65de9363fc0d..18c181bc841b 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -183,9 +183,6 @@ static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
         if (!hwif->dma_base)
                 return;
 
-        hwif->ultra_mask = 0x3f;
-        hwif->mwdma_mask = 0x07;
-
         pci_read_config_byte(pdev, ATIIXP_IDE_UDMA_MODE + ch, &udma_mode);
 
         if ((udma_mode & 0x07) >= 0x04 || (udma_mode & 0x70) >= 0x40)
@@ -205,12 +202,16 @@ static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
                 .enablebits     = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
                 .host_flags     = IDE_HFLAG_BOOTABLE,
                 .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA5,
         },{     /* 1 */
                 .name           = "SB600_PATA",
                 .init_hwif      = init_hwif_atiixp,
                 .enablebits     = {{0x48,0x01,0x00}, {0x00,0x00,0x00}},
                 .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_BOOTABLE,
                 .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA5,
         },
 };