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

Commit 7639bfc7 authored by Hidetoshi Seto's avatar Hidetoshi Seto Committed by Borislav Petkov
Browse files

x86, mce, severity: Clean up trivial coding style problems 



More specifically:

- sort bits in the macros
- use BITCLR/BITSET
- coordinate message pattern
- use m for struct mce
- cleanup for severities_debugfs_init()

No functional change.

Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Link: http://lkml.kernel.org/r/4DEED679.9090503@jp.fujitsu.com


Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
parent a17957cd

arch/x86/kernel/cpu/mcheck/mce-severity.c

+19 −20
Original line number Original line Diff line number Diff line
@@ -99,41 +99,40 @@ static struct severity { 
		),

		),

	MCESEV(

	MCESEV(

		KEEP, "Non signalled machine check",

		KEEP, "Non signalled machine check",

		SER, MASK(MCI_STATUS_S, 0)

		SER, BITCLR(MCI_STATUS_S)

		),

		),





	/* AR add known MCACODs here */

	/* AR add known MCACODs here */

	MCESEV(

	MCESEV(

		PANIC, "Action required with lost events",

		PANIC, "Action required with lost events",

		SER,

		SER, BITSET(MCI_STATUS_OVER|MCI_UC_SAR)

		MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_STATUS_OVER|MCI_UC_SAR)

		),

		),

	MCESEV(

	MCESEV(

		PANIC, "Action required; unknown MCACOD",

		PANIC, "Action required: unknown MCACOD",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_UC_SAR)

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_UC_SAR)

		),

		),





	/* known AO MCACODs: */

	/* known AO MCACODs: */

	MCESEV(

	MCESEV(

		AO, "Action optional: memory scrubbing error",

		AO, "Action optional: memory scrubbing error",

		SER, MASK(MCI_UC_SAR|MCI_STATUS_OVER|0xfff0, MCI_UC_S|0xc0)

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|0xfff0, MCI_UC_S|0x00c0)

		),

		),

	MCESEV(

	MCESEV(

		AO, "Action optional: last level cache writeback error",

		AO, "Action optional: last level cache writeback error",

		SER, MASK(MCI_UC_SAR|MCI_STATUS_OVER|MCACOD, MCI_UC_S|0x17a)

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCACOD, MCI_UC_S|0x017a)

		),

		),

	MCESEV(

	MCESEV(

		SOME, "Action optional unknown MCACOD",

		SOME, "Action optional: unknown MCACOD",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_UC_S)

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_UC_S)

		),

		),

	MCESEV(

	MCESEV(

		SOME, "Action optional with lost events",

		SOME, "Action optional with lost events",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_UC_S|MCI_STATUS_OVER)

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_STATUS_OVER|MCI_UC_S)

		),

		),





	MCESEV(

	MCESEV(

		PANIC, "Overflowed uncorrected",

		PANIC, "Overflowed uncorrected",

		BITSET(MCI_STATUS_UC|MCI_STATUS_OVER)

		BITSET(MCI_STATUS_OVER|MCI_STATUS_UC)

		),

		),

	MCESEV(

	MCESEV(

		UC, "Uncorrected",

		UC, "Uncorrected",
@@ -157,15 +156,15 @@ static int error_context(struct mce *m) 
	return IN_KERNEL;

	return IN_KERNEL;

}

}





int mce_severity(struct mce *a, int tolerant, char **msg)

int mce_severity(struct mce *m, int tolerant, char **msg)

{

{

	enum context ctx = error_context(a);

	enum context ctx = error_context(m);

	struct severity *s;

	struct severity *s;





	for (s = severities;; s++) {

	for (s = severities;; s++) {

		if ((a->status & s->mask) != s->result)

		if ((m->status & s->mask) != s->result)

			continue;

			continue;

		if ((a->mcgstatus & s->mcgmask) != s->mcgres)

		if ((m->mcgstatus & s->mcgmask) != s->mcgres)

			continue;

			continue;

		if (s->ser == SER_REQUIRED && !mce_ser)

		if (s->ser == SER_REQUIRED && !mce_ser)

			continue;

			continue;
@@ -242,15 +241,15 @@ static const struct file_operations severities_coverage_fops = { 




static int __init severities_debugfs_init(void)

static int __init severities_debugfs_init(void)

{

{

	struct dentry *dmce = NULL, *fseverities_coverage = NULL;

	struct dentry *dmce, *fsev;





	dmce = mce_get_debugfs_dir();

	dmce = mce_get_debugfs_dir();

	if (dmce == NULL)

	if (!dmce)

		goto err_out;

		goto err_out;

	fseverities_coverage = debugfs_create_file("severities-coverage",



						   0444, dmce, NULL,

	fsev = debugfs_create_file("severities-coverage", 0444, dmce, NULL,

				   &severities_coverage_fops);

				   &severities_coverage_fops);

	if (fseverities_coverage == NULL)

	if (!fsev)

		goto err_out;

		goto err_out;





	return 0;

	return 0;
@@ -259,4 +258,4 @@ static int __init severities_debugfs_init(void) 
	return -ENOMEM;

	return -ENOMEM;

}

}

late_initcall(severities_debugfs_init);

late_initcall(severities_debugfs_init);

#endif
 
#endif /* CONFIG_DEBUG_FS */