Commit 38603f41 authored by David E. Box's avatar David E. Box Committed by Jun Tian
Browse files

platform/x86: intel_pmt_crashlog: Fix incorrect macros 

mainline inclusion
from mainline-v5.12-rc5
commit 10c931cd
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I596K9


CVE: NA

Intel-SIG: commit 10c931cd platform/x86: intel_pmt_crashlog: Fix
incorrect macros.
Backport for intel PMT (Platform Monitoring Technology) support

--------------------------------

Fixes off-by-one bugs in the macro assignments for the crashlog control
bits. Was initially tested on emulation but bug revealed after testing on
silicon.

Fixes: 5ef9998c ("platform/x86: Intel PMT Crashlog capability driver")
Signed-off-by: default avatarDavid E. Box <david.e.box@linux.intel.com>
Link: https://lore.kernel.org/r/20210317024455.3071477-2-david.e.box@linux.intel.com


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avataryingbao jia <yingbao.jia@intel.com>
Signed-off-by: default avatarJun Tian <jun.j.tian@intel.com>
parent 9a2f0041

drivers/platform/x86/intel_pmt_crashlog.c

+6 −7
Original line number Diff line number Diff line
@@ -23,18 +23,17 @@ 
#define CRASH_TYPE_OOBMSM	1



/* Control Flags */

#define CRASHLOG_FLAG_DISABLE		BIT(27)

#define CRASHLOG_FLAG_DISABLE		BIT(28)



/*

 * Bits 28 and 29 control the state of bit 31.

 * Bits 29 and 30 control the state of bit 31.

 *

 * Bit 28 will clear bit 31, if set, allowing a new crashlog to be captured.

 * Bit 29 will immediately trigger a crashlog to be generated, setting bit 31.

 * Bit 30 is read-only and reserved as 0.

 * Bit 29 will clear bit 31, if set, allowing a new crashlog to be captured.

 * Bit 30 will immediately trigger a crashlog to be generated, setting bit 31.

 * Bit 31 is the read-only status with a 1 indicating log is complete.

 */

#define CRASHLOG_FLAG_TRIGGER_CLEAR	BIT(28)

#define CRASHLOG_FLAG_TRIGGER_EXECUTE	BIT(29)

#define CRASHLOG_FLAG_TRIGGER_CLEAR	BIT(29)

#define CRASHLOG_FLAG_TRIGGER_EXECUTE	BIT(30)

#define CRASHLOG_FLAG_TRIGGER_COMPLETE	BIT(31)

#define CRASHLOG_FLAG_TRIGGER_MASK	GENMASK(31, 28)