From: Prarit Bhargava <prarit@redhat.com> Date: Mon, 30 Mar 2009 08:10:00 -0400 Subject: [net] e1000e: make driver ioport free Message-id: 20090330120958.29177.36719.sendpatchset@prarit.bos.redhat.com O-Subject: [RHEL5 PATCH 2/5]: e1000e - make driver ioport free Bugzilla: 442007 RH-Acked-by: Andy Gospodarek <gospo@redhat.com> RH-Acked-by: David Miller <davem@redhat.com> RH-Acked-by: Tomas Henzl <thenzl@redhat.com> Backport of 6e4f6f6b408cf3257c65cf4f3e299c098345b72f, which introduces ioport checking in the e1000e driver, and a backport of f0f422e5735ba9f48039aa7dd4c9daa16b996c2c which removes much of the ioport checking but does update the code to correctly call pci_enable_device_mem() and pci_[request|release]_selected_regions(). Successfully tested by me. Resolves BZ 442007. diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 51bcd09..b39d878 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -4495,7 +4495,8 @@ static int e1000_resume(struct pci_dev *pdev) pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); e1000e_disable_l1aspm(pdev); - err = pci_enable_device(pdev); + + err = pci_enable_device_mem(pdev); if (err) { dev_err(&pdev->dev, "Cannot enable PCI device from suspend\n"); @@ -4596,9 +4597,11 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev) struct net_device *netdev = pci_get_drvdata(pdev); struct e1000_adapter *adapter = netdev_priv(netdev); struct e1000_hw *hw = &adapter->hw; + int err; e1000e_disable_l1aspm(pdev); - 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; @@ -4721,7 +4724,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev, u16 eeprom_apme_mask = E1000_EEPROM_APME; e1000e_disable_l1aspm(pdev); - err = pci_enable_device(pdev); + + err = pci_enable_device_mem(pdev); if (err) return err; @@ -4744,7 +4748,9 @@ static int __devinit e1000_probe(struct pci_dev *pdev, } } - err = pci_request_regions(pdev, e1000e_driver_name); + err = pci_request_selected_regions(pdev, + pci_select_bars(pdev, IORESOURCE_MEM), + e1000e_driver_name); if (err) goto err_pci_reg; @@ -5010,7 +5016,8 @@ err_flashmap: err_ioremap: free_netdev(netdev); err_alloc_etherdev: - pci_release_regions(pdev); + pci_release_selected_regions(pdev, + pci_select_bars(pdev, IORESOURCE_MEM)); err_pci_reg: err_dma: pci_disable_device(pdev); @@ -5059,7 +5066,8 @@ static void __devexit 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, + pci_select_bars(pdev, IORESOURCE_MEM)); free_netdev(netdev);