Commit 5f8b6c34 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 9adf768a

drivers/ide/pci/aec62xx.c

+10 −8
Original line number Diff line number Diff line
@@ -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,

	}

};

drivers/ide/pci/alim15x3.c

+6 −7
Original line number Diff line number Diff line
@@ -684,16 +684,13 @@ static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif) 
	if (m5229_revision <= 0x20)

		hwif->ultra_mask = 0x00; /* no udma */

	else if (m5229_revision < 0xC2)

		hwif->ultra_mask = 0x07; /* udma0-2 */

		hwif->ultra_mask = ATA_UDMA2;

	else if (m5229_revision == 0xC2 || m5229_revision == 0xC3)

		hwif->ultra_mask = 0x1f; /* udma0-4 */

		hwif->ultra_mask = ATA_UDMA4;

	else if (m5229_revision == 0xC4)

		hwif->ultra_mask = 0x3f; /* udma0-5 */

		hwif->ultra_mask = ATA_UDMA5;

	else

		hwif->ultra_mask = 0x7f; /* udma0-6 */



	hwif->mwdma_mask = 0x07;

	hwif->swdma_mask = 0x07;

		hwif->ultra_mask = ATA_UDMA6;



	hwif->dma_setup = &ali15x3_dma_setup;
@@ -779,6 +776,8 @@ static ide_pci_device_t ali15x3_chipset __devinitdata = { 
	.init_dma	= init_dma_ali15x3,

	.host_flags	= IDE_HFLAG_BOOTABLE,

	.pio_mask	= ATA_PIO5,

	.swdma_mask	= ATA_SWDMA2,

	.mwdma_mask	= ATA_MWDMA2,

};



/**

drivers/ide/pci/amd74xx.c

+6 −3
Original line number Diff line number Diff line
@@ -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 = {

drivers/ide/pci/atiixp.c

+4 −3
Original line number Diff line number Diff line
@@ -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,

 	},

};

drivers/ide/pci/cmd64x.c

+7 −6
Original line number Diff line number Diff line
@@ -517,9 +517,6 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif) 
	if (!hwif->dma_base)

		return;



	hwif->mwdma_mask = 0x07;

	hwif->ultra_mask = hwif->cds->udma_mask;



	/*

	 * UltraDMA only supported on PCI646U and PCI646U2, which

	 * correspond to revisions 0x03, 0x05 and 0x07 respectively.
@@ -586,6 +583,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.enablebits	= {{0x00,0x00,0x00}, {0x51,0x08,0x08}},

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO5,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= 0x00, /* no udma */

	},{	/* 1 */

		.name		= "CMD646",
@@ -595,7 +593,8 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.enablebits	= {{0x51,0x04,0x04}, {0x51,0x08,0x08}},

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO5,

		.udma_mask	= 0x07, /* udma0-2 */

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA2,

	},{	/* 2 */

		.name		= "CMD648",

		.init_setup	= init_setup_cmd64x,
@@ -604,7 +603,8 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.enablebits	= {{0x51,0x04,0x04}, {0x51,0x08,0x08}},

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO5,

		.udma_mask	= 0x1f, /* udma0-4 */

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA4,

	},{	/* 3 */

		.name		= "CMD649",

		.init_setup	= init_setup_cmd64x,
@@ -613,7 +613,8 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.enablebits	= {{0x51,0x04,0x04}, {0x51,0x08,0x08}},

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO5,

		.udma_mask	= 0x3f, /* udma0-5 */

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,

	}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE