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, 10 insertions, 8 deletions

diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 1c52cb67a267..4906f00cc0c4 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -201,9 +201,6 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
         if (hwif->dma_base == 0)
                 return;
 
-        hwif->ultra_mask = hwif->cds->udma_mask;
-        hwif->mwdma_mask = 0x07;
-
         hwif->dma_lost_irq      = &aec62xx_dma_lost_irq;
 
         if (dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF) {
@@ -247,7 +244,8 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                 .host_flags     = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,
                 .pio_mask       = ATA_PIO4,
-                .udma_mask      = 0x07, /* udma0-2 */
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA2,
         },{     /* 1 */
                 .name           = "AEC6260",
                 .init_setup     = init_setup_aec62xx,
@@ -256,7 +254,8 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .host_flags     = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_NO_AUTODMA |
                                   IDE_HFLAG_OFF_BOARD,
                 .pio_mask       = ATA_PIO4,
-                .udma_mask      = 0x1f, /* udma0-4 */
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA4,
         },{     /* 2 */
                 .name           = "AEC6260R",
                 .init_setup     = init_setup_aec62xx,
@@ -265,7 +264,8 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                 .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
                 .pio_mask       = ATA_PIO4,
-                .udma_mask      = 0x1f, /* udma0-4 */
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA4,
         },{     /* 3 */
                 .name           = "AEC6280",
                 .init_setup     = init_setup_aec6x80,
@@ -273,7 +273,8 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_aec62xx,
                 .host_flags     = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,
                 .pio_mask       = ATA_PIO4,
-                .udma_mask      = 0x3f, /* udma0-5 */
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA5,
         },{     /* 4 */
                 .name           = "AEC6280R",
                 .init_setup     = init_setup_aec6x80,
@@ -282,7 +283,8 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                 .host_flags     = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,
                 .pio_mask       = ATA_PIO4,
-                .udma_mask      = 0x3f, /* udma0-5 */
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA5,
         }
 };