From: Dave Jones <davej@redhat.com>
Date: Tue, 15 Jul 2008 23:54:53 +0000 (-0400)
Subject: 8139too: Force usage of PIO on OQO2
X-Git-Tag: v2.6.27-rc1~860^2~3^2~30
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=152151daece9d5dfd86e652b95846072c0d2b566;p=linux-2.6-omap-h63xx.git

8139too: Force usage of PIO on OQO2

The OQO model 2 has an RTL8139 from Atheros that doesn't like MMIO.
It fails on modprobe, with a 'PCI Bus error' message.

Force it to always use polled IO.

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index f172b5d822d..f62ac64e98f 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -949,6 +949,14 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
 			   "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_io = 1;
+	}
+
 	i = rtl8139_init_board (pdev, &dev);
 	if (i < 0)
 		return i;