lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: PAT use reserve free memtype in set_memory_uc

Browse Source 
Use reserve_memtype and free_memtype interfaces in set_memory_uc/set_memory_wb
interfaces to avoid aliasing.
Usage model of set_memory_uc and set_memory_wb is for RAM memory and users
will first call set_memory_uc and call set_memory_wb after use to reset the
attribute.

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
venkatesh.pallipadi@intel.com
2008-03-18 17:00:18 -07:00
committed by Ingo Molnar
parent d7677d4034
commit 1219333dfd
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/mm/ioremap.c
View File

@@ -95,10 +95,10 @@ int ioremap_change_attr(unsigned long vaddr, unsigned long size,
switch (prot_val) { switch (prot_val) {
case _PAGE_CACHE_UC: case _PAGE_CACHE_UC:
default: default:
err = set_memory_uc(vaddr, nrpages); err = _set_memory_uc(vaddr, nrpages);
break; break;
case _PAGE_CACHE_WB: case _PAGE_CACHE_WB:
err = set_memory_wb(vaddr, nrpages); err = _set_memory_wb(vaddr, nrpages);
break; break;
} }

21
arch/x86/mm/pageattr.c
View File

@@ -19,6 +19,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/proto.h> #include <asm/proto.h>
#include <asm/pat.h>
/* /*
* The current flushing context - we pass it instead of 5 arguments: * The current flushing context - we pass it instead of 5 arguments:
@@ -770,18 +771,34 @@ static inline int change_page_attr_clear(unsigned long addr, int numpages,
return change_page_attr_set_clr(addr, numpages, __pgprot(0), mask); return change_page_attr_set_clr(addr, numpages, __pgprot(0), mask);
} }
int set_memory_uc(unsigned long addr, int numpages) int _set_memory_uc(unsigned long addr, int numpages)
{ {
return change_page_attr_set(addr, numpages, return change_page_attr_set(addr, numpages,
__pgprot(_PAGE_CACHE_UC)); __pgprot(_PAGE_CACHE_UC));
} }
int set_memory_uc(unsigned long addr, int numpages)
{
if (reserve_memtype(addr, addr + numpages * PAGE_SIZE,
_PAGE_CACHE_UC, NULL))
return -EINVAL;
return _set_memory_uc(addr, numpages);
}
EXPORT_SYMBOL(set_memory_uc); EXPORT_SYMBOL(set_memory_uc);
int set_memory_wb(unsigned long addr, int numpages) int _set_memory_wb(unsigned long addr, int numpages)
{ {
return change_page_attr_clear(addr, numpages, return change_page_attr_clear(addr, numpages,
__pgprot(_PAGE_CACHE_MASK)); __pgprot(_PAGE_CACHE_MASK));
} }
int set_memory_wb(unsigned long addr, int numpages)
{
free_memtype(addr, addr + numpages * PAGE_SIZE);
return _set_memory_wb(addr, numpages);
}
EXPORT_SYMBOL(set_memory_wb); EXPORT_SYMBOL(set_memory_wb);
int set_memory_x(unsigned long addr, int numpages) int set_memory_x(unsigned long addr, int numpages)

2
include/asm-x86/cacheflush.h
View File

@@ -34,6 +34,8 @@ int set_pages_nx(struct page *page, int numpages);
int set_pages_ro(struct page *page, int numpages); int set_pages_ro(struct page *page, int numpages);
int set_pages_rw(struct page *page, int numpages); int set_pages_rw(struct page *page, int numpages);
int _set_memory_uc(unsigned long addr, int numpages);
int _set_memory_wb(unsigned long addr, int numpages);
int set_memory_uc(unsigned long addr, int numpages); int set_memory_uc(unsigned long addr, int numpages);
int set_memory_wb(unsigned long addr, int numpages); int set_memory_wb(unsigned long addr, int numpages);
int set_memory_x(unsigned long addr, int numpages); int set_memory_x(unsigned long addr, int numpages);