From: Hidetoshi Seto Make Intel e1000 driver legacy I/O port free. Signed-off-by: Kenji Kaneshige Signed-off-by: Hidetoshi Seto Cc: Greg KH Cc: Auke Kok Cc: Jeff Garzik Signed-off-by: Andrew Morton --- drivers/net/e1000/e1000.h | 6 - drivers/net/e1000/e1000_main.c | 152 ++++++++++++++++--------------- 2 files changed, 86 insertions(+), 72 deletions(-) diff -puN drivers/net/e1000/e1000.h~e1000-make-intel-e1000-driver-legacy-i-o-port-free drivers/net/e1000/e1000.h --- a/drivers/net/e1000/e1000.h~e1000-make-intel-e1000-driver-legacy-i-o-port-free +++ a/drivers/net/e1000/e1000.h @@ -78,8 +78,9 @@ #define BAR_1 1 #define BAR_5 5 -#define INTEL_E1000_ETHERNET_DEVICE(device_id) {\ - PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} +#define E1000_USE_IOPORT (1 << 0) +#define INTEL_E1000_ETHERNET_DEVICE(device_id, flags) {\ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id), .driver_data = flags} struct e1000_adapter; @@ -355,6 +356,7 @@ struct e1000_adapter { boolean_t quad_port_a; unsigned long flags; uint32_t eeprom_wol; + int bars; /* BARs to be enabled */ }; enum e1000_state_t { diff -puN drivers/net/e1000/e1000_main.c~e1000-make-intel-e1000-driver-legacy-i-o-port-free drivers/net/e1000/e1000_main.c --- a/drivers/net/e1000/e1000_main.c~e1000-make-intel-e1000-driver-legacy-i-o-port-free +++ a/drivers/net/e1000/e1000_main.c @@ -48,65 +48,65 @@ static char e1000_copyright[] = "Copyrig * {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} */ static struct pci_device_id e1000_pci_tbl[] = { - INTEL_E1000_ETHERNET_DEVICE(0x1000), - INTEL_E1000_ETHERNET_DEVICE(0x1001), - INTEL_E1000_ETHERNET_DEVICE(0x1004), - INTEL_E1000_ETHERNET_DEVICE(0x1008), - INTEL_E1000_ETHERNET_DEVICE(0x1009), - INTEL_E1000_ETHERNET_DEVICE(0x100C), - INTEL_E1000_ETHERNET_DEVICE(0x100D), - INTEL_E1000_ETHERNET_DEVICE(0x100E), - INTEL_E1000_ETHERNET_DEVICE(0x100F), - INTEL_E1000_ETHERNET_DEVICE(0x1010), - INTEL_E1000_ETHERNET_DEVICE(0x1011), - INTEL_E1000_ETHERNET_DEVICE(0x1012), - INTEL_E1000_ETHERNET_DEVICE(0x1013), - INTEL_E1000_ETHERNET_DEVICE(0x1014), - INTEL_E1000_ETHERNET_DEVICE(0x1015), - INTEL_E1000_ETHERNET_DEVICE(0x1016), - INTEL_E1000_ETHERNET_DEVICE(0x1017), - INTEL_E1000_ETHERNET_DEVICE(0x1018), - INTEL_E1000_ETHERNET_DEVICE(0x1019), - INTEL_E1000_ETHERNET_DEVICE(0x101A), - INTEL_E1000_ETHERNET_DEVICE(0x101D), - INTEL_E1000_ETHERNET_DEVICE(0x101E), - INTEL_E1000_ETHERNET_DEVICE(0x1026), - INTEL_E1000_ETHERNET_DEVICE(0x1027), - INTEL_E1000_ETHERNET_DEVICE(0x1028), - INTEL_E1000_ETHERNET_DEVICE(0x1049), - INTEL_E1000_ETHERNET_DEVICE(0x104A), - INTEL_E1000_ETHERNET_DEVICE(0x104B), - INTEL_E1000_ETHERNET_DEVICE(0x104C), - INTEL_E1000_ETHERNET_DEVICE(0x104D), - INTEL_E1000_ETHERNET_DEVICE(0x105E), - INTEL_E1000_ETHERNET_DEVICE(0x105F), - INTEL_E1000_ETHERNET_DEVICE(0x1060), - INTEL_E1000_ETHERNET_DEVICE(0x1075), - INTEL_E1000_ETHERNET_DEVICE(0x1076), - INTEL_E1000_ETHERNET_DEVICE(0x1077), - INTEL_E1000_ETHERNET_DEVICE(0x1078), - INTEL_E1000_ETHERNET_DEVICE(0x1079), - INTEL_E1000_ETHERNET_DEVICE(0x107A), - INTEL_E1000_ETHERNET_DEVICE(0x107B), - INTEL_E1000_ETHERNET_DEVICE(0x107C), - INTEL_E1000_ETHERNET_DEVICE(0x107D), - INTEL_E1000_ETHERNET_DEVICE(0x107E), - INTEL_E1000_ETHERNET_DEVICE(0x107F), - INTEL_E1000_ETHERNET_DEVICE(0x108A), - INTEL_E1000_ETHERNET_DEVICE(0x108B), - INTEL_E1000_ETHERNET_DEVICE(0x108C), - INTEL_E1000_ETHERNET_DEVICE(0x1096), - INTEL_E1000_ETHERNET_DEVICE(0x1098), - INTEL_E1000_ETHERNET_DEVICE(0x1099), - INTEL_E1000_ETHERNET_DEVICE(0x109A), - INTEL_E1000_ETHERNET_DEVICE(0x10A4), - INTEL_E1000_ETHERNET_DEVICE(0x10B5), - INTEL_E1000_ETHERNET_DEVICE(0x10B9), - INTEL_E1000_ETHERNET_DEVICE(0x10BA), - INTEL_E1000_ETHERNET_DEVICE(0x10BB), - INTEL_E1000_ETHERNET_DEVICE(0x10BC), - INTEL_E1000_ETHERNET_DEVICE(0x10C4), - INTEL_E1000_ETHERNET_DEVICE(0x10C5), + INTEL_E1000_ETHERNET_DEVICE(0x1000, 0), + INTEL_E1000_ETHERNET_DEVICE(0x1001, 0), + INTEL_E1000_ETHERNET_DEVICE(0x1004, 0), + INTEL_E1000_ETHERNET_DEVICE(0x1008, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x1009, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x100C, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x100D, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x100E, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x100F, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x1010, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x1011, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x1012, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x1013, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x1014, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x1015, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x1016, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x1017, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x1018, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x1019, 0), + INTEL_E1000_ETHERNET_DEVICE(0x101A, 0), + INTEL_E1000_ETHERNET_DEVICE(0x101D, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x101E, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x1026, 0), + INTEL_E1000_ETHERNET_DEVICE(0x1027, 0), + INTEL_E1000_ETHERNET_DEVICE(0x1028, 0), + INTEL_E1000_ETHERNET_DEVICE(0x1049, 0), + INTEL_E1000_ETHERNET_DEVICE(0x104A, 0), + INTEL_E1000_ETHERNET_DEVICE(0x104B, 0), + INTEL_E1000_ETHERNET_DEVICE(0x104C, 0), + INTEL_E1000_ETHERNET_DEVICE(0x104D, 0), + INTEL_E1000_ETHERNET_DEVICE(0x105E, 0), + INTEL_E1000_ETHERNET_DEVICE(0x105F, 0), + INTEL_E1000_ETHERNET_DEVICE(0x1060, 0), + INTEL_E1000_ETHERNET_DEVICE(0x1075, 0), + INTEL_E1000_ETHERNET_DEVICE(0x1076, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x1077, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x1078, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x1079, 0), + INTEL_E1000_ETHERNET_DEVICE(0x107A, 0), + INTEL_E1000_ETHERNET_DEVICE(0x107B, 0), + INTEL_E1000_ETHERNET_DEVICE(0x107C, E1000_USE_IOPORT), + INTEL_E1000_ETHERNET_DEVICE(0x107D, 0), + INTEL_E1000_ETHERNET_DEVICE(0x107E, 0), + INTEL_E1000_ETHERNET_DEVICE(0x107F, 0), + INTEL_E1000_ETHERNET_DEVICE(0x108A, 0), + INTEL_E1000_ETHERNET_DEVICE(0x108B, 0), + INTEL_E1000_ETHERNET_DEVICE(0x108C, 0), + INTEL_E1000_ETHERNET_DEVICE(0x1096, 0), + INTEL_E1000_ETHERNET_DEVICE(0x1098, 0), + INTEL_E1000_ETHERNET_DEVICE(0x1099, 0), + INTEL_E1000_ETHERNET_DEVICE(0x109A, 0), + INTEL_E1000_ETHERNET_DEVICE(0x10A4, 0), + INTEL_E1000_ETHERNET_DEVICE(0x10B5, 0), + INTEL_E1000_ETHERNET_DEVICE(0x10B9, 0), + INTEL_E1000_ETHERNET_DEVICE(0x10BA, 0), + INTEL_E1000_ETHERNET_DEVICE(0x10BB, 0), + INTEL_E1000_ETHERNET_DEVICE(0x10BC, 0), + INTEL_E1000_ETHERNET_DEVICE(0x10C4, 0), + INTEL_E1000_ETHERNET_DEVICE(0x10C5, 0), /* required last entry */ {0,} }; @@ -741,7 +741,14 @@ e1000_probe(struct pci_dev *pdev, 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; + + if (ent->driver_data & E1000_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))) return err; if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) && @@ -756,7 +763,8 @@ e1000_probe(struct pci_dev *pdev, pci_using_dac = 0; } - if ((err = pci_request_regions(pdev, e1000_driver_name))) + err = pci_request_selected_regions(pdev, bars, e1000_driver_name); + if (err) goto err_pci_reg; pci_set_master(pdev); @@ -775,6 +783,7 @@ e1000_probe(struct pci_dev *pdev, adapter->pdev = pdev; adapter->hw.back = adapter; adapter->msg_enable = (1 << debug) - 1; + adapter->bars = bars; mmio_start = pci_resource_start(pdev, BAR_0); mmio_len = pci_resource_len(pdev, BAR_0); @@ -784,12 +793,15 @@ e1000_probe(struct pci_dev *pdev, 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 (ent->driver_data & E1000_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; + } } } @@ -1057,7 +1069,7 @@ err_sw_init: err_ioremap: free_netdev(netdev); err_alloc_etherdev: - pci_release_regions(pdev); + pci_release_selected_regions(pdev, bars); err_pci_reg: err_dma: pci_disable_device(pdev); @@ -1118,7 +1130,7 @@ e1000_remove(struct pci_dev *pdev) iounmap(adapter->hw.hw_addr); if (adapter->hw.flash_address) iounmap(adapter->hw.flash_address); - pci_release_regions(pdev); + pci_release_selected_regions(pdev, adapter->bars); free_netdev(netdev); @@ -5106,7 +5118,7 @@ e1000_resume(struct pci_dev *pdev) pci_set_power_state(pdev, PCI_D0); e1000_pci_restore_state(adapter); - if ((err = pci_enable_device(pdev))) { + if ((err = pci_enable_device_bars(pdev, adapter->bars))) { printk(KERN_ERR "e1000: Cannot enable PCI device from suspend\n"); return err; } _