Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8004dd96 authored by Yinghai Lu's avatar Yinghai Lu Committed by Thomas Gleixner
Browse files

x86: amd opteron TOM2 mask val fix 



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>
parent b79cd8f1

arch/x86/kernel/cpu/mtrr/generic.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ void __init get_mtrr_state(void) 
		mtrr_tom2 = high;

		mtrr_tom2 <<= 32;

		mtrr_tom2 |= low;

		mtrr_tom2 &= 0xffffff8000000ULL;

		mtrr_tom2 &= 0xffffff800000ULL;

	}

	if (mtrr_show) {

		int high_width;

arch/x86/pci/k8-bus_64.c

+2 −2
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ static int __init early_fill_mp_bus_info(void) 
	/* need to take out [0, TOM) for RAM*/

	address = MSR_K8_TOP_MEM1;

	rdmsrl(address, val);

	end = (val & 0xffffff8000000ULL);

	end = (val & 0xffffff800000ULL);

	printk(KERN_INFO "TOM: %016lx aka %ldM\n", end, end>>20);

	if (end < (1ULL<<32))

		update_range(range, 0, end - 1);
@@ -478,7 +478,7 @@ static int __init early_fill_mp_bus_info(void) 
		/* TOP_MEM2 */

		address = MSR_K8_TOP_MEM2;

		rdmsrl(address, val);

		end = (val & 0xffffff8000000ULL);

		end = (val & 0xffffff800000ULL);

		printk(KERN_INFO "TOM2: %016lx aka %ldM\n", end, end>>20);

		update_range(range, 1ULL<<32, end - 1);

	}