From 624d370c2ae784ea6db94185e51ea3284df63a5c Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Thu, 19 Jul 2007 17:48:44 -0700 Subject: [PATCH] --- yaml --- r: 64321 b: refs/heads/master c: 5ca24814247fa4c039b893bf80fc05d0e5d41b00 h: refs/heads/master i: 64319: ed8719c67ad50adae530c4cf8f9be5c9cf07cdd2 v: v3 --- [refs] | 2 +- trunk/Documentation/DocBook/deviceiobook.tmpl | 3 ++- trunk/include/asm-i386/io.h | 3 +++ trunk/lib/iomap.c | 15 ++++++++++++++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3065bb3197f2..b1c1d25e6212 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e68fc97b17470365a65bc569523dd9012730e44 +refs/heads/master: 5ca24814247fa4c039b893bf80fc05d0e5d41b00 diff --git a/trunk/Documentation/DocBook/deviceiobook.tmpl b/trunk/Documentation/DocBook/deviceiobook.tmpl index 90ed23df1f68..c917de681ccd 100644 --- a/trunk/Documentation/DocBook/deviceiobook.tmpl +++ b/trunk/Documentation/DocBook/deviceiobook.tmpl @@ -316,7 +316,8 @@ CPU B: spin_unlock_irqrestore(&dev_lock, flags) Public Functions Provided -!Einclude/asm-i386/io.h +!Iinclude/asm-i386/io.h +!Elib/iomap.c diff --git a/trunk/include/asm-i386/io.h b/trunk/include/asm-i386/io.h index 7b65b5b00034..e8e0bd641120 100644 --- a/trunk/include/asm-i386/io.h +++ b/trunk/include/asm-i386/io.h @@ -112,6 +112,9 @@ extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsign * writew/writel functions and the other mmio helpers. The returned * address is not guaranteed to be usable directly as a virtual * address. + * + * If the area you are trying to map is a PCI BAR you should have a + * look at pci_iomap(). */ static inline void __iomem * ioremap(unsigned long offset, unsigned long size) diff --git a/trunk/lib/iomap.c b/trunk/lib/iomap.c index a57d262a5ed9..864f2ec1966e 100644 --- a/trunk/lib/iomap.c +++ b/trunk/lib/iomap.c @@ -240,7 +240,20 @@ void ioport_unmap(void __iomem *addr) EXPORT_SYMBOL(ioport_map); EXPORT_SYMBOL(ioport_unmap); -/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */ +/** + * 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) { unsigned long start = pci_resource_start(dev, bar);