| Message ID | e4aea657faf920a0d207e582724ccd7ef08487f1.1291004790.git.michael@ellerman.id.au (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 7a9d12568e34e37a72d9e00ce01b62dec527e663 |
| Delegated to: | Benjamin Herrenschmidt |
| Headers | show |
On Mon, 2010-11-29 at 15:26 +1100, Michael Ellerman wrote: > The vmalloc code can track the physical address of a vma, when the > vma is used for ioremap, if set it is displayed in /proc/vmallocinfo. > > Because get_vm_area_caller() doesn't know it's being called for > ioremap() it's up to the arch code to set the phys_addr. A bunch > of other arch's do this, I'm not sure why powerpc doesn't? Because I never noticed ? :-) Cheers, Ben. > Signed-off-by: Michael Ellerman <michael@ellerman.id.au> > --- > arch/powerpc/mm/pgtable_32.c | 1 + > arch/powerpc/mm/pgtable_64.c | 2 ++ > 2 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c > index a87ead0..71932d0 100644 > --- a/arch/powerpc/mm/pgtable_32.c > +++ b/arch/powerpc/mm/pgtable_32.c > @@ -230,6 +230,7 @@ __ioremap_caller(phys_addr_t addr, unsigned long size, unsigned long flags, > area = get_vm_area_caller(size, VM_IOREMAP, caller); > if (area == 0) > return NULL; > + area->phys_addr = p; > v = (unsigned long) area->addr; > } else { > v = (ioremap_bot -= size); > diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c > index 21d6dfa..88927a0 100644 > --- a/arch/powerpc/mm/pgtable_64.c > +++ b/arch/powerpc/mm/pgtable_64.c > @@ -223,6 +223,8 @@ void __iomem * __ioremap_caller(phys_addr_t addr, unsigned long size, > caller); > if (area == NULL) > return NULL; > + > + area->phys_addr = paligned; > ret = __ioremap_at(paligned, area->addr, size, flags); > if (!ret) > vunmap(area->addr);
On Mon, 2010-11-29 at 15:56 +1100, Benjamin Herrenschmidt wrote: > On Mon, 2010-11-29 at 15:26 +1100, Michael Ellerman wrote: > > The vmalloc code can track the physical address of a vma, when the > > vma is used for ioremap, if set it is displayed in /proc/vmallocinfo. > > > > Because get_vm_area_caller() doesn't know it's being called for > > ioremap() it's up to the arch code to set the phys_addr. A bunch > > of other arch's do this, I'm not sure why powerpc doesn't? > > Because I never noticed ? :-) Yeah I figured. It seems to go back past 2.6.12 so who knows when it went in, anyway it's useful. cheers
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index a87ead0..71932d0 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c @@ -230,6 +230,7 @@ __ioremap_caller(phys_addr_t addr, unsigned long size, unsigned long flags, area = get_vm_area_caller(size, VM_IOREMAP, caller); if (area == 0) return NULL; + area->phys_addr = p; v = (unsigned long) area->addr; } else { v = (ioremap_bot -= size); diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c index 21d6dfa..88927a0 100644 --- a/arch/powerpc/mm/pgtable_64.c +++ b/arch/powerpc/mm/pgtable_64.c @@ -223,6 +223,8 @@ void __iomem * __ioremap_caller(phys_addr_t addr, unsigned long size, caller); if (area == NULL) return NULL; + + area->phys_addr = paligned; ret = __ioremap_at(paligned, area->addr, size, flags); if (!ret) vunmap(area->addr);
The vmalloc code can track the physical address of a vma, when the vma is used for ioremap, if set it is displayed in /proc/vmallocinfo. Because get_vm_area_caller() doesn't know it's being called for ioremap() it's up to the arch code to set the phys_addr. A bunch of other arch's do this, I'm not sure why powerpc doesn't? Signed-off-by: Michael Ellerman <michael@ellerman.id.au> --- arch/powerpc/mm/pgtable_32.c | 1 + arch/powerpc/mm/pgtable_64.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-)