Commit 2117654e authored by Smita Koralahalli's avatar Smita Koralahalli Committed by Borislav Petkov (AMD)
Browse files

x86/mce: Define a function to extract ErrorAddr from MCA_ADDR 



Move MCA_ADDR[ErrorAddr] extraction into a separate helper function. This
will be further refactored to support extended ErrorAddr bits in MCA_ADDR
in newer AMD CPUs.

  [ bp: Massage. ]

Signed-off-by: default avatarSmita Koralahalli <Smita.KoralahalliChannabasappa@amd.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Link: https://lore.kernel.org/all/20220225193342.215780-3-Smita.KoralahalliChannabasappa@amd.com/
parent 1b929c02

arch/x86/kernel/cpu/mce/amd.c

+1 −9
Original line number Diff line number Diff line
@@ -736,15 +736,7 @@ static void __log_error(unsigned int bank, u64 status, u64 addr, u64 misc) 
	if (m.status & MCI_STATUS_ADDRV) {

		m.addr = addr;



		/*

		 * Extract [55:<lsb>] where lsb is the least significant

		 * *valid* bit of the address bits.

		 */

		if (mce_flags.smca) {

			u8 lsb = (m.addr >> 56) & 0x3f;



			m.addr &= GENMASK_ULL(55, lsb);

		}

		smca_extract_err_addr(&m);

	}



	if (mce_flags.smca) {

arch/x86/kernel/cpu/mce/core.c

+1 −9
Original line number Diff line number Diff line
@@ -633,15 +633,7 @@ static noinstr void mce_read_aux(struct mce *m, int i) 
			m->addr <<= shift;

		}



		/*

		 * Extract [55:<lsb>] where lsb is the least significant

		 * *valid* bit of the address bits.

		 */

		if (mce_flags.smca) {

			u8 lsb = (m->addr >> 56) & 0x3f;



			m->addr &= GENMASK_ULL(55, lsb);

		}

		smca_extract_err_addr(m);

	}



	if (mce_flags.smca) {

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

+15 −0
Original line number Diff line number Diff line
@@ -189,8 +189,23 @@ extern bool filter_mce(struct mce *m); 


#ifdef CONFIG_X86_MCE_AMD

extern bool amd_filter_mce(struct mce *m);



/* Extract [55:<lsb>] where lsb is the LS-*valid* bit of the address bits. */

static __always_inline void smca_extract_err_addr(struct mce *m)

{

	u8 lsb;



	if (!mce_flags.smca)

		return;



	lsb = (m->addr >> 56) & 0x3f;



	m->addr &= GENMASK_ULL(55, lsb);

}



#else

static inline bool amd_filter_mce(struct mce *m) { return false; }

static inline void smca_extract_err_addr(struct mce *m) { }

#endif



#ifdef CONFIG_X86_ANCIENT_MCE