From patchwork Fri Sep 1 10:32:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xie XiuQi X-Patchwork-Id: 9933863 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E5A4360309 for ; Fri, 1 Sep 2017 10:31:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E55D228622 for ; Fri, 1 Sep 2017 10:31:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA4F12862C; Fri, 1 Sep 2017 10:31:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 876F428622 for ; Fri, 1 Sep 2017 10:31:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751866AbdIAKbS (ORCPT ); Fri, 1 Sep 2017 06:31:18 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:5520 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751674AbdIAKbQ (ORCPT ); Fri, 1 Sep 2017 06:31:16 -0400 Received: from 172.30.72.58 (EHLO DGGEMS405-HUB.china.huawei.com) ([172.30.72.58]) by dggrg05-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id DGK21187; Fri, 01 Sep 2017 18:31:08 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.301.0; Fri, 1 Sep 2017 18:30:58 +0800 From: Xie XiuQi To: , , , , , , , , , , , CC: , , , , , , Subject: [RFC PATCH v1 2/3] apei: add ghes param for arch_apei_report_mem_error Date: Fri, 1 Sep 2017 18:32:00 +0800 Message-ID: <1504261921-39308-3-git-send-email-xiexiuqi@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1504261921-39308-1-git-send-email-xiexiuqi@huawei.com> References: <1504261921-39308-1-git-send-email-xiexiuqi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020205.59A936EE.00AA, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 04bcb99ac1ecd167d42466c40a228931 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add ghes param for arch_apei_report_mem_error, with which we could do more arch-specific processing. Signed-off-by: Xie XiuQi --- arch/x86/kernel/acpi/apei.c | 2 +- drivers/acpi/apei/apei-base.c | 4 +++- drivers/acpi/apei/ghes.c | 2 +- include/acpi/apei.h | 4 +++- include/acpi/ghes.h | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/acpi/apei.c b/arch/x86/kernel/acpi/apei.c index ea3046e..1bf1c9b 100644 --- a/arch/x86/kernel/acpi/apei.c +++ b/arch/x86/kernel/acpi/apei.c @@ -46,7 +46,7 @@ int arch_apei_enable_cmcff(struct acpi_hest_header *hest_hdr, void *data) return 1; } -void arch_apei_report_mem_error(int sev, struct cper_sec_mem_err *mem_err) +void arch_apei_report_mem_error(struct ghes *ghes, int sev, struct cper_sec_mem_err *mem_err) { #ifdef CONFIG_X86_MCE apei_mce_report_mem_error(sev, mem_err); diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c index da370e1..317169b 100644 --- a/drivers/acpi/apei/apei-base.c +++ b/drivers/acpi/apei/apei-base.c @@ -38,6 +38,8 @@ #include #include +#include + #include "apei-internal.h" #define APEI_PFX "APEI: " @@ -770,7 +772,7 @@ int __weak arch_apei_enable_cmcff(struct acpi_hest_header *hest_hdr, } EXPORT_SYMBOL_GPL(arch_apei_enable_cmcff); -void __weak arch_apei_report_mem_error(int sev, +void __weak arch_apei_report_mem_error(struct ghes *ghes, int sev, struct cper_sec_mem_err *mem_err) { } diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index fa9400d..996d16c4 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -483,7 +483,7 @@ static void ghes_do_proc(struct ghes *ghes, ghes_edac_report_mem_error(ghes, sev, mem_err); - arch_apei_report_mem_error(sev, mem_err); + arch_apei_report_mem_error(ghes, sev, mem_err); ghes_handle_memory_failure(gdata, sev); } #ifdef CONFIG_ACPI_APEI_PCIEAER diff --git a/include/acpi/apei.h b/include/acpi/apei.h index 76284bb..586dfb0 100644 --- a/include/acpi/apei.h +++ b/include/acpi/apei.h @@ -9,6 +9,8 @@ #include #include +#include + #define APEI_ERST_INVALID_RECORD_ID 0xffffffffffffffffULL #define APEI_ERST_CLEAR_RECORD _IOW('E', 1, u64) @@ -43,7 +45,7 @@ ssize_t erst_read(u64 record_id, struct cper_record_header *record, int erst_clear(u64 record_id); int arch_apei_enable_cmcff(struct acpi_hest_header *hest_hdr, void *data); -void arch_apei_report_mem_error(int sev, struct cper_sec_mem_err *mem_err); +void arch_apei_report_mem_error(struct ghes *ghes, int sev, struct cper_sec_mem_err *mem_err); void arch_apei_flush_tlb_one(unsigned long addr); #endif diff --git a/include/acpi/ghes.h b/include/acpi/ghes.h index 9f26e01..3100791 100644 --- a/include/acpi/ghes.h +++ b/include/acpi/ghes.h @@ -1,7 +1,8 @@ #ifndef GHES_H #define GHES_H -#include +#include +#include #include /*