From patchwork Wed Jan 22 10:25:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hawa, Hanna" X-Patchwork-Id: 11345475 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 103CC92A for ; Wed, 22 Jan 2020 10:26:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D79CB20828 for ; Wed, 22 Jan 2020 10:26:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="FTSoLDHi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729129AbgAVK0F (ORCPT ); Wed, 22 Jan 2020 05:26:05 -0500 Received: from smtp-fw-9102.amazon.com ([207.171.184.29]:48193 "EHLO smtp-fw-9102.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728931AbgAVK0F (ORCPT ); Wed, 22 Jan 2020 05:26:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1579688765; x=1611224765; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=x6lepp6ci+wA5iJu0pBXSTl1io4HgG1fLV8TCUcbtxs=; b=FTSoLDHi1WDndHRlt1qT9I3rNYE0Npb9p22KIEf65/NfkHMq13diPeqm UjPgXc4QvYWDVvUug4iVuEAbIgHpSMpgaiEfqEe5SmrzfNzPSmulwjYv9 smR7eZpgX/vmDl5LmtVuLTNTiFX5s6PIYgL3oE9Nv1V7HRt2PtQw32HES g=; IronPort-SDR: S+z7KVicXwson8+l6Vxug2TVleEAmF4pCd1J+lLWi8HoTNnKnbuAlX1gslN1AIVTw/n9Ms8Tob /fy6P3IJnWkg== X-IronPort-AV: E=Sophos;i="5.70,349,1574121600"; d="scan'208";a="20330516" Received: from sea32-co-svc-lb4-vlan3.sea.corp.amazon.com (HELO email-inbound-relay-1d-2c665b5d.us-east-1.amazon.com) ([10.47.23.38]) by smtp-border-fw-out-9102.sea19.amazon.com with ESMTP; 22 Jan 2020 10:25:54 +0000 Received: from EX13MTAUEA002.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1d-2c665b5d.us-east-1.amazon.com (Postfix) with ESMTPS id C0900A243E; Wed, 22 Jan 2020 10:25:48 +0000 (UTC) Received: from EX13D19EUB003.ant.amazon.com (10.43.166.69) by EX13MTAUEA002.ant.amazon.com (10.43.61.77) with Microsoft SMTP Server (TLS) id 15.0.1236.3; Wed, 22 Jan 2020 10:25:48 +0000 Received: from u8a88181e7b2355.ant.amazon.com (10.43.161.78) by EX13D19EUB003.ant.amazon.com (10.43.166.69) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Wed, 22 Jan 2020 10:25:37 +0000 From: Hanna Hawa To: , , , , , , , , , , , CC: , , , , , , , , , Subject: [PATCH v8 1/3] edac: Add support for Amazon's Annapurna Labs L1 EDAC Date: Wed, 22 Jan 2020 12:25:11 +0200 Message-ID: <20200122102513.31132-2-hhhawa@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200122102513.31132-1-hhhawa@amazon.com> References: <20200122102513.31132-1-hhhawa@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.43.161.78] X-ClientProxiedBy: EX13D28UWB004.ant.amazon.com (10.43.161.56) To EX13D19EUB003.ant.amazon.com (10.43.166.69) Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org Adds support for Amazon's Annapurna Labs L1 EDAC driver to detect and report L1 errors. Signed-off-by: Hanna Hawa Reviewed-by: James Morse --- MAINTAINERS | 5 + drivers/edac/Kconfig | 8 ++ drivers/edac/Makefile | 1 + drivers/edac/al_l1_edac.c | 207 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 221 insertions(+) create mode 100644 drivers/edac/al_l1_edac.c diff --git a/MAINTAINERS b/MAINTAINERS index 296de2b51c83..a36c31c94521 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -757,6 +757,11 @@ F: drivers/tty/serial/altera_jtaguart.c F: include/linux/altera_uart.h F: include/linux/altera_jtaguart.h +AMAZON ANNAPURNA LABS L1 EDAC +M: Hanna Hawa +S: Maintained +F: drivers/edac/al_l1_edac.c + AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER M: Talel Shenhar S: Maintained diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 417dad635526..64621e4f3a6f 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -74,6 +74,14 @@ config EDAC_GHES In doubt, say 'Y'. +config EDAC_AL_L1 + tristate "Amazon's Annapurna Labs L1 EDAC" + depends on (ARM64 && ARCH_ALPINE) || COMPILE_TEST + help + Support for L1 error detection and correction + for Amazon's Annapurna Labs SoCs. + This driver detects errors of L1 caches. + config EDAC_AMD64 tristate "AMD64 (Opteron, Athlon64)" depends on AMD_NB && EDAC_DECODE_MCE diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile index d77200c9680b..7d67433b683a 100644 --- a/drivers/edac/Makefile +++ b/drivers/edac/Makefile @@ -22,6 +22,7 @@ obj-$(CONFIG_EDAC_GHES) += ghes_edac.o edac_mce_amd-y := mce_amd.o obj-$(CONFIG_EDAC_DECODE_MCE) += edac_mce_amd.o +obj-$(CONFIG_EDAC_AL_L1) += al_l1_edac.o obj-$(CONFIG_EDAC_AMD76X) += amd76x_edac.o obj-$(CONFIG_EDAC_CPC925) += cpc925_edac.o obj-$(CONFIG_EDAC_I5000) += i5000_edac.o diff --git a/drivers/edac/al_l1_edac.c b/drivers/edac/al_l1_edac.c new file mode 100644 index 000000000000..723b35b18f5b --- /dev/null +++ b/drivers/edac/al_l1_edac.c @@ -0,0 +1,207 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + */ + +#include +#include +#include +#include +#include + +#include "edac_device.h" +#include "edac_module.h" + +#define DRV_NAME "al_l1_edac" + +/* Same bit assignments of CPUMERRSR_EL1 in ARM CA57/CA72 */ +#define ARM_CA57_CPUMERRSR_EL1 sys_reg(3, 1, 15, 2, 2) +#define ARM_CA57_CPUMERRSR_RAM_ID GENMASK(30, 24) +#define ARM_CA57_L1_I_TAG_RAM 0x00 +#define ARM_CA57_L1_I_DATA_RAM 0x01 +#define ARM_CA57_L1_D_TAG_RAM 0x08 +#define ARM_CA57_L1_D_DATA_RAM 0x09 +#define ARM_CA57_L2_TLB_RAM 0x18 +#define ARM_CA57_CPUMERRSR_VALID BIT(31) +#define ARM_CA57_CPUMERRSR_REPEAT GENMASK_ULL(39, 32) +#define ARM_CA57_CPUMERRSR_OTHER GENMASK_ULL(47, 40) +#define ARM_CA57_CPUMERRSR_FATAL BIT_ULL(63) + +#define AL_L1_EDAC_MSG_MAX 256 + +static void al_l1_edac_cpumerrsr_read_status(void *arg) +{ + struct edac_device_ctl_info *edac_dev = arg; + int cpu, space, count; + u32 ramid, repeat, other, fatal; + u64 val; + char msg[AL_L1_EDAC_MSG_MAX]; + char *p; + spinlock_t *lock; + + val = read_sysreg_s(ARM_CA57_CPUMERRSR_EL1); + if (!(FIELD_GET(ARM_CA57_CPUMERRSR_VALID, val))) + return; + + write_sysreg_s(0, ARM_CA57_CPUMERRSR_EL1); + + cpu = smp_processor_id(); + ramid = FIELD_GET(ARM_CA57_CPUMERRSR_RAM_ID, val); + repeat = FIELD_GET(ARM_CA57_CPUMERRSR_REPEAT, val); + other = FIELD_GET(ARM_CA57_CPUMERRSR_OTHER, val); + fatal = FIELD_GET(ARM_CA57_CPUMERRSR_FATAL, val); + + space = sizeof(msg); + p = msg; + count = scnprintf(p, space, "CPU%d L1 %serror detected", cpu, + (fatal) ? "Fatal " : ""); + p += count; + space -= count; + + switch (ramid) { + case ARM_CA57_L1_I_TAG_RAM: + count = scnprintf(p, space, " RAMID='L1-I Tag RAM'"); + break; + case ARM_CA57_L1_I_DATA_RAM: + count = scnprintf(p, space, " RAMID='L1-I Data RAM'"); + break; + case ARM_CA57_L1_D_TAG_RAM: + count = scnprintf(p, space, " RAMID='L1-D Tag RAM'"); + break; + case ARM_CA57_L1_D_DATA_RAM: + count = scnprintf(p, space, " RAMID='L1-D Data RAM'"); + break; + case ARM_CA57_L2_TLB_RAM: + count = scnprintf(p, space, " RAMID='L2 TLB RAM'"); + break; + default: + count = scnprintf(p, space, " RAMID='unknown'"); + break; + } + + p += count; + space -= count; + count = scnprintf(p, space, + " repeat=%d, other=%d (CPUMERRSR_EL1=0x%llx)", + repeat, other, val); + + lock = edac_dev->pvt_info; + spin_lock(lock); + if (fatal) + edac_device_handle_ue_count(edac_dev, repeat, 0, 0, msg); + else + edac_device_handle_ce_count(edac_dev, repeat, 0, 0, msg); + spin_unlock(lock); +} + +static void al_l1_edac_check(struct edac_device_ctl_info *edac_dev) +{ + on_each_cpu(al_l1_edac_cpumerrsr_read_status, edac_dev, 1); +} + +static int al_l1_edac_probe(struct platform_device *pdev) +{ + struct edac_device_ctl_info *edac_dev; + struct device *dev = &pdev->dev; + spinlock_t *lock; + int ret; + + edac_dev = edac_device_alloc_ctl_info(sizeof(*lock), DRV_NAME, 1, "L", + 1, 1, NULL, 0, + edac_device_alloc_index()); + if (!edac_dev) + return -ENOMEM; + + edac_dev->edac_check = al_l1_edac_check; + edac_dev->dev = dev; + edac_dev->mod_name = DRV_NAME; + edac_dev->dev_name = dev_name(dev); + edac_dev->ctl_name = "L1_cache"; + platform_set_drvdata(pdev, edac_dev); + lock = edac_dev->pvt_info; + + spin_lock_init(lock); + + ret = edac_device_add_device(edac_dev); + if (ret) { + dev_err(dev, "Failed to add L1 edac device (%d)\n", ret); + edac_device_free_ctl_info(edac_dev); + return ret; + } + + return 0; +} + +static int al_l1_edac_remove(struct platform_device *pdev) +{ + struct edac_device_ctl_info *edac_dev = platform_get_drvdata(pdev); + + edac_device_del_device(edac_dev->dev); + edac_device_free_ctl_info(edac_dev); + + return 0; +} + +static const struct of_device_id al_l1_edac_of_match[] = { + /* + * "al,alpine-v2", and "amazon,al-alpine-v3" are machine compatible + * strings which have Cortex-A57/A72 configured with this support, + * and access to CPUMERRSR_EL1 register is enabled in firmware. + */ + { .compatible = "al,alpine-v2" }, + { .compatible = "amazon,al-alpine-v3" }, + {} +}; +MODULE_DEVICE_TABLE(of, al_l1_edac_of_match); + +static struct platform_driver al_l1_edac_driver = { + .probe = al_l1_edac_probe, + .remove = al_l1_edac_remove, + .driver = { + .name = DRV_NAME, + }, +}; + +static struct platform_device *edac_l1_device; + +static int __init al_l1_init(void) +{ + struct device_node *root; + int ret; + + root = of_find_node_by_path("/"); + if (!root) { + pr_debug("Can't find root node!\n"); + return 0; + } + + if (!of_match_node(al_l1_edac_of_match, root)) + return 0; + + ret = platform_driver_register(&al_l1_edac_driver); + if (ret) { + pr_err("Failed to register %s (%d)\n", DRV_NAME, ret); + return ret; + } + + edac_l1_device = platform_device_register_simple(DRV_NAME, -1, NULL, 0); + if (IS_ERR(edac_l1_device)) { + pr_err("Failed to register EDAC AL L1 platform device\n"); + return PTR_ERR(edac_l1_device); + } + + return 0; +} + +static void __exit al_l1_exit(void) +{ + platform_device_unregister(edac_l1_device); + platform_driver_unregister(&al_l1_edac_driver); +} + +late_initcall(al_l1_init); +module_exit(al_l1_exit); + +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Hanna Hawa "); +MODULE_DESCRIPTION("Amazon's Annapurna Lab's L1 EDAC Driver"); From patchwork Wed Jan 22 10:25:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hawa, Hanna" X-Patchwork-Id: 11345479 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 8ADCD1398 for ; Wed, 22 Jan 2020 10:26:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69BBE24683 for ; Wed, 22 Jan 2020 10:26:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="mRwiNRAa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729016AbgAVK0P (ORCPT ); Wed, 22 Jan 2020 05:26:15 -0500 Received: from smtp-fw-33001.amazon.com ([207.171.190.10]:63676 "EHLO smtp-fw-33001.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728931AbgAVK0P (ORCPT ); Wed, 22 Jan 2020 05:26:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1579688774; x=1611224774; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=q1HmxflKg5RJkSzpVrAiFLEw/He8edTOjzy4l2VYtIg=; b=mRwiNRAab1UVkPBMCiwJkl1CpBIkUVkQLLt7f9719V8ZsH++/RekIqjP A8oFQI5FIBRuakciz6Ut6JFJKJdB62zy44JkUGy3JbU6lDypksXXgnJDj uEJflIJ4OcrIqQe3zNU/JVXLPL9xzbrnlODK/D9EbzULkklioSW3GlHNk w=; IronPort-SDR: 04TQwjRwwVdCNlyVcWD/oReZh5voAJY9gQEkB9glJhN5nhUa6+Rw4KZcEZeXuKTHCZwzeMhK41 dfETuyWqQsTw== X-IronPort-AV: E=Sophos;i="5.70,349,1574121600"; d="scan'208";a="21698462" Received: from sea32-co-svc-lb4-vlan3.sea.corp.amazon.com (HELO email-inbound-relay-1a-16acd5e0.us-east-1.amazon.com) ([10.47.23.38]) by smtp-border-fw-out-33001.sea14.amazon.com with ESMTP; 22 Jan 2020 10:26:03 +0000 Received: from EX13MTAUEA002.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1a-16acd5e0.us-east-1.amazon.com (Postfix) with ESMTPS id 36743A2406; Wed, 22 Jan 2020 10:25:57 +0000 (UTC) Received: from EX13D19EUB003.ant.amazon.com (10.43.166.69) by EX13MTAUEA002.ant.amazon.com (10.43.61.77) with Microsoft SMTP Server (TLS) id 15.0.1236.3; Wed, 22 Jan 2020 10:25:57 +0000 Received: from u8a88181e7b2355.ant.amazon.com (10.43.161.78) by EX13D19EUB003.ant.amazon.com (10.43.166.69) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Wed, 22 Jan 2020 10:25:47 +0000 From: Hanna Hawa To: , , , , , , , , , , , CC: , , , , , , , , , Subject: [PATCH v8 2/3] of: EXPORT_SYMBOL_GPL of_find_next_cache_node Date: Wed, 22 Jan 2020 12:25:12 +0200 Message-ID: <20200122102513.31132-3-hhhawa@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200122102513.31132-1-hhhawa@amazon.com> References: <20200122102513.31132-1-hhhawa@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.43.161.78] X-ClientProxiedBy: EX13D28UWB004.ant.amazon.com (10.43.161.56) To EX13D19EUB003.ant.amazon.com (10.43.166.69) Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org Make of_find_next_cache_node() available for modules. Signed-off-by: Hanna Hawa Acked-by: Rob Herring --- drivers/of/base.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/of/base.c b/drivers/of/base.c index 1d667eb730e1..9f5610f55ed6 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2212,6 +2212,7 @@ struct device_node *of_find_next_cache_node(const struct device_node *np) return NULL; } +EXPORT_SYMBOL_GPL(of_find_next_cache_node); /** * of_find_last_cache_level - Find the level at which the last cache is From patchwork Wed Jan 22 10:25:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hawa, Hanna" X-Patchwork-Id: 11345477 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 CA55C1398 for ; Wed, 22 Jan 2020 10:26:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 953B424688 for ; Wed, 22 Jan 2020 10:26:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="aUxW6658" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729525AbgAVK0S (ORCPT ); Wed, 22 Jan 2020 05:26:18 -0500 Received: from smtp-fw-2101.amazon.com ([72.21.196.25]:27474 "EHLO smtp-fw-2101.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728931AbgAVK0R (ORCPT ); Wed, 22 Jan 2020 05:26:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1579688777; x=1611224777; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=EPizAQO93EJTplAs1NARRik68b25j20hVby84Fp7Yew=; b=aUxW6658BFDISC3ayKBoae5cw9CeI8Ag2LqVjNRa3FS3pldHq3NDUJz8 SRKDKNAA1N/QJf2XW48Ap2HiIJvWCyv+0LyOiVdAwoDKMe/I3aBq/Kl7f nAgAdrBz8pLqHvwaC7L/eavnJOrc8QDW+Xaih1UVAhdYo1mt65H7l65b/ s=; IronPort-SDR: 79WZOkfsfX+CkuUkGhamkNX7H4Xt9lsoOMQTQ05UCDbybjtGAxSCa3t0yxEhOca6tC5DvEFhwW VvrxSg8p+CYg== X-IronPort-AV: E=Sophos;i="5.70,349,1574121600"; d="scan'208";a="13656338" Received: from iad12-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-1a-7d76a15f.us-east-1.amazon.com) ([10.43.8.2]) by smtp-border-fw-out-2101.iad2.amazon.com with ESMTP; 22 Jan 2020 10:26:13 +0000 Received: from EX13MTAUEA002.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1a-7d76a15f.us-east-1.amazon.com (Postfix) with ESMTPS id 014EBA29D0; Wed, 22 Jan 2020 10:26:07 +0000 (UTC) Received: from EX13D19EUB003.ant.amazon.com (10.43.166.69) by EX13MTAUEA002.ant.amazon.com (10.43.61.77) with Microsoft SMTP Server (TLS) id 15.0.1236.3; Wed, 22 Jan 2020 10:26:07 +0000 Received: from u8a88181e7b2355.ant.amazon.com (10.43.161.78) by EX13D19EUB003.ant.amazon.com (10.43.166.69) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Wed, 22 Jan 2020 10:25:56 +0000 From: Hanna Hawa To: , , , , , , , , , , , CC: , , , , , , , , , Subject: [PATCH v8 3/3] edac: Add support for Amazon's Annapurna Labs L2 EDAC Date: Wed, 22 Jan 2020 12:25:13 +0200 Message-ID: <20200122102513.31132-4-hhhawa@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200122102513.31132-1-hhhawa@amazon.com> References: <20200122102513.31132-1-hhhawa@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.43.161.78] X-ClientProxiedBy: EX13D28UWB004.ant.amazon.com (10.43.161.56) To EX13D19EUB003.ant.amazon.com (10.43.166.69) Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org Adds support for Amazon's Annapurna Labs L2 EDAC driver to detect and report L2 errors. Signed-off-by: Hanna Hawa Reported-by: kbuild test robot --- MAINTAINERS | 5 + drivers/edac/Kconfig | 8 ++ drivers/edac/Makefile | 1 + drivers/edac/al_l2_edac.c | 270 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 284 insertions(+) create mode 100644 drivers/edac/al_l2_edac.c diff --git a/MAINTAINERS b/MAINTAINERS index a36c31c94521..746bc124d2fb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -762,6 +762,11 @@ M: Hanna Hawa S: Maintained F: drivers/edac/al_l1_edac.c +AMAZON ANNAPURNA LABS L2 EDAC +M: Hanna Hawa +S: Maintained +F: drivers/edac/al_l2_edac.c + AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER M: Talel Shenhar S: Maintained diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 64621e4f3a6f..077a9ef428ad 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -82,6 +82,14 @@ config EDAC_AL_L1 for Amazon's Annapurna Labs SoCs. This driver detects errors of L1 caches. +config EDAC_AL_L2 + tristate "Amazon's Annapurna Labs L2 EDAC" + depends on (ARM64 && ARCH_ALPINE) || COMPILE_TEST + help + Support for L2 error detection and correction + for Amazon's Annapurna Labs SoCs. + This driver detects errors of L2 caches. + config EDAC_AMD64 tristate "AMD64 (Opteron, Athlon64)" depends on AMD_NB && EDAC_DECODE_MCE diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile index 7d67433b683a..ae48f8fccec3 100644 --- a/drivers/edac/Makefile +++ b/drivers/edac/Makefile @@ -23,6 +23,7 @@ edac_mce_amd-y := mce_amd.o obj-$(CONFIG_EDAC_DECODE_MCE) += edac_mce_amd.o obj-$(CONFIG_EDAC_AL_L1) += al_l1_edac.o +obj-$(CONFIG_EDAC_AL_L2) += al_l2_edac.o obj-$(CONFIG_EDAC_AMD76X) += amd76x_edac.o obj-$(CONFIG_EDAC_CPC925) += cpc925_edac.o obj-$(CONFIG_EDAC_I5000) += i5000_edac.o diff --git a/drivers/edac/al_l2_edac.c b/drivers/edac/al_l2_edac.c new file mode 100644 index 000000000000..147094efb6fd --- /dev/null +++ b/drivers/edac/al_l2_edac.c @@ -0,0 +1,270 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + */ + +#include +#include +#include +#include +#include +#include + +#include "edac_device.h" +#include "edac_module.h" + +#define DRV_NAME "al_l2_edac" + +/* Same bit assignments of L2MERRSR_EL1 in ARM CA57/CA72 */ +#define ARM_CA57_L2MERRSR_EL1 sys_reg(3, 1, 15, 2, 3) +#define ARM_CA57_L2MERRSR_RAMID GENMASK(30, 24) +#define ARM_CA57_L2_TAG_RAM 0x10 +#define ARM_CA57_L2_DATA_RAM 0x11 +#define ARM_CA57_L2_SNOOP_RAM 0x12 +#define ARM_CA57_L2_DIRTY_RAM 0x14 +#define ARM_CA57_L2_INC_PF_RAM 0x18 +#define ARM_CA57_L2MERRSR_VALID BIT(31) +#define ARM_CA57_L2MERRSR_REPEAT GENMASK_ULL(39, 32) +#define ARM_CA57_L2MERRSR_OTHER GENMASK_ULL(47, 40) +#define ARM_CA57_L2MERRSR_FATAL BIT_ULL(63) + +#define AL_L2_EDAC_MSG_MAX 256 + +struct al_l2_cache { + cpumask_t cluster_cpus; + struct list_head list_node; + struct device_node *of_node; +}; + +struct al_l2_edac { + struct list_head l2_caches; + spinlock_t lock; +}; + +static void al_l2_edac_l2merrsr_read_status(void *arg) +{ + struct edac_device_ctl_info *edac_dev = arg; + struct al_l2_edac *al_l2 = edac_dev->pvt_info; + int cpu, space, count; + u32 ramid, repeat, other, fatal; + u64 val; + char msg[AL_L2_EDAC_MSG_MAX]; + char *p; + + val = read_sysreg_s(ARM_CA57_L2MERRSR_EL1); + if (!(FIELD_GET(ARM_CA57_L2MERRSR_VALID, val))) + return; + + write_sysreg_s(0, ARM_CA57_L2MERRSR_EL1); + + cpu = smp_processor_id(); + ramid = FIELD_GET(ARM_CA57_L2MERRSR_RAMID, val); + repeat = FIELD_GET(ARM_CA57_L2MERRSR_REPEAT, val); + other = FIELD_GET(ARM_CA57_L2MERRSR_OTHER, val); + fatal = FIELD_GET(ARM_CA57_L2MERRSR_FATAL, val); + + space = sizeof(msg); + p = msg; + count = scnprintf(p, space, "CPU%d L2 %serror detected", cpu, + (fatal) ? "Fatal " : ""); + p += count; + space -= count; + + switch (ramid) { + case ARM_CA57_L2_TAG_RAM: + count = scnprintf(p, space, " RAMID='L2 Tag RAM'"); + break; + case ARM_CA57_L2_DATA_RAM: + count = scnprintf(p, space, " RAMID='L2 Data RAM'"); + break; + case ARM_CA57_L2_SNOOP_RAM: + count = scnprintf(p, space, " RAMID='L2 Snoop Tag RAM'"); + break; + case ARM_CA57_L2_DIRTY_RAM: + count = scnprintf(p, space, " RAMID='L2 Dirty RAM'"); + break; + case ARM_CA57_L2_INC_PF_RAM: + count = scnprintf(p, space, " RAMID='L2 internal metadata'"); + break; + default: + count = scnprintf(p, space, " RAMID='unknown'"); + break; + } + + p += count; + space -= count; + + count = scnprintf(p, space, + " repeat=%d, other=%d (L2MERRSR_EL1=0x%llx)", + repeat, other, val); + + spin_lock(&al_l2->lock); + if (fatal) + edac_device_handle_ue_count(edac_dev, repeat, 0, 0, msg); + else + edac_device_handle_ce_count(edac_dev, repeat, 0, 0, msg); + spin_unlock(&al_l2->lock); +} + +static void al_l2_edac_check(struct edac_device_ctl_info *edac_dev) +{ + struct al_l2_edac *al_l2 = edac_dev->pvt_info; + struct al_l2_cache *l2_cache; + + list_for_each_entry(l2_cache, &al_l2->l2_caches, list_node) + smp_call_function_any(&l2_cache->cluster_cpus, + al_l2_edac_l2merrsr_read_status, + edac_dev, 1); +} + +static int al_l2_edac_probe(struct platform_device *pdev) +{ + struct edac_device_ctl_info *edac_dev; + struct al_l2_edac *al_l2; + struct al_l2_cache *l2_cache; + struct device *dev = &pdev->dev; + int ret, i; + + edac_dev = edac_device_alloc_ctl_info(sizeof(*al_l2), DRV_NAME, 1, "L", + 1, 2, NULL, 0, + edac_device_alloc_index()); + if (!edac_dev) + return -ENOMEM; + + al_l2 = edac_dev->pvt_info; + edac_dev->edac_check = al_l2_edac_check; + edac_dev->dev = dev; + edac_dev->mod_name = DRV_NAME; + edac_dev->dev_name = dev_name(dev); + edac_dev->ctl_name = "L2_cache"; + platform_set_drvdata(pdev, edac_dev); + + spin_lock_init(&al_l2->lock); + INIT_LIST_HEAD(&al_l2->l2_caches); + + for_each_possible_cpu(i) { + struct device_node *cpu; + struct device_node *cpu_cache; + bool found = false; + + cpu = of_get_cpu_node(i, NULL); + if (!cpu) + continue; + + cpu_cache = of_find_next_cache_node(cpu); + list_for_each_entry(l2_cache, &al_l2->l2_caches, list_node) { + if (l2_cache->of_node == cpu_cache) { + found = true; + break; + } + } + + if (found) { + cpumask_set_cpu(i, &l2_cache->cluster_cpus); + of_node_put(cpu_cache); + } else { + l2_cache = devm_kzalloc(dev, sizeof(*l2_cache), + GFP_KERNEL); + l2_cache->of_node = cpu_cache; + list_add(&l2_cache->list_node, &al_l2->l2_caches); + cpumask_set_cpu(i, &l2_cache->cluster_cpus); + } + + of_node_put(cpu); + } + + list_for_each_entry(l2_cache, &al_l2->l2_caches, list_node) + of_node_put(l2_cache->of_node); + + if (list_empty(&al_l2->l2_caches)) { + dev_err(dev, "L2 Cache list is empty for EDAC device\n"); + ret = -EINVAL; + goto err; + } + + ret = edac_device_add_device(edac_dev); + if (ret) + goto err; + + return 0; + +err: + dev_err(dev, "Failed to add L2 edac device (%d)\n", ret); + edac_device_free_ctl_info(edac_dev); + + return ret; +} + +static int al_l2_edac_remove(struct platform_device *pdev) +{ + struct edac_device_ctl_info *edac_dev = platform_get_drvdata(pdev); + + edac_device_del_device(edac_dev->dev); + edac_device_free_ctl_info(edac_dev); + + return 0; +} + +static const struct of_device_id al_l2_edac_of_match[] = { + /* + * "al,alpine-v2", and "amazon,al-alpine-v3" are machine compatible + * strings which have Cortex-A57/A72 configured with this support, + * and access to L2MERRSR_EL1 register is enabled in firmware. + */ + { .compatible = "al,alpine-v2" }, + { .compatible = "amazon,al-alpine-v3" }, + {} +}; +MODULE_DEVICE_TABLE(of, al_l2_edac_of_match); + +static struct platform_driver al_l2_edac_driver = { + .probe = al_l2_edac_probe, + .remove = al_l2_edac_remove, + .driver = { + .name = DRV_NAME, + }, +}; + +static struct platform_device *edac_l2_device; + +static int __init al_l2_init(void) +{ + struct device_node *root; + int ret; + + root = of_find_node_by_path("/"); + if (!root) { + pr_debug("Can't find root node!\n"); + return 0; + } + + if (!of_match_node(al_l2_edac_of_match, root)) + return 0; + + ret = platform_driver_register(&al_l2_edac_driver); + if (ret) { + pr_err("Failed to register %s (%d)\n", DRV_NAME, ret); + return ret; + } + + edac_l2_device = platform_device_register_simple(DRV_NAME, -1, NULL, 0); + if (IS_ERR(edac_l2_device)) { + pr_err("Failed to register EDAC AL L2 platform device\n"); + return PTR_ERR(edac_l2_device); + } + + return 0; +} + +static void __exit al_l2_exit(void) +{ + platform_device_unregister(edac_l2_device); + platform_driver_unregister(&al_l2_edac_driver); +} + +late_initcall(al_l2_init); +module_exit(al_l2_exit); + +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Hanna Hawa "); +MODULE_DESCRIPTION("Amazon's Annapurna Lab's L2 EDAC Driver");