Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c15238df authored by venkatesh.pallipadi@intel.com's avatar venkatesh.pallipadi@intel.com Committed by Ingo Molnar
Browse files

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: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b2a6a58c

arch/x86/mm/pageattr.c

+3 −3
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ int set_memory_uc(unsigned long addr, int numpages) 
	/*

	 * 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))

		return -EINVAL;
@@ -868,7 +868,7 @@ int set_memory_wc(unsigned long addr, int numpages) 
	if (!pat_enabled)

		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))

		return -EINVAL;
@@ -884,7 +884,7 @@ 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);

}