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

Commit 2b3b4835 authored by Bernhard Kaindl's avatar Bernhard Kaindl Committed by Andi Kleen
Browse files

[PATCH] x86: Adds mtrr_save_fixed_ranges() for use in two later patches. 



In this current implementation which is used in other patches,
mtrr_save_fixed_ranges() accepts a dummy void pointer because
in the current implementation of one of these patches, this
function may be called from smp_call_function_single() which
requires that this function takes a void pointer argument.

This function calls get_fixed_ranges(), passing mtrr_state.fixed_ranges
which is the element of the static struct which stores our current
backup of the fixed-range MTRR values which all CPUs shall be
using.

Because  mtrr_save_fixed_ranges calls get_fixed_ranges after
kernel initialisation time, __init needs to be removed from
the declaration of get_fixed_ranges().

If CONFIG_MTRR is not set, we define mtrr_save_fixed_ranges
as an empty statement because there is nothing to do.

AK: Moved prototypes for x86-64 around to fix warnings

Signed-off-by: default avatarBernhard Kaindl <bk@suse.de>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andi Kleen <ak@suse.de>
Cc: Dave Jones <davej@codemonkey.org.uk>
parent 856f44ff

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

+6 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ get_mtrr_var_range(unsigned int index, struct mtrr_var_range *vr) 
	rdmsr(MTRRphysMask_MSR(index), vr->mask_lo, vr->mask_hi);

}



static void __init

static void

get_fixed_ranges(mtrr_type * frs)

{

	unsigned int *p = (unsigned int *) frs;
@@ -51,6 +51,11 @@ get_fixed_ranges(mtrr_type * frs) 
		rdmsr(MTRRfix4K_C0000_MSR + i, p[6 + i * 2], p[7 + i * 2]);

}



void mtrr_save_fixed_ranges(void *info)

{

	get_fixed_ranges(mtrr_state.fixed_ranges);

}



static void __init print_fixed(unsigned base, unsigned step, const mtrr_type*types)

{

	unsigned i;

include/asm-i386/mtrr.h

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ struct mtrr_gentry 


/*  The following functions are for use by other drivers  */

# ifdef CONFIG_MTRR

extern void mtrr_save_fixed_ranges(void *);

extern int mtrr_add (unsigned long base, unsigned long size,

		     unsigned int type, char increment);

extern int mtrr_add_page (unsigned long base, unsigned long size,
@@ -79,6 +80,7 @@ extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi); 
extern void mtrr_ap_init(void);

extern void mtrr_bp_init(void);

#  else

#define mtrr_save_fixed_ranges(arg) do {} while (0)

static __inline__ int mtrr_add (unsigned long base, unsigned long size,

				unsigned int type, char increment)

{

include/asm-x86_64/mtrr.h

+2 −0
Original line number Diff line number Diff line
@@ -138,9 +138,11 @@ struct mtrr_gentry32 
#ifdef CONFIG_MTRR

extern void mtrr_ap_init(void);

extern void mtrr_bp_init(void);

extern void mtrr_save_fixed_ranges(void *);

#else

#define mtrr_ap_init() do {} while (0)

#define mtrr_bp_init() do {} while (0)

#define mtrr_save_fixed_ranges(arg) do {} while (0)

#endif



#endif /* __KERNEL__ */