From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: akpm@osdl.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org
Subject: PATCH: just a small update for the ALi driver
Date: Tue, 08 Aug 2006 13:06:05 +0100 [thread overview]
Message-ID: <1155038765.5729.16.camel@localhost.localdomain> (raw)
Correct register for high dma mode
Turn on MWDMA
Correct linuxdoc
Signed-off-by: Alan Cox <alan@redhat.com>
--- linux.vanilla-2.6.18-rc3-mm2/drivers/scsi/pata_ali.c 2006-08-07 16:20:34.000000000 +0100
+++ linux-2.6.18-rc3-mm2/drivers/scsi/pata_ali.c 2006-08-07 16:36:32.000000000 +0100
@@ -34,7 +34,7 @@
#include <linux/dmi.h>
#define DRV_NAME "pata_ali"
-#define DRV_VERSION "0.6.4"
+#define DRV_VERSION "0.6.5"
/*
* Cable special cases
@@ -198,10 +198,10 @@
* @adev: Device the timing is for
* @cmd: Command timing
* @data: Data timing
- * @udma: UDMA timing or zero for off
+ * @ultra: UDMA timing or zero for off
*
* Loads the timing registers for cmd/data and disable UDMA if
- * udma is zero. If udma is set then load and enable the UDMA
+ * ultra is zero. If ultra is set then load and enable the UDMA
* timing but do not touch the command/data timing.
*/
@@ -292,10 +292,10 @@
if (adev->dma_mode >= XFER_UDMA_0) {
ali_program_modes(ap, adev, NULL, udma_timing[adev->dma_mode - XFER_UDMA_0]);
if (adev->dma_mode >= XFER_UDMA_3) {
- u8 reg54;
- pci_read_config_byte(pdev, 0x54, ®54);
- reg54 |= 1;
- pci_write_config_byte(pdev, 0x54, reg54);
+ u8 reg4b;
+ pci_read_config_byte(pdev, 0x4B, ®4b);
+ reg4b |= 1;
+ pci_write_config_byte(pdev, 0x4B, reg4b);
}
} else {
ata_timing_compute(adev, adev->dma_mode, &t, T, 1);
@@ -518,7 +518,7 @@
.sht = &ali_sht,
.host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
.pio_mask = 0x1f,
- /*.mwdma_mask = 0x07,*/
+ .mwdma_mask = 0x07,
.port_ops = &ali_20_port_ops
};
/* Revision 0x20 with support logic added UDMA */
@@ -526,7 +526,7 @@
.sht = &ali_sht,
.host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
.pio_mask = 0x1f,
- /*.mwdma_mask = 0x07, */
+ .mwdma_mask = 0x07,
.udma_mask = 0x07, /* UDMA33 */
.port_ops = &ali_20_port_ops
};
@@ -535,7 +535,7 @@
.sht = &ali_sht,
.host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
.pio_mask = 0x1f,
- /*.mwdma_mask = 0x07, */
+ .mwdma_mask = 0x07,
.udma_mask = 0x1f,
.port_ops = &ali_c2_port_ops
};
@@ -544,7 +544,7 @@
.sht = &ali_sht,
.host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
.pio_mask = 0x1f,
- /* .mwdma_mask = 0x07, */
+ .mwdma_mask = 0x07,
.udma_mask = 0x3f,
.port_ops = &ali_c2_port_ops
};
@@ -553,7 +553,7 @@
.sht = &ali_sht,
.host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
.pio_mask = 0x1f,
- /* .mwdma_mask = 0x07, */
+ .mwdma_mask = 0x07,
.udma_mask = 0x7f,
.port_ops = &ali_c2_port_ops
};
@@ -562,7 +562,7 @@
.sht = &ali_sht,
.host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
.pio_mask = 0x1f,
- /* .mwdma_mask = 0x07, */
+ .mwdma_mask = 0x07,
.udma_mask = 0x7f,
.port_ops = &ali_c5_port_ops
};
next reply other threads:[~2006-08-08 11:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-08 12:06 Alan Cox [this message]
2006-08-09 4:11 ` PATCH: just a small update for the ALi driver Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1155038765.5729.16.camel@localhost.localdomain \
--to=alan@lxorguk.ukuu.org.uk \
--cc=akpm@osdl.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.