GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtrr: retry fitting w/o WRCOMB if usage exceeds BIOS allocation 

If the MTRR usage exceeds the BIOS allocation for MTRR usage
re-try without the WRCOMB type.

Change-Id: Ie70ce84994428ff6700c36310264c3c44d9ed128
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/5151
Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Aaron Durbin 2014-02-05 16:00:43 -06:00 committed by Aaron Durbin
parent ed9307db13
commit 5b9e3b6051
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/cpu/x86/mtrr/mtrr.c
View File

@ -661,8 +661,9 @@ static void calc_var_mtrrs_without_hole(struct var_mtrr_state *var_state,
calc_var_mtrr_range(var_state, c1, c2 - c1, mtrr_type); calc_var_mtrr_range(var_state, c1, c2 - c1, mtrr_type);
} }
static int calc_var_mtrrs(struct memranges *addr_space, static void __calc_var_mtrrs(struct memranges *addr_space,
int above4gb, int address_bits) int above4gb, int address_bits,
int *num_def_wb_mtrrs, int *num_def_uc_mtrrs)
{ {
int wb_deftype_count; int wb_deftype_count;
int uc_deftype_count; int uc_deftype_count;
@ -738,6 +739,28 @@ static int calc_var_mtrrs(struct memranges *addr_space,
wb_deftype_count += var_state.mtrr_index; wb_deftype_count += var_state.mtrr_index;
} }
} }
*num_def_wb_mtrrs = wb_deftype_count;
*num_def_uc_mtrrs = uc_deftype_count;
}
static int calc_var_mtrrs(struct memranges *addr_space,
int above4gb, int address_bits)
{
int wb_deftype_count = 0;
int uc_deftype_count = 0;
__calc_var_mtrrs(addr_space, above4gb, address_bits, &wb_deftype_count,
&uc_deftype_count);
if (wb_deftype_count > bios_mtrrs && uc_deftype_count > bios_mtrrs) {
printk(BIOS_DEBUG, "MTRR: Removing WRCOMB type. "
"WB/UC MTRR counts: %d/%d > %d.\n",
wb_deftype_count, uc_deftype_count, bios_mtrrs);
memranges_update_tag(addr_space, MTRR_TYPE_WRCOMB,
MTRR_TYPE_UNCACHEABLE);
__calc_var_mtrrs(addr_space, above4gb, address_bits,
&wb_deftype_count, &uc_deftype_count);
}
printk(BIOS_DEBUG, "MTRR: default type WB/UC MTRR counts: %d/%d.\n", printk(BIOS_DEBUG, "MTRR: default type WB/UC MTRR counts: %d/%d.\n",
wb_deftype_count, uc_deftype_count); wb_deftype_count, uc_deftype_count);