From patchwork Mon Aug 12 10:11:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiju Jose X-Patchwork-Id: 171053 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp2628743ily; Mon, 12 Aug 2019 03:12:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqwdEPyvG8HuwX9mSNIrIwIKnoFIyVDEPpKS3W1ClX3J+Kl1007u25GKVK0yFF9+LftV9mtx X-Received: by 2002:a17:90b:907:: with SMTP id bo7mr243447pjb.107.1565604757339; Mon, 12 Aug 2019 03:12:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565604757; cv=none; d=google.com; s=arc-20160816; b=gCrF2qbzF/NuA2vzmXM2oKYzanQnH80yusWGSSQ3U6i8YAfI9FUclPAWDiaKfoIXJ2 GWKi8393dc+ngE9f/HbimA3Dc0IcDwSSFEC2L+SFCKz5rnip9nQCQc8wgtmSVNjEPzVE V54beEs/FX9VP0x2yeG9lJLzapjUxKblepi2ppa7tE3pwQkdwADngl1vs3o5PLvpb+ny kgDdYfHbmxhbH/iIowyGn/HliqmRTUcR8eWut/KEiTK7bIGt7aTfzFyug6eUZWtPm3VL 4aPH9w0epO1hGla25oOa1N7O0XgUqviCwV538Am7nKowHJydhe0s/Ee+XsgisOacR25d mFHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=o5PqbDX0zwQDBq7fToBRJHaCckWoAx8ZyH0kt67qcKc=; b=PXbnJtoltRhTCYa/RVszfHips6xezVycrxJziYFhqLbWYtJqtKNTqGvQ3oGbYVIb3p 0yFDiy11MeuW3HqhPGavyzl0zFxBDr4R5q9Iokt+0oyDNnWVIt4Qbl9zGSJ9PGmNhRDF XSuBtdMtzv114cv97n1Ua1rdFcf3LHJng87L+YrW+Vqq1rIZqwRIcRrZ/7ztIJEB+6Dt sp86qTimZtrlMl653Kp+ukOexmn5lHapTGtBaWTs4AEGnqlEvn8R93eq/mRPlzik+yTp MPXxj5FMOHlW6StlrGTz3DXhQCMDDYtQl1Xm59XpHCxZW6rqHlu5iVbhjAdSbS0ysBFb VsLQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e5si47331731pgl.536.2019.08.12.03.12.37; Mon, 12 Aug 2019 03:12:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727913AbfHLKMf (ORCPT + 28 others); Mon, 12 Aug 2019 06:12:35 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4659 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727703AbfHLKMe (ORCPT ); Mon, 12 Aug 2019 06:12:34 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 528D31947E2185D4EE0C; Mon, 12 Aug 2019 18:12:30 +0800 (CST) Received: from DESKTOP-6T4S3DQ.china.huawei.com (10.202.226.45) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.439.0; Mon, 12 Aug 2019 18:12:19 +0800 From: Shiju Jose To: , , , , , , , , CC: , , , Shiju Jose Subject: [PATCH RFC 2/4] ACPI: APEI: Add ghes_handle_memory_failure to the new notification method Date: Mon, 12 Aug 2019 11:11:47 +0100 Message-ID: <20190812101149.26036-3-shiju.jose@huawei.com> X-Mailer: git-send-email 2.19.2.windows.1 In-Reply-To: <20190812101149.26036-1-shiju.jose@huawei.com> References: <20190812101149.26036-1-shiju.jose@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.202.226.45] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds ghes_handle_memory_failure to the new error notification method. Signed-off-by: Shiju Jose --- drivers/acpi/apei/ghes.c | 51 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 15 deletions(-) -- 1.9.1 diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 374d197..4400d56 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -401,14 +401,18 @@ static void ghes_clear_estatus(struct ghes *ghes, ghes_ack_error(ghes->generic_v2); } -static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, int sev) +static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, + int sev, void *data) { -#ifdef CONFIG_ACPI_APEI_MEMORY_FAILURE + struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata); + int sec_sev = ghes_severity(gdata->error_severity); unsigned long pfn; int flags = -1; - int sec_sev = ghes_severity(gdata->error_severity); - struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata); + ghes_edac_report_mem_error(sev, mem_err); + arch_apei_report_mem_error(sev, mem_err); + +#ifdef CONFIG_ACPI_APEI_MEMORY_FAILURE if (!(mem_err->validation_bits & CPER_MEM_VALID_PA)) return; @@ -569,15 +573,7 @@ static void ghes_do_proc(struct ghes *ghes, if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT) fru_text = gdata->fru_text; - if (guid_equal(sec_type, &CPER_SEC_PLATFORM_MEM)) { - struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata); - - ghes_edac_report_mem_error(sev, mem_err); - - arch_apei_report_mem_error(sev, mem_err); - ghes_handle_memory_failure(gdata, sev); - } - else if (guid_equal(sec_type, &CPER_SEC_PCIE)) { + if (guid_equal(sec_type, &CPER_SEC_PCIE)) { ghes_handle_aer(gdata); } else if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) { @@ -1190,11 +1186,25 @@ static int apei_sdei_unregister_ghes(struct ghes *ghes) return sdei_unregister_ghes(ghes); } +struct ghes_err_handler_tab { + guid_t sec_type; + error_handle handle; +}; + +static struct ghes_err_handler_tab handler_tab[] = { + { + .sec_type = CPER_SEC_PLATFORM_MEM, + .handle = ghes_handle_memory_failure, + }, + { /* sentinel */ } +}; + static int ghes_probe(struct platform_device *ghes_dev) { struct acpi_hest_generic *generic; struct ghes *ghes = NULL; unsigned long flags; + int i; int rc = -EINVAL; @@ -1308,9 +1318,20 @@ static int ghes_probe(struct platform_device *ghes_dev) ghes_edac_register(ghes, &ghes_dev->dev); - if (!refcount_read(&ghes_ref_count)) + if (!refcount_read(&ghes_ref_count)) { refcount_set(&ghes_ref_count, 1); - else + /* register handler functions for the standard errors. + * This may be done from the corresponding drivers. + */ + for (i = 0; handler_tab[i].handle; i++) { + if (ghes_error_notify_register(handler_tab[i].sec_type, + handler_tab[i].handle, NULL)) { + ghes_edac_unregister(ghes); + platform_set_drvdata(ghes_dev, NULL); + goto err; + } + } + } else refcount_inc(&ghes_ref_count); /* Handle any pending errors right away */ From patchwork Mon Aug 12 10:11:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiju Jose X-Patchwork-Id: 171054 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp2628769ily; Mon, 12 Aug 2019 03:12:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqy7I9b2SHy1C+8s5yevbQg7QE/7KcWBdAXEHNDGwPDJlQifddkQ7w6HLVhxXdpsFl9XqNSm X-Received: by 2002:a17:902:141:: with SMTP id 59mr32848814plb.324.1565604759583; Mon, 12 Aug 2019 03:12:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565604759; cv=none; d=google.com; s=arc-20160816; b=xnu38INmEh2kGrbi+SNSblt4zv7Xay7cAODDfb90lb0DnUgG+6ln9dvsuMEHYdF0/m zaz9NZ5IU6MeckT2yROwinASKE3CXA7Ox9b9z8DRk2JajXbJvRScZzBbDsTswZKR2e/a jk8VzC/x2jxvn1l3IYg4BL3ZD/GikVxVomA0hbHIl4O17kzTe6a9rnSxTxzLCysUjthO RSuyDUnv7OGCFj8Ypm8YPVvUiEI9bg8BksaRZiGI6dUg/ysKetKcPY/XJ24eFQ11Ovhm /w0a81QUS1jl0GefEpJJeX0T8WWQ3JogHcIxtuRK+LzkuqPKMaXnf0k1rJNbRtaRnC7s qxMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=je7WD1qJAOjjag99SwErS/Zdgkr3bmkDTJrpFe+/lzU=; b=RGJtCfIEZDU5QN696bczPKmOvI1O+IGACxG/MhjijDmfHTkoN5t8liiKGDdOVIEVKw rTs0VybeXsdeYZ07ZxSDWy2CpoQprdi6YzSNBBG/+PefayZb3SE8s6bB2KvXFDgeKBGo aBw3n8Et90sYyAMBPIuA5KysH1R0Fm2qOBMClXed2lwffOple9HgfYd9KCt1eyEiNpSN EpzRyOPYwQwkIR8d59OhOXTthTMzOrZwiWWjeSPDOjf44zgOzyxyb1uQXBB/rg3pFPOl YET0pE8vnvsixwD1gMz5vIViII2evPxWKU32QiUcuf6TX7eT6JDZ8sBP7Jn1adLj4EFK 4yVQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e5si47331731pgl.536.2019.08.12.03.12.39; Mon, 12 Aug 2019 03:12:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727929AbfHLKMi (ORCPT + 28 others); Mon, 12 Aug 2019 06:12:38 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:35434 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727910AbfHLKMg (ORCPT ); Mon, 12 Aug 2019 06:12:36 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 48D7E7B952D90A652941; Mon, 12 Aug 2019 18:12:30 +0800 (CST) Received: from DESKTOP-6T4S3DQ.china.huawei.com (10.202.226.45) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.439.0; Mon, 12 Aug 2019 18:12:22 +0800 From: Shiju Jose To: , , , , , , , , CC: , , , Shiju Jose Subject: [PATCH RFC 3/4] ACPI: APEI: Add ghes_handle_aer to the new notification method Date: Mon, 12 Aug 2019 11:11:48 +0100 Message-ID: <20190812101149.26036-4-shiju.jose@huawei.com> X-Mailer: git-send-email 2.19.2.windows.1 In-Reply-To: <20190812101149.26036-1-shiju.jose@huawei.com> References: <20190812101149.26036-1-shiju.jose@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.202.226.45] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds ghes_handle_aer to the new error notification method. Signed-off-by: Shiju Jose --- drivers/acpi/apei/ghes.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 1.9.1 diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 4400d56..ffc309c 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -450,7 +450,8 @@ static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, * GHES_SEV_PANIC does not make it to this handling since the kernel must * panic. */ -static void ghes_handle_aer(struct acpi_hest_generic_data *gdata) +static void ghes_handle_aer(struct acpi_hest_generic_data *gdata, + int sev, void *data) { #ifdef CONFIG_ACPI_APEI_PCIEAER struct cper_sec_pcie *pcie_err = acpi_hest_get_payload(gdata); @@ -573,10 +574,7 @@ static void ghes_do_proc(struct ghes *ghes, if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT) fru_text = gdata->fru_text; - if (guid_equal(sec_type, &CPER_SEC_PCIE)) { - ghes_handle_aer(gdata); - } - else if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) { + if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) { struct cper_sec_proc_arm *err = acpi_hest_get_payload(gdata); log_arm_hw_error(err); @@ -1196,6 +1194,10 @@ struct ghes_err_handler_tab { .sec_type = CPER_SEC_PLATFORM_MEM, .handle = ghes_handle_memory_failure, }, + { + .sec_type = CPER_SEC_PCIE, + .handle = ghes_handle_aer, + }, { /* sentinel */ } };