Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf6263a8 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] Use ATA_UDMAx standard masks when filling driver's udma_mask info 



The ATA_UDMAx masks are self-documenting, and far better than manually
writing in the hex mask.

Note that pata_it8213 mask differed from the comment.  Added a FIXME there.

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent cd70c266

drivers/ata/ata_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id 
		.flags = ATA_FLAG_SLAVE_POSS,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,

		.udma_mask = 0x3f,

		.udma_mask = ATA_UDMA5,

		.port_ops = &generic_port_ops

	};

	const struct ata_port_info *ppi[] = { &info, NULL };

drivers/ata/ata_piix.c

+5 −5
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static struct ata_port_info piix_port_info[] = { 
		.flags		= PIIX_SATA_FLAGS,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f,	/* udma0-6 */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &piix_sata_ops,

	},
@@ -507,7 +507,7 @@ static struct ata_port_info piix_port_info[] = { 
		.flags		= PIIX_SATA_FLAGS | PIIX_FLAG_SCR,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f,	/* udma0-6 */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &piix_sata_ops,

	},
@@ -518,7 +518,7 @@ static struct ata_port_info piix_port_info[] = { 
				  PIIX_FLAG_AHCI,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f,	/* udma0-6 */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &piix_sata_ops,

	},
@@ -529,7 +529,7 @@ static struct ata_port_info piix_port_info[] = { 
				  PIIX_FLAG_AHCI,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f,	/* udma0-6 */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &piix_sata_ops,

	},
@@ -540,7 +540,7 @@ static struct ata_port_info piix_port_info[] = { 
				  PIIX_FLAG_AHCI,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f,	/* udma0-6 */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &piix_sata_ops,

	},

drivers/ata/pata_ali.c

+4 −4
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,

		.udma_mask = 0x1f,

		.udma_mask = ATA_UDMA4,

		.port_ops = &ali_c2_port_ops

	};

	/* Revision 0xC3 is UDMA66 for now */
@@ -556,7 +556,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,

		.udma_mask = 0x1f,

		.udma_mask = ATA_UDMA4,

		.port_ops = &ali_c2_port_ops

	};

	/* Revision 0xC4 is UDMA100 */
@@ -565,7 +565,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,

		.udma_mask = 0x3f,

		.udma_mask = ATA_UDMA5,

		.port_ops = &ali_c2_port_ops

	};

	/* Revision 0xC5 is UDMA133 with LBA48 DMA */
@@ -574,7 +574,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		.flags = ATA_FLAG_SLAVE_POSS,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,

		.udma_mask = 0x7f,

		.udma_mask = ATA_UDMA6,

		.port_ops = &ali_c5_port_ops

	};

drivers/ata/pata_amd.c

+9 −9
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x1f,	/* UDMA 66 */

			.udma_mask = ATA_UDMA4,	/* UDMA 66 */

			.port_ops = &amd66_port_ops

		},

		{	/* 2: AMD 7409, no swdma errata */
@@ -560,7 +560,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x1f,	/* UDMA 66 */

			.udma_mask = ATA_UDMA4,	/* UDMA 66 */

			.port_ops = &amd66_port_ops

		},

		{	/* 3: AMD 7411 */
@@ -568,7 +568,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x3f,	/* UDMA 100 */

			.udma_mask = ATA_UDMA5,	/* UDMA 100 */

			.port_ops = &amd100_port_ops

		},

		{	/* 4: AMD 7441 */
@@ -576,7 +576,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x3f,	/* UDMA 100 */

			.udma_mask = ATA_UDMA5,	/* UDMA 100 */

			.port_ops = &amd100_port_ops

		},

		{	/* 5: AMD 8111*/
@@ -584,7 +584,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x7f,	/* UDMA 133, no swdma */

			.udma_mask = ATA_UDMA6,	/* UDMA 133, no swdma */

			.port_ops = &amd133_port_ops

		},

		{	/* 6: AMD 8111 UDMA 100 (Serenade) */
@@ -592,7 +592,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x3f,	/* UDMA 100, no swdma */

			.udma_mask = ATA_UDMA5,	/* UDMA 100, no swdma */

			.port_ops = &amd133_port_ops

		},

		{	/* 7: Nvidia Nforce */
@@ -600,7 +600,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x3f,	/* UDMA 100 */

			.udma_mask = ATA_UDMA5,	/* UDMA 100 */

			.port_ops = &nv100_port_ops

		},

		{	/* 8: Nvidia Nforce2 and later */
@@ -608,7 +608,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x7f,	/* UDMA 133, no swdma */

			.udma_mask = ATA_UDMA6,	/* UDMA 133, no swdma */

			.port_ops = &nv133_port_ops

		},

		{	/* 9: AMD CS5536 (Geode companion) */
@@ -616,7 +616,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
			.flags = ATA_FLAG_SLAVE_POSS,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,

			.udma_mask = 0x3f,	/* UDMA 100 */

			.udma_mask = ATA_UDMA5,	/* UDMA 100 */

			.port_ops = &amd100_port_ops

		}

	};

drivers/ata/pata_cs5535.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id) 
		.flags = ATA_FLAG_SLAVE_POSS,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,

		.udma_mask = 0x1f,

		.udma_mask = ATA_UDMA4,

		.port_ops = &cs5535_port_ops

	};

	const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info };