rpms/kernel/devel linux-2.6-libata-ali-atapi-dma.patch, NONE, 1.1 kernel-2.6.spec, 1.3139, 1.3140

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22062

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-libata-ali-atapi-dma.patch 
Log Message:
* Fri May 04 2007 Dave Jones <davej at redhat.com>
- Disable ATAPI DMA on ALI chipsets.


linux-2.6-libata-ali-atapi-dma.patch:

--- NEW FILE linux-2.6-libata-ali-atapi-dma.patch ---
ali atapi dma is broken right now. disable it (but not disk dma)
until the problem is better understood.

--- 1/drivers/ata/pata_ali.c~	2007-05-04 18:22:41.129254272 +0100
+++ 2/drivers/ata/pata_ali.c	2007-05-04 18:22:57.105825464 +0100
@@ -329,6 +329,11 @@
 	adev->max_sectors = 255;
 }
 
+static int ali_no_atapi_dma(struct ata_queued_cmd *qc)
+{
+	return -1;
+}
+
 static struct scsi_host_template ali_sht = {
 	.module			= THIS_MODULE,
 	.name			= DRV_NAME,
@@ -371,6 +376,7 @@
 
 	.qc_prep 	= ata_qc_prep,
 	.qc_issue	= ata_qc_issue_prot,
+	.check_atapi_dma= ali_no_atapi_dma,
 
 	.data_xfer	= ata_data_xfer,
 
@@ -412,6 +418,7 @@
 
 	.qc_prep 	= ata_qc_prep,
 	.qc_issue	= ata_qc_issue_prot,
+	.check_atapi_dma= ali_no_atapi_dma,
 
 	.data_xfer	= ata_data_xfer,
 
@@ -450,6 +457,7 @@
 
 	.qc_prep 	= ata_qc_prep,
 	.qc_issue	= ata_qc_issue_prot,
+	.check_atapi_dma= ali_no_atapi_dma,
 
 	.data_xfer	= ata_data_xfer,
 
@@ -487,6 +495,7 @@
 
 	.qc_prep 	= ata_qc_prep,
 	.qc_issue	= ata_qc_issue_prot,
+	.check_atapi_dma= ali_no_atapi_dma,
 
 	.data_xfer	= ata_data_xfer,
 



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3139
retrieving revision 1.3140
diff -u -r1.3139 -r1.3140
--- kernel-2.6.spec	4 May 2007 15:10:04 -0000	1.3139
+++ kernel-2.6.spec	4 May 2007 17:44:11 -0000	1.3140
@@ -575,6 +575,7 @@
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
 Patch2201: linux-2.6-libata-hpa.patch
 Patch2202: linux-2.6-libata-sata_nv-adma.patch
+Patch2203: linux-2.6-libata-ali-atapi-dma.patch
 Patch2204: linux-2.6-ata-quirk.patch
 Patch2205: linux-2.6-libata-sff-pci_iomap-bug.patch
 Patch2206: linux-2.6-libata-sata_nv-wildcard-removal.patch
@@ -1307,6 +1308,8 @@
 %patch2201 -p1
 # sata_nv: Don't attempt using ADMA for (READ|SET)_MAX commands
 %patch2202 -p1
+# Disable ATAPI DMA on ALI chipsets.
+%patch2203 -p1
 # libata: don't initialize sg in ata_exec_internal() if DMA_NONE
 # ia64 ata quirk
 %patch2204 -p1
@@ -2307,6 +2310,9 @@
 
 %changelog
 * Fri May 04 2007 Dave Jones <davej at redhat.com>
+- Disable ATAPI DMA on ALI chipsets.
+
+* Fri May 04 2007 Dave Jones <davej at redhat.com>
 - Reenable CONFIG_USB_SUSPEND
 
 * Fri May 04 2007 David Woodhouse <dwmw2 at redhat.com>