Attachment 151386 Details for Bug 227207 – patch that alan sent upstream, altered for 3025.fc7, and does not fix the problem

[patch] patch that alan sent upstream, altered for 3025.fc7, and does not fix the problem

linux-2.6-fix-ali-atapi-dma.patch (text/plain), 4.94 KB, created by Mark Drago on 2007-04-01 12:48:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Drago

Created: 2007-04-01 12:48:50 UTC

Size: 4.94 KB

patch

obsolete

>diff -urN linux-2.6.20.i686/drivers/ata/pata_ali.c linux-2.6.20.i686.working/drivers/ata/pata_ali.c
>--- linux-2.6.20.i686/drivers/ata/pata_ali.c	2007-03-31 08:44:11.000000000 -0400
>+++ linux-2.6.20.i686.working/drivers/ata/pata_ali.c	2007-03-31 18:16:33.000000000 -0400
>@@ -286,8 +286,8 @@
> 	struct pci_dev *pdev = to_pci_dev(ap->host->dev);
> 
> 
>-	if (adev->class == ATA_DEV_ATA)
>-		ali_fifo_control(ap, adev, 0x08);
>+/*	if (adev->class == ATA_DEV_ATA)
>+		ali_fifo_control(ap, adev, 0x08); */
> 
> 	if (adev->dma_mode >= XFER_UDMA_0) {
> 		ali_program_modes(ap, adev, NULL, udma_timing[adev->dma_mode - XFER_UDMA_0]);
>@@ -329,6 +329,77 @@
> 	adev->max_sectors = 255;
> }
> 
>+/**
>+ *     ali_tf_load - send taskfile registers to host controller
>+ *     @ap: Port to which output is sent
>+ *     @tf: ATA taskfile register set
>+ *
>+ *     Outputs ATA taskfile to standard ATA host controller. We can't
>+ *     use the default one as the onboard FIFO logic requires that we
>+ *     write all the registers (see 1535 BIOS programming guide)
>+ *
>+ *     LOCKING:
>+ *     Inherited from caller.
>+ */
>+
>+void ali_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
>+{
>+       struct ata_ioports *ioaddr = &ap->ioaddr;
>+       unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR;
>+
>+       iowrite8(tf->ctl, ioaddr->ctl_addr);
>+       ap->last_ctl = tf->ctl;
>+       ata_wait_idle(ap);
>+
>+       if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
>+               iowrite8(tf->hob_feature, ioaddr->feature_addr);
>+               iowrite8(tf->hob_nsect, ioaddr->nsect_addr);
>+               iowrite8(tf->hob_lbal, ioaddr->lbal_addr);
>+               iowrite8(tf->hob_lbam, ioaddr->lbam_addr);
>+               iowrite8(tf->hob_lbah, ioaddr->lbah_addr);
>+               VPRINTK("hob: feat 0x%X nsect 0x%X, lba 0x%X 0x%X 0x%X\n",
>+                       tf->hob_feature,
>+                       tf->hob_nsect,
>+                       tf->hob_lbal,
>+                       tf->hob_lbam,
>+                       tf->hob_lbah);
>+       }
>+       if (is_addr) {
>+               iowrite8(tf->feature, ioaddr->feature_addr);
>+               iowrite8(tf->nsect, ioaddr->nsect_addr);
>+               iowrite8(tf->lbal, ioaddr->lbal_addr);
>+               iowrite8(tf->lbam, ioaddr->lbam_addr);
>+               iowrite8(tf->lbah, ioaddr->lbah_addr);
>+               VPRINTK("feat 0x%X nsect 0x%X lba 0x%X 0x%X 0x%X\n",
>+                       tf->feature,
>+                       tf->nsect,
>+                       tf->lbal,
>+                       tf->lbam,
>+                       tf->lbah);
>+       } else {
>+               iowrite8(0, ioaddr->feature_addr);
>+               iowrite8(0, ioaddr->nsect_addr);
>+               iowrite8(0, ioaddr->lbal_addr);
>+               iowrite8(0, ioaddr->lbam_addr);
>+               iowrite8(0, ioaddr->lbah_addr);
>+       }
>+
>+       if (tf->flags & ATA_TFLAG_DEVICE) {
>+               iowrite8(tf->device, ioaddr->device_addr);
>+               VPRINTK("device 0x%X\n", tf->device);
>+       }
>+
>+       ata_wait_idle(ap);
>+}
>+
>+static int ali_check_atapi_dma(struct ata_queued_cmd *qc)
>+{
>+       /* Don't do DMA except for whole blocks */
>+       if (qc->nbytes & 511)
>+               return -1;
>+       return 0;
>+}
>+
> static struct scsi_host_template ali_sht = {
> 	.module			= THIS_MODULE,
> 	.name			= DRV_NAME,
>@@ -358,7 +429,7 @@
> static struct ata_port_operations ali_early_port_ops = {
> 	.port_disable	= ata_port_disable,
> 	.set_piomode	= ali_set_piomode,
>-	.tf_load	= ata_tf_load,
>+	.tf_load	= ali_tf_load,
> 	.tf_read	= ata_tf_read,
> 	.check_status 	= ata_check_status,
> 	.exec_command	= ata_exec_command,
>@@ -371,6 +442,7 @@
> 
> 	.qc_prep 	= ata_qc_prep,
> 	.qc_issue	= ata_qc_issue_prot,
>+	.check_atapi_dma= ali_check_atapi_dma,
> 
> 	.data_xfer	= ata_data_xfer,
> 
>@@ -393,7 +465,7 @@
> 	.set_dmamode	= ali_set_dmamode,
> 	.mode_filter	= ali_20_filter,
> 
>-	.tf_load	= ata_tf_load,
>+	.tf_load	= ali_tf_load,
> 	.tf_read	= ata_tf_read,
> 	.check_status 	= ata_check_status,
> 	.exec_command	= ata_exec_command,
>@@ -412,6 +484,7 @@
> 
> 	.qc_prep 	= ata_qc_prep,
> 	.qc_issue	= ata_qc_issue_prot,
>+	.check_atapi_dma= ali_check_atapi_dma,
> 
> 	.data_xfer	= ata_data_xfer,
> 
>@@ -431,7 +504,7 @@
> 	.set_piomode	= ali_set_piomode,
> 	.set_dmamode	= ali_set_dmamode,
> 	.mode_filter	= ata_pci_default_filter,
>-	.tf_load	= ata_tf_load,
>+	.tf_load	= ali_tf_load,
> 	.tf_read	= ata_tf_read,
> 	.check_status 	= ata_check_status,
> 	.exec_command	= ata_exec_command,
>@@ -450,6 +523,7 @@
> 
> 	.qc_prep 	= ata_qc_prep,
> 	.qc_issue	= ata_qc_issue_prot,
>+	.check_atapi_dma= ali_check_atapi_dma,
> 
> 	.data_xfer	= ata_data_xfer,
> 
>@@ -469,7 +543,7 @@
> 	.set_piomode	= ali_set_piomode,
> 	.set_dmamode	= ali_set_dmamode,
> 	.mode_filter	= ata_pci_default_filter,
>-	.tf_load	= ata_tf_load,
>+	.tf_load	= ali_tf_load,
> 	.tf_read	= ata_tf_read,
> 	.check_status 	= ata_check_status,
> 	.exec_command	= ata_exec_command,
>@@ -487,6 +561,7 @@
> 
> 	.qc_prep 	= ata_qc_prep,
> 	.qc_issue	= ata_qc_issue_prot,
>+	.check_atapi_dma= ali_check_atapi_dma,
> 
> 	.data_xfer	= ata_data_xfer,
>

Actions: View | Diff

Attachments on bug 227207: 150828 | 150829 | 151386 | 153577 | 153578 | 153639