Commit bee879f4 authored by Yinghai Lu's avatar Yinghai Lu Committed by Greg Kroah-Hartman

x86: amd opteron TOM2 mask val fix

commit 8004dd96 upstream.

there is a typo in the mask value, need to remove that extra 0,
to avoid 4bit clearing.
Signed-off-by: default avatarYinghal Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: maximilian attems <max@stro.at>
Cc: Peter Palfrader <weasel@debian.org>
Cc: dann frazier <dannf@debian.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1c94e41a
...@@ -219,7 +219,7 @@ void __init get_mtrr_state(void) ...@@ -219,7 +219,7 @@ void __init get_mtrr_state(void)
tom2 = hi; tom2 = hi;
tom2 <<= 32; tom2 <<= 32;
tom2 |= lo; tom2 |= lo;
tom2 &= 0xffffff8000000ULL; tom2 &= 0xffffff800000ULL;
} }
if (mtrr_show) { if (mtrr_show) {
int high_width; int high_width;
......
...@@ -384,7 +384,7 @@ static int __init early_fill_mp_bus_info(void) ...@@ -384,7 +384,7 @@ static int __init early_fill_mp_bus_info(void)
/* need to take out [0, TOM) for RAM*/ /* need to take out [0, TOM) for RAM*/
address = MSR_K8_TOP_MEM1; address = MSR_K8_TOP_MEM1;
rdmsrl(address, val); rdmsrl(address, val);
end = (val & 0xffffff8000000ULL); end = (val & 0xffffff800000ULL);
printk(KERN_INFO "TOM: %016lx aka %ldM\n", end, end>>20); printk(KERN_INFO "TOM: %016lx aka %ldM\n", end, end>>20);
if (end < (1ULL<<32)) if (end < (1ULL<<32))
update_range(range, 0, end - 1); update_range(range, 0, end - 1);
...@@ -478,7 +478,7 @@ static int __init early_fill_mp_bus_info(void) ...@@ -478,7 +478,7 @@ static int __init early_fill_mp_bus_info(void)
/* TOP_MEM2 */ /* TOP_MEM2 */
address = MSR_K8_TOP_MEM2; address = MSR_K8_TOP_MEM2;
rdmsrl(address, val); rdmsrl(address, val);
end = (val & 0xffffff8000000ULL); end = (val & 0xffffff800000ULL);
printk(KERN_INFO "TOM2: %016lx aka %ldM\n", end, end>>20); printk(KERN_INFO "TOM2: %016lx aka %ldM\n", end, end>>20);
update_range(range, 1ULL<<32, end - 1); update_range(range, 1ULL<<32, end - 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