Commit a189c032 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/mce: Put private structures and definitions into the internal header 



... because they don't need to be exported outside of MCE.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/20180221101900.10326-2-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 91ab883e

arch/x86/include/asm/mce.h

+0 −52
Original line number Diff line number Diff line
@@ -138,58 +138,6 @@ struct mce_log_buffer { 
	struct mce entry[MCE_LOG_LEN];

};



struct mca_config {

	bool dont_log_ce;

	bool cmci_disabled;

	bool lmce_disabled;

	bool ignore_ce;

	bool disabled;

	bool ser;

	bool recovery;

	bool bios_cmci_threshold;

	u8 banks;

	s8 bootlog;

	int tolerant;

	int monarch_timeout;

	int panic_timeout;

	u32 rip_msr;

};



struct mce_vendor_flags {

	/*

	 * Indicates that overflow conditions are not fatal, when set.

	 */

	__u64 overflow_recov	: 1,



	/*

	 * (AMD) SUCCOR stands for S/W UnCorrectable error COntainment and

	 * Recovery. It indicates support for data poisoning in HW and deferred

	 * error interrupts.

	 */

	      succor		: 1,



	/*

	 * (AMD) SMCA: This bit indicates support for Scalable MCA which expands

	 * the register space for each MCA bank and also increases number of

	 * banks. Also, to accommodate the new banks and registers, the MCA

	 * register space is moved to a new MSR range.

	 */

	      smca		: 1,



	      __reserved_0	: 61;

};



struct mca_msr_regs {

	u32 (*ctl)	(int bank);

	u32 (*status)	(int bank);

	u32 (*addr)	(int bank);

	u32 (*misc)	(int bank);

};



extern struct mce_vendor_flags mce_flags;



extern struct mca_msr_regs msr_ops;



enum mce_notifier_prios {

	MCE_PRIO_FIRST		= INT_MAX,

	MCE_PRIO_SRAO		= INT_MAX - 1,

arch/x86/kernel/cpu/mcheck/mce-internal.h

+54 −2
Original line number Diff line number Diff line
@@ -113,8 +113,6 @@ static inline void mce_register_injector_chain(struct notifier_block *nb) { } 
static inline void mce_unregister_injector_chain(struct notifier_block *nb)	{ }

#endif



extern struct mca_config mca_cfg;



#ifndef CONFIG_X86_64

/*

 * On 32-bit systems it would be difficult to safely unmap a poison page
@@ -130,4 +128,58 @@ static inline void mce_unmap_kpfn(unsigned long pfn) {} 
#define mce_unmap_kpfn mce_unmap_kpfn

#endif



struct mca_config {

	bool dont_log_ce;

	bool cmci_disabled;

	bool lmce_disabled;

	bool ignore_ce;

	bool disabled;

	bool ser;

	bool recovery;

	bool bios_cmci_threshold;

	u8 banks;

	s8 bootlog;

	int tolerant;

	int monarch_timeout;

	int panic_timeout;

	u32 rip_msr;

};



extern struct mca_config mca_cfg;



struct mce_vendor_flags {

	/*

	 * Indicates that overflow conditions are not fatal, when set.

	 */

	__u64 overflow_recov	: 1,



	/*

	 * (AMD) SUCCOR stands for S/W UnCorrectable error COntainment and

	 * Recovery. It indicates support for data poisoning in HW and deferred

	 * error interrupts.

	 */

	      succor		: 1,



	/*

	 * (AMD) SMCA: This bit indicates support for Scalable MCA which expands

	 * the register space for each MCA bank and also increases number of

	 * banks. Also, to accommodate the new banks and registers, the MCA

	 * register space is moved to a new MSR range.

	 */

	      smca		: 1,



	      __reserved_0	: 61;

};



extern struct mce_vendor_flags mce_flags;



struct mca_msr_regs {

	u32 (*ctl)	(int bank);

	u32 (*status)	(int bank);

	u32 (*addr)	(int bank);

	u32 (*misc)	(int bank);

};



extern struct mca_msr_regs msr_ops;



#endif /* __X86_MCE_INTERNAL_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE