x86, mtrr: Refactor MTRR type overlap check code
A message that is not in the archive (sent off-list or not yet received): [email protected]
Commit-ID: a7f07cfbaa1dd5bf9e615948f280c92e7928e6f7 Gitweb: http://git.kernel.org/tip/a7f07cfbaa1dd5bf9e615948f280c92e7928e6f7 Author: Venkatesh Pallipadi <[email protected]> AuthorDate: Fri, 10 Sep 2010 15:55:49 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Fri, 10 Sep 2010 16:11:10 -0700
x86, mtrr: Refactor MTRR type overlap check code
Move the MTRR type overlap check into a new function. No functional change in this patch. Just making it easier to add multiple region overlap check in the following patch.
Signed-off-by Venkatesh Pallipadi <[email protected]>
LKML-Reference: <[email protected]>
Reviewed-by Suresh Siddha <[email protected]>
Signed-off-by H. Peter Anvin <[email protected]>
--- arch/x86/kernel/cpu/mtrr/generic.c | 44 +++++++++++++++++++++++------------ 1 files changed, 29 insertions(+), 15 deletions(-)
arch/x86/kernel/cpu/mtrr/generic.c +29 -15
@@ -65,6 +65,33 @@ static inline void k8_check_syscfg_dram_mod_en(void) }/* +* Check and return the effective type for MTRR-MTRR type overlap. +* Returns 1 if the effective type is UNCACHEABLE, else returns 0 +*/ +static int check_type_overlap (u8 *prev,u8 *curr) +{ +if (*prev ==MTRR_TYPE_UNCACHABLE || *curr ==MTRR_TYPE_UNCACHABLE ) { + *prev =MTRR_TYPE_UNCACHABLE ; + *curr =MTRR_TYPE_UNCACHABLE ; +return 1 ; + } + +if ((*prev ==MTRR_TYPE_WRBACK && *curr ==MTRR_TYPE_WRTHROUGH ) || + (*prev ==MTRR_TYPE_WRTHROUGH && *curr ==MTRR_TYPE_WRBACK )) { + *prev =MTRR_TYPE_WRTHROUGH ; + *curr =MTRR_TYPE_WRTHROUGH ; + } + +if (*prev != *curr) { + *prev =MTRR_TYPE_UNCACHABLE ; + *curr =MTRR_TYPE_UNCACHABLE ; +return 1 ; + } + +return 0 ; +} + +/* * Returns the effective MTRR type for the region * Error returns: * - 0xFE - when the range is "not entirely covered" by _any_ var range MTRR
@@ -138,21 +165,8 @@ u8 mtrr_type_lookup(u64 start, u64 end)continue ; } -if (prev_match ==MTRR_TYPE_UNCACHABLE || - curr_match ==MTRR_TYPE_UNCACHABLE ) { -return MTRR_TYPE_UNCACHABLE ; - } - -if ((prev_match ==MTRR_TYPE_WRBACK && - curr_match ==MTRR_TYPE_WRTHROUGH ) || - (prev_match ==MTRR_TYPE_WRTHROUGH && - curr_match ==MTRR_TYPE_WRBACK )) { - prev_match =MTRR_TYPE_WRTHROUGH ; - curr_match =MTRR_TYPE_WRTHROUGH ; - } - -if (prev_match != curr_match) -return MTRR_TYPE_UNCACHABLE ; +if (check_type_overlap (&prev_match, &curr_match)) +return curr_match; }if (mtrr_tom2) {