Merge tag 'x86_mtrr_for_v6.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 350a604221d2 · 2025-05-27T10:17:03.000-07:00
Pull mtrr update from Borislav Petkov:
 "A single change to verify the presence of fixed MTRR ranges before
  accessing the respective MSRs"

* tag 'x86_mtrr_for_v6.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mtrr: Check if fixed-range MTRRs exist in mtrr_save_fixed_ranges()
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -593,7 +593,7 @@ static void get_fixed_ranges(mtrr_type *frs)
 
 void mtrr_save_fixed_ranges(void *info)
 {
-	if (boot_cpu_has(X86_FEATURE_MTRR))
+	if (mtrr_state.have_fixed)
 		get_fixed_ranges(mtrr_state.fixed_ranges);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -593,7 +593,7 @@ static void get_fixed_ranges(mtrr_type *frs)`
`593`	`593`
`594`	`594`	`void mtrr_save_fixed_ranges(void *info)`
`595`	`595`	`{`
`596`		`- if (boot_cpu_has(X86_FEATURE_MTRR))`
	`596`	`+ if (mtrr_state.have_fixed)`
`597`	`597`	`get_fixed_ranges(mtrr_state.fixed_ranges);`
`598`	`598`	`}`
`599`	`599`