rpms/kernel/F-7 linux-2.6-libata-ncq-blacklist-2.6.22-rc7.patch, NONE, 1.1 linux-2.6-libata-pata_dma-param.patch, NONE, 1.1 kernel-2.6.spec, 1.3249, 1.3250

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7892

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-libata-ncq-blacklist-2.6.22-rc7.patch 
	linux-2.6-libata-pata_dma-param.patch 
Log Message:
* Thu Jul 05 2007 Chuck Ebbert <cebbert at redhat.com>
- update libata NCQ blacklist


linux-2.6-libata-ncq-blacklist-2.6.22-rc7.patch:

--- NEW FILE linux-2.6-libata-ncq-blacklist-2.6.22-rc7.patch ---
Updata libata NCQ blacklist to 2.6.22-rc7.

---
 drivers/ata/libata-core.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- linux-2.6.21.noarch.orig/drivers/ata/libata-core.c
+++ linux-2.6.21.noarch/drivers/ata/libata-core.c
@@ -3590,6 +3590,7 @@ static const struct ata_blacklist_entry 
 	{ "FUJITSU MHT2060BH",	NULL,		ATA_HORKAGE_NONCQ },
 	/* NCQ is broken */
 	{ "Maxtor 6L250S0",     "BANC1G10",     ATA_HORKAGE_NONCQ },
+	{ "Maxtor 6B200M0",	"BANC1B10",	ATA_HORKAGE_NONCQ },
 	/* NCQ hard hangs device under heavier load, needs hard power cycle */
 	{ "Maxtor 6B250S0",	"BANC1B70",	ATA_HORKAGE_NONCQ },
 	/* Blacklist entries taken from Silicon Image 3124/3132
@@ -3597,6 +3598,11 @@ static const struct ata_blacklist_entry 
 	{ "HTS541060G9SA00",    "MB3OC60D",     ATA_HORKAGE_NONCQ, },
 	{ "HTS541080G9SA00",    "MB4OC60D",     ATA_HORKAGE_NONCQ, },
 	{ "HTS541010G9SA00",    "MBZOC60D",     ATA_HORKAGE_NONCQ, },
+	/* Drives which do spurious command completion */
+	{ "HTS541680J9SA00",	"SB2IC7EP",	ATA_HORKAGE_NONCQ, },
+	{ "HTS541612J9SA00",	"SBDIC7JP",	ATA_HORKAGE_NONCQ, },
+	{ "Hitachi HTS541616J9SA00", "SB4OC70P", ATA_HORKAGE_NONCQ, },
+	{ "WDC WD740ADFD-00NLR1", NULL,		ATA_HORKAGE_NONCQ, },
 
 	/* Devices with NCQ limits */
 

linux-2.6-libata-pata_dma-param.patch:

--- NEW FILE linux-2.6-libata-pata_dma-param.patch ---
Allow

	libata.pata_dma=0

to disable DMA (default is 1)

SATA is unaffected as disabling DMA for SATA makes no sense at all.

Signed-off-by: Alan Cox <alan at redhat.com>
[documentation: cebbert at redhat.com]

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.22-rc4-mm2/drivers/ata/libata-core.c linux-2.6.22-rc4-mm2/drivers/ata/libata-core.c
--- linux.vanilla-2.6.22-rc4-mm2/drivers/ata/libata-core.c	2007-06-07 14:26:08.000000000 +0100
+++ linux-2.6.22-rc4-mm2/drivers/ata/libata-core.c	2007-06-07 16:53:43.000000000 +0100
@@ -94,6 +94,10 @@
 module_param_named(ignore_hpa, ata_ignore_hpa, int, 0644);
 MODULE_PARM_DESC(ignore_hpa, "Ignore HPA limit (0=keep BIOS limits, 1=ignore limits, using full disk)");
 
+static int ata_pata_dma = 1;
+module_param_named(pata_dma, ata_pata_dma, int, 0644);
+MODULE_PARM_DESC(pata_dma, "Use DMA on PATA devices");
+
 static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ;
 module_param(ata_probe_timeout, int, 0444);
 MODULE_PARM_DESC(ata_probe_timeout, "Set ATA probing timeout (seconds)");
@@ -2815,7 +2831,12 @@
 		ata_dev_xfermask(dev);
 
 		pio_mask = ata_pack_xfermask(dev->pio_mask, 0, 0);
-		dma_mask = ata_pack_xfermask(0, dev->mwdma_mask, dev->udma_mask);
+		
+		if (ata_pata_dma || ap->cbl == ATA_CBL_SATA)
+			dma_mask = ata_pack_xfermask(0, dev->mwdma_mask, dev->udma_mask);
+		else
+			dma_mask = 0;
+
 		dev->pio_mode = ata_xfer_mask2mode(pio_mask);
 		dev->dma_mode = ata_xfer_mask2mode(dma_mask);
 
--- linux-2.6.21.noarch.orig/Documentation/kernel-parameters.txt
+++ linux-2.6.21.noarch/Documentation/kernel-parameters.txt
@@ -786,6 +786,10 @@ and is between 256 and 4096 characters. 
 	lasi=		[HW,SCSI] PARISC LASI driver for the 53c700 chip
 			Format: addr:<io>,irq:<irq>
 
+	libata.pata_dma	[LIBATA] enable or disable DMA in the
+			Parallel ATA drivers.
+			Format: <integer> (0=disable, 1=enable)
+
 	llsc*=		[IA64] See function print_params() in
 			arch/ia64/sn/kernel/llsc4.c.
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3249
retrieving revision 1.3250
diff -u -r1.3249 -r1.3250
--- kernel-2.6.spec	5 Jul 2007 15:55:10 -0000	1.3249
+++ kernel-2.6.spec	5 Jul 2007 19:00:52 -0000	1.3250
@@ -641,6 +641,7 @@
 Patch2214: linux-2.6-ata-call-check-dma-with-qc-prepared.patch
 Patch2215: linux-2.6-libata-ich8m-add-pciid.patch
 Patch2216: linux-2.6-libata-pata_dma-param.patch
+Patch2217: linux-2.6-libata-ncq-blacklist-2.6.22-rc7.patch
 
 # ATA spindown
 Patch2220: linux-2.6-2110_scsi-sd-printing.patch
@@ -1452,6 +1453,8 @@
 %patch2215 -p1
 # libata: add option to disable PATA DMA
 %patch2216 -p1
+# libata: update NCQ blacklist
+%patch2217 -p1
 
 # ATA spindown
 %patch2220 -p1
@@ -2457,6 +2460,10 @@
 
 %changelog
 * Thu Jul 05 2007 Chuck Ebbert <cebbert at redhat.com>
+- update libata NCQ blacklist
+- add the PATA DMA disable patch to CVS
+
+* Thu Jul 05 2007 Chuck Ebbert <cebbert at redhat.com>
 - add option to disable LIBATA PATA DMA [from alan]
 
 * Thu Jul 05 2007 Chuck Ebbert <cebbert at redhat.com>