Dear Auke and e1000 maintainers Hi, this is the patch which makes the e1000 driver legacy I/O port free.
I've received some advice from Auke quite long time ago, and submitted a patch (http://lkml.org/lkml/2007/8/10/11) which I think meets what Auke had told me. Since the patch has not received any reaction from the e1000 community, let me submit it once again (plus, the previous one had a bug regarding module parameter). If the module parameter enable_legacy_ioport_free is set to 0, it does not differ from the existing e1000 driver, otherwise legacy I/O port free function is enabled. I may have done something wrong, so any comments would be helpful. Tomohiro Kusumi Signed-off-by: Tomohiro Kusumi <[EMAIL PROTECTED]> --- diff -Nur linux-2.6.23.org/drivers/net/e1000/e1000.h linux-2.6.23/drivers/net/e1000/e1000.h --- linux-2.6.23.org/drivers/net/e1000/e1000.h 2007-10-16 11:30:37.000000000 +0900 +++ linux-2.6.23/drivers/net/e1000/e1000.h 2007-10-16 11:32:55.000000000 +0900 @@ -342,6 +342,9 @@ boolean_t quad_port_a; unsigned long flags; uint32_t eeprom_wol; + + int use_ioport; + int bars; }; enum e1000_state_t { diff -Nur linux-2.6.23.org/drivers/net/e1000/e1000_main.c linux-2.6.23/drivers/net/e1000/e1000_main.c --- linux-2.6.23.org/drivers/net/e1000/e1000_main.c 2007-10-16 11:30:38.000000000 +0900 +++ linux-2.6.23/drivers/net/e1000/e1000_main.c 2007-10-16 14:48:16.390575464 +0900 @@ -226,6 +226,11 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev); static void e1000_io_resume(struct pci_dev *pdev); +static unsigned int enable_legacy_ioport_free = 0; +module_param(enable_legacy_ioport_free, uint, 0644); +MODULE_PARM_DESC(enable_legacy_ioport_free, "Enable legacy I/O port free (default:0)"); +static int e1000_test_legacy_ioport(struct pci_dev *pdev); + static struct pci_error_handlers e1000_err_handler = { .error_detected = e1000_io_error_detected, .slot_reset = e1000_io_slot_reset, @@ -872,8 +877,24 @@ int i, err, pci_using_dac; uint16_t eeprom_data = 0; uint16_t eeprom_apme_mask = E1000_EEPROM_APME; - if ((err = pci_enable_device(pdev))) + int bars = 0; + int use_ioport = 0; + + if (enable_legacy_ioport_free) { + if ((use_ioport = e1000_test_legacy_ioport(pdev)) < 0) { + E1000_ERR("e1000_test_legacy_ioport failed, aborting\n"); + return -1; + } + if (use_ioport) + bars = pci_select_bars(pdev, IORESOURCE_MEM | IORESOURCE_IO); + else + bars = pci_select_bars(pdev, IORESOURCE_MEM); + if ((err = pci_enable_device_bars(pdev, bars)) != 0) + return err; + } + else if ((err = pci_enable_device(pdev)) != 0) { return err; + } if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) && !(err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))) { @@ -887,7 +908,11 @@ pci_using_dac = 0; } - if ((err = pci_request_regions(pdev, e1000_driver_name))) + if (enable_legacy_ioport_free) + err = pci_request_selected_regions(pdev, bars, e1000_driver_name); + else + err = pci_request_regions(pdev, e1000_driver_name); + if (err) goto err_pci_reg; pci_set_master(pdev); @@ -906,6 +931,10 @@ adapter->pdev = pdev; adapter->hw.back = adapter; adapter->msg_enable = (1 << debug) - 1; + if (enable_legacy_ioport_free) { + adapter->use_ioport = use_ioport; + adapter->bars = bars; + } mmio_start = pci_resource_start(pdev, BAR_0); mmio_len = pci_resource_len(pdev, BAR_0); @@ -915,12 +944,14 @@ if (!adapter->hw.hw_addr) goto err_ioremap; - for (i = BAR_1; i <= BAR_5; i++) { - if (pci_resource_len(pdev, i) == 0) - continue; - if (pci_resource_flags(pdev, i) & IORESOURCE_IO) { - adapter->hw.io_base = pci_resource_start(pdev, i); - break; + if (!enable_legacy_ioport_free || adapter->use_ioport) { + for (i = BAR_1; i <= BAR_5; i++) { + if (pci_resource_len(pdev, i) == 0) + continue; + if (pci_resource_flags(pdev, i) & IORESOURCE_IO) { + adapter->hw.io_base = pci_resource_start(pdev, i); + break; + } } } @@ -1188,7 +1219,10 @@ err_ioremap: free_netdev(netdev); err_alloc_etherdev: - pci_release_regions(pdev); + if (enable_legacy_ioport_free) + pci_release_selected_regions(pdev, bars); + else + pci_release_regions(pdev); err_pci_reg: err_dma: pci_disable_device(pdev); @@ -1240,7 +1274,10 @@ iounmap(adapter->hw.hw_addr); if (adapter->hw.flash_address) iounmap(adapter->hw.flash_address); - pci_release_regions(pdev); + if (enable_legacy_ioport_free) + pci_release_selected_regions(pdev, adapter->bars); + else + pci_release_regions(pdev); free_netdev(netdev); @@ -5180,7 +5217,11 @@ pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); - if ((err = pci_enable_device(pdev))) { + if (enable_legacy_ioport_free) + err = pci_enable_device_bars(pdev, adapter->bars); + else + err = pci_enable_device(pdev); + if (err) { printk(KERN_ERR "e1000: Cannot enable PCI device from suspend\n"); return err; } @@ -5325,4 +5366,42 @@ } +/* + * e1000_test_legacy_ioport - see if the device uses legacy I/O port + * @pdev: Pointer to PCI device + * + * This function tests if the PCI device uses I/O port. + * If yes the function returns 1, if no the function returns 0. + * The function returns -1 if there is an error. + */ +static int e1000_test_legacy_ioport(struct pci_dev *pdev) +{ + int ret; + struct e1000_hw hw; + memset(&hw, 0, sizeof(hw)); + + hw.mac_type = e1000_undefined; + hw.device_id = pdev->device; + pci_read_config_byte(pdev, PCI_REVISION_ID, &hw.revision_id); + + if (e1000_set_mac_type(&hw) < 0) + return -1; + + switch (hw.mac_type) { + case e1000_82540: + case e1000_82541: + case e1000_82541_rev_2: + case e1000_82544: + case e1000_82545: + case e1000_82546: + ret = 1; + break; + default: + ret = 0; + break; + } + + return ret; +} + /* e1000_main.c */ - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
