Commit ca8ffdae authored by Jan Beulich's avatar Jan Beulich Committed by Juergen Gross
Browse files

xen/mcelog: drop __MC_MSR_MCGCAP 



It has never been part of Xen's public interface, and there's therefore
no guarantee for MCG_CAP's value to always be present in array entry 0.

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent fa6614d8

drivers/xen/mcelog.c

+7 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static int convert_log(struct mc_info *mi) 
	struct mcinfo_global *mc_global;

	struct mcinfo_bank *mc_bank;

	struct xen_mce m;

	uint32_t i;

	unsigned int i, j;



	mic = NULL;

	x86_mcinfo_lookup(&mic, mi, MC_TYPE_GLOBAL);
@@ -248,7 +248,12 @@ static int convert_log(struct mc_info *mi) 
	m.socketid = g_physinfo[i].mc_chipid;

	m.cpu = m.extcpu = g_physinfo[i].mc_cpunr;

	m.cpuvendor = (__u8)g_physinfo[i].mc_vendor;

	m.mcgcap = g_physinfo[i].mc_msrvalues[__MC_MSR_MCGCAP].value;

	for (j = 0; j < g_physinfo[i].mc_nmsrvals; ++j)

		switch (g_physinfo[i].mc_msrvalues[j].reg) {

		case MSR_IA32_MCG_CAP:

			m.mcgcap = g_physinfo[i].mc_msrvalues[j].value;

			break;

		}



	mic = NULL;

	x86_mcinfo_lookup(&mic, mi, MC_TYPE_BANK);

include/xen/interface/xen-mca.h

+0 −1
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ struct mc_info { 
DEFINE_GUEST_HANDLE_STRUCT(mc_info);



#define __MC_MSR_ARRAYSIZE 8

#define __MC_MSR_MCGCAP 0

#define __MC_NMSRS 1

#define MC_NCAPS 7

struct mcinfo_logical_cpu {

CRA Git | Maintained and supported by SUSTech CRA and CCSE