lkml.org 
[lkml]   [2005]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch 2.6.13 2/2] 3c59x: add option for using memory-mapped PCI I/O resources
Add module option to enable 3c59x driver to use memory-mapped PCI I/O
resources. This may improve performance for those devices so equipped.

Add "use_mmio=1" to the 3c59x module options in order to enable this
functionality.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
Ideally this option will eventually go away. First we need a good list
of which devices "work" and which ones do not.
drivers/net/3c59x.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -918,6 +918,9 @@ static int global_enable_wol = -1;
static int compaq_ioaddr, compaq_irq, compaq_device_id = 0x5900;
static struct net_device *compaq_net_device;

+/* Flag to enable use of memory-mapped PCI I/O resource */
+static int use_mmio;
+
static int vortex_cards_found;

module_param(debug, int, 0);
@@ -935,6 +938,7 @@ module_param(compaq_ioaddr, int, 0);
module_param(compaq_irq, int, 0);
module_param(compaq_device_id, int, 0);
module_param(watchdog, int, 0);
+module_param(use_mmio, int, 0);
MODULE_PARM_DESC(debug, "3c59x debug level (0-6)");
MODULE_PARM_DESC(options, "3c59x: Bits 0-3: media type, bit 4: bus mastering, bit 9: full duplex");
MODULE_PARM_DESC(global_options, "3c59x: same as options, but applies to all NICs if options is unset");
@@ -950,6 +954,7 @@ MODULE_PARM_DESC(compaq_ioaddr, "3c59x P
MODULE_PARM_DESC(compaq_irq, "3c59x PCI IRQ number (Compaq BIOS problem workaround)");
MODULE_PARM_DESC(compaq_device_id, "3c59x PCI device ID (Compaq BIOS problem workaround)");
MODULE_PARM_DESC(watchdog, "3c59x transmit timeout in milliseconds");
+MODULE_PARM_DESC(use_mmio, "3c59x: use memory-mapped PCI I/O resource");

#ifdef CONFIG_NET_POLL_CONTROLLER
static void poll_vortex(struct net_device *dev)
@@ -1093,14 +1098,16 @@ static int __init vortex_eisa_init (void
static int __devinit vortex_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent)
{
- int rc;
+ int rc, pci_bar;

/* wake up and enable device */
rc = pci_enable_device (pdev);
if (rc < 0)
goto out;

- rc = vortex_probe1 (&pdev->dev, pci_iomap(pdev, 0, 0),
+ pci_bar = use_mmio ? 1 : 0;
+
+ rc = vortex_probe1 (&pdev->dev, pci_iomap(pdev, pci_bar, 0),
pdev->irq, ent->driver_data, vortex_cards_found);
if (rc < 0) {
pci_disable_device (pdev);
--
John W. Linville
linville@tuxdriver.com
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-09-06 22:53    [from the cache]
©2003-2011 Jasper Spaans