OBS User unknown 2008-09-29 16:00:24 +00:00 committed by Git OBS Bridge
parent 29dcccd35f
commit 6175ac9f9c
5 changed files with 1116 additions and 63 deletions

1022
mcelog-0.7-newcpus-1.diff Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,42 +0,0 @@
--- mcelog/p4.c~ 2005-02-09 12:20:20.000000000 +0100
+++ mcelog/p4.c 2006-05-27 06:22:06.000000000 +0200
@@ -24,6 +24,8 @@
#include <stdio.h>
#include "mcelog.h"
+#define BANK_THERMAL 128
+
/* decode mce for P4/Xeon family */
static inline int test_prefix(int nr, __u32 value)
@@ -272,8 +274,21 @@
Wprintf("\n");
}
+static void decode_thermal(struct mce *log)
+{
+ if (log->status & 1)
+ Wprintf("Processor core is above trip temperature. Throttling enabled.\n");
+ else
+ Wprintf("Processor core below trip temperature. Throttling disabled\n");
+}
+
void decode_p4_mc(struct mce *log)
{
+ if (log->bank == BANK_THERMAL) {
+ decode_thermal(log);
+ return;
+ }
+
decode_mcg(log->mcgstatus);
decode_mci(log->status);
}
@@ -281,6 +296,8 @@
char *p4_bank_name(int num)
{
static char bname[64];
+ if (num == BANK_THERMAL)
+ return "THERMAL EVENT";
sprintf(bname, "BANK %d", num);
return bname;
}

52
mcelog-thermal.diff Normal file
View File

@ -0,0 +1,52 @@
---
p4.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
Index: mcelog-0.7/p4.c
===================================================================
--- mcelog-0.7.orig/p4.c
+++ mcelog-0.7/p4.c
@@ -28,6 +28,8 @@
#include "nehalem.h"
#include "dunnington.h"
+#define BANK_THERMAL 128
+
/* decode mce for P4/Xeon and Core2 family */
static inline int test_prefix(int nr, __u32 value)
@@ -274,10 +276,25 @@ static void decode_mcg(__u64 mcgstatus)
Wprintf("\n");
}
+static void decode_thermal(struct mce *log)
+{
+ if (log->status & 1)
+ Wprintf("Processor core is above trip temperature. "
+ "Throttling enabled.\n");
+ else
+ Wprintf("Processor core below trip temperature. "
+ "Throttling disabled\n");
+}
+
void decode_intel_mc(struct mce *log, int cputype)
{
int cpu = log->cpu;
+ if (log->bank == BANK_THERMAL) {
+ decode_thermal(log);
+ return;
+ }
+
decode_mcg(log->mcgstatus);
decode_mci(log->status, cpu);
@@ -306,6 +323,8 @@ void decode_intel_mc(struct mce *log, in
char *intel_bank_name(int num)
{
static char bname[64];
+ if (num == BANK_THERMAL)
+ return "THERMAL EVENT";
sprintf(bname, "BANK %d", num);
return bname;
}

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Sep 27 21:50:27 CEST 2008 - trenn@suse.de
- fate #304279 mcelog support for Tigerton/Dunnington
Patch is from Andi himself with this statement:
While it looks large most of it is just new tables.
-------------------------------------------------------------------
Mon May 29 16:23:12 CEST 2006 - ak@suse.de

View File

@ -1,23 +1,32 @@
#
# spec file for package mcelog (Version 0.7)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: mcelog
License: GPL
License: GPL v2 or later
Summary: Log Machine Check Events
Version: 0.7
Release: 3
Autoreqprov: on
Release: 111
AutoReqProv: on
Source: mcelog-%{version}.tar.gz
Patch0: mcelog-thermal
Patch0: mcelog-0.7-newcpus-1.diff
Patch1: mcelog-thermal.diff
Group: System/Monitoring
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -35,11 +44,12 @@ In addition, it allows decoding machine check kernel panic messages.
Authors:
--------
Andi Kleen <ak@suse.de>
Andi Kleen <andi@firstfloor.org>
%prep
%setup
%patch0 -p1
%patch1 -p1
%build
make CFLAGS="$RPM_OPT_FLAGS"
@ -64,40 +74,44 @@ rm -rf $RPM_BUILD_ROOT
/etc/cron.hourly/mcelog
/etc/logrotate.d/mcelog
%changelog -n mcelog
* Mon May 29 2006 - ak@suse.de
%changelog
* Sat Sep 27 2008 trenn@suse.de
- fate #304279 mcelog support for Tigerton/Dunnington
Patch is from Andi himself with this statement:
While it looks large most of it is just new tables.
* Mon May 29 2006 ak@suse.de
- decode intel thermal events too (#179327)
* Fri May 05 2006 - ak@suse.de
* Fri May 05 2006 ak@suse.de
- Update to 0.7. This fixes
- Fix --dmi option (#166324)
- Incorporate old patches
* Fri Mar 03 2006 - ak@suse.de
- Fix --dmi option (#166324)
- Incorporate old patches
* Fri Mar 03 2006 ak@suse.de
- Avoid cosmetic problem in --filter (#153347)
* Wed Feb 08 2006 - ak@suse.de
* Wed Feb 08 2006 ak@suse.de
- update to mcelog 0.6
* Fixes bugs (#148869, #137985)
* Adds --dmi option to map addresses to DIMMs using SMBIOS
(default to off)
* Wed Jan 25 2006 - mls@suse.de
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Mon Dec 19 2005 - sf@suse.de
* Mon Dec 19 2005 sf@suse.de
- update to version 0.5
* Clarify --ascii in the manpage
*Support for AMD K8 Revision F machine check DRAM error
thresholding
* Fri Feb 11 2005 - ak@suse.de
* Fri Feb 11 2005 ak@suse.de
- Use RPM_OPT_FLAGS
- Improve description again
* Thu Feb 10 2005 - ak@suse.de
* Thu Feb 10 2005 ak@suse.de
- mcelog-0.4:
* add support to decode AMD K8 (Opteron/Athlon64/AthlonFX) and
Intel P4 (Xeon and Pentium 4) events
* add --ascii option to decode machine check panic information
- Rewrite description in .spec file
* Wed Jun 09 2004 - ak@suse.de
* Wed Jun 09 2004 ak@suse.de
- memlog-0.2:
* fix mcelog looping (#41863)
* Add GPL notices
* Thu Mar 25 2004 - sf@suse.de
* Thu Mar 25 2004 sf@suse.de
- initial version
- fixes #36898