Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp4266705ybi; Mon, 15 Jul 2019 06:27:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqz8xuSCtvQ/AeNx/6HuJ/HTBmQRXPCeMjRUftYUaAH5SOTw0UK4rQCk98XGfN/yeAcxSELg X-Received: by 2002:a17:902:6b81:: with SMTP id p1mr25770527plk.91.1563197245814; Mon, 15 Jul 2019 06:27:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563197245; cv=none; d=google.com; s=arc-20160816; b=yemMe7dz4+YzNfT+aRNKY5k70fsUBFd//spLUiAhI1qFaFBYLfv7PiieljizLOmHrq 8cLFOkjIXe7Ne4EtgQaWtW7Zhz10R5pAg6t0CCdP87YqAE/ZrMCPZzg+Q8urmgKcaHQ4 4dco0AtyPDig/RUJEINE1wiM7FN7wn3rYJFcZTk1Z7mkc6gObAP9xNvGmDVTawBOsjui J/bkR71qrkk7rHb2IWYRBCM8lfACbjMdmv7VzQZs+AwsFYh/2gh4evQBEaZ7rKio7js8 IOCYXl6XUeZ3lbRcXYHPuwSfUYXwLCW/SQP52jUVjLwOdNp8TWGObtWiYUa1L9Ax20P/ k8Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ZW14BD2Acm3p2KE8xBbi64jLd/vRC3af636A1speF5k=; b=L55qZdCnN1ftiLWwRJyN/WsoV1i3Y0ugxeSp5Rx3LG9jf3FXaKG0k18S6tgt/wEDJu kY1dfeHyA5jMOI7962ETxdkrgNIjCZZhdPK2COy3+N0sUa4ie6dNxQl6Fu35dhaqu4UY Ah++EdvHFmUsKEfR6GmD5JyFBiHOKp2BmZiALrfl1QcWqMsQr3dZg8Q9jDi3nIp7TzKk 6pYdzz9330RkckJfxNEXeM+8X+J2LFudNYXBQ+ZNkrRlDE2csP+wTqPs6J+jpmcoLJ0x e1BwMrQtAvBiZG1W1I51QIx71iZv6hfYNPTJLSyQhQOIUoawCCaWB1u9ar+NAhlb/BhO c1wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=rQe0CyMI; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y65si16092829pgd.487.2019.07.15.06.27.06; Mon, 15 Jul 2019 06:27:25 -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; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=rQe0CyMI; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730309AbfGONYy (ORCPT + 99 others); Mon, 15 Jul 2019 09:24:54 -0400 Received: from smtp-fw-6001.amazon.com ([52.95.48.154]:13906 "EHLO smtp-fw-6001.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730093AbfGONYx (ORCPT ); Mon, 15 Jul 2019 09:24:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1563197091; x=1594733091; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=ZW14BD2Acm3p2KE8xBbi64jLd/vRC3af636A1speF5k=; b=rQe0CyMIIkjZVI9vkUJQ/rqfT/mVZxKMfqqH4CsmWo+D+Ok6/cvCHKpY VIDD6Wr7hhwiyQNg08PI81JkRylGFT9F6+cHaR8UmBc9Q9KeZvovqDX6T e8ZaWbtoOn2DPVYlnT/KuFfmBCvf/h12ZOacdYPM3/T3eFdhPbKIKp1gE A=; X-IronPort-AV: E=Sophos;i="5.62,493,1554768000"; d="scan'208";a="404986369" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1d-37fd6b3d.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6001.iad6.amazon.com with ESMTP; 15 Jul 2019 13:24:49 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1d-37fd6b3d.us-east-1.amazon.com (Postfix) with ESMTPS id C62F428222C; Mon, 15 Jul 2019 13:24:45 +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:24:45 +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:35 +0000 From: Hanna Hawa To: , , , , , , , , , , CC: , , , , , , , , , Subject: [PATCH v3 2/4] edac: Add support for Amazon's Annapurna Labs L1 EDAC Date: Mon, 15 Jul 2019 16:24:07 +0300 Message-ID: <1563197049-12679-3-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 L1 EDAC driver to detect and report L1 errors. Signed-off-by: Hanna Hawa --- MAINTAINERS | 6 ++ drivers/edac/Kconfig | 8 +++ drivers/edac/Makefile | 1 + drivers/edac/al_l1_edac.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 171 insertions(+) create mode 100644 drivers/edac/al_l1_edac.c diff --git a/MAINTAINERS b/MAINTAINERS index 77eae44..fd29ea6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -743,6 +743,12 @@ 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 +F: Documentation/devicetree/bindings/edac/amazon,al-l1-edac.txt + AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER M: Talel Shenhar S: Maintained diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 200c04c..58b92bc 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -74,6 +74,14 @@ config EDAC_GHES In doubt, say 'Y'. +config EDAC_AL_L1 + bool "Amazon's Annapurna Labs L1 EDAC" + depends on ARCH_ALPINE + 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 165ca65e..caa2dc9 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 0000000..70510ea --- /dev/null +++ b/drivers/edac/al_l1_edac.c @@ -0,0 +1,156 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + */ + +#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(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_CPUMERRSR_EL1); + char msg[AL_L1_EDAC_MSG_MAX]; + int space, count; + char *p; + + if (!(FIELD_GET(ARM_CA57_CPUMERRSR_VALID, val))) + return; + + 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 = snprintf(p, space, "CPU%d L1 %serror detected", cpu, + (fatal) ? "Fatal " : ""); + p += count; + space -= count; + + switch (ramid) { + case ARM_CA57_L1_I_TAG_RAM: + count = snprintf(p, space, " RAMID='L1-I Tag RAM'"); + break; + case ARM_CA57_L1_I_DATA_RAM: + count = snprintf(p, space, " RAMID='L1-I Data RAM'"); + break; + case ARM_CA57_L1_D_TAG_RAM: + count = snprintf(p, space, " RAMID='L1-D Tag RAM'"); + break; + case ARM_CA57_L1_D_DATA_RAM: + count = snprintf(p, space, " RAMID='L1-D Data RAM'"); + break; + case ARM_CA57_L2_TLB_RAM: + count = snprintf(p, space, " RAMID='L2 TLB RAM'"); + break; + default: + count = snprintf(p, space, " RAMID='unknown'"); + break; + } + + p += count; + space -= count; + count = snprintf(p, space, + " repeat=%d, other=%d (CPUMERRSR_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_CPUMERRSR_EL1); +} + +static void al_l1_edac_check(struct edac_device_ctl_info *edac_dev) +{ + on_each_cpu(al_l1_edac_cpumerrsr, 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; + int ret; + + edac_dev = edac_device_alloc_ctl_info(0, (char *)dev_name(dev), 1, "L", + 1, 1, NULL, 0, + edac_device_alloc_index()); + if (IS_ERR(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); + + ret = edac_device_add_device(edac_dev); + if (ret) { + dev_err(dev, "Failed to add L1 edac device\n"); + goto err; + } + + return 0; +err: + edac_device_free_ctl_info(edac_dev); + + return ret; +} + +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[] = { + { .compatible = "amazon,al-l1-edac" }, + {} +}; +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, + .of_match_table = al_l1_edac_of_match, + }, +}; +module_platform_driver(al_l1_edac_driver); + +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Hanna Hawa "); +MODULE_DESCRIPTION("Amazon's Annapurna Lab's L1 EDAC Driver"); -- 2.7.4