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

x86: shrink pat_x_mtrr_type to its essentials

Browse Source 
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Suresh B Siddha <suresh.b.siddha@intel.com>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Andreas Herrmann
2008-06-18 15:38:57 +02:00
committed by Ingo Molnar
parent 6cf514fce1
commit dd0c7c4903
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
arch/x86/mm/pat.c
View File

@@ -161,29 +161,21 @@ static DEFINE_SPINLOCK(memtype_lock); /* protects memtype list */
*/ */
static unsigned long pat_x_mtrr_type(u64 start, u64 end, unsigned long req_type) static unsigned long pat_x_mtrr_type(u64 start, u64 end, unsigned long req_type)
{ {
u8 mtrr_type;
/*
* We return the PAT request directly for types where PAT takes
* precedence with respect to MTRR and for UC_MINUS.
* Consistency checks with other PAT requests is done later
* while going through memtype list.
*/
if (req_type == _PAGE_CACHE_WC ||
req_type == _PAGE_CACHE_UC_MINUS ||
req_type == _PAGE_CACHE_UC)
return req_type;
/* /*
* Look for MTRR hint to get the effective type in case where PAT * Look for MTRR hint to get the effective type in case where PAT
* request is for WB. * request is for WB.
*/ */
mtrr_type = mtrr_type_lookup(start, end); if (req_type == _PAGE_CACHE_WB) {
if (mtrr_type == MTRR_TYPE_UNCACHABLE) u8 mtrr_type;
return _PAGE_CACHE_UC;
if (mtrr_type == MTRR_TYPE_WRCOMB) mtrr_type = mtrr_type_lookup(start, end);
return _PAGE_CACHE_WC; if (mtrr_type == MTRR_TYPE_UNCACHABLE)
return _PAGE_CACHE_WB; return _PAGE_CACHE_UC;
if (mtrr_type == MTRR_TYPE_WRCOMB)
return _PAGE_CACHE_WC;
}
return req_type;
} }
/* /*