'mtrr_state.enabled' contains the FE (fixed MTRRs enabled) and E (MTRRs enabled) flags in MSR_MTRRdefType. Intel SDM, section 11.11.2.1, defines these flags as follows: - All MTRRs are disabled when the E flag is clear. The FE flag has no affect when the E flag is clear. - The default type is enabled when the E flag is set. - MTRR variable ranges are enabled when the E flag is set. - MTRR fixed ranges are enabled when both E and FE flags are set. MTRR state checks in __mtrr_type_lookup() do not match with SDM. Hence, this patch makes the following changes: - The current code detects MTRRs disabled when both E and FE flags are clear in mtrr_state.enabled. Fix to detect MTRRs disabled when the E flag is clear. - The current code does not check if the FE bit is set in mtrr_state.enabled when looking at the fixed entries. Fix to check the FE flag. - The current code returns the default type when the E flag is clear in mtrr_state.enabled. However, the default type is UC when the E flag is clear. Remove the code as this case is handled as MTRR disabled with the 1st change. In addition, this patch defines the E and FE flags in mtrr_state.enabled as follows. - FE flag: MTRR_STATE_MTRR_FIXED_ENABLED - E flag: MTRR_STATE_MTRR_ENABLED print_mtrr_state() and x86_get_mtrr_mem_range() are also updated accordingly. Signed-off-by: Toshi Kani <toshi.kani@hp.com> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: Elliott@hp.com Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Luis R. Rodriguez <mcgrof@suse.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: dave.hansen@intel.com Cc: linux-mm <linux-mm@kvack.org> Cc: pebolle@tiscali.nl Link: http://lkml.kernel.org/r/1431714237-880-4-git-send-email-toshi.kani@hp.com Link: http://lkml.kernel.org/r/1432628901-18044-4-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
135 lines
4.6 KiB
C
135 lines
4.6 KiB
C
/* Generic MTRR (Memory Type Range Register) ioctls.
|
|
|
|
Copyright (C) 1997-1999 Richard Gooch
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
Richard Gooch may be reached by email at rgooch@atnf.csiro.au
|
|
The postal address is:
|
|
Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia.
|
|
*/
|
|
#ifndef _ASM_X86_MTRR_H
|
|
#define _ASM_X86_MTRR_H
|
|
|
|
#include <uapi/asm/mtrr.h>
|
|
|
|
|
|
/*
|
|
* The following functions are for use by other drivers that cannot use
|
|
* arch_phys_wc_add and arch_phys_wc_del.
|
|
*/
|
|
# ifdef CONFIG_MTRR
|
|
extern u8 mtrr_type_lookup(u64 addr, u64 end);
|
|
extern void mtrr_save_fixed_ranges(void *);
|
|
extern void mtrr_save_state(void);
|
|
extern int mtrr_add(unsigned long base, unsigned long size,
|
|
unsigned int type, bool increment);
|
|
extern int mtrr_add_page(unsigned long base, unsigned long size,
|
|
unsigned int type, bool increment);
|
|
extern int mtrr_del(int reg, unsigned long base, unsigned long size);
|
|
extern int mtrr_del_page(int reg, unsigned long base, unsigned long size);
|
|
extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi);
|
|
extern void mtrr_ap_init(void);
|
|
extern void mtrr_bp_init(void);
|
|
extern void set_mtrr_aps_delayed_init(void);
|
|
extern void mtrr_aps_init(void);
|
|
extern void mtrr_bp_restore(void);
|
|
extern int mtrr_trim_uncached_memory(unsigned long end_pfn);
|
|
extern int amd_special_default_mtrr(void);
|
|
extern int phys_wc_to_mtrr_index(int handle);
|
|
# else
|
|
static inline u8 mtrr_type_lookup(u64 addr, u64 end)
|
|
{
|
|
/*
|
|
* Return no-MTRRs:
|
|
*/
|
|
return 0xff;
|
|
}
|
|
#define mtrr_save_fixed_ranges(arg) do {} while (0)
|
|
#define mtrr_save_state() do {} while (0)
|
|
static inline int mtrr_add(unsigned long base, unsigned long size,
|
|
unsigned int type, bool increment)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
static inline int mtrr_add_page(unsigned long base, unsigned long size,
|
|
unsigned int type, bool increment)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
static inline int mtrr_del(int reg, unsigned long base, unsigned long size)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
static inline int mtrr_del_page(int reg, unsigned long base, unsigned long size)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
static inline int mtrr_trim_uncached_memory(unsigned long end_pfn)
|
|
{
|
|
return 0;
|
|
}
|
|
static inline void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi)
|
|
{
|
|
}
|
|
static inline int phys_wc_to_mtrr_index(int handle)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
#define mtrr_ap_init() do {} while (0)
|
|
#define mtrr_bp_init() do {} while (0)
|
|
#define set_mtrr_aps_delayed_init() do {} while (0)
|
|
#define mtrr_aps_init() do {} while (0)
|
|
#define mtrr_bp_restore() do {} while (0)
|
|
# endif
|
|
|
|
#ifdef CONFIG_COMPAT
|
|
#include <linux/compat.h>
|
|
|
|
struct mtrr_sentry32 {
|
|
compat_ulong_t base; /* Base address */
|
|
compat_uint_t size; /* Size of region */
|
|
compat_uint_t type; /* Type of region */
|
|
};
|
|
|
|
struct mtrr_gentry32 {
|
|
compat_ulong_t regnum; /* Register number */
|
|
compat_uint_t base; /* Base address */
|
|
compat_uint_t size; /* Size of region */
|
|
compat_uint_t type; /* Type of region */
|
|
};
|
|
|
|
#define MTRR_IOCTL_BASE 'M'
|
|
|
|
#define MTRRIOC32_ADD_ENTRY _IOW(MTRR_IOCTL_BASE, 0, struct mtrr_sentry32)
|
|
#define MTRRIOC32_SET_ENTRY _IOW(MTRR_IOCTL_BASE, 1, struct mtrr_sentry32)
|
|
#define MTRRIOC32_DEL_ENTRY _IOW(MTRR_IOCTL_BASE, 2, struct mtrr_sentry32)
|
|
#define MTRRIOC32_GET_ENTRY _IOWR(MTRR_IOCTL_BASE, 3, struct mtrr_gentry32)
|
|
#define MTRRIOC32_KILL_ENTRY _IOW(MTRR_IOCTL_BASE, 4, struct mtrr_sentry32)
|
|
#define MTRRIOC32_ADD_PAGE_ENTRY _IOW(MTRR_IOCTL_BASE, 5, struct mtrr_sentry32)
|
|
#define MTRRIOC32_SET_PAGE_ENTRY _IOW(MTRR_IOCTL_BASE, 6, struct mtrr_sentry32)
|
|
#define MTRRIOC32_DEL_PAGE_ENTRY _IOW(MTRR_IOCTL_BASE, 7, struct mtrr_sentry32)
|
|
#define MTRRIOC32_GET_PAGE_ENTRY _IOWR(MTRR_IOCTL_BASE, 8, struct mtrr_gentry32)
|
|
#define MTRRIOC32_KILL_PAGE_ENTRY \
|
|
_IOW(MTRR_IOCTL_BASE, 9, struct mtrr_sentry32)
|
|
#endif /* CONFIG_COMPAT */
|
|
|
|
/* Bit fields for enabled in struct mtrr_state_type */
|
|
#define MTRR_STATE_MTRR_FIXED_ENABLED 0x01
|
|
#define MTRR_STATE_MTRR_ENABLED 0x02
|
|
|
|
#endif /* _ASM_X86_MTRR_H */
|