From: "Chen, Gong" <gong.chen@linux.intel.com>
To: tony.luck@intel.com, bp@alien8.de
Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, "Chen,
Gong" <gong.chen@linux.intel.com>
Subject: [PATCH 7/8] ACPI, APEI, CPER: Cleanup CPER memory error output format
Date: Fri, 11 Oct 2013 02:32:45 -0400 [thread overview]
Message-ID: <1381473166-29303-8-git-send-email-gong.chen@linux.intel.com> (raw)
In-Reply-To: <1381473166-29303-1-git-send-email-gong.chen@linux.intel.com>
Keep up only the most important fields for memory error
reporting. The detail information will be moved to perf/trace
interface.
Suggested-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Chen, Gong <gong.chen@linux.intel.com>
---
drivers/acpi/apei/cper.c | 42 ++++++++++++++----------------------------
1 file changed, 14 insertions(+), 28 deletions(-)
diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
index 2a4389f..567410e 100644
--- a/drivers/acpi/apei/cper.c
+++ b/drivers/acpi/apei/cper.c
@@ -206,29 +206,29 @@ static void cper_print_mem(const char *pfx, const struct cper_sec_mem_err *mem)
printk("%s""physical_address_mask: 0x%016llx\n",
pfx, mem->physical_addr_mask);
if (mem->validation_bits & CPER_MEM_VALID_NODE)
- printk("%s""node: %d\n", pfx, mem->node);
+ pr_debug("node: %d\n", mem->node);
if (mem->validation_bits & CPER_MEM_VALID_CARD)
- printk("%s""card: %d\n", pfx, mem->card);
+ pr_debug("card: %d\n", mem->card);
if (mem->validation_bits & CPER_MEM_VALID_MODULE)
- printk("%s""module: %d\n", pfx, mem->module);
+ pr_debug("module: %d\n", mem->module);
if (mem->validation_bits & CPER_MEM_VALID_RANK_NUMBER)
- printk("%s""rank: %d\n", pfx, mem->rank);
+ pr_debug("rank: %d\n", mem->rank);
if (mem->validation_bits & CPER_MEM_VALID_BANK)
- printk("%s""bank: %d\n", pfx, mem->bank);
+ pr_debug("bank: %d\n", mem->bank);
if (mem->validation_bits & CPER_MEM_VALID_DEVICE)
- printk("%s""device: %d\n", pfx, mem->device);
+ pr_debug("device: %d\n", mem->device);
if (mem->validation_bits & CPER_MEM_VALID_ROW)
- printk("%s""row: %d\n", pfx, mem->row);
+ pr_debug("row: %d\n", mem->row);
if (mem->validation_bits & CPER_MEM_VALID_COLUMN)
- printk("%s""column: %d\n", pfx, mem->column);
+ pr_debug("column: %d\n", mem->column);
if (mem->validation_bits & CPER_MEM_VALID_BIT_POSITION)
- printk("%s""bit_position: %d\n", pfx, mem->bit_pos);
+ pr_debug("bit_position: %d\n", mem->bit_pos);
if (mem->validation_bits & CPER_MEM_VALID_REQUESTOR_ID)
- printk("%s""requestor_id: 0x%016llx\n", pfx, mem->requestor_id);
+ pr_debug("requestor_id: 0x%016llx\n", mem->requestor_id);
if (mem->validation_bits & CPER_MEM_VALID_RESPONDER_ID)
- printk("%s""responder_id: 0x%016llx\n", pfx, mem->responder_id);
+ pr_debug("responder_id: 0x%016llx\n", mem->responder_id);
if (mem->validation_bits & CPER_MEM_VALID_TARGET_ID)
- printk("%s""target_id: 0x%016llx\n", pfx, mem->target_id);
+ pr_debug("target_id: 0x%016llx\n", mem->target_id);
if (mem->validation_bits & CPER_MEM_VALID_ERROR_TYPE) {
u8 etype = mem->error_type;
printk("%s""error_type: %d, %s\n", pfx, etype,
@@ -296,15 +296,6 @@ static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie,
pfx, pcie->bridge.secondary_status, pcie->bridge.control);
}
-static const char *cper_estatus_section_flag_strs[] = {
- "primary",
- "containment warning",
- "reset",
- "error threshold exceeded",
- "resource not accessible",
- "latent error",
-};
-
static void cper_estatus_print_section(
const char *pfx, const struct acpi_generic_data *gdata, int sec_no)
{
@@ -312,11 +303,8 @@ static void cper_estatus_print_section(
__u16 severity;
severity = gdata->error_severity;
- printk("%s""section: %d, severity: %d, %s\n", pfx, sec_no, severity,
+ printk("%s""sub_event[%d], severity: %s\n", pfx, sec_no,
cper_severity_str(severity));
- printk("%s""flags: 0x%02x\n", pfx, gdata->flags);
- cper_print_bits(pfx, gdata->flags, cper_estatus_section_flag_strs,
- ARRAY_SIZE(cper_estatus_section_flag_strs));
if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID)
printk("%s""fru_id: %pUl\n", pfx, (uuid_le *)gdata->fru_id);
if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)
@@ -360,10 +348,8 @@ void cper_estatus_print(const char *pfx,
int sec_no = 0;
__u16 severity;
- printk("%s""Generic Hardware Error Status\n", pfx);
severity = estatus->error_severity;
- printk("%s""severity: %d, %s\n", pfx, severity,
- cper_severity_str(severity));
+ printk("%s""event severity: %s\n", pfx, cper_severity_str(severity));
data_len = estatus->data_length;
gdata = (struct acpi_generic_data *)(estatus + 1);
while (data_len >= sizeof(*gdata)) {
--
1.8.4.rc3
next prev parent reply other threads:[~2013-10-11 6:47 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-11 6:32 Extended H/W error log driver Chen, Gong
2013-10-11 6:32 ` [PATCH 1/8] ACPI, APEI, CPER: Fix status check during error printing Chen, Gong
2013-10-11 8:50 ` Borislav Petkov
2013-10-11 6:32 ` [PATCH 2/8] ACPI, CPER: Update cper info Chen, Gong
2013-10-11 9:06 ` Borislav Petkov
2013-10-11 15:47 ` Borislav Petkov
2013-10-16 1:57 ` Joe Perches
2013-10-16 2:46 ` Chen Gong
2013-10-16 3:10 ` Joe Perches
2013-10-15 18:17 ` Naveen N. Rao
2013-10-16 1:39 ` Chen Gong
2013-10-17 12:21 ` Naveen N. Rao
2013-10-18 11:06 ` Naveen N. Rao
2013-10-11 6:32 ` [PATCH 3/8] ACPI, x86: Extended error log driver for x86 platform Chen, Gong
2013-10-11 15:24 ` Borislav Petkov
2013-10-14 3:16 ` Chen Gong
2013-10-14 10:26 ` Borislav Petkov
2013-10-14 13:03 ` Chen Gong
2013-10-14 13:28 ` Borislav Petkov
2013-10-14 16:50 ` Tony Luck
2013-10-14 17:07 ` Borislav Petkov
2013-10-14 17:16 ` Tony Luck
2013-10-11 6:32 ` [PATCH 4/8] DMI: Parse memory device (type 17) in SMBIOS Chen, Gong
2013-10-11 15:40 ` Borislav Petkov
2013-10-14 3:21 ` Chen Gong
2013-10-14 10:30 ` Borislav Petkov
2013-10-15 19:00 ` Naveen N. Rao
2013-10-11 6:32 ` [PATCH 5/8] ACPI, APEI, CPER: Add UEFI 2.4 support for memory error Chen, Gong
2013-10-11 15:41 ` Borislav Petkov
2013-10-15 17:26 ` Naveen N. Rao
2013-10-16 1:35 ` Chen Gong
2013-10-11 6:32 ` [PATCH 6/8] ACPI, APEI, CPER: Enhance memory reporting capability Chen, Gong
2013-10-11 15:49 ` Borislav Petkov
2013-10-15 19:18 ` Naveen N. Rao
2013-10-11 6:32 ` Chen, Gong [this message]
2013-10-11 16:02 ` [PATCH 7/8] ACPI, APEI, CPER: Cleanup CPER memory error output format Borislav Petkov
2013-10-14 4:55 ` Chen Gong
2013-10-14 10:36 ` Borislav Petkov
2013-10-14 17:12 ` Tony Luck
2013-10-14 18:47 ` Borislav Petkov
2013-10-14 21:03 ` Tony Luck
2013-10-14 21:50 ` Borislav Petkov
2013-10-15 9:18 ` Chen Gong
2013-10-15 10:13 ` Borislav Petkov
2013-10-15 11:28 ` Naveen N. Rao
2013-10-15 11:41 ` Naveen N. Rao
2013-10-15 12:29 ` Borislav Petkov
2013-10-15 16:42 ` Joe Perches
2013-10-15 16:49 ` Tony Luck
2013-10-15 16:56 ` Borislav Petkov
2013-10-11 6:32 ` [PATCH 8/8] ACPI / trace: Add trace interface for eMCA driver Chen, Gong
2013-10-11 7:52 ` Borislav Petkov
2013-10-11 16:14 ` Borislav Petkov
2013-10-14 7:07 ` Chen Gong
2013-10-15 16:54 ` Naveen N. Rao
2013-10-15 17:00 ` Borislav Petkov
2013-10-15 17:30 ` Naveen N. Rao
2013-10-15 17:47 ` Borislav Petkov
2013-10-16 0:43 ` Mauro Carvalho Chehab
2013-10-16 9:16 ` Borislav Petkov
2013-10-16 10:35 ` Mauro Carvalho Chehab
2013-10-16 10:42 ` Borislav Petkov
2013-10-16 11:55 ` Mauro Carvalho Chehab
2013-10-16 12:20 ` Borislav Petkov
2013-10-16 20:47 ` Luck, Tony
2013-10-17 10:34 ` Mauro Carvalho Chehab
2013-10-17 21:35 ` Luck, Tony
2013-10-16 20:35 ` Luck, Tony
2013-10-17 10:32 ` Mauro Carvalho Chehab
2013-10-16 9:50 ` Chen Gong
2013-10-16 10:49 ` Borislav Petkov
2013-10-18 11:04 ` Naveen N. Rao
2013-10-11 7:00 ` Extended H/W error log driver Joe Perches
2013-10-11 8:04 ` Borislav Petkov
2013-10-11 14:54 ` Luck, Tony
2013-10-11 15:27 ` Borislav Petkov
2013-10-14 6:49 ` Chen Gong
2013-10-14 10:55 ` Borislav Petkov
2013-10-15 4:07 ` Chen Gong
2013-10-15 9:28 ` Borislav Petkov
2013-10-15 16:15 ` Tony Luck
2013-10-15 19:10 ` Naveen N. Rao
2013-10-15 19:23 ` Borislav Petkov
2013-10-17 12:07 ` Naveen N. Rao
2013-10-17 13:04 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381473166-29303-8-git-send-email-gong.chen@linux.intel.com \
--to=gong.chen@linux.intel.com \
--cc=bp@alien8.de \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).