Re: [PATCH 3/3] igb: make ioport free
From: Taku Izumi <hidden>
Date: 2008-06-23 08:32:57
Also in:
lkml
This patch makes igb driver ioport-free. This corrects behavior in probe function so as not to request ioport resources. Signed-off-by: Taku Izumi <redacted> --- drivers/net/igb/igb.h | 3 +++ drivers/net/igb/igb_main.c | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) Index: linux-2.6.25.7/drivers/net/igb/igb.h ===================================================================
--- linux-2.6.25.7.orig/drivers/net/igb/igb.h
+++ linux-2.6.25.7/drivers/net/igb/igb.h@@ -271,6 +271,9 @@ struct igb_adapter { unsigned int msi_enabled; u32 eeprom_wol; + + /* for ioport free */ + int bars; }; enum e1000_state_t {
Index: linux-2.6.25.7/drivers/net/igb/igb_main.c ===================================================================
--- linux-2.6.25.7.orig/drivers/net/igb/igb_main.c
+++ linux-2.6.25.7/drivers/net/igb/igb_main.c@@ -843,8 +843,11 @@ static int __devinit igb_probe(struct pc u16 eeprom_data = 0; u16 eeprom_apme_mask = IGB_EEPROM_APME; u32 part_num; + int bars; - err = pci_enable_device(pdev); + /* do not allocate ioport bars when not needed */ + bars = pci_select_bars(pdev, IORESOURCE_MEM); + err = pci_enable_device_mem(pdev); if (err) return err;
@@ -866,7 +869,7 @@ static int __devinit igb_probe(struct pc } } - err = pci_request_regions(pdev, igb_driver_name); + err = pci_request_selected_regions(pdev, bars, igb_driver_name); if (err) goto err_pci_reg;
@@ -886,6 +889,7 @@ static int __devinit igb_probe(struct pc hw = &adapter->hw; hw->back = adapter; adapter->msg_enable = NETIF_MSG_DRV | NETIF_MSG_PROBE; + adapter->bars = bars; mmio_start = pci_resource_start(pdev, 0); mmio_len = pci_resource_len(pdev, 0);
@@ -1121,7 +1125,7 @@ err_hw_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);
@@ -1168,7 +1172,7 @@ static void __devexit igb_remove(struct 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);
@@ -3969,7 +3973,8 @@ static int igb_resume(struct pci_dev *pd pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); - err = pci_enable_device(pdev); + + err = pci_enable_device_mem(pdev); if (err) { dev_err(&pdev->dev, "igb: Cannot enable PCI device from suspend\n");
@@ -4072,8 +4077,10 @@ static pci_ers_result_t igb_io_slot_rese struct net_device *netdev = pci_get_drvdata(pdev); struct igb_adapter *adapter = netdev_priv(netdev); struct e1000_hw *hw = &adapter->hw; + int err; - if (pci_enable_device(pdev)) { + err = pci_enable_device_mem(pdev); + if (err) { dev_err(&pdev->dev, "Cannot re-enable PCI device after reset.\n"); return PCI_ERS_RESULT_DISCONNECT;