mirror of
git://slackware.nl/current.git
synced 2025-02-06 20:46:02 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
60 lines
1.8 KiB
Diff
60 lines
1.8 KiB
Diff
From 34f03e306c36487a3720ae96b8ed5fbaa5256b5f Mon Sep 17 00:00:00 2001
|
|
From: Tony Luck <tony.luck@intel.com>
|
|
Date: Tue, 25 Jul 2017 14:45:52 -0700
|
|
Subject: [PATCH] mcelog: Change name of skylake interconnect from QPI to UPI
|
|
|
|
Skylake interconnect is actually called "UPI" (Ultra Path Interconnect)
|
|
|
|
Signed-off-by: Tony Luck <tony.luck@intel.com>
|
|
Signed-off-by: Andi Kleen <ak@linux.intel.com>
|
|
---
|
|
skylake_xeon.c | 14 +++++++-------
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/skylake_xeon.c b/skylake_xeon.c
|
|
index fd71b98..16c6181 100644
|
|
--- a/skylake_xeon.c
|
|
+++ b/skylake_xeon.c
|
|
@@ -79,7 +79,7 @@ static struct field pcu_mc4[] = {
|
|
|
|
/* See IA32 SDM Vol3B Table 16-28 */
|
|
|
|
-static char *qpi[] = {
|
|
+static char *upi[] = {
|
|
[0x00] = "UC Phy Initialization Failure",
|
|
[0x01] = "UC Phy detected drift buffer alarm",
|
|
[0x02] = "UC Phy detected latency buffer rollover",
|
|
@@ -98,13 +98,13 @@ static char *qpi[] = {
|
|
[0x31] = "COR LL Rx detected CRC error - successful LLR with Phy Reinit",
|
|
};
|
|
|
|
-static struct field qpi_mc[] = {
|
|
- FIELD(16, qpi),
|
|
+static struct field upi_mc[] = {
|
|
+ FIELD(16, upi),
|
|
{}
|
|
};
|
|
|
|
/* These apply to MSCOD 0x12 "UC LL or Phy control error" */
|
|
-static struct field qpi_0x12[] = {
|
|
+static struct field upi_0x12[] = {
|
|
SBITFIELD(22, "Phy Control Error"),
|
|
SBITFIELD(23, "Unexpected Retry.Ack flit"),
|
|
SBITFIELD(24, "Unexpected Retry.Req flit"),
|
|
@@ -194,10 +194,10 @@ void skylake_s_decode_model(int cputype, int bank, u64 status, u64 misc)
|
|
case 5:
|
|
case 12:
|
|
case 19:
|
|
- Wprintf("QPI: ");
|
|
- decode_bitfield(status, qpi_mc);
|
|
+ Wprintf("UPI: ");
|
|
+ decode_bitfield(status, upi_mc);
|
|
if (EXTRACT(status, 16, 21) == 0x12)
|
|
- decode_bitfield(status, qpi_0x12);
|
|
+ decode_bitfield(status, upi_0x12);
|
|
break;
|
|
case 7: case 8:
|
|
Wprintf("M2M: ");
|
|
--
|
|
2.14.1
|
|
|