pata_ali patch not merged?

pata_ali patch not merged?

[Chuck Ebbert]

This patch was found to fix some of the problems with the
pata_ali driver. Is it going to be merged in 2.6.22?

[https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=156482]

--- linux-2.6.22-rc4/drivers/ata/pata_ali.c	2007-06-04 23:05:17.000000000 -0700
+++ devel/drivers/ata/pata_ali.c	2007-06-06 20:49:03.000000000 -0700
@@ -544,34 +628,34 @@ static int ali_init_one(struct pci_dev *
 	/* Revision 0xC2 adds UDMA66 */
 	static const struct ata_port_info info_c2 = {
 		.sht = &ali_sht,
		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
 		.pio_mask = 0x1f,
 		.mwdma_mask = 0x07,
 		.udma_mask = 0x1f,
 		.port_ops = &ali_c2_port_ops
 	};
-	/* Revision 0xC3 is UDMA100 */
+	/* Revision 0xC3 is UDMA66 for now */
 	static const struct ata_port_info info_c3 = {
 		.sht = &ali_sht,
		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
 		.pio_mask = 0x1f,
 		.mwdma_mask = 0x07,
-		.udma_mask = 0x3f,
+		.udma_mask = 0x1f,
 		.port_ops = &ali_c2_port_ops
 	};
-	/* Revision 0xC4 is UDMA133 */
+	/* Revision 0xC4 is UDMA100 */
 	static const struct ata_port_info info_c4 = {
 		.sht = &ali_sht,
		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
 		.pio_mask = 0x1f,
 		.mwdma_mask = 0x07,
-		.udma_mask = 0x7f,
+		.udma_mask = 0x3f,
 		.port_ops = &ali_c2_port_ops
 	};
 	/* Revision 0xC5 is UDMA133 with LBA48 DMA */
 	static const struct ata_port_info info_c5 = {
 		.sht = &ali_sht,
		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
 		.pio_mask = 0x1f,
 		.mwdma_mask = 0x07,
 		.udma_mask = 0x7f,

Re: pata_ali patch not merged?

[Tejun Heo]

Chuck Ebbert wrote:
> This patch was found to fix some of the problems with the
> pata_ali driver. Is it going to be merged in 2.6.22?
> 
> [https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=156482]

Jeff, this looks like a worthy fix for 2.6.22.

-- 
tejun

Re: pata_ali patch not merged?

[Alan Cox]

On Tue, 03 Jul 2007 16:47:33 +0900
Tejun Heo <htejun@gmail.com> wrote:

> Chuck Ebbert wrote:
> > This patch was found to fix some of the problems with the
> > pata_ali driver. Is it going to be merged in 2.6.22?
> > 
> > [https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=156482]
> 
> Jeff, this looks like a worthy fix for 2.6.22.

It's currently in -mm and seems to have sorted all those chipsets out so
its a good candidate to push on further.

Alan

Re: pata_ali patch not merged?

[Jeff Garzik]

Chuck Ebbert wrote:
> This patch was found to fix some of the problems with the
> pata_ali driver. Is it going to be merged in 2.6.22?
> 
> [https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=156482]

applied