* [PATCH][RFC] mm: uncached vma support with writenotify @ 2009-06-14 13:28 Magnus Damm 2009-06-15 3:32 ` Paul Mundt 0 siblings, 1 reply; 12+ messages in thread From: Magnus Damm @ 2009-06-14 13:28 UTC (permalink / raw) To: linux-mm; +Cc: Magnus Damm, lethal, jayakumar.lkml, akpm From: Magnus Damm <damm@igel.co.jp> This patch modifies the generic mmap() code to keep the cache attribute in vma->vm_page_prot regardless if writenotify is enabled or not. Without this patch the cache configuration selected by f_op->mmap() is overwritten if writenotify is enabled, making it impossible to keep the vma uncached. Needed by drivers such as drivers/video/sh_mobile_lcdcfb.c which uses deferred io together with uncached memory. Signed-off-by: Magnus Damm <damm@igel.co.jp> --- Everyone: Maybe there is a cleaner way to do this? Jaya: Will post a patch for deferred io to use fb_pgprotect() in the non-vmalloc mmap() case. That patch together with this allow architectures to use uncached memory with deferred io. mm/mmap.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) --- 0001/mm/mmap.c +++ work/mm/mmap.c 2009-06-11 21:43:16.000000000 +0900 @@ -1209,8 +1209,20 @@ munmap_back: pgoff = vma->vm_pgoff; vm_flags = vma->vm_flags; - if (vma_wants_writenotify(vma)) + if (vma_wants_writenotify(vma)) { + pgprot_t pprot = vma->vm_page_prot; + + /* Can vma->vm_page_prot have changed?? + * + * Answer: Yes, drivers may have changed it in their + * f_op->mmap method. + * + * Ensures that vmas marked as uncached stay that way. + */ vma->vm_page_prot = vm_get_page_prot(vm_flags & ~VM_SHARED); + if (pgprot_val(pprot) == pgprot_val(pgprot_noncached(pprot))) + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); + } vma_link(mm, vma, prev, rb_link, rb_parent); file = vma->vm_file; -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH][RFC] mm: uncached vma support with writenotify 2009-06-14 13:28 [PATCH][RFC] mm: uncached vma support with writenotify Magnus Damm @ 2009-06-15 3:32 ` Paul Mundt 2009-06-22 22:15 ` Andrew Morton 0 siblings, 1 reply; 12+ messages in thread From: Paul Mundt @ 2009-06-15 3:32 UTC (permalink / raw) To: Magnus Damm, Arnd Bergmann; +Cc: linux-mm, jayakumar.lkml, akpm On Sun, Jun 14, 2009 at 10:28:45PM +0900, Magnus Damm wrote: > --- 0001/mm/mmap.c > +++ work/mm/mmap.c 2009-06-11 21:43:16.000000000 +0900 > @@ -1209,8 +1209,20 @@ munmap_back: > pgoff = vma->vm_pgoff; > vm_flags = vma->vm_flags; > > - if (vma_wants_writenotify(vma)) > + if (vma_wants_writenotify(vma)) { > + pgprot_t pprot = vma->vm_page_prot; > + > + /* Can vma->vm_page_prot have changed?? > + * > + * Answer: Yes, drivers may have changed it in their > + * f_op->mmap method. > + * > + * Ensures that vmas marked as uncached stay that way. > + */ > vma->vm_page_prot = vm_get_page_prot(vm_flags & ~VM_SHARED); > + if (pgprot_val(pprot) == pgprot_val(pgprot_noncached(pprot))) > + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); > + } > > vma_link(mm, vma, prev, rb_link, rb_parent); > file = vma->vm_file; > I guess the only real issue here is that we presently have no generic interface in the kernel for setting a VMA uncached. pgprot_noncached() is the closest approximation we have, but there are still architectures that do not implement it. Given that this comes up at least once a month, perhaps it makes sense to see which platforms are still outstanding. At least cris, h8300, m68knommu, s390, and xtensa all presently lack a definition for it. The nommu cases are easily handled, but the rest still require some attention from their architecture maintainers before we can really start treating this as a generic interface. Until then, you will have to do what every other user of pgprot_noncached() code does in generic code: #ifdef pgprot_noncached vma->vm_page_prot = pgprot_noncached(...); #endif OTOH, I guess we could just add something like: #define pgprot_noncached(x) (x) which works fine for the nommu case, and which functionally is no different from what happens right now anyways for the users that don't wire it up sanely. Arnd, what do you think about throwing this at asm-generic? --- include/asm-generic/pgtable.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index e410f60..e2bd73e 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -129,6 +129,10 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres #define move_pte(pte, prot, old_addr, new_addr) (pte) #endif +#ifndef pgprot_noncached +#define pgprot_noncached(prot) (prot) +#endif + #ifndef pgprot_writecombine #define pgprot_writecombine pgprot_noncached #endif -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH][RFC] mm: uncached vma support with writenotify 2009-06-15 3:32 ` Paul Mundt @ 2009-06-22 22:15 ` Andrew Morton 2009-06-23 12:40 ` Arnd Bergmann ` (2 more replies) 0 siblings, 3 replies; 12+ messages in thread From: Andrew Morton @ 2009-06-22 22:15 UTC (permalink / raw) To: Paul Mundt; +Cc: magnus.damm, arnd, linux-mm, jayakumar.lkml On Mon, 15 Jun 2009 12:32:40 +0900 Paul Mundt <lethal@linux-sh.org> wrote: > On Sun, Jun 14, 2009 at 10:28:45PM +0900, Magnus Damm wrote: > > --- 0001/mm/mmap.c > > +++ work/mm/mmap.c 2009-06-11 21:43:16.000000000 +0900 > > @@ -1209,8 +1209,20 @@ munmap_back: > > pgoff = vma->vm_pgoff; > > vm_flags = vma->vm_flags; > > > > - if (vma_wants_writenotify(vma)) > > + if (vma_wants_writenotify(vma)) { > > + pgprot_t pprot = vma->vm_page_prot; > > + > > + /* Can vma->vm_page_prot have changed?? > > + * > > + * Answer: Yes, drivers may have changed it in their > > + * f_op->mmap method. > > + * > > + * Ensures that vmas marked as uncached stay that way. > > + */ > > vma->vm_page_prot = vm_get_page_prot(vm_flags & ~VM_SHARED); > > + if (pgprot_val(pprot) == pgprot_val(pgprot_noncached(pprot))) > > + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); > > + } > > > > vma_link(mm, vma, prev, rb_link, rb_parent); > > file = vma->vm_file; > > > I guess the only real issue here is that we presently have no generic > interface in the kernel for setting a VMA uncached. pgprot_noncached() > is the closest approximation we have, but there are still architectures > that do not implement it. > > Given that this comes up at least once a month, perhaps it makes sense to > see which platforms are still outstanding. At least cris, h8300, > m68knommu, s390, and xtensa all presently lack a definition for it. The > nommu cases are easily handled, but the rest still require some attention > from their architecture maintainers before we can really start treating > this as a generic interface. > > Until then, you will have to do what every other user of > pgprot_noncached() code does in generic code: > > #ifdef pgprot_noncached > vma->vm_page_prot = pgprot_noncached(...); > #endif > > OTOH, I guess we could just add something like: > > #define pgprot_noncached(x) (x) > > which works fine for the nommu case, and which functionally is no > different from what happens right now anyways for the users that don't > wire it up sanely. > > Arnd, what do you think about throwing this at asm-generic? > I think Arnd fell asleep ;) > > include/asm-generic/pgtable.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h > index e410f60..e2bd73e 100644 > --- a/include/asm-generic/pgtable.h > +++ b/include/asm-generic/pgtable.h > @@ -129,6 +129,10 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres > #define move_pte(pte, prot, old_addr, new_addr) (pte) > #endif > > +#ifndef pgprot_noncached > +#define pgprot_noncached(prot) (prot) > +#endif > + > #ifndef pgprot_writecombine > #define pgprot_writecombine pgprot_noncached > #endif -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH][RFC] mm: uncached vma support with writenotify 2009-06-22 22:15 ` Andrew Morton @ 2009-06-23 12:40 ` Arnd Bergmann 2009-06-23 12:41 ` [PATCH] asm-generic: add dummy pgprot_noncached() Arnd Bergmann 2009-06-23 12:55 ` [PATCH] cris: add pgprot_noncached Arnd Bergmann 2 siblings, 0 replies; 12+ messages in thread From: Arnd Bergmann @ 2009-06-23 12:40 UTC (permalink / raw) To: Andrew Morton; +Cc: Paul Mundt, magnus.damm, arnd, linux-mm, jayakumar.lkml On Tuesday 23 June 2009, you wrote: > > I guess the only real issue here is that we presently have no generic > > interface in the kernel for setting a VMA uncached. pgprot_noncached() > > is the closest approximation we have, but there are still architectures > > that do not implement it. > > > > Given that this comes up at least once a month, perhaps it makes sense to > > see which platforms are still outstanding. At least cris, h8300, > > m68knommu, s390, and xtensa all presently lack a definition for it. The > > nommu cases are easily handled, but the rest still require some attention > > from their architecture maintainers before we can really start treating > > this as a generic interface. For m68knommu, h8300 and s390, doing nothing is correct because they either don't have page tables or don't control caching through them. Xtensa could easily add it, they have the respective caching strategy in their page flags. On cris, caching is controlled through the high bit of the address, but I guess that means we could just add '#define _PAGE_UNCACHED (1 << 31)' there and set that for uncached. > > which works fine for the nommu case, and which functionally is no > > different from what happens right now anyways for the users that don't > > wire it up sanely. > > > > Arnd, what do you think about throwing this at asm-generic? > > > > I think Arnd fell asleep ;) For some reason I did not get the original mail. I've added the patch to my asm-generic queue and will send a pull request together with other patches I got. Arnd <>< -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] asm-generic: add dummy pgprot_noncached() 2009-06-22 22:15 ` Andrew Morton 2009-06-23 12:40 ` Arnd Bergmann @ 2009-06-23 12:41 ` Arnd Bergmann 2009-06-23 12:55 ` Paul Mundt ` (2 more replies) 2009-06-23 12:55 ` [PATCH] cris: add pgprot_noncached Arnd Bergmann 2 siblings, 3 replies; 12+ messages in thread From: Arnd Bergmann @ 2009-06-23 12:41 UTC (permalink / raw) To: Andrew Morton Cc: Paul Mundt, magnus.damm, linux-mm, jayakumar.lkml, Jesper Nilsson, Chris Zankel From: Paul Mundt <lethal@linux-sh.org> Most architectures now provide a pgprot_noncached(), the remaining ones can simply use an dummy default implementation, except for cris and xtensa, which should override the default appropriately. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Chris Zankel <chris@zankel.net> Cc: Magnus Damm <magnus.damm@gmail.com> --- include/asm-generic/pgtable.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index e410f60..e2bd73e 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -129,6 +129,10 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres #define move_pte(pte, prot, old_addr, new_addr) (pte) #endif +#ifndef pgprot_noncached +#define pgprot_noncached(prot) (prot) +#endif + #ifndef pgprot_writecombine #define pgprot_writecombine pgprot_noncached #endif -- 1.6.3.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] asm-generic: add dummy pgprot_noncached() 2009-06-23 12:41 ` [PATCH] asm-generic: add dummy pgprot_noncached() Arnd Bergmann @ 2009-06-23 12:55 ` Paul Mundt 2009-06-23 13:00 ` xtensa: add pgprot_noncached Arnd Bergmann 2009-06-23 13:07 ` m32r: define pgprot_noncached Arnd Bergmann 2 siblings, 0 replies; 12+ messages in thread From: Paul Mundt @ 2009-06-23 12:55 UTC (permalink / raw) To: Arnd Bergmann Cc: Andrew Morton, magnus.damm, linux-mm, jayakumar.lkml, Jesper Nilsson, Chris Zankel On Tue, Jun 23, 2009 at 02:41:36PM +0200, Arnd Bergmann wrote: > From: Paul Mundt <lethal@linux-sh.org> > > Most architectures now provide a pgprot_noncached(), the > remaining ones can simply use an dummy default implementation, > except for cris and xtensa, which should override the > default appropriately. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Cc: Jesper Nilsson <jesper.nilsson@axis.com> > Cc: Chris Zankel <chris@zankel.net> > Cc: Magnus Damm <magnus.damm@gmail.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org> -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 12+ messages in thread
* xtensa: add pgprot_noncached 2009-06-23 12:41 ` [PATCH] asm-generic: add dummy pgprot_noncached() Arnd Bergmann 2009-06-23 12:55 ` Paul Mundt @ 2009-06-23 13:00 ` Arnd Bergmann 2009-06-23 13:07 ` m32r: define pgprot_noncached Arnd Bergmann 2 siblings, 0 replies; 12+ messages in thread From: Arnd Bergmann @ 2009-06-23 13:00 UTC (permalink / raw) To: Chris Zankel Cc: Andrew Morton, Paul Mundt, magnus.damm, linux-mm, jayakumar.lkml, Jesper Nilsson This adds a straightforward pgprot_noncached() macro for xtensa, so we can use it in architecture independent code in the future. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- a/arch/xtensa/include/asm/pgtable.h +++ b/arch/xtensa/include/asm/pgtable.h @@ -251,6 +251,9 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) return __pte((pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot)); } +#define pgprot_noncached(prot) \ + __pgprot((pgprot_val(prot) & ~_PAGE_CA_MASK) | _PAGE_CA_BYPASS) + /* * Certain architectures need to do special things when pte's * within a page table are directly modified. Thus, the following -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 12+ messages in thread
* m32r: define pgprot_noncached 2009-06-23 12:41 ` [PATCH] asm-generic: add dummy pgprot_noncached() Arnd Bergmann 2009-06-23 12:55 ` Paul Mundt 2009-06-23 13:00 ` xtensa: add pgprot_noncached Arnd Bergmann @ 2009-06-23 13:07 ` Arnd Bergmann 2 siblings, 0 replies; 12+ messages in thread From: Arnd Bergmann @ 2009-06-23 13:07 UTC (permalink / raw) To: Hirokazu Takata Cc: Andrew Morton, Paul Mundt, magnus.damm, linux-mm, jayakumar.lkml, Jesper Nilsson, Chris Zankel, linux-m32r On m32r, pgprot_noncached is an inline function and not a macro, which means that various bits of code that check its presence with #ifdef never get to call it. In particular, the asm-generic version of that macro would override it. This adds a self-referencing macro like other architectures do it to make the checks work correctly. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- a/arch/m32r/include/asm/pgtable.h +++ b/arch/m32r/include/asm/pgtable.h @@ -281,6 +281,7 @@ static inline pgprot_t pgprot_noncached(pgprot_t _prot) return __pgprot(prot); } +#define pgprot_noncached(prot) pgprot_noncached(prot) #define pgprot_writecombine(prot) pgprot_noncached(prot) /* -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] cris: add pgprot_noncached 2009-06-22 22:15 ` Andrew Morton 2009-06-23 12:40 ` Arnd Bergmann 2009-06-23 12:41 ` [PATCH] asm-generic: add dummy pgprot_noncached() Arnd Bergmann @ 2009-06-23 12:55 ` Arnd Bergmann 2009-06-23 19:20 ` Jesper Nilsson 2 siblings, 1 reply; 12+ messages in thread From: Arnd Bergmann @ 2009-06-23 12:55 UTC (permalink / raw) To: Jesper Nilsson Cc: Andrew Morton, Paul Mundt, magnus.damm, linux-mm, jayakumar.lkml On cris, the high address bit controls caching, which means that we can add a pgprot_noncached() macro that sets this bit in the address. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- Jesper, does this patch make any sense to you? I could well be misunderstanding how cris works. arch/cris/include/arch-v10/arch/mmu.h | 9 +++++---- arch/cris/include/arch-v32/arch/mmu.h | 10 ++++++---- arch/cris/include/asm/pgtable.h | 2 ++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/arch/cris/include/arch-v10/arch/mmu.h b/arch/cris/include/arch-v10/arch/mmu.h index df84f17..e829e5a 100644 --- a/arch/cris/include/arch-v10/arch/mmu.h +++ b/arch/cris/include/arch-v10/arch/mmu.h @@ -33,10 +33,10 @@ typedef struct /* CRIS PTE bits (see R_TLB_LO in the register description) * - * Bit: 31-13 12-------4 3 2 1 0 - * ________________________________________________ - * | pfn | reserved | global | valid | kernel | we | - * |_____|__________|________|_______|________|_____| + * Bit: 31 30-13 12-------4 3 2 1 0 + * _______________________________________________________ + * | cache |pfn | reserved | global | valid | kernel | we | + * |_______|____|__________|________|_______|________|_____| * * (pfn = physical frame number) */ @@ -53,6 +53,7 @@ typedef struct #define _PAGE_VALID (1<<2) /* page is valid */ #define _PAGE_SILENT_READ (1<<2) /* synonym */ #define _PAGE_GLOBAL (1<<3) /* global page - context is ignored */ +#define _PAGE_NO_CACHE (1<<31) /* part of the uncached memory map */ /* Bits the HW doesn't care about but the kernel uses them in SW */ diff --git a/arch/cris/include/arch-v32/arch/mmu.h b/arch/cris/include/arch-v32/arch/mmu.h index 6bcdc3f..a05b033 100644 --- a/arch/cris/include/arch-v32/arch/mmu.h +++ b/arch/cris/include/arch-v32/arch/mmu.h @@ -28,10 +28,10 @@ typedef struct /* * CRISv32 PTE bits: * - * Bit: 31-13 12-5 4 3 2 1 0 - * +-----+------+--------+-------+--------+-------+---------+ - * | pfn | zero | global | valid | kernel | write | execute | - * +-----+------+--------+-------+--------+-------+---------+ + * Bit: 31 30-13 12-5 4 3 2 1 0 + * +-------+-----+------+--------+-------+--------+-------+---------+ + * | cache | pfn | zero | global | valid | kernel | write | execute | + * +-------+-----+------+--------+-------+--------+-------+---------+ */ /* @@ -45,6 +45,8 @@ typedef struct #define _PAGE_VALID (1 << 3) /* Page is valid. */ #define _PAGE_SILENT_READ (1 << 3) /* Same as above. */ #define _PAGE_GLOBAL (1 << 4) /* Global page. */ +#define _PAGE_NO_CACHE (1 <<31) /* part of the uncached memory map */ + /* * The hardware doesn't care about these bits, but the kernel uses them in diff --git a/arch/cris/include/asm/pgtable.h b/arch/cris/include/asm/pgtable.h index 50aa974..1fcce00 100644 --- a/arch/cris/include/asm/pgtable.h +++ b/arch/cris/include/asm/pgtable.h @@ -197,6 +197,8 @@ static inline pte_t __mk_pte(void * page, pgprot_t pgprot) static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) { pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot); return pte; } +#define pgprot_noncached(prot) __pgprot((pgprot_val(prot) | _PAGE_NO_CACHE)) + /* pte_val refers to a page in the 0x4xxxxxxx physical DRAM interval * __pte_page(pte_val) refers to the "virtual" DRAM interval -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] cris: add pgprot_noncached 2009-06-23 12:55 ` [PATCH] cris: add pgprot_noncached Arnd Bergmann @ 2009-06-23 19:20 ` Jesper Nilsson 2009-06-23 20:07 ` Arnd Bergmann 0 siblings, 1 reply; 12+ messages in thread From: Jesper Nilsson @ 2009-06-23 19:20 UTC (permalink / raw) To: Arnd Bergmann Cc: Andrew Morton, Paul Mundt, magnus.damm, linux-mm, jayakumar.lkml On Tue, Jun 23, 2009 at 02:55:30PM +0200, Arnd Bergmann wrote: > On cris, the high address bit controls caching, which means that > we can add a pgprot_noncached() macro that sets this bit in the > address. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Jesper Nilsson <jesper.nilsson@axis.com> > --- > > Jesper, does this patch make any sense to you? I could well > be misunderstanding how cris works. No, this looks good to me. Do you want me to grab it for the CRIS tree or do you want to keep it as a series? > arch/cris/include/arch-v10/arch/mmu.h | 9 +++++---- > arch/cris/include/arch-v32/arch/mmu.h | 10 ++++++---- > arch/cris/include/asm/pgtable.h | 2 ++ > 3 files changed, 13 insertions(+), 8 deletions(-) > > diff --git a/arch/cris/include/arch-v10/arch/mmu.h b/arch/cris/include/arch-v10/arch/mmu.h > index df84f17..e829e5a 100644 > --- a/arch/cris/include/arch-v10/arch/mmu.h > +++ b/arch/cris/include/arch-v10/arch/mmu.h > @@ -33,10 +33,10 @@ typedef struct > > /* CRIS PTE bits (see R_TLB_LO in the register description) > * > - * Bit: 31-13 12-------4 3 2 1 0 > - * ________________________________________________ > - * | pfn | reserved | global | valid | kernel | we | > - * |_____|__________|________|_______|________|_____| > + * Bit: 31 30-13 12-------4 3 2 1 0 > + * _______________________________________________________ > + * | cache |pfn | reserved | global | valid | kernel | we | > + * |_______|____|__________|________|_______|________|_____| > * > * (pfn = physical frame number) > */ > @@ -53,6 +53,7 @@ typedef struct > #define _PAGE_VALID (1<<2) /* page is valid */ > #define _PAGE_SILENT_READ (1<<2) /* synonym */ > #define _PAGE_GLOBAL (1<<3) /* global page - context is ignored */ > +#define _PAGE_NO_CACHE (1<<31) /* part of the uncached memory map */ > > /* Bits the HW doesn't care about but the kernel uses them in SW */ > > diff --git a/arch/cris/include/arch-v32/arch/mmu.h b/arch/cris/include/arch-v32/arch/mmu.h > index 6bcdc3f..a05b033 100644 > --- a/arch/cris/include/arch-v32/arch/mmu.h > +++ b/arch/cris/include/arch-v32/arch/mmu.h > @@ -28,10 +28,10 @@ typedef struct > /* > * CRISv32 PTE bits: > * > - * Bit: 31-13 12-5 4 3 2 1 0 > - * +-----+------+--------+-------+--------+-------+---------+ > - * | pfn | zero | global | valid | kernel | write | execute | > - * +-----+------+--------+-------+--------+-------+---------+ > + * Bit: 31 30-13 12-5 4 3 2 1 0 > + * +-------+-----+------+--------+-------+--------+-------+---------+ > + * | cache | pfn | zero | global | valid | kernel | write | execute | > + * +-------+-----+------+--------+-------+--------+-------+---------+ > */ > > /* > @@ -45,6 +45,8 @@ typedef struct > #define _PAGE_VALID (1 << 3) /* Page is valid. */ > #define _PAGE_SILENT_READ (1 << 3) /* Same as above. */ > #define _PAGE_GLOBAL (1 << 4) /* Global page. */ > +#define _PAGE_NO_CACHE (1 <<31) /* part of the uncached memory map */ > + > > /* > * The hardware doesn't care about these bits, but the kernel uses them in > diff --git a/arch/cris/include/asm/pgtable.h b/arch/cris/include/asm/pgtable.h > index 50aa974..1fcce00 100644 > --- a/arch/cris/include/asm/pgtable.h > +++ b/arch/cris/include/asm/pgtable.h > @@ -197,6 +197,8 @@ static inline pte_t __mk_pte(void * page, pgprot_t pgprot) > static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) > { pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot); return pte; } > > +#define pgprot_noncached(prot) __pgprot((pgprot_val(prot) | _PAGE_NO_CACHE)) > + > > /* pte_val refers to a page in the 0x4xxxxxxx physical DRAM interval > * __pte_page(pte_val) refers to the "virtual" DRAM interval /^JN - Jesper Nilsson -- Jesper Nilsson -- jesper.nilsson@axis.com -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] cris: add pgprot_noncached 2009-06-23 19:20 ` Jesper Nilsson @ 2009-06-23 20:07 ` Arnd Bergmann 2009-06-23 20:23 ` Jesper Nilsson 0 siblings, 1 reply; 12+ messages in thread From: Arnd Bergmann @ 2009-06-23 20:07 UTC (permalink / raw) To: Jesper Nilsson Cc: Andrew Morton, Paul Mundt, magnus.damm, linux-mm, jayakumar.lkml On Tuesday 23 June 2009, Jesper Nilsson wrote: > No, this looks good to me. > Do you want me to grab it for the CRIS tree or do you want > to keep it as a series? I'd prefer you to take it. The order of the four patches is entirely arbitrary anyway and there are no other dependencies on it once the asm-generic version is merged. Arnd <>< -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] cris: add pgprot_noncached 2009-06-23 20:07 ` Arnd Bergmann @ 2009-06-23 20:23 ` Jesper Nilsson 0 siblings, 0 replies; 12+ messages in thread From: Jesper Nilsson @ 2009-06-23 20:23 UTC (permalink / raw) To: Arnd Bergmann Cc: Andrew Morton, Paul Mundt, magnus.damm, linux-mm, jayakumar.lkml On Tue, Jun 23, 2009 at 10:07:42PM +0200, Arnd Bergmann wrote: > On Tuesday 23 June 2009, Jesper Nilsson wrote: > > No, this looks good to me. > > Do you want me to grab it for the CRIS tree or do you want > > to keep it as a series? > > I'd prefer you to take it. The order of the four patches is > entirely arbitrary anyway and there are no other dependencies > on it once the asm-generic version is merged. Right, I'll add it the CRIS tree. Thanks! > Arnd <>< /^JN - Jesper Nilsson -- Jesper Nilsson -- jesper.nilsson@axis.com -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2009-06-23 20:23 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2009-06-14 13:28 [PATCH][RFC] mm: uncached vma support with writenotify Magnus Damm 2009-06-15 3:32 ` Paul Mundt 2009-06-22 22:15 ` Andrew Morton 2009-06-23 12:40 ` Arnd Bergmann 2009-06-23 12:41 ` [PATCH] asm-generic: add dummy pgprot_noncached() Arnd Bergmann 2009-06-23 12:55 ` Paul Mundt 2009-06-23 13:00 ` xtensa: add pgprot_noncached Arnd Bergmann 2009-06-23 13:07 ` m32r: define pgprot_noncached Arnd Bergmann 2009-06-23 12:55 ` [PATCH] cris: add pgprot_noncached Arnd Bergmann 2009-06-23 19:20 ` Jesper Nilsson 2009-06-23 20:07 ` Arnd Bergmann 2009-06-23 20:23 ` Jesper Nilsson
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.