Skip to content

L
linux-davinci
Commit 3f03c54a authored by Yinghai Lu's avatar Yinghai Lu Committed by Thomas Gleixner
Browse files
Options

x86: mtrr cleanup for converting continuous to discrete layout - fix #2 

disable the noisy print out.
also use the one the less spare mtrr reg.
Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8004dd96
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 31 deletions
arch/x86/kernel/cpu/mtrr/main.c
View file @ 3f03c54a
...@@ -730,6 +730,7 @@ struct var_mtrr_range_state { ...@@ -730,6 +730,7 @@ struct var_mtrr_range_state {
}; };
struct var_mtrr_range_state __initdata range_state[RANGE_NUM]; struct var_mtrr_range_state __initdata range_state[RANGE_NUM];
static int __initdata debug_print;
static int __init static int __init
x86_get_mtrr_mem_range(struct res_range *range, int nr_range, x86_get_mtrr_mem_range(struct res_range *range, int nr_range,
...@@ -748,10 +749,12 @@ x86_get_mtrr_mem_range(struct res_range *range, int nr_range, ...@@ -748,10 +749,12 @@ x86_get_mtrr_mem_range(struct res_range *range, int nr_range,
nr_range = add_range_with_merge(range, nr_range, base, nr_range = add_range_with_merge(range, nr_range, base,
base + size - 1); base + size - 1);
} }
printk(KERN_DEBUG "After WB checking\n"); if (debug_print) {
for (i = 0; i < nr_range; i++) printk(KERN_DEBUG "After WB checking\n");
printk(KERN_DEBUG "MTRR MAP PFN: %016lx - %016lx\n", for (i = 0; i < nr_range; i++)
printk(KERN_DEBUG "MTRR MAP PFN: %016lx - %016lx\n",
range[i].start, range[i].end + 1); range[i].start, range[i].end + 1);
}
/* take out UC ranges */ /* take out UC ranges */
for (i = 0; i < num_var_ranges; i++) { for (i = 0; i < num_var_ranges; i++) {
...@@ -775,17 +778,21 @@ x86_get_mtrr_mem_range(struct res_range *range, int nr_range, ...@@ -775,17 +778,21 @@ x86_get_mtrr_mem_range(struct res_range *range, int nr_range,
continue; continue;
nr_range++; nr_range++;
} }
printk(KERN_DEBUG "After UC checking\n"); if (debug_print) {
for (i = 0; i < nr_range; i++) printk(KERN_DEBUG "After UC checking\n");
printk(KERN_DEBUG "MTRR MAP PFN: %016lx - %016lx\n", for (i = 0; i < nr_range; i++)
range[i].start, range[i].end + 1); printk(KERN_DEBUG "MTRR MAP PFN: %016lx - %016lx\n",
range[i].start, range[i].end + 1);
}
/* sort the ranges */ /* sort the ranges */
sort(range, nr_range, sizeof(struct res_range), cmp_range, NULL); sort(range, nr_range, sizeof(struct res_range), cmp_range, NULL);
printk(KERN_DEBUG "After sorting\n"); if (debug_print) {
for (i = 0; i < nr_range; i++) printk(KERN_DEBUG "After sorting\n");
printk(KERN_DEBUG "MTRR MAP PFN: %016lx - %016lx\n", for (i = 0; i < nr_range; i++)
printk(KERN_DEBUG "MTRR MAP PFN: %016lx - %016lx\n",
range[i].start, range[i].end + 1); range[i].start, range[i].end + 1);
}
/* clear those is not used */ /* clear those is not used */
for (i = nr_range; i < RANGE_NUM; i++) for (i = nr_range; i < RANGE_NUM; i++)
...@@ -912,12 +919,13 @@ range_to_mtrr(unsigned int reg, unsigned long range_startk, ...@@ -912,12 +919,13 @@ range_to_mtrr(unsigned int reg, unsigned long range_startk,
align = max_align; align = max_align;
sizek = 1 << align; sizek = 1 << align;
printk(KERN_DEBUG "Setting variable MTRR %d, base: %ldMB, " if (debug_print)
"range: %ldMB, type %s\n", printk(KERN_DEBUG "Setting variable MTRR %d, "
reg, range_startk >> 10, sizek >> 10, "base: %ldMB, range: %ldMB, type %s\n",
(type == MTRR_TYPE_UNCACHABLE)?"UC": reg, range_startk >> 10, sizek >> 10,
((type == MTRR_TYPE_WRBACK)?"WB":"Other") (type == MTRR_TYPE_UNCACHABLE)?"UC":
); ((type == MTRR_TYPE_WRBACK)?"WB":"Other")
);
save_var_mtrr(reg++, range_startk, sizek, type); save_var_mtrr(reg++, range_startk, sizek, type);
range_startk += sizek; range_startk += sizek;
range_sizek -= sizek; range_sizek -= sizek;
...@@ -963,7 +971,9 @@ range_to_mtrr_with_hole(struct var_mtrr_state *state, unsigned long basek, ...@@ -963,7 +971,9 @@ range_to_mtrr_with_hole(struct var_mtrr_state *state, unsigned long basek,
range0_basek = state->range_startk; range0_basek = state->range_startk;
range0_sizek = ALIGN(state->range_sizek, chunk_sizek); range0_sizek = ALIGN(state->range_sizek, chunk_sizek);
if (range0_sizek == state->range_sizek) { if (range0_sizek == state->range_sizek) {
printk(KERN_DEBUG "rangeX: %016lx - %016lx\n", range0_basek<<10, if (debug_print)
printk(KERN_DEBUG "rangeX: %016lx - %016lx\n",
range0_basek<<10,
(range0_basek + state->range_sizek)<<10); (range0_basek + state->range_sizek)<<10);
state->reg = range_to_mtrr(state->reg, range0_basek, state->reg = range_to_mtrr(state->reg, range0_basek,
state->range_sizek, MTRR_TYPE_WRBACK); state->range_sizek, MTRR_TYPE_WRBACK);
...@@ -980,7 +990,9 @@ range_to_mtrr_with_hole(struct var_mtrr_state *state, unsigned long basek, ...@@ -980,7 +990,9 @@ range_to_mtrr_with_hole(struct var_mtrr_state *state, unsigned long basek,
} }
if (range0_sizek) { if (range0_sizek) {
printk(KERN_DEBUG "range0: %016lx - %016lx\n", range0_basek<<10, if (debug_print)
printk(KERN_DEBUG "range0: %016lx - %016lx\n",
range0_basek<<10,
(range0_basek + range0_sizek)<<10); (range0_basek + range0_sizek)<<10);
state->reg = range_to_mtrr(state->reg, range0_basek, state->reg = range_to_mtrr(state->reg, range0_basek,
range0_sizek, MTRR_TYPE_WRBACK); range0_sizek, MTRR_TYPE_WRBACK);
...@@ -1016,13 +1028,15 @@ range_to_mtrr_with_hole(struct var_mtrr_state *state, unsigned long basek, ...@@ -1016,13 +1028,15 @@ range_to_mtrr_with_hole(struct var_mtrr_state *state, unsigned long basek,
second_sizek = 0; second_sizek = 0;
} }
printk(KERN_DEBUG "range: %016lx - %016lx\n", range_basek<<10, if (debug_print)
printk(KERN_DEBUG "range: %016lx - %016lx\n", range_basek<<10,
(range_basek + range_sizek)<<10); (range_basek + range_sizek)<<10);
state->reg = range_to_mtrr(state->reg, range_basek, range_sizek, state->reg = range_to_mtrr(state->reg, range_basek, range_sizek,
MTRR_TYPE_WRBACK); MTRR_TYPE_WRBACK);
if (hole_sizek) { if (hole_sizek) {
printk(KERN_DEBUG "hole: %016lx - %016lx\n", hole_basek<<10, if (debug_print)
(hole_basek + hole_sizek)<<10); printk(KERN_DEBUG "hole: %016lx - %016lx\n",
hole_basek<<10, (hole_basek + hole_sizek)<<10);
state->reg = range_to_mtrr(state->reg, hole_basek, hole_sizek, state->reg = range_to_mtrr(state->reg, hole_basek, hole_sizek,
MTRR_TYPE_UNCACHABLE); MTRR_TYPE_UNCACHABLE);
...@@ -1120,7 +1134,6 @@ x86_setup_var_mtrrs(struct res_range *range, int nr_range, ...@@ -1120,7 +1134,6 @@ x86_setup_var_mtrrs(struct res_range *range, int nr_range,
/* Write the last range */ /* Write the last range */
if (var_state.range_sizek != 0) if (var_state.range_sizek != 0)
range_to_mtrr_with_hole(&var_state, 0, 0); range_to_mtrr_with_hole(&var_state, 0, 0);
printk(KERN_DEBUG "DONE variable MTRRs\n");
num_reg = var_state.reg; num_reg = var_state.reg;
/* Clear out the extra MTRR's */ /* Clear out the extra MTRR's */
...@@ -1219,6 +1232,7 @@ static int __init mtrr_cleanup(unsigned address_bits) ...@@ -1219,6 +1232,7 @@ static int __init mtrr_cleanup(unsigned address_bits)
if (mtrr_chunk_size && mtrr_gran_size) { if (mtrr_chunk_size && mtrr_gran_size) {
int num_reg; int num_reg;
debug_print = 1;
/* convert ranges to var ranges state */ /* convert ranges to var ranges state */
num_reg = x86_setup_var_mtrrs(range, nr_range, mtrr_chunk_size, num_reg = x86_setup_var_mtrrs(range, nr_range, mtrr_chunk_size,
mtrr_gran_size); mtrr_gran_size);
...@@ -1242,8 +1256,8 @@ static int __init mtrr_cleanup(unsigned address_bits) ...@@ -1242,8 +1256,8 @@ static int __init mtrr_cleanup(unsigned address_bits)
result[i].lose_cover_sizek = result[i].lose_cover_sizek =
(range_sums - range_sums_new) << PSHIFT; (range_sums - range_sums_new) << PSHIFT;
printk(KERN_INFO " %sgran_size: %ldM \tchunk_size: %ldM \t", printk(KERN_INFO "%sgran_size: %ldM \tchunk_size: %ldM \t",
result[i].bad?" BAD ":"", result[i].gran_sizek >> 10, result[i].bad?"*BAD*":" ", result[i].gran_sizek >> 10,
result[i].chunk_sizek >> 10); result[i].chunk_sizek >> 10);
printk(KERN_CONT "num_reg: %d \tlose cover RAM: %s%ldM \n", printk(KERN_CONT "num_reg: %d \tlose cover RAM: %s%ldM \n",
result[i].num_reg, result[i].bad?"-":"", result[i].num_reg, result[i].bad?"-":"",
...@@ -1254,6 +1268,7 @@ static int __init mtrr_cleanup(unsigned address_bits) ...@@ -1254,6 +1268,7 @@ static int __init mtrr_cleanup(unsigned address_bits)
} }
printk(KERN_INFO "invalid mtrr_gran_size or mtrr_chunk_size, " printk(KERN_INFO "invalid mtrr_gran_size or mtrr_chunk_size, "
"will find optimal one\n"); "will find optimal one\n");
debug_print = 0;
memset(result, 0, sizeof(result[0])); memset(result, 0, sizeof(result[0]));
} }
...@@ -1265,9 +1280,10 @@ static int __init mtrr_cleanup(unsigned address_bits) ...@@ -1265,9 +1280,10 @@ static int __init mtrr_cleanup(unsigned address_bits)
chunk_size <<= 1) { chunk_size <<= 1) {
int num_reg; int num_reg;
printk(KERN_INFO if (debug_print)
printk(KERN_INFO
"\ngran_size: %lldM chunk_size_size: %lldM\n", "\ngran_size: %lldM chunk_size_size: %lldM\n",
gran_size >> 20, chunk_size >> 20); gran_size >> 20, chunk_size >> 20);
if (i >= NUM_RESULT) if (i >= NUM_RESULT)
continue; continue;
...@@ -1310,10 +1326,10 @@ static int __init mtrr_cleanup(unsigned address_bits) ...@@ -1310,10 +1326,10 @@ static int __init mtrr_cleanup(unsigned address_bits)
/* print out all */ /* print out all */
for (i = 0; i < NUM_RESULT; i++) { for (i = 0; i < NUM_RESULT; i++) {
printk(KERN_INFO "%sgran_size: %ldM \tchunk_size: %ldM \t", printk(KERN_INFO "%sgran_size: %ldM \tchunk_size: %ldM \t",
result[i].bad?"*BAD* ":" ", result[i].gran_sizek >> 10, result[i].bad?"*BAD* ":" ", result[i].gran_sizek >> 10,
result[i].chunk_sizek >> 10); result[i].chunk_sizek >> 10);
printk(KERN_CONT "num_reg: %d \tlose cover RAM: %s%ldM \n", printk(KERN_CONT "num_reg: %d \tlose RAM: %s%ldM\n",
result[i].num_reg, result[i].bad?"-":"", result[i].num_reg, result[i].bad?"-":"",
result[i].lose_cover_sizek >> 10); result[i].lose_cover_sizek >> 10);
} }
...@@ -1322,7 +1338,7 @@ static int __init mtrr_cleanup(unsigned address_bits) ...@@ -1322,7 +1338,7 @@ static int __init mtrr_cleanup(unsigned address_bits)
if (nr_mtrr_spare_reg >= num_var_ranges) if (nr_mtrr_spare_reg >= num_var_ranges)
nr_mtrr_spare_reg = num_var_ranges - 1; nr_mtrr_spare_reg = num_var_ranges - 1;
num_reg_good = -1; num_reg_good = -1;
for (i = 1; i < num_var_ranges + 1 - nr_mtrr_spare_reg; i++) { for (i = num_var_ranges - nr_mtrr_spare_reg; i > 0; i--) {
if (!min_loss_pfn[i]) { if (!min_loss_pfn[i]) {
num_reg_good = i; num_reg_good = i;
break; break;
...@@ -1344,10 +1360,10 @@ static int __init mtrr_cleanup(unsigned address_bits) ...@@ -1344,10 +1360,10 @@ static int __init mtrr_cleanup(unsigned address_bits)
if (index_good != -1) { if (index_good != -1) {
printk(KERN_INFO "Found optimal setting for mtrr clean up\n"); printk(KERN_INFO "Found optimal setting for mtrr clean up\n");
i = index_good; i = index_good;
printk(KERN_INFO "gran_size: %ldM \tchunk_size: %ldM \t", printk(KERN_INFO "gran_size: %ldM \tchunk_size: %ldM \t",
result[i].gran_sizek >> 10, result[i].gran_sizek >> 10,
result[i].chunk_sizek >> 10); result[i].chunk_sizek >> 10);
printk(KERN_CONT "num_reg: %d \tlose cover RAM: %ldM \n", printk(KERN_CONT "num_reg: %d \tlose RAM: %ldM\n",
result[i].num_reg, result[i].num_reg,
result[i].lose_cover_sizek >> 10); result[i].lose_cover_sizek >> 10);
/* convert ranges to var ranges state */ /* convert ranges to var ranges state */
...@@ -1355,6 +1371,7 @@ static int __init mtrr_cleanup(unsigned address_bits) ...@@ -1355,6 +1371,7 @@ static int __init mtrr_cleanup(unsigned address_bits)
chunk_size <<= 10; chunk_size <<= 10;
gran_size = result[i].gran_sizek; gran_size = result[i].gran_sizek;
gran_size <<= 10; gran_size <<= 10;
debug_print = 1;
x86_setup_var_mtrrs(range, nr_range, chunk_size, gran_size); x86_setup_var_mtrrs(range, nr_range, chunk_size, gran_size);
set_var_mtrr_all(address_bits); set_var_mtrr_all(address_bits);
return 1; return 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment