From patchwork Wed May 27 08:02:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaofei Tan X-Patchwork-Id: 11572235 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7BFC4912 for ; Wed, 27 May 2020 08:03:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 644BD20FC3 for ; Wed, 27 May 2020 08:03:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729323AbgE0IDJ (ORCPT ); Wed, 27 May 2020 04:03:09 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:5288 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729300AbgE0IDI (ORCPT ); Wed, 27 May 2020 04:03:08 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 71986ED6D5DC42F7453E; Wed, 27 May 2020 16:03:01 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Wed, 27 May 2020 16:02:54 +0800 From: Xiaofei Tan To: , CC: Xiaofei Tan , , , Subject: [PATCH RESEND 1/2] rasdaemon: add support of l3tag and l3data in hip08 OEM format2 Date: Wed, 27 May 2020 16:02:32 +0800 Message-ID: <1590566553-51565-2-git-send-email-tanxiaofei@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1590566553-51565-1-git-send-email-tanxiaofei@huawei.com> References: <1590566553-51565-1-git-send-email-tanxiaofei@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.24] X-CFilter-Loop: Reflected Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org The two modules, l3tag and l3data were originally reported through "ARM processor error section". But it is not suitable. Because l3tag or l3data doesn't belong to any single CPU core. So we change it to use OEM format2. Signed-off-by: Xiaofei Tan --- non-standard-hisi_hip08.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/non-standard-hisi_hip08.c b/non-standard-hisi_hip08.c index 4cfa107..8bf10c1 100644 --- a/non-standard-hisi_hip08.c +++ b/non-standard-hisi_hip08.c @@ -52,6 +52,8 @@ #define HISI_OEM_MODULE_ID_PA 2 #define HISI_OEM_MODULE_ID_HLLC 3 #define HISI_OEM_MODULE_ID_DDRC 4 +#define HISI_OEM_MODULE_ID_L3T 5 +#define HISI_OEM_MODULE_ID_L3D 6 #define HISI_OEM_TYPE2_VALID_ERR_FR BIT(6) #define HISI_OEM_TYPE2_VALID_ERR_CTRL BIT(7) @@ -374,6 +376,36 @@ static const char *ddrc_submodule_name[] = { "TA_DDRC3", }; +static const char *l3tag_submodule_name[] = { + "TB_PARTITION0", + "TB_PARTITION1", + "TB_PARTITION2", + "TB_PARTITION3", + "TB_PARTITION4", + "TB_PARTITION5", + "TB_PARTITION6", + "TB_PARTITION7", + "TA_PARTITION0", + "TA_PARTITION1", + "TA_PARTITION2", + "TA_PARTITION3", + "TA_PARTITION4", + "TA_PARTITION5", + "TA_PARTITION6", + "TA_PARTITION7", +}; + +static const char *l3data_submodule_name[] = { + "TB_BANK0", + "TB_BANK1", + "TB_BANK2", + "TB_BANK3", + "TA_BANK0", + "TA_BANK1", + "TA_BANK2", + "TA_BANK3", +}; + static const struct hisi_module_info hisi_oem_type2_module[] = { { .id = HISI_OEM_MODULE_ID_SMMU, @@ -404,6 +436,18 @@ static const struct hisi_module_info hisi_oem_type2_module[] = { .sub_num = ARRAY_SIZE(ddrc_submodule_name), }, { + .id = HISI_OEM_MODULE_ID_L3T, + .name = "L3TAG", + .sub = l3tag_submodule_name, + .sub_num = ARRAY_SIZE(l3tag_submodule_name), + }, + { + .id = HISI_OEM_MODULE_ID_L3D, + .name = "L3DATA", + .sub = l3data_submodule_name, + .sub_num = ARRAY_SIZE(l3data_submodule_name), + }, + { } }; From patchwork Wed May 27 08:02:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaofei Tan X-Patchwork-Id: 11572237 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 435A090 for ; Wed, 27 May 2020 08:03:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2BF2620FC3 for ; Wed, 27 May 2020 08:03:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729341AbgE0IDK (ORCPT ); Wed, 27 May 2020 04:03:10 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:5289 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729318AbgE0IDJ (ORCPT ); Wed, 27 May 2020 04:03:09 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 931286F59412700B71B0; Wed, 27 May 2020 16:03:06 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Wed, 27 May 2020 16:02:56 +0800 From: Xiaofei Tan To: , CC: Xiaofei Tan , , , Subject: [PATCH RESEND 2/2] rasdaemon: fix the issue that non standard decoder can't work in pthread way Date: Wed, 27 May 2020 16:02:33 +0800 Message-ID: <1590566553-51565-3-git-send-email-tanxiaofei@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1590566553-51565-1-git-send-email-tanxiaofei@huawei.com> References: <1590566553-51565-1-git-send-email-tanxiaofei@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.24] X-CFilter-Loop: Reflected Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org The non standard decoding functions are registered in app init process through __attribute__((constructor)), and unregistered in app exit process through __attribute__((destructor)). We don't need to unregister them in any other steps. This patch removes these unnecessary unregister calls. Fixes: 78a21c1e9770 ("rasdaemon: add closure and cleanups for the database") Signed-off-by: Xiaofei Tan --- ras-events.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ras-events.c b/ras-events.c index 5635278..e6c89dd 100644 --- a/ras-events.c +++ b/ras-events.c @@ -496,10 +496,8 @@ static int read_ras_event_all_cpus(struct pthread_data *pdata, "Old kernel detected. Stop listening and fall back to pthread way.\n"); cleanup: - if (pdata[0].ras->record_events) { - unregister_ns_dec_tab(); + if (pdata[0].ras->record_events) ras_mc_event_closedb(pdata[0].cpu, pdata[0].ras); - } error: kbuffer_free(kbuf); @@ -598,10 +596,8 @@ static void *handle_ras_events_cpu(void *priv) read_ras_event(fd, pdata, kbuf, page); - if (pdata->ras->record_events) { - unregister_ns_dec_tab(); + if (pdata->ras->record_events) ras_mc_event_closedb(pdata->cpu, pdata->ras); - } close(fd); kbuffer_free(kbuf);