2 files changed, 45 insertions, 20 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index cb9758e0ba0c..87da53bb1fef 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -23,7 +23,7 @@ config HAVE_ARCH_BITREVERSE
           have this capability.
 
 config RATIONAL
-        boolean
+        bool
 
 config GENERIC_STRNCPY_FROM_USER
         bool
@@ -48,14 +48,14 @@ config GENERIC_IOMAP
         select GENERIC_PCI_IOMAP
 
 config GENERIC_IO
-        boolean
+        bool
         default n
 
 config STMP_DEVICE
         bool
 
 config PERCPU_RWSEM
-        boolean
+        bool
 
 config ARCH_USE_CMPXCHG_LOCKREF
         bool
@@ -266,7 +266,7 @@ config DECOMPRESS_LZ4
 # Generic allocator support is selected if needed
 #
 config GENERIC_ALLOCATOR
-        boolean
+        bool
 
 #
 # reed solomon support is select'ed if needed
@@ -275,16 +275,16 @@ config REED_SOLOMON
         tristate
         
 config REED_SOLOMON_ENC8
-        boolean
+        bool
 
 config REED_SOLOMON_DEC8
-        boolean
+        bool
 
 config REED_SOLOMON_ENC16
-        boolean
+        bool
 
 config REED_SOLOMON_DEC16
-        boolean
+        bool
 
 #
 # BCH support is selected if needed
@@ -293,7 +293,7 @@ config BCH
         tristate
 
 config BCH_CONST_PARAMS
-        boolean
+        bool
         help
           Drivers may select this option to force specific constant
           values for parameters 'm' (Galois field order) and 't'
@@ -329,7 +329,7 @@ config BCH_CONST_T
 # Textsearch support is select'ed if needed
 #
 config TEXTSEARCH
-        boolean
+        bool
 
 config TEXTSEARCH_KMP
         tristate
@@ -341,10 +341,10 @@ config TEXTSEARCH_FSM
         tristate
 
 config BTREE
-        boolean
+        bool
 
 config INTERVAL_TREE
-        boolean
+        bool
         help
           Simple, embeddable, interval-tree. Can find the start of an
           overlapping range in log(n) time and then iterate over all
@@ -372,18 +372,18 @@ config ASSOCIATIVE_ARRAY
           for more information.
 
 config HAS_IOMEM
-        boolean
+        bool
         depends on !NO_IOMEM
         select GENERIC_IO
         default y
 
 config HAS_IOPORT_MAP
-        boolean
+        bool
         depends on HAS_IOMEM && !NO_IOPORT_MAP
         default y
 
 config HAS_DMA
-        boolean
+        bool
         depends on !NO_DMA
         default y
 
diff --git a/lib/pci_iomap.c b/lib/pci_iomap.c
index 0d83ea8a9605..bcce5f149310 100644
--- a/lib/pci_iomap.c
+++ b/lib/pci_iomap.c
@@ -10,10 +10,11 @@
 
 #ifdef CONFIG_PCI
 /**
- * pci_iomap - create a virtual mapping cookie for a PCI BAR
+ * pci_iomap_range - create a virtual mapping cookie for a PCI BAR
  * @dev: PCI device that owns the BAR
  * @bar: BAR number
- * @maxlen: length of the memory to map
+ * @offset: map memory at the given offset in BAR
+ * @maxlen: max length of the memory to map
  *
  * Using this function you will get a __iomem address to your device BAR.
  * You can access it using ioread*() and iowrite*(). These functions hide
@@ -21,16 +22,21 @@
  * you expect from them in the correct way.
  *
  * @maxlen specifies the maximum length to map. If you want to get access to
- * the complete BAR without checking for its length first, pass %0 here.
+ * the complete BAR from offset to the end, pass %0 here.
  * */
-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
+void __iomem *pci_iomap_range(struct pci_dev *dev,
+                              int bar,
+                              unsigned long offset,
+                              unsigned long maxlen)
 {
         resource_size_t start = pci_resource_start(dev, bar);
         resource_size_t len = pci_resource_len(dev, bar);
         unsigned long flags = pci_resource_flags(dev, bar);
 
-        if (!len || !start)
+        if (len <= offset || !start)
                 return NULL;
+        len -= offset;
+        start += offset;
         if (maxlen && len > maxlen)
                 len = maxlen;
         if (flags & IORESOURCE_IO)
@@ -43,6 +49,25 @@ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
         /* What? */
         return NULL;
 }
+EXPORT_SYMBOL(pci_iomap_range);
 
+/**
+ * pci_iomap - create a virtual mapping cookie for a PCI BAR
+ * @dev: PCI device that owns the BAR
+ * @bar: BAR number
+ * @maxlen: length of the memory to map
+ *
+ * Using this function you will get a __iomem address to your device BAR.
+ * You can access it using ioread*() and iowrite*(). These functions hide
+ * the details if this is a MMIO or PIO address space and will just do what
+ * you expect from them in the correct way.
+ *
+ * @maxlen specifies the maximum length to map. If you want to get access to
+ * the complete BAR without checking for its length first, pass %0 here.
+ * */
+void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
+{
+        return pci_iomap_range(dev, bar, 0, maxlen);
+}
 EXPORT_SYMBOL(pci_iomap);
 #endif /* CONFIG_PCI */