rpms/kernel/devel linux-2.6-ide-jmicron-fixup.patch, NONE, 1.1 kernel-2.6.spec, 1.2731, 1.2732

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5956

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ide-jmicron-fixup.patch 
Log Message:
Fix up Jmicron IDE PCI probing.

linux-2.6-ide-jmicron-fixup.patch:
 generic.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-ide-jmicron-fixup.patch ---

Some BIOSen somehow end up with the jmicron port in use but the PCI device
disabled again after the firmware enabled it.

This patch isn't relevant to the upstream plans as upstream will get a 
specific Jmicron pata driver in 2.6.19. Basically if its a Jmicron we enable
it and probe it anyway, that will do the right thing in all the cases I've
tested. Change is intentionally minimal.

--- 1/drivers/ide/pci/generic.c~	2006-10-03 16:57:36.276961952 +0100
+++ 2/drivers/ide/pci/generic.c	2006-10-03 16:57:36.276961952 +0100
@@ -236,11 +236,13 @@
 
 	if (dev->vendor == PCI_VENDOR_ID_JMICRON && PCI_FUNC(dev->devfn) != 1)
 		goto out;
-
-	pci_read_config_word(dev, PCI_COMMAND, &command);
-	if (!(command & PCI_COMMAND_IO)) {
-		printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d->name);
-		goto out;
+	
+	if (dev->vendor != PCI_VENDOR_ID_JMICRON) {
+		pci_read_config_word(dev, PCI_COMMAND, &command);
+		if (!(command & PCI_COMMAND_IO)) {
+			printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d->name);
+			goto out;
+		}
 	}
 	ret = ide_setup_pci_device(dev, d);
 out:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2731
retrieving revision 1.2732
diff -u -r1.2731 -r1.2732
--- kernel-2.6.spec	3 Oct 2006 18:00:26 -0000	1.2731
+++ kernel-2.6.spec	3 Oct 2006 18:03:06 -0000	1.2732
@@ -484,6 +484,7 @@
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1680: linux-2.6-reiserfs-dentry-ref.patch
 Patch1690: linux-2.6-PT_LOAD-align.patch
+Patch1700: linux-2.6-ide-jmicron-fixup.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
 Patch1730: linux-2.6-cpufreq-drop-sticky.patch
@@ -1094,6 +1095,8 @@
 %patch1680 -p1
 # Align kernel data segment to page boundary.
 %patch1690 -p1
+# Jmicron PCI IDE probing fixup
+%patch1700 -p1
 # Only print migration info on SMP
 %patch1710 -p1
 # setuid /proc/self/maps fix.
@@ -1987,6 +1990,7 @@
 - Fix bug triggered by fsstress on nfs
 - Fix nfs connectathon test6 regression.
 - Fix breakage in /proc/*/smaps access control (#208589)
+- Fix up Jmicron IDE PCI probing.
 
 * Tue Oct  3 2006 David Woodhouse <dwmw2 at redhat.com>
 - Fix PCMCIA serial port suspend/resume