Browse Source

x86: PAT proper tracking of set_memory_uc and friends

Big thinko in pat memtype tracking code. reserve_memtype should be called
with physical address and not virtual address.

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>
venkatesh.pallipadi@intel.com 16 năm trước cách đây
mục cha
commit
c15238df3b
1 tập tin đã thay đổi với 3 bổ sung3 xóa
  1. 3 3
      arch/x86/mm/pageattr.c

+ 3 - 3
arch/x86/mm/pageattr.c

@@ -849,7 +849,7 @@ int set_memory_uc(unsigned long addr, int numpages)
 	/*
 	/*
 	 * for now UC MINUS. see comments in ioremap_nocache()
 	 * for now UC MINUS. see comments in ioremap_nocache()
 	 */
 	 */
-	if (reserve_memtype(addr, addr + numpages * PAGE_SIZE,
+	if (reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE,
 			    _PAGE_CACHE_UC_MINUS, NULL))
 			    _PAGE_CACHE_UC_MINUS, NULL))
 		return -EINVAL;
 		return -EINVAL;
 
 
@@ -868,7 +868,7 @@ int set_memory_wc(unsigned long addr, int numpages)
 	if (!pat_enabled)
 	if (!pat_enabled)
 		return set_memory_uc(addr, numpages);
 		return set_memory_uc(addr, numpages);
 
 
-	if (reserve_memtype(addr, addr + numpages * PAGE_SIZE,
+	if (reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE,
 		_PAGE_CACHE_WC, NULL))
 		_PAGE_CACHE_WC, NULL))
 		return -EINVAL;
 		return -EINVAL;
 
 
@@ -884,7 +884,7 @@ int _set_memory_wb(unsigned long addr, int numpages)
 
 
 int set_memory_wb(unsigned long addr, int numpages)
 int set_memory_wb(unsigned long addr, int numpages)
 {
 {
-	free_memtype(addr, addr + numpages * PAGE_SIZE);
+	free_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE);
 
 
 	return _set_memory_wb(addr, numpages);
 	return _set_memory_wb(addr, numpages);
 }
 }