From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BB56C76192 for ; Mon, 15 Jul 2019 13:25:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E92AE2067C for ; Mon, 15 Jul 2019 13:25:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="Cve8e8CB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730354AbfGONZM (ORCPT ); Mon, 15 Jul 2019 09:25:12 -0400 Received: from smtp-fw-6002.amazon.com ([52.95.49.90]:40404 "EHLO smtp-fw-6002.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730162AbfGONZL (ORCPT ); Mon, 15 Jul 2019 09:25:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1563197109; x=1594733109; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=x/g/6W5g2uROM+3D/2gh8e/WjobjLChvpDCo3AhuOQA=; b=Cve8e8CBBcyKGUsLcCmgwKgiw0hynHIDv//OEyVrRDgKD+DBdqZHeHRr 9bkT54wXt6Xy6X9Nz0StgGXbW66IK0J5L2aHknDX57Fo9Jq0wp98gGfpx RWZyI9H0iXdpR2KrthMbwcalaKvwlrDf4jjbD3yuzsE3Xkvc1q/pRK0hl s=; X-IronPort-AV: E=Sophos;i="5.62,493,1554768000"; d="scan'208";a="410741113" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1e-97fdccfd.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6002.iad6.amazon.com with ESMTP; 15 Jul 2019 13:25:07 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1e-97fdccfd.us-east-1.amazon.com (Postfix) with ESMTPS id 39473A21FA; Mon, 15 Jul 2019 13:25:02 +0000 (UTC) Received: from EX13D19EUB003.ant.amazon.com (10.43.166.69) by EX13MTAUEA001.ant.amazon.com (10.43.61.243) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 15 Jul 2019 13:25:02 +0000 Received: from ub6d44c9ce3e25c.ant.amazon.com (10.43.162.137) by EX13D19EUB003.ant.amazon.com (10.43.166.69) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 15 Jul 2019 13:24:53 +0000 From: Hanna Hawa To: , , , , , , , , , , CC: , , , , , , , , , Subject: [PATCH v3 4/4] edac: Add support for Amazon's Annapurna Labs L2 EDAC Date: Mon, 15 Jul 2019 16:24:09 +0300 Message-ID: <1563197049-12679-5-git-send-email-hhhawa@amazon.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563197049-12679-1-git-send-email-hhhawa@amazon.com> References: <1563197049-12679-1-git-send-email-hhhawa@amazon.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.43.162.137] X-ClientProxiedBy: EX13D05UWC003.ant.amazon.com (10.43.162.226) To EX13D19EUB003.ant.amazon.com (10.43.166.69) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adds support for Amazon's Annapurna Labs L2 EDAC driver to detect and report L2 errors. Signed-off-by: Hanna Hawa --- MAINTAINERS | 6 ++ drivers/edac/Kconfig | 8 ++ drivers/edac/Makefile | 1 + drivers/edac/al_l2_edac.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 202 insertions(+) create mode 100644 drivers/edac/al_l2_edac.c diff --git a/MAINTAINERS b/MAINTAINERS index fd29ea6..a6dcf3d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -749,6 +749,12 @@ S: Maintained F: drivers/edac/al_l1_edac.c F: Documentation/devicetree/bindings/edac/amazon,al-l1-edac.txt +AMAZON ANNAPURNA LABS L2 EDAC +M: Hanna Hawa +S: Maintained +F: drivers/edac/al_l2_edac.c +F: Documentation/devicetree/bindings/edac/amazon,al-l2-edac.txt + AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER M: Talel Shenhar S: Maintained diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 58b92bc..8bbb745 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 + bool "Amazon's Annapurna Labs L2 EDAC" + depends on ARCH_ALPINE + 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 caa2dc9..60a6b8b 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 0000000..bae1ea9 --- /dev/null +++ b/drivers/edac/al_l2_edac.c @@ -0,0 +1,187 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + */ + +#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_edac { + cpumask_t cluster_cpus; +}; + +static void al_l2_edac_l2merrsr(void *arg) +{ + struct edac_device_ctl_info *edac_dev = arg; + int cpu, i; + u32 ramid, repeat, other, fatal; + u64 val = read_sysreg_s(ARM_CA57_L2MERRSR_EL1); + char msg[AL_L2_EDAC_MSG_MAX]; + int space, count; + char *p; + + if (!(FIELD_GET(ARM_CA57_L2MERRSR_VALID, val))) + return; + + 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 = snprintf(p, space, "CPU%d L2 %serror detected", cpu, + (fatal) ? "Fatal " : ""); + p += count; + space -= count; + + switch (ramid) { + case ARM_CA57_L2_TAG_RAM: + count = snprintf(p, space, " RAMID='L2 Tag RAM'"); + break; + case ARM_CA57_L2_DATA_RAM: + count = snprintf(p, space, " RAMID='L2 Data RAM'"); + break; + case ARM_CA57_L2_SNOOP_RAM: + count = snprintf(p, space, " RAMID='L2 Snoop RAM'"); + break; + case ARM_CA57_L2_DIRTY_RAM: + count = snprintf(p, space, " RAMID='L2 Dirty RAM'"); + break; + case ARM_CA57_L2_INC_PF_RAM: + count = snprintf(p, space, " RAMID='L2 internal metadat'"); + break; + default: + count = snprintf(p, space, " RAMID='unknown'"); + break; + } + + p += count; + space -= count; + + count = snprintf(p, space, + " repeat=%d, other=%d (L2MERRSR_EL1=0x%llx)", + repeat, other, val); + + for (i = 0; i < repeat; i++) { + if (fatal) + edac_device_handle_ue(edac_dev, 0, 0, msg); + else + edac_device_handle_ce(edac_dev, 0, 0, msg); + } + + write_sysreg_s(0, ARM_CA57_L2MERRSR_EL1); +} + +static void al_l2_edac_check(struct edac_device_ctl_info *edac_dev) +{ + struct al_l2_edac *al_l2 = edac_dev->pvt_info; + + smp_call_function_any(&al_l2->cluster_cpus, al_l2_edac_l2merrsr, + 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 device *dev = &pdev->dev; + int ret, i; + + edac_dev = edac_device_alloc_ctl_info(sizeof(*al_l2), + (char *)dev_name(dev), 1, "L", 1, + 2, NULL, 0, + edac_device_alloc_index()); + if (IS_ERR(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); + + for_each_online_cpu(i) { + struct device_node *cpu; + struct device_node *cpu_cache, *l2_cache; + + cpu = of_get_cpu_node(i, NULL); + cpu_cache = of_find_next_cache_node(cpu); + l2_cache = of_parse_phandle(dev->of_node, "l2-cache", 0); + + if (cpu_cache == l2_cache) + cpumask_set_cpu(i, &al_l2->cluster_cpus); + } + + if (cpumask_empty(&al_l2->cluster_cpus)) { + dev_err(dev, "CPU mask is empty for this L2 cache\n"); + ret = -EINVAL; + goto err; + } + + ret = edac_device_add_device(edac_dev); + if (ret) { + dev_err(dev, "Failed to add L2 edac device\n"); + goto err; + } + + return 0; + +err: + 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[] = { + { .compatible = "amazon,al-l2-edac" }, + {} +}; +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, + .of_match_table = al_l2_edac_of_match, + }, +}; +module_platform_driver(al_l2_edac_driver); + +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Hanna Hawa "); +MODULE_DESCRIPTION("Amazon's Annapurna Lab's L2 EDAC Driver"); -- 2.7.4