PCI: add a new function to map BAR offsets

Add a function to map a given resource number to a corresponding
register so drivers can get the offset and type of device specific BARs.

Signed-off-by: Yu Zhao <yu.zhao@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 3c5203ff53c7..32e8d88a4619 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -31,6 +31,7 @@ void pci_update_resource(struct pci_dev *dev, int resno)
         struct pci_bus_region region;
         u32 new, check, mask;
         int reg;
+        enum pci_bar_type type;
         struct resource *res = dev->resource + resno;
 
         /*
@@ -62,17 +63,13 @@ void pci_update_resource(struct pci_dev *dev, int resno)
         else
                 mask = (u32)PCI_BASE_ADDRESS_MEM_MASK;
 
-        if (resno < 6) {
-                reg = PCI_BASE_ADDRESS_0 + 4 * resno;
-        } else if (resno == PCI_ROM_RESOURCE) {
+        reg = pci_resource_bar(dev, resno, &type);
+        if (!reg)
+                return;
+        if (type != pci_bar_unknown) {
                 if (!(res->flags & IORESOURCE_ROM_ENABLE))
                         return;
                 new |= PCI_ROM_ADDRESS_ENABLE;
-                reg = dev->rom_base_reg;
-        } else {
-                /* Hmm, non-standard resource. */
-        
-                return;         /* kill uninitialised var warning */
         }
 
         pci_write_config_dword(dev, reg, new);