Signed-off-by: Andrew Morton --- drivers/pci/pci-driver.c | 3 +- drivers/pci/pci.c | 47 +++++++++++++++++++++++++++++++------ include/linux/pci.h | 2 + 3 files changed, 44 insertions(+), 8 deletions(-) diff -puN drivers/pci/pci.c~gregkh-pci-pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code drivers/pci/pci.c --- devel/drivers/pci/pci.c~gregkh-pci-pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code 2006-06-09 15:21:23.000000000 -0700 +++ devel-akpm/drivers/pci/pci.c 2006-06-09 15:21:23.000000000 -0700 @@ -489,6 +489,9 @@ pci_enable_device_bars(struct pci_dev *d err = pcibios_enable_device(dev, bars); if (err < 0) return err; + pci_fixup_device(pci_fixup_enable, dev); + dev->is_enabled = 1; + dev->bars_enabled = bars; return 0; } @@ -506,8 +509,6 @@ pci_enable_device(struct pci_dev *dev) int err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1); if (err) return err; - pci_fixup_device(pci_fixup_enable, dev); - dev->is_enabled = 1; return 0; } @@ -542,6 +543,7 @@ pci_disable_device(struct pci_dev *dev) pcibios_disable_device(dev); dev->is_enabled = 0; + dev->bars_enabled = 0; } /** @@ -624,6 +626,12 @@ void pci_release_region(struct pci_dev * { if (pci_resource_len(pdev, bar) == 0) return; + if (!(pdev->bars_enabled & (1 << bar))) { + dev_warn(&pdev->dev, + "Trying to release region #%d that is not enabled\n", + bar + 1); + return; + } if (pci_resource_flags(pdev, bar) & IORESOURCE_IO) release_region(pci_resource_start(pdev, bar), pci_resource_len(pdev, bar)); @@ -650,7 +658,12 @@ int pci_request_region(struct pci_dev *p { if (pci_resource_len(pdev, bar) == 0) return 0; - + if (!(pdev->bars_enabled & (1 << bar))) { + dev_warn(&pdev->dev, + "Trying to request region #%d that is not enabled\n", + bar + 1); + goto err_out; + } if (pci_resource_flags(pdev, bar) & IORESOURCE_IO) { if (!request_region(pci_resource_start(pdev, bar), pci_resource_len(pdev, bar), res_name)) @@ -688,7 +701,8 @@ void pci_release_regions(struct pci_dev int i; for (i = 0; i < 6; i++) - pci_release_region(pdev, i); + if (pdev->bars_enabled & (1 << i)) + pci_release_region(pdev, i); } /** @@ -709,13 +723,15 @@ int pci_request_regions(struct pci_dev * int i; for (i = 0; i < 6; i++) - if(pci_request_region(pdev, i, res_name)) - goto err_out; + if (pdev->bars_enabled & (1 << i)) + if(pci_request_region(pdev, i, res_name)) + goto err_out; return 0; err_out: while(--i >= 0) - pci_release_region(pdev, i); + if (pdev->bars_enabled & (1 << i)) + pci_release_region(pdev, i); return -EBUSY; } @@ -890,6 +906,22 @@ pci_set_consistent_dma_mask(struct pci_d } #endif +/** + * pci_select_bars - Make BAR mask from the type of resource + * @pdev: the PCI device for which BAR mask is made + * @flags: resource type mask to be selected + * + * This helper routine makes bar mask from the type of resource. + */ +int pci_select_bars(struct pci_dev *dev, unsigned long flags) +{ + int i, bars = 0; + for (i = 0; i < PCI_NUM_RESOURCES; i++) + if (pci_resource_flags(dev, i) & flags) + bars |= (1 << i); + return bars; +} + static int __devinit pci_init(void) { struct pci_dev *dev = NULL; @@ -947,6 +979,7 @@ EXPORT_SYMBOL(pci_set_dma_mask); EXPORT_SYMBOL(pci_set_consistent_dma_mask); EXPORT_SYMBOL(pci_assign_resource); EXPORT_SYMBOL(pci_find_parent_resource); +EXPORT_SYMBOL(pci_select_bars); EXPORT_SYMBOL(pci_set_power_state); EXPORT_SYMBOL(pci_save_state); diff -puN drivers/pci/pci-driver.c~gregkh-pci-pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code drivers/pci/pci-driver.c --- devel/drivers/pci/pci-driver.c~gregkh-pci-pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code 2006-06-09 15:21:23.000000000 -0700 +++ devel-akpm/drivers/pci/pci-driver.c 2006-06-09 15:21:23.000000000 -0700 @@ -293,7 +293,8 @@ static void pci_default_resume(struct pc pci_restore_state(pci_dev); /* if the device was enabled before suspend, reenable */ if (pci_dev->is_enabled) - retval = pci_enable_device(pci_dev); + retval = pci_enable_device_bars(pci_dev, + pci_dev->bars_enabled); /* if the device was busmaster before the suspend, make it busmaster again */ if (pci_dev->is_busmaster) pci_set_master(pci_dev); diff -puN include/linux/pci.h~gregkh-pci-pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code include/linux/pci.h --- devel/include/linux/pci.h~gregkh-pci-pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code 2006-06-09 15:21:23.000000000 -0700 +++ devel-akpm/include/linux/pci.h 2006-06-09 15:21:23.000000000 -0700 @@ -168,6 +168,7 @@ struct pci_dev { struct bin_attribute *rom_attr; /* attribute descriptor for sysfs ROM entry */ int rom_attr_enabled; /* has display of the rom attribute been enabled? */ struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */ + int bars_enabled; /* BARs enabled */ }; #define pci_dev_g(n) list_entry(n, struct pci_dev, global_list) @@ -497,6 +498,7 @@ int pci_set_consistent_dma_mask(struct p void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno); int pci_assign_resource(struct pci_dev *dev, int i); void pci_restore_bars(struct pci_dev *dev); +int pci_select_bars(struct pci_dev *dev, unsigned long flags); /* ROM control related routines */ void __iomem __must_check *pci_map_rom(struct pci_dev *pdev, size_t *size); _