rpms/kernel/devel linux-2.6-net-8139-pio-oqo2.patch, NONE, 1.1 kernel.spec, 1.665, 1.666

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-net-8139-pio-oqo2.patch 
Log Message:
Make the OQO2 use polled IO for its ethernet.

linux-2.6-net-8139-pio-oqo2.patch:

--- NEW FILE linux-2.6-net-8139-pio-oqo2.patch ---
The OQO model 2 has an RTL8139 from Atheros that doesn't like MMIO.
Force it to always use polled IO.

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.25.noarch/drivers/net/8139too.c~	2008-05-28 21:07:36.000000000 -0400
+++ linux-2.6.25.noarch/drivers/net/8139too.c	2008-05-28 21:19:57.000000000 -0400
@@ -951,6 +951,14 @@ static int __devinit rtl8139_init_one (s
 			   "Use the \"8139cp\" driver for improved performance and stability.\n");
 	}
 
+	if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&
+	    pdev->device == PCI_DEVICE_ID_REALTEK_8139 &&
+	    pdev->subsystem_vendor == PCI_VENDOR_ID_ATHEROS &&
+	    pdev->subsystem_device == PCI_DEVICE_ID_REALTEK_8139) {
+		printk(KERN_INFO "8139too: OQO Model 2 detected. Forcing PIO\n");
+		use_pio = 1;
+	}
+
 	i = rtl8139_init_board (pdev, &dev);
 	if (i < 0)
 		return i;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.665
retrieving revision 1.666
diff -u -r1.665 -r1.666
--- kernel.spec	28 May 2008 21:48:59 -0000	1.665
+++ kernel.spec	29 May 2008 01:21:43 -0000	1.666
@@ -598,6 +598,7 @@
 Patch420: linux-2.6-squashfs.patch
 Patch430: linux-2.6-net-silence-noisy-printks.patch
 Patch440: linux-2.6-net-8139-pio-modparam.patch
+Patch441: linux-2.6-net-8139-pio-oqo2.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
@@ -1093,6 +1094,8 @@
 ApplyPatch linux-2.6-net-silence-noisy-printks.patch
 # Make 8139too PIO/MMIO a module parameter
 ApplyPatch linux-2.6-net-8139-pio-modparam.patch
+# OQO2 needs PIO
+ApplyPatch linux-2.6-net-8139-pio-oqo2.patch
 
 # Misc fixes
 # The input layer spews crap no-one cares about.
@@ -1769,6 +1772,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed May 28 2008 Dave Jones <davej at redhat.com>
+- Make the OQO2 use polled IO for its ethernet.
+
 * Wed May 28 2008 Chuck Ebbert <cebbert at redhat.com>
 - Remove eeepc driver, now upstream as eeepc-laptop.