* [PATCH 0/4] edac: Add APM X-Gene SoC EDAC driver
@ 2014-05-08 23:03 Loc Ho
2014-05-08 23:03 ` [PATCH 1/4] edac: Fix MC scrub mode comparsion bug for correctable error Loc Ho
0 siblings, 1 reply; 11+ messages in thread
From: Loc Ho @ 2014-05-08 23:03 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds support for the APM X-Gene SoC EDAC driver.
Signed-off-by: Feng Kan <fkan@apm.com>
Signed-off-by: Loc Ho <lho@apm.com>
---
Loc Ho (4):
edac: Fix MC scrub mode comparsion bug for correctable error
Documentation: Add documentation for the APM X-Gene SoC EDAC DTS
binding
edac: Add APM X-Gene SoC EDAC driver
arm64: Add APM X-Gene SoC EDAC DTS entries
.../devicetree/bindings/edac/apm-xgene-edac.txt | 70 +
arch/arm64/boot/dts/apm-storm.dtsi | 89 +
drivers/edac/Kconfig | 9 +-
drivers/edac/Makefile | 3 +
drivers/edac/edac_mc.c | 2 +-
drivers/edac/xgene_edac.c | 1915 ++++++++++++++++++++
6 files changed, 2086 insertions(+), 2 deletions(-)
create mode 100644 Documentation/devicetree/bindings/edac/apm-xgene-edac.txt
create mode 100644 drivers/edac/xgene_edac.c
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/4] edac: Fix MC scrub mode comparsion bug for correctable error 2014-05-08 23:03 [PATCH 0/4] edac: Add APM X-Gene SoC EDAC driver Loc Ho @ 2014-05-08 23:03 ` Loc Ho 2014-05-08 23:03 ` [PATCH 2/4] Documentation: Add documentation for the APM X-Gene SoC EDAC DTS binding Loc Ho 2014-05-09 7:38 ` [PATCH 1/4] edac: Fix MC scrub mode comparsion bug for correctable error Borislav Petkov 0 siblings, 2 replies; 11+ messages in thread From: Loc Ho @ 2014-05-08 23:03 UTC (permalink / raw) To: linux-arm-kernel This patch fixes the MC scrub mode comparsion bug by replacing '&' with '=='. The MC structure field scrub_mode is integer type - not bit field. Signed-off-by: Loc Ho <lho@apm.com> --- drivers/edac/edac_mc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 33edd67..2c694b5 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -1018,7 +1018,7 @@ static void edac_ce_error(struct mem_ctl_info *mci, } edac_inc_ce_error(mci, enable_per_layer_report, pos, error_count); - if (mci->scrub_mode & SCRUB_SW_SRC) { + if (mci->scrub_mode == SCRUB_SW_SRC) { /* * Some memory controllers (called MCs below) can remap * memory so that it is still available at a different -- 1.5.5 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/4] Documentation: Add documentation for the APM X-Gene SoC EDAC DTS binding 2014-05-08 23:03 ` [PATCH 1/4] edac: Fix MC scrub mode comparsion bug for correctable error Loc Ho @ 2014-05-08 23:03 ` Loc Ho 2014-05-08 23:03 ` [PATCH 3/4] edac: Add APM X-Gene SoC EDAC driver Loc Ho 2014-05-14 12:01 ` [PATCH 2/4] Documentation: Add documentation for the APM X-Gene SoC EDAC DTS binding Borislav Petkov 2014-05-09 7:38 ` [PATCH 1/4] edac: Fix MC scrub mode comparsion bug for correctable error Borislav Petkov 1 sibling, 2 replies; 11+ messages in thread From: Loc Ho @ 2014-05-08 23:03 UTC (permalink / raw) To: linux-arm-kernel This patch adds documentation for the APM X-Gene SoC EDAC DTS binding. Signed-off-by: Feng Kan <fkan@apm.com> Signed-off-by: Loc Ho <lho@apm.com> --- .../devicetree/bindings/edac/apm-xgene-edac.txt | 70 ++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/edac/apm-xgene-edac.txt diff --git a/Documentation/devicetree/bindings/edac/apm-xgene-edac.txt b/Documentation/devicetree/bindings/edac/apm-xgene-edac.txt new file mode 100644 index 0000000..c4ccc98 --- /dev/null +++ b/Documentation/devicetree/bindings/edac/apm-xgene-edac.txt @@ -0,0 +1,70 @@ +* APM X-Gene EDAC nodes + +EDAC nodes are defined to describe on-chip error detection and correction. +There are four types of EDAC: + + memory controller - Memory controller + PMD (L1/L2) - Processor module unit (PMD) L1/L2 cache + L3 - CPU L3 cache + SoC - SoC IP such as SATA, Ethernet. and etc + +The following section describes the memory controller DT node binding. + +Required properties: +- compatible : Shall be "apm,xgene-edac-mc". +- reg : First resource shall be the PCP resource. + Second resource shall be the CSW resource. + Third resource shall be the MCB-A resource. + Fourth resource shall be the MCB-B resource. + Fifth resource shall be the MCU resource. +- interrupts : Interrupt-specifier for MCU error IRQ. + +The following section describes the L1/L2 DT node binding. + +- compatible : Shall be "apm,xgene-edac-pmd". +- reg : First resource shall be the PCP resource. + Second resource shall be the PMD resource. +- interrupts : Interrupt-specifier for PMD error IRQ. + +The following section describes the L3 DT node binding. + +- compatible : Shall be "apm,xgene-edac-l3". +- reg : First resource shall be the PCP resource. + Second resource shall be the L3 resource. +- interrupts : Interrupt-specifier for L3 error IRQ. + +Example: + edacmc0: edacmc0 at 7e800000 { + compatible = "apm,xgene-edac-mc"; + reg = <0x0 0x78800000 0x0 0x1000>, + <0x0 0x7e200000 0x0 0x1000>, + <0x0 0x7e700000 0x0 0x1000>, + <0x0 0x7e720000 0x0 0x1000>, + <0x0 0x7e800000 0x0 0x1000>; + interrupts = <0x0 0x20 0x4>; + }; + + edacl3: edacl3 at 7e600000 { + compatible = "apm,xgene-edac-l3"; + reg = <0x0 0x78800000 0x0 0x1000>, + <0x0 0x7e600000 0x0 0x1000>; + interrupts = <0x0 0x20 0x4>, + <0x0 0x21 0x4>; + }; + + edacpmd0: edacpmd0 at 7c000000 { + compatible = "apm,xgene-edac-pmd"; + reg = <0x0 0x78800000 0x0 0x1000>, + <0x0 0x7c000000 0x0 0x200000>; + interrupts = <0x0 0x20 0x4>, + <0x0 0x21 0x4>; + }; + + edacsoc: edacsoc at 7e930000 { + compatible = "apm,xgene-edac-soc"; + reg = <0x0 0x78800000 0x0 0x1000>, + <0x0 0x7e930000 0x0 0x1000>; + interrupts = <0x0 0x20 0x4>, + <0x0 0x21 0x4>, + <0x0 0x27 0x4>; + }; -- 1.5.5 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/4] edac: Add APM X-Gene SoC EDAC driver 2014-05-08 23:03 ` [PATCH 2/4] Documentation: Add documentation for the APM X-Gene SoC EDAC DTS binding Loc Ho @ 2014-05-08 23:03 ` Loc Ho 2014-05-08 23:03 ` [PATCH 4/4] arm64: Add APM X-Gene SoC EDAC DTS entries Loc Ho 2014-05-20 19:39 ` [PATCH 3/4] edac: Add APM X-Gene SoC EDAC driver Borislav Petkov 2014-05-14 12:01 ` [PATCH 2/4] Documentation: Add documentation for the APM X-Gene SoC EDAC DTS binding Borislav Petkov 1 sibling, 2 replies; 11+ messages in thread From: Loc Ho @ 2014-05-08 23:03 UTC (permalink / raw) To: linux-arm-kernel This patch adds support for the APM X-Gene SoC EDAC driver and requires ARM64 EDAC support patch [1] to compile. [1] http://www.spinics.net/lists/arm-kernel/msg324093.html Signed-off-by: Feng Kan <fkan@apm.com> Signed-off-by: Loc Ho <lho@apm.com> --- drivers/edac/Kconfig | 9 +- drivers/edac/Makefile | 3 + drivers/edac/xgene_edac.c | 1915 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1926 insertions(+), 1 deletions(-) create mode 100644 drivers/edac/xgene_edac.c diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 878f090..a945bfe 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -10,7 +10,7 @@ config EDAC_SUPPORT menuconfig EDAC bool "EDAC (Error Detection And Correction) reporting" depends on HAS_IOMEM - depends on X86 || PPC || TILE || ARM || EDAC_SUPPORT + depends on X86 || PPC || TILE || ARM || ARM64 || EDAC_SUPPORT help EDAC is designed to report errors in the core system. These are low-level errors that are reported in the CPU or @@ -368,4 +368,11 @@ config EDAC_OCTEON_PCI Support for error detection and correction on the Cavium Octeon family of SOCs. +config EDAC_XGENE + tristate "APM X-Gene SoC Caches" + depends on EDAC_MM_EDAC && ARM64 + help + Support for error detection and correction on the + APM X-Gene family of SOCs. + endif # EDAC diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile index 4154ed6..f408be4 100644 --- a/drivers/edac/Makefile +++ b/drivers/edac/Makefile @@ -64,3 +64,6 @@ obj-$(CONFIG_EDAC_OCTEON_PC) += octeon_edac-pc.o obj-$(CONFIG_EDAC_OCTEON_L2C) += octeon_edac-l2c.o obj-$(CONFIG_EDAC_OCTEON_LMC) += octeon_edac-lmc.o obj-$(CONFIG_EDAC_OCTEON_PCI) += octeon_edac-pci.o + +obj-$(CONFIG_EDAC_XGENE) += xgene_edac.o + diff --git a/drivers/edac/xgene_edac.c b/drivers/edac/xgene_edac.c new file mode 100644 index 0000000..4e05d50 --- /dev/null +++ b/drivers/edac/xgene_edac.c @@ -0,0 +1,1915 @@ +/* + * APM X-Gene SoC EDAC (error detection and correction) Module + * + * Copyright (c) 2014, Applied Micro Circuits Corporation + * Author: Feng Kan <fkan@apm.com> + * Loc Ho <lho@apm.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <linux/module.h> +#include <linux/interrupt.h> +#include <linux/ctype.h> +#include <linux/edac.h> +#include <linux/of.h> +#include "edac_core.h" + +#define EDAC_MOD_STR "xgene_edac" + +static int edac_mc_idx; +static DEFINE_MUTEX(xgene_edac_lock); + +/* Global Error CSR registers */ +#define PCPHPERRINTSTS 0x0000 +#define PCPHPERRINTMSK 0x0004 +#define MCU_CTL_ERR_MASK 0x00001000 +#define IOB_PA_ERR_MASK 0x00000800 +#define IOB_BA_ERR_MASK 0x00000400 +#define IOB_XGIC_ERR_MASK 0x00000200 +#define IOB_RB_ERR_MASK 0x00000100 +#define L3C_UNCORR_ERR_MASK 0x00000020 +#define MCU_UNCORR_ERR_MASK 0x00000010 +#define PMD3_MERR_MASK 0x00000008 +#define PMD2_MERR_MASK 0x00000004 +#define PMD1_MERR_MASK 0x00000002 +#define PMD0_MERR_MASK 0x00000001 +#define PCPLPERRINTSTS 0x0008 +#define PCPLPERRINTMSK 0x000C +#define CSW_SWITCH_TRACE_ERR_MASK 0x00000004 +#define L3C_CORR_ERR_MASK 0x00000002 +#define MCU_CORR_ERR_MASK 0x00000001 +#define MEMERRINTSTS 0x0010 +#define MEMERRINTMSK 0x0014 + +/* Memory Controller Error CSR/defines */ +#define MCU_MAX_RANK 8 +#define MCU_RANK_STRIDE 0x40 + +#define MCUGESR 0x0114 +#define MCU_GESR_ADDRNOMATCH_ERR_MASK 0x00000080 +#define MCU_GESR_ADDRMULTIMATCH_ERR_MASK 0x00000040 +#define MCU_GESR_PHYP_ERR_MASK 0x00000008 +#define MCUESRR0 0x0314 +#define MCU_ESRR_MULTUCERR_MASK 0x00000008 +#define MCU_ESRR_BACKUCERR_MASK 0x00000004 +#define MCU_ESRR_DEMANDUCERR_MASK 0x00000002 +#define MCU_ESRR_CERR_MASK 0x00000001 +#define MCUESRRA0 0x0318 +#define MCUEBLRR0 0x031c +#define MCU_EBLRR_ERRBANK_RD(src) (((src) & 0x00000007) >> 0) +#define MCUERCRR0 0x0320 +#define MCU_ERCRR_ERRROW_RD(src) (((src) & 0xFFFF0000) >> 16) +#define MCU_ERCRR_ERRCOL_RD(src) ((src) & 0x00000FFF) +#define MCUSBECNT0 0x0324 +#define MCU_SBECNT_COUNT(src) ((src) & 0xFFFF) + +#define CSW_CSWCR 0x0000 +#define CSW_CSWCR_DUALMCB_MASK 0x00000001 + +#define MCBADDRMR 0x0000 +#define MCBADDRMR_MCU_INTLV_MODE_MASK 0x00000008 +#define MCBADDRMR_DUALMCU_MODE_MASK 0x00000004 +#define MCBADDRMR_MCB_INTLV_MODE_MASK 0x00000002 +#define MCBADDRMR_ADDRESS_MODE_MASK 0x00000001 + +struct xgene_edac_mc_ctx { + char *name; + void __iomem *pcp_csr; + void __iomem *csw_csr; + void __iomem *mcba_csr; + void __iomem *mcbb_csr; + void __iomem *mcu_csr; +}; + +#define to_mci(k) container_of(k, struct mem_ctl_info, dev) + +static ssize_t xgene_edac_mc_inject_ctrl_show(struct device *dev, + struct device_attribute *mattr, + char *data) +{ + struct mem_ctl_info *mci = to_mci(dev); + struct xgene_edac_mc_ctx *ctx = mci->pvt_info; + int i; + ssize_t ret_size = 0; + + for (i = 0; i < MCU_MAX_RANK; i++) { + ret_size += sprintf(data, "0x%08X", + readl(ctx->mcu_csr + MCUESRRA0 + + i * MCU_RANK_STRIDE)); + data += 10; + if (i != (MCU_MAX_RANK - 1)) { + ret_size += sprintf(data, " "); + data++; + } + } + return ret_size; +} + +static ssize_t xgene_edac_mc_inject_ctrl_store(struct device *dev, + struct device_attribute *mattr, + const char *data, size_t count) +{ + struct mem_ctl_info *mci = to_mci(dev); + struct xgene_edac_mc_ctx *ctx = mci->pvt_info; + u32 val; + int i; + + if (isdigit(*data)) { + if (kstrtou32(data, 0, &val)) + return 0; + for (i = 0; i < MCU_MAX_RANK; i++) { + writel(val, + ctx->mcu_csr + MCUESRRA0 + i * MCU_RANK_STRIDE); + } + return count; + } + return 0; +} + +DEVICE_ATTR(inject_ctrl, S_IRUGO | S_IWUSR, + xgene_edac_mc_inject_ctrl_show, xgene_edac_mc_inject_ctrl_store); + +static int xgene_edac_mc_create_sysfs_attributes(struct mem_ctl_info *mci) +{ + return device_create_file(&mci->dev, &dev_attr_inject_ctrl); +} + +static void xgene_edac_mc_remove_sysfs_attributes(struct mem_ctl_info *mci) +{ + device_remove_file(&mci->dev, &dev_attr_inject_ctrl); +} + +static void xgene_edac_mc_check(struct mem_ctl_info *mci) +{ + struct xgene_edac_mc_ctx *ctx = mci->pvt_info; + u32 pcp_hp_stat; + u32 pcp_lp_stat; + u32 reg; + u32 rank; + u32 bank; + u32 count; + u32 col_row; + + pcp_hp_stat = readl(ctx->pcp_csr + PCPHPERRINTSTS); + pcp_lp_stat = readl(ctx->pcp_csr + PCPLPERRINTSTS); + if (!((MCU_UNCORR_ERR_MASK & pcp_hp_stat) || + (MCU_CTL_ERR_MASK & pcp_hp_stat) || + (MCU_CORR_ERR_MASK & pcp_lp_stat))) + return; + + for (rank = 0; rank < MCU_MAX_RANK; rank++) { + reg = readl(ctx->mcu_csr + MCUESRR0 + rank * MCU_RANK_STRIDE); + + /* Detect uncorrectable memory error */ + if (reg & (MCU_ESRR_DEMANDUCERR_MASK | + MCU_ESRR_BACKUCERR_MASK)) { + /* Detected uncorrectable memory error */ + edac_mc_chipset_printk(mci, KERN_ERR, "X-Gene", + "MCU uncorrectable error at rank %d\n", rank); + + /* Notify upper layer */ + edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, + 1, 0, 0, 0, 0, 0, -1, mci->ctl_name, ""); + } + + /* Detect correctable memory error */ + if (reg & MCU_ESRR_CERR_MASK) { + bank = readl(ctx->mcu_csr + MCUEBLRR0 + + rank * MCU_RANK_STRIDE); + col_row = readl(ctx->mcu_csr + MCUERCRR0 + + rank * MCU_RANK_STRIDE); + count = readl(ctx->mcu_csr + MCUSBECNT0 + + rank * MCU_RANK_STRIDE); + edac_mc_chipset_printk(mci, KERN_WARNING, "X-Gene", + "MCU correctable error at rank %d bank %d column %d row %d count %d\n", + rank, MCU_EBLRR_ERRBANK_RD(bank), + MCU_ERCRR_ERRCOL_RD(col_row), + MCU_ERCRR_ERRROW_RD(col_row), + MCU_SBECNT_COUNT(count)); + + /* Notify upper layer */ + edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, + 1, 0, 0, 0, 0, 0, -1, mci->ctl_name, ""); + } + + /* Clear all error registers */ + writel(0x0, ctx->mcu_csr + MCUEBLRR0 + rank * MCU_RANK_STRIDE); + writel(0x0, ctx->mcu_csr + MCUERCRR0 + rank * MCU_RANK_STRIDE); + writel(0x0, ctx->mcu_csr + MCUSBECNT0 + + rank * MCU_RANK_STRIDE); + writel(reg, ctx->mcu_csr + MCUESRR0 + rank * MCU_RANK_STRIDE); + } + + /* Detect memory controller error */ + reg = readl(ctx->mcu_csr + MCUGESR); + if (reg) { + if (reg & MCU_GESR_ADDRNOMATCH_ERR_MASK) + edac_mc_chipset_printk(mci, KERN_WARNING, "X-Gene", + "MCU address miss-match error\n"); + if (reg & MCU_GESR_ADDRMULTIMATCH_ERR_MASK) + edac_mc_chipset_printk(mci, KERN_WARNING, "X-Gene", + "MCU address multi-match error\n"); + + writel(reg, ctx->mcu_csr + MCUGESR); + } +} + +static irqreturn_t xgene_edac_mc_isr(int irq, void *dev_id) +{ + struct mem_ctl_info *mci = dev_id; + struct xgene_edac_mc_ctx *ctx = mci->pvt_info; + u32 pcp_hp_stat; + u32 pcp_lp_stat; + + pcp_hp_stat = readl(ctx->pcp_csr + PCPHPERRINTSTS); + pcp_lp_stat = readl(ctx->pcp_csr + PCPLPERRINTSTS); + if (!((MCU_UNCORR_ERR_MASK & pcp_hp_stat) || + (MCU_CTL_ERR_MASK & pcp_hp_stat) || + (MCU_CORR_ERR_MASK & pcp_lp_stat))) + return IRQ_NONE; + + xgene_edac_mc_check(mci); + + return IRQ_HANDLED; +} + +static void xgene_edac_mc_hw_init(struct mem_ctl_info *mci, bool enable) +{ + struct xgene_edac_mc_ctx *ctx = mci->pvt_info; + u32 val; + + if (edac_op_state != EDAC_OPSTATE_INT) + return; + + mutex_lock(&xgene_edac_lock); + + if (enable) { + /* Enable memory controller top level interrupt */ + val = readl(ctx->pcp_csr + PCPHPERRINTMSK); + val &= ~(MCU_UNCORR_ERR_MASK | MCU_CTL_ERR_MASK); + writel(val, ctx->pcp_csr + PCPHPERRINTMSK); + } else { + /* Disable memory controller top level interrupt */ + val = readl(ctx->pcp_csr + PCPHPERRINTMSK); + val |= MCU_UNCORR_ERR_MASK | MCU_CTL_ERR_MASK; + writel(val, ctx->pcp_csr + PCPHPERRINTMSK); + } + + mutex_unlock(&xgene_edac_lock); +} + +static int xgene_edac_mc_is_active(struct xgene_edac_mc_ctx *ctx, int mc_idx) +{ + u32 reg; + u32 mcu_mask; + + reg = readl(ctx->csw_csr + CSW_CSWCR); + if (reg & CSW_CSWCR_DUALMCB_MASK) { + /* + * Dual MCB active - Determine if all 4 activie or just MCU0 + * and MCU2 active + */ + reg = readl(ctx->mcbb_csr + MCBADDRMR); + mcu_mask = (reg & MCBADDRMR_DUALMCU_MODE_MASK) ? 0xF : 0x5; + } else { + /* + * Single MCB active - Determine if MCU0/MCU1 or just MCU0 + * active + */ + reg = readl(ctx->mcba_csr + MCBADDRMR); + mcu_mask = (reg & MCBADDRMR_DUALMCU_MODE_MASK) ? 0x3 : 0x1; + } + + return (mcu_mask & (1 << mc_idx)) ? 1 : 0; +} + +static int xgene_edac_mc_probe(struct platform_device *pdev) +{ + struct mem_ctl_info *mci; + struct edac_mc_layer layers[2]; + struct xgene_edac_mc_ctx *ctx; + struct resource *res; + int rc = 0; + + if (!devres_open_group(&pdev->dev, xgene_edac_mc_probe, GFP_KERNEL)) + return -ENOMEM; + + layers[0].type = EDAC_MC_LAYER_CHIP_SELECT; + layers[0].size = 4; + layers[0].is_virt_csrow = true; + layers[1].type = EDAC_MC_LAYER_CHANNEL; + layers[1].size = 2; + layers[1].is_virt_csrow = false; + mci = edac_mc_alloc(edac_mc_idx++, ARRAY_SIZE(layers), layers, + sizeof(*ctx)); + if (!mci) { + rc = -ENOMEM; + goto err_group; + } + + ctx = mci->pvt_info; + ctx->name = "xgene_edac_mc_err"; + mci->pdev = &pdev->dev; + dev_set_drvdata(mci->pdev, mci); + mci->ctl_name = ctx->name; + mci->dev_name = ctx->name; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + ctx->pcp_csr = devm_ioremap(&pdev->dev, res->start, + resource_size(res)); + if (IS_ERR(ctx->pcp_csr)) { + dev_err(&pdev->dev, "no PCP resource address\n"); + rc = PTR_ERR(ctx->pcp_csr); + goto err_free; + } + + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + ctx->csw_csr = devm_ioremap(&pdev->dev, res->start, + resource_size(res)); + if (IS_ERR(ctx->csw_csr)) { + dev_err(&pdev->dev, "no CSW resource address\n"); + rc = PTR_ERR(ctx->csw_csr); + goto err_free; + } + + res = platform_get_resource(pdev, IORESOURCE_MEM, 2); + ctx->mcba_csr = devm_ioremap(&pdev->dev, res->start, + resource_size(res)); + if (IS_ERR(ctx->mcba_csr)) { + dev_err(&pdev->dev, "no MCBA resource address\n"); + rc = PTR_ERR(ctx->mcba_csr); + goto err_free; + } + + res = platform_get_resource(pdev, IORESOURCE_MEM, 3); + ctx->mcbb_csr = devm_ioremap(&pdev->dev, res->start, + resource_size(res)); + if (IS_ERR(ctx->mcbb_csr)) { + dev_err(&pdev->dev, "no MCBB resource address\n"); + rc = PTR_ERR(ctx->mcbb_csr); + goto err_free; + } + + res = platform_get_resource(pdev, IORESOURCE_MEM, 4); + ctx->mcu_csr = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(ctx->mcu_csr)) { + dev_err(&pdev->dev, "no MCU resource address\n"); + rc = PTR_ERR(ctx->mcu_csr); + goto err_free; + } + /* Ignore non-active MCU */ + if (!xgene_edac_mc_is_active(ctx, ((res->start >> 16) & 0xF) / 4)) { + rc = -ENODEV; + goto err_free; + } + + mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_RDDR2 | MEM_FLAG_RDDR3 | + MEM_FLAG_DDR | MEM_FLAG_DDR2 | MEM_FLAG_DDR3; + mci->edac_ctl_cap = EDAC_FLAG_SECDED; + mci->edac_cap = EDAC_FLAG_SECDED; + mci->mod_name = EDAC_MOD_STR; + mci->mod_ver = "0.1"; + mci->ctl_page_to_phys = NULL; + mci->scrub_cap = SCRUB_FLAG_HW_SRC; + mci->scrub_mode = SCRUB_HW_SRC; + + if (edac_op_state == EDAC_OPSTATE_POLL) + mci->edac_check = xgene_edac_mc_check; + + if (edac_mc_add_mc(mci)) { + dev_err(&pdev->dev, "failed add edac mc\n"); + rc = -EINVAL; + goto err_free; + } + + if (xgene_edac_mc_create_sysfs_attributes(mci)) { + dev_err(&pdev->dev, "failed create edac sysfs\n"); + goto err_del; + } + + if (edac_op_state == EDAC_OPSTATE_INT) { + int irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(&pdev->dev, "No IRQ resource\n"); + rc = -EINVAL; + goto err_sysfs; + } + rc = devm_request_irq(&pdev->dev, irq, + xgene_edac_mc_isr, IRQF_SHARED, + dev_name(&pdev->dev), mci); + if (rc) { + dev_err(&pdev->dev, "Could not request IRQ\n"); + goto err_sysfs; + } + } + + xgene_edac_mc_hw_init(mci, 1); + + devres_remove_group(&pdev->dev, xgene_edac_mc_probe); + + dev_info(&pdev->dev, "X-Gene EDAC MC registered\n"); + return 0; + +err_sysfs: + xgene_edac_mc_remove_sysfs_attributes(mci); +err_del: + edac_mc_del_mc(&pdev->dev); +err_free: + edac_mc_free(mci); +err_group: + devres_release_group(&pdev->dev, xgene_edac_mc_probe); + return rc; +} + +static int xgene_edac_mc_remove(struct platform_device *pdev) +{ + struct mem_ctl_info *mci = dev_get_drvdata(&pdev->dev); + + xgene_edac_mc_hw_init(mci, 0); + xgene_edac_mc_remove_sysfs_attributes(mci); + edac_mc_del_mc(&pdev->dev); + edac_mc_free(mci); + return 0; +} + +#ifdef CONFIG_OF +static struct of_device_id xgene_edac_mc_of_match[] = { + { .compatible = "apm,xgene-edac-mc" }, + {}, +}; +MODULE_DEVICE_TABLE(of, xgene_edac_of_match); +#endif + +static struct platform_driver xgene_edac_mc_driver = { + .probe = xgene_edac_mc_probe, + .remove = xgene_edac_mc_remove, + .driver = { + .name = "xgene-edac-mc", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(xgene_edac_mc_of_match), + }, +}; + +/* CPU L1/L2 error device */ +#define MAX_CPU_PER_PMD 2 +#define CPU_CSR_STRIDE 0x00100000 +#define CPU_L2C_PAGE 0x000D0000 +#define CPU_MEMERR_L2C_PAGE 0x000E0000 +#define CPU_MEMERR_CPU_PAGE 0x000F0000 + +#define MEMERR_CPU_ICFECR_PAGE_OFFSET 0x0000 +#define MEMERR_CPU_ICFESR_PAGE_OFFSET 0x0004 +#define MEMERR_CPU_ICFESR_ERRWAY_RD(src) (((src) & 0xFF000000) >> 24) +#define MEMERR_CPU_ICFESR_ERRINDEX_RD(src) (((src) & 0x003F0000) >> 16) +#define MEMERR_CPU_ICFESR_ERRINFO_RD(src) (((src) & 0x0000FF00) >> 8) +#define MEMERR_CPU_ICFESR_ERRTYPE_RD(src) (((src) & 0x00000070) >> 4) +#define MEMERR_CPU_ICFESR_MULTCERR_MASK 0x00000004 +#define MEMERR_CPU_ICFESR_CERR_MASK 0x00000001 +#define MEMERR_CPU_LSUESR_PAGE_OFFSET 0x000c +#define MEMERR_CPU_LSUESR_ERRWAY_RD(src) (((src) & 0xFF000000) >> 24) +#define MEMERR_CPU_LSUESR_ERRINDEX_RD(src) (((src) & 0x003F0000) >> 16) +#define MEMERR_CPU_LSUESR_ERRINFO_RD(src) (((src) & 0x0000FF00) >> 8) +#define MEMERR_CPU_LSUESR_ERRTYPE_RD(src) (((src) & 0x00000070) >> 4) +#define MEMERR_CPU_LSUESR_MULTCERR_MASK 0x00000004 +#define MEMERR_CPU_LSUESR_CERR_MASK 0x00000001 +#define MEMERR_CPU_LSUECR_PAGE_OFFSET 0x0008 +#define MEMERR_CPU_MMUECR_PAGE_OFFSET 0x0010 +#define MEMERR_CPU_MMUESR_PAGE_OFFSET 0x0014 +#define MEMERR_CPU_ICFESRA_PAGE_OFFSET 0x0804 +#define MEMERR_CPU_LSUESRA_PAGE_OFFSET 0x080c +#define MEMERR_CPU_MMUESRA_PAGE_OFFSET 0x0814 + +#define MEMERR_L2C_L2ECR_PAGE_OFFSET 0x0000 +#define MEMERR_L2C_L2ESR_PAGE_OFFSET 0x0004 +#define MEMERR_L2C_L2ESR_ERRSYN_RD(src) (((src) & 0xFF000000) >> 24) +#define MEMERR_L2C_L2ESR_ERRWAY_RD(src) (((src) & 0x00FC0000) >> 18) +#define MEMERR_L2C_L2ESR_ERRCPU_RD(src) (((src) & 0x00020000) >> 17) +#define MEMERR_L2C_L2ESR_ERRGROUP_RD(src) (((src) & 0x0000E000) >> 13) +#define MEMERR_L2C_L2ESR_ERRACTION_RD(src) (((src) & 0x00001C00) >> 10) +#define MEMERR_L2C_L2ESR_ERRTYPE_RD(src) (((src) & 0x00000300) >> 8) +#define MEMERR_L2C_L2ESR_MULTUCERR_MASK 0x00000008 +#define MEMERR_L2C_L2ESR_MULTICERR_MASK 0x00000004 +#define MEMERR_L2C_L2ESR_UCERR_MASK 0x00000002 +#define MEMERR_L2C_L2ESR_ERR_MASK 0x00000001 +#define MEMERR_L2C_L2EALR_PAGE_OFFSET 0x0008 +#define CPUX_L2C_L2RTOCR_PAGE_OFFSET 0x0010 +#define MEMERR_L2C_L2EAHR_PAGE_OFFSET 0x000c +#define CPUX_L2C_L2RTOSR_PAGE_OFFSET 0x0014 +#define CPUX_L2C_L2RTOALR_PAGE_OFFSET 0x0018 +#define CPUX_L2C_L2RTOAHR_PAGE_OFFSET 0x001c +#define MEMERR_L2C_L2ESRA_PAGE_OFFSET 0x0804 + +struct xgene_edac_pmd_ctx { + struct device *dev; + char *name; + void __iomem *pcp_csr; + void __iomem *pmd_csr; + int pmd; +}; + +static void xgene_edac_pmd_check(struct edac_device_ctl_info *edac_dev) +{ + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; + u32 __iomem *pg_d; + u32 __iomem *pg_e; + u32 __iomem *pg_f; + u32 pcp_hp_stat; + u32 val_hi; + u32 val_lo; + u32 val; + int i; + + pcp_hp_stat = readl(ctx->pcp_csr + PCPHPERRINTSTS); + if (!((PMD0_MERR_MASK << ctx->pmd) & pcp_hp_stat)) + return; + + /* Check CPU L1 error */ + for (i = 0; i < MAX_CPU_PER_PMD; i++) { + pg_f = ctx->pmd_csr + i * CPU_CSR_STRIDE + CPU_MEMERR_CPU_PAGE; + + val = readl(pg_f + MEMERR_CPU_ICFESR_PAGE_OFFSET); + if (val) { + dev_err(edac_dev->dev, + "CPU%d L1 memory error ICF 0x%08X Way 0x%02X Index 0x%02X Info 0x%02X\n", + ctx->pmd * MAX_CPU_PER_PMD + i, val, + MEMERR_CPU_ICFESR_ERRWAY_RD(val), + MEMERR_CPU_ICFESR_ERRINDEX_RD(val), + MEMERR_CPU_ICFESR_ERRINFO_RD(val)); + if (val & MEMERR_CPU_ICFESR_CERR_MASK) + dev_err(edac_dev->dev, + "One or more correctable error\n"); + if (val & MEMERR_CPU_ICFESR_MULTCERR_MASK) + dev_err(edac_dev->dev, + "Multiple correctable error\n"); + switch (MEMERR_CPU_ICFESR_ERRTYPE_RD(val)) { + case 1: + dev_err(edac_dev->dev, + "L1 TLB multiple hit\n"); + break; + case 2: + dev_err(edac_dev->dev, + "Way select multiple hit\n"); + break; + case 3: + dev_err(edac_dev->dev, + "Physical tag parity error\n"); + break; + case 4: + case 5: + dev_err(edac_dev->dev, + "L1 data parity error\n"); + break; + case 6: + dev_err(edac_dev->dev, + "L1 pre-decode parity error\n"); + break; + } + writel(val, pg_f + MEMERR_CPU_ICFESRA_PAGE_OFFSET); + if (val & (MEMERR_CPU_ICFESR_CERR_MASK | + MEMERR_CPU_ICFESR_MULTCERR_MASK)) + edac_device_handle_ce(edac_dev, 0, 0, + edac_dev->ctl_name); + } + + val = readl(pg_f + MEMERR_CPU_LSUESR_PAGE_OFFSET); + if (val) { + dev_err(edac_dev->dev, + "CPU%d memory error LSU 0x%08X Way 0x%02X Index 0x%02X Info 0x%02X\n", + ctx->pmd * MAX_CPU_PER_PMD + i, val, + MEMERR_CPU_LSUESR_ERRWAY_RD(val), + MEMERR_CPU_LSUESR_ERRINDEX_RD(val), + MEMERR_CPU_LSUESR_ERRINFO_RD(val)); + if (val & MEMERR_CPU_LSUESR_CERR_MASK) + dev_err(edac_dev->dev, + "One or more correctable error\n"); + if (val & MEMERR_CPU_LSUESR_MULTCERR_MASK) + dev_err(edac_dev->dev, + "Multiple correctable error\n"); + switch (MEMERR_CPU_LSUESR_ERRTYPE_RD(val)) { + case 0: + dev_err(edac_dev->dev, "Load tag error\n"); + break; + case 1: + dev_err(edac_dev->dev, "Load data error\n"); + break; + case 2: + dev_err(edac_dev->dev, "WSL multihit error\n"); + break; + case 3: + dev_err(edac_dev->dev, "Store tag error\n"); + break; + case 4: + dev_err(edac_dev->dev, + "DTB multihit from load pipeline error\n"); + break; + case 5: + dev_err(edac_dev->dev, + "DTB multihit from store pipeline error\n"); + break; + } + writel(val, pg_f + MEMERR_CPU_LSUESRA_PAGE_OFFSET); + if (val & (MEMERR_CPU_LSUESR_CERR_MASK | + MEMERR_CPU_LSUESR_MULTCERR_MASK)) + edac_device_handle_ce(edac_dev, 0, 0, + edac_dev->ctl_name); + else + edac_device_handle_ue(edac_dev, 0, 0, + edac_dev->ctl_name); + } + + val = readl(pg_f + MEMERR_CPU_MMUESR_PAGE_OFFSET); + if (val) { + dev_err(edac_dev->dev, + "CPU%d memory error MMU 0x%08X\n", + ctx->pmd * MAX_CPU_PER_PMD + i, val); + writel(val, pg_f + MEMERR_CPU_MMUESRA_PAGE_OFFSET); + edac_device_handle_ue(edac_dev, 0, 0, + edac_dev->ctl_name); + } + } + + /* Check L2 */ + pg_e = ctx->pmd_csr + CPU_MEMERR_L2C_PAGE; + val = readl(pg_e + MEMERR_L2C_L2ESR_PAGE_OFFSET); + if (val) { + val_lo = readl(pg_e + MEMERR_L2C_L2EALR_PAGE_OFFSET); + val_hi = readl(pg_e + MEMERR_L2C_L2EAHR_PAGE_OFFSET); + dev_err(edac_dev->dev, + "PMD%d memory error L2C L2ESR 0x%08X @ 0x%08X.%08X\n", + ctx->pmd, val, val_hi, val_lo); + dev_err(edac_dev->dev, + "ErrSyndrome 0x%02X ErrWay 0x%02X ErrCpu %d ErrGroup 0x%02X ErrAction 0x%02X\n", + MEMERR_L2C_L2ESR_ERRSYN_RD(val), + MEMERR_L2C_L2ESR_ERRWAY_RD(val), + MEMERR_L2C_L2ESR_ERRCPU_RD(val), + MEMERR_L2C_L2ESR_ERRGROUP_RD(val), + MEMERR_L2C_L2ESR_ERRACTION_RD(val)); + + if (val & MEMERR_L2C_L2ESR_ERR_MASK) + dev_err(edac_dev->dev, + "One or more correctable error\n"); + if (val & MEMERR_L2C_L2ESR_MULTICERR_MASK) + dev_err(edac_dev->dev, "Multiple correctable error\n"); + if (val & MEMERR_L2C_L2ESR_UCERR_MASK) + dev_err(edac_dev->dev, + "One or more uncorrectable error\n"); + if (val & MEMERR_L2C_L2ESR_MULTUCERR_MASK) + dev_err(edac_dev->dev, + "Multiple uncorrectable error\n"); + + switch (MEMERR_L2C_L2ESR_ERRTYPE_RD(val)) { + case 0: + dev_err(edac_dev->dev, "Outbound SDB parity error\n"); + break; + case 1: + dev_err(edac_dev->dev, "Inbound SDB parity error\n"); + break; + case 2: + dev_err(edac_dev->dev, "Tag ECC error\n"); + break; + case 3: + dev_err(edac_dev->dev, "Data ECC error\n"); + break; + } + + writel(0x0, pg_e + MEMERR_L2C_L2EALR_PAGE_OFFSET); + writel(0x0, pg_e + MEMERR_L2C_L2EAHR_PAGE_OFFSET); + writel(val, pg_e + MEMERR_L2C_L2ESRA_PAGE_OFFSET); + + if (val & (MEMERR_L2C_L2ESR_ERR_MASK | + MEMERR_L2C_L2ESR_MULTICERR_MASK)) + edac_device_handle_ce(edac_dev, 0, 0, + edac_dev->ctl_name); + if (val & (MEMERR_L2C_L2ESR_UCERR_MASK | + MEMERR_L2C_L2ESR_MULTUCERR_MASK)) + edac_device_handle_ue(edac_dev, 0, 0, + edac_dev->ctl_name); + } + + /* Check if any memory request timed out on L2 cache */ + pg_d = ctx->pmd_csr + CPU_L2C_PAGE; + val = readl(pg_d + CPUX_L2C_L2RTOSR_PAGE_OFFSET); + if (val) { + val_lo = readl(pg_d + CPUX_L2C_L2RTOALR_PAGE_OFFSET); + val_hi = readl(pg_d + CPUX_L2C_L2RTOAHR_PAGE_OFFSET); + dev_err(edac_dev->dev, + "PMD%d L2C error L2C RTOSR 0x%08X @ 0x%08X.%08X\n", + ctx->pmd, val, val_hi, val_lo); + writel(0x0, pg_d + CPUX_L2C_L2RTOALR_PAGE_OFFSET); + writel(0x0, pg_d + CPUX_L2C_L2RTOAHR_PAGE_OFFSET); + writel(0x0, pg_d + CPUX_L2C_L2RTOSR_PAGE_OFFSET); + } +} + +static irqreturn_t xgene_edac_pmd_isr(int irq, void *dev_id) +{ + struct edac_device_ctl_info *edac_dev = dev_id; + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; + u32 pcp_hp_stat; + + pcp_hp_stat = readl(ctx->pcp_csr + PCPHPERRINTSTS); + if (!(pcp_hp_stat & (PMD0_MERR_MASK << ctx->pmd))) + return IRQ_NONE; + + xgene_edac_pmd_check(edac_dev); + + return IRQ_HANDLED; +} + +static void xgene_edac_pmd_cpu_hw_cfg(struct edac_device_ctl_info *edac_dev, + int cpu) +{ + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; + void __iomem *pg_f = ctx->pmd_csr + cpu * CPU_CSR_STRIDE + + CPU_MEMERR_CPU_PAGE; + + /* + * Clear CPU memory error: + * MEMERR_CPU_ICFESRA, MEMERR_CPU_LSUESRA, and MEMERR_CPU_MMUESRA + */ + writel(0x00000000, pg_f + MEMERR_CPU_ICFESRA_PAGE_OFFSET); + writel(0x00000000, pg_f + MEMERR_CPU_LSUESRA_PAGE_OFFSET); + writel(0x00000000, pg_f + MEMERR_CPU_MMUESRA_PAGE_OFFSET); + + /* + * Enable CPU memory error: + * MEMERR_CPU_ICFESRA, MEMERR_CPU_LSUESRA, and MEMERR_CPU_MMUESRA + */ + writel(0x00000301, pg_f + MEMERR_CPU_ICFECR_PAGE_OFFSET); + writel(0x00000301, pg_f + MEMERR_CPU_LSUECR_PAGE_OFFSET); + writel(0x00000101, pg_f + MEMERR_CPU_MMUECR_PAGE_OFFSET); +} + +static void xgene_edac_pmd_hw_cfg(struct edac_device_ctl_info *edac_dev) +{ + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; + void __iomem *pg_d = ctx->pmd_csr + CPU_L2C_PAGE; + void __iomem *pg_e = ctx->pmd_csr + CPU_MEMERR_L2C_PAGE; + + /* + * Clear PMD memory error: + * MEMERR_L2C_L2ESRA, MEMERR_L2C_L2EALR, and MEMERR_L2C_L2EAHR + */ + writel(0x00000000, pg_e + MEMERR_L2C_L2ESRA_PAGE_OFFSET); + writel(0x00000000, pg_e + MEMERR_L2C_L2EALR_PAGE_OFFSET); + writel(0x00000000, pg_e + MEMERR_L2C_L2EAHR_PAGE_OFFSET); + + /* + * Clear L2 error: + * L2C_L2RTOSR, L2C_L2RTOALR, L2C_L2RTOAHR + */ + writel(0x00000000, pg_d + CPUX_L2C_L2RTOSR_PAGE_OFFSET); + writel(0x00000000, pg_d + CPUX_L2C_L2RTOALR_PAGE_OFFSET); + writel(0x00000000, pg_d + CPUX_L2C_L2RTOAHR_PAGE_OFFSET); + + /* Enable PMD memory error - MEMERR_L2C_L2ECR and L2C_L2RTOCR */ + writel(0x00000703, pg_e + MEMERR_L2C_L2ECR_PAGE_OFFSET); + writel(0x00000119, pg_d + CPUX_L2C_L2RTOCR_PAGE_OFFSET); +} + +static void xgene_edac_pmd_hw_init(struct edac_device_ctl_info *edac_dev, + bool enable) +{ + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; + u32 val; + + /* Enable PMD error interrupt */ + if (edac_dev->op_state == OP_RUNNING_INTERRUPT) { + mutex_lock(&xgene_edac_lock); + + val = readl(ctx->pcp_csr + PCPHPERRINTMSK); + if (enable) + val &= ~(PMD0_MERR_MASK << ctx->pmd); + else + val |= PMD0_MERR_MASK << ctx->pmd; + writel(val, ctx->pcp_csr + PCPHPERRINTMSK); + + mutex_unlock(&xgene_edac_lock); + } + + if (enable) { + xgene_edac_pmd_hw_cfg(edac_dev); + + /* Two CPU's per an PMD */ + xgene_edac_pmd_cpu_hw_cfg(edac_dev, 0); + xgene_edac_pmd_cpu_hw_cfg(edac_dev, 1); + } +} + +static ssize_t xgene_edac_pmd_l1_inject_ctrl_show( + struct edac_device_ctl_info *edac_dev, char *data) +{ + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; + void __iomem *cpu0_pg_f = ctx->pmd_csr + CPU_MEMERR_CPU_PAGE; + void __iomem *cpu1_pg_f = ctx->pmd_csr + CPU_CSR_STRIDE + + CPU_MEMERR_CPU_PAGE; + + return sprintf(data, "0x%08X 0x%08X 0x%08X 0x%08X 0x%08X 0x%08X", + readl(cpu0_pg_f + MEMERR_CPU_ICFESRA_PAGE_OFFSET), + readl(cpu0_pg_f + MEMERR_CPU_LSUESRA_PAGE_OFFSET), + readl(cpu0_pg_f + MEMERR_CPU_MMUESRA_PAGE_OFFSET), + readl(cpu1_pg_f + MEMERR_CPU_ICFESRA_PAGE_OFFSET), + readl(cpu1_pg_f + MEMERR_CPU_LSUESRA_PAGE_OFFSET), + readl(cpu1_pg_f + MEMERR_CPU_MMUESRA_PAGE_OFFSET)); +} + +static ssize_t xgene_edac_pmd_l1_inject_ctrl_store( + struct edac_device_ctl_info *edac_dev, const char *data, size_t count) +{ + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; + void __iomem *cpu0_pg_f = ctx->pmd_csr + CPU_MEMERR_CPU_PAGE; + void __iomem *cpu1_pg_f = ctx->pmd_csr + CPU_CSR_STRIDE + + CPU_MEMERR_CPU_PAGE; + u32 val; + + if (isdigit(*data)) { + if (kstrtou32(data, 0, &val)) + return 0; + writel(val, cpu0_pg_f + MEMERR_CPU_ICFESRA_PAGE_OFFSET); + writel(val, cpu0_pg_f + MEMERR_CPU_LSUESRA_PAGE_OFFSET); + writel(val, cpu0_pg_f + MEMERR_CPU_MMUESRA_PAGE_OFFSET); + writel(val, cpu1_pg_f + MEMERR_CPU_ICFESRA_PAGE_OFFSET); + writel(val, cpu1_pg_f + MEMERR_CPU_LSUESRA_PAGE_OFFSET); + writel(val, cpu1_pg_f + MEMERR_CPU_MMUESRA_PAGE_OFFSET); + return count; + } + return 0; +} + +static ssize_t xgene_edac_pmd_l2_inject_ctrl_show( + struct edac_device_ctl_info *edac_dev, char *data) +{ + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; + void __iomem *pg_e = ctx->pmd_csr + CPU_MEMERR_L2C_PAGE; + + return sprintf(data, "0x%08X", + readl(pg_e + MEMERR_L2C_L2ESRA_PAGE_OFFSET)); +} + +static ssize_t xgene_edac_pmd_l2_inject_ctrl_store( + struct edac_device_ctl_info *edac_dev, const char *data, size_t count) +{ + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; + void __iomem *pg_e = ctx->pmd_csr + CPU_MEMERR_L2C_PAGE; + u32 val; + + if (isdigit(*data)) { + if (kstrtou32(data, 0, &val)) + return 0; + writel(val, + pg_e + MEMERR_L2C_L2ESRA_PAGE_OFFSET); + return count; + } + return 0; +} + +static struct edac_dev_sysfs_attribute xgene_edac_pmd_sysfs_attributes[] = { + { .attr = { + .name = "l1_inject_ctrl", + .mode = (S_IRUGO | S_IWUSR) + }, + .show = xgene_edac_pmd_l1_inject_ctrl_show, + .store = xgene_edac_pmd_l1_inject_ctrl_store }, + { .attr = { + .name = "l2_inject_ctrl", + .mode = (S_IRUGO | S_IWUSR) + }, + .show = xgene_edac_pmd_l2_inject_ctrl_show, + .store = xgene_edac_pmd_l2_inject_ctrl_store }, + + /* End of list */ + { .attr = {.name = NULL } } +}; + +static int xgene_edac_pmd_probe(struct platform_device *pdev) +{ + struct edac_device_ctl_info *edac_dev; + struct xgene_edac_pmd_ctx *ctx; + char edac_name[10]; + struct resource *res; + int pmd; + int rc = 0; + + if (!devres_open_group(&pdev->dev, xgene_edac_pmd_probe, GFP_KERNEL)) + return -ENOMEM; + + /* Find the PMD number from its address */ + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + if (resource_size(res) <= 0) { + rc = -ENODEV; + goto err_group; + } + pmd = ((res->start >> 20) & 0x1E) / 2; + + sprintf(edac_name, "l2c%d", pmd); + edac_dev = edac_device_alloc_ctl_info(sizeof(*ctx), + edac_name, 1, "l2c", 1, 2, NULL, + 0, edac_device_alloc_index()); + if (!edac_dev) { + rc = -ENOMEM; + goto err_group; + } + + ctx = edac_dev->pvt_info; + ctx->name = "xgene_pmd_err"; + ctx->pmd = pmd; + edac_dev->dev = &pdev->dev; + dev_set_drvdata(edac_dev->dev, edac_dev); + edac_dev->ctl_name = ctx->name; + edac_dev->dev_name = ctx->name; + edac_dev->mod_name = EDAC_MOD_STR; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + ctx->pcp_csr = devm_ioremap(&pdev->dev, res->start, resource_size(res)); + if (IS_ERR(ctx->pcp_csr)) { + dev_err(&pdev->dev, "no PCP resource address\n"); + rc = PTR_ERR(ctx->pcp_csr); + goto err_free; + } + + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + ctx->pmd_csr = devm_ioremap(&pdev->dev, res->start, resource_size(res)); + if (IS_ERR(ctx->pmd_csr)) { + dev_err(&pdev->dev, "no PMD resource address\n"); + rc = PTR_ERR(ctx->pmd_csr); + goto err_free; + } + + if (edac_op_state == EDAC_OPSTATE_POLL) + edac_dev->edac_check = xgene_edac_pmd_check; + + edac_dev->sysfs_attributes = xgene_edac_pmd_sysfs_attributes; + + rc = edac_device_add_device(edac_dev); + if (rc > 0) { + dev_err(&pdev->dev, "failed edac_device_add_device()\n"); + /* + * NOTE: Can't use return value from edac_device_add_device + * as it is 1 on failure + */ + rc = -ENOMEM; + goto err_free; + } + + if (edac_op_state == EDAC_OPSTATE_INT) { + int irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(&pdev->dev, "No IRQ resource\n"); + rc = -EINVAL; + goto err_del; + } + rc = devm_request_irq(&pdev->dev, irq, + xgene_edac_pmd_isr, IRQF_SHARED, + dev_name(&pdev->dev), edac_dev); + if (rc) { + dev_err(&pdev->dev, "Could not request IRQ %d\n", irq); + goto err_del; + } + edac_dev->op_state = OP_RUNNING_INTERRUPT; + } + + xgene_edac_pmd_hw_init(edac_dev, 1); + + devres_remove_group(&pdev->dev, xgene_edac_pmd_probe); + + dev_info(&pdev->dev, "X-Gene EDAC PMD registered\n"); + return 0; + +err_del: + edac_device_del_device(&pdev->dev); +err_free: + edac_device_free_ctl_info(edac_dev); +err_group: + devres_release_group(&pdev->dev, xgene_edac_pmd_probe); + return rc; +} + +static int xgene_edac_pmd_remove(struct platform_device *pdev) +{ + struct edac_device_ctl_info *edac_dev = dev_get_drvdata(&pdev->dev); + + xgene_edac_pmd_hw_init(edac_dev, 0); + edac_device_del_device(&pdev->dev); + edac_device_free_ctl_info(edac_dev); + return 0; +} + +#ifdef CONFIG_OF +static struct of_device_id xgene_edac_pmd_of_match[] = { + { .compatible = "apm,xgene-edac-pmd" }, + {}, +}; +MODULE_DEVICE_TABLE(of, xgene_edac_pmd_of_match); +#endif + +static struct platform_driver xgene_edac_pmd_driver = { + .probe = xgene_edac_pmd_probe, + .remove = xgene_edac_pmd_remove, + .driver = { + .name = "xgene-edac-pmd", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(xgene_edac_pmd_of_match), + }, +}; + +/* L3 Error device */ +#define L3C_ESR (0x0A * 4) +#define L3C_ESR_DATATAG_MASK 0x00000200 +#define L3C_ESR_MULTIHIT_MASK 0x00000100 +#define L3C_ESR_UCEVICT_MASK 0x00000040 +#define L3C_ESR_MULTIUCERR_MASK 0x00000020 +#define L3C_ESR_MULTICERR_MASK 0x00000010 +#define L3C_ESR_UCERR_MASK 0x00000008 +#define L3C_ESR_CERR_MASK 0x00000004 +#define L3C_ESR_UCERRINTR_MASK 0x00000002 +#define L3C_ESR_CERRINTR_MASK 0x00000001 +#define L3C_ECR (0x0B * 4) +#define L3C_ECR_UCINTREN 0x00000008 +#define L3C_ECR_CINTREN 0x00000004 +#define L3C_UCERREN 0x00000002 +#define L3C_CERREN 0x00000001 +#define L3C_ELR (0x0C * 4) +#define L3C_ELR_ERRSYN(src) ((src & 0xFF800000) >> 23) +#define L3C_ELR_ERRWAY(src) ((src & 0x007E0000) >> 17) +#define L3C_ELR_AGENTID(src) ((src & 0x0001E000) >> 13) +#define L3C_ELR_ERRGRP(src) ((src & 0x00000F00) >> 8) +#define L3C_ELR_OPTYPE(src) ((src & 0x000000F0) >> 4) +#define L3C_ELR_PADDRHIGH(src) (src & 0x0000000F) +#define L3C_AELR (0x0D * 4) +#define L3C_BELR (0x0E * 4) +#define L3C_BELR_BANK(src) (src & 0x0000000F) + +struct xgene_edac_dev_ctx { + char *name; + int edac_idx; + void __iomem *pcp_csr; + void __iomem *dev_csr; +}; + +static void xgene_edac_l3_check(struct edac_device_ctl_info *edac_dev) +{ + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; + u32 l3cesr; + u32 l3celr; + u32 l3caelr; + u32 l3cbelr; + + l3cesr = readl(ctx->dev_csr + L3C_ESR); + if (!(l3cesr & (L3C_ESR_UCERR_MASK | L3C_ESR_CERR_MASK))) + return; + + if (l3cesr & L3C_ESR_UCERR_MASK) + dev_err(edac_dev->dev, "L3C uncorrectable error\n"); + if (l3cesr & L3C_ESR_CERR_MASK) + dev_warn(edac_dev->dev, "L3C correctable error\n"); + + l3celr = readl(ctx->dev_csr + L3C_ELR); + l3caelr = readl(ctx->dev_csr + L3C_AELR); + l3cbelr = readl(ctx->dev_csr + L3C_BELR); + if (l3cesr & L3C_ESR_MULTIHIT_MASK) + dev_err(edac_dev->dev, "L3C multiple hit error\n"); + if (l3cesr & L3C_ESR_UCEVICT_MASK) + dev_err(edac_dev->dev, + "L3C dropped eviction of line with error\n"); + if (l3cesr & L3C_ESR_MULTIUCERR_MASK) + dev_err(edac_dev->dev, "L3C multiple uncorrectable error\n"); + if (l3cesr & L3C_ESR_DATATAG_MASK) + dev_err(edac_dev->dev, + "L3C data error syndrome 0x%X group 0x%X\n", + L3C_ELR_ERRSYN(l3celr), L3C_ELR_ERRGRP(l3celr)); + else + dev_err(edac_dev->dev, + "L3C tag error syndrome 0x%X Way of Tag 0x%X Agent ID 0x%X Operation type 0x%X\n", + L3C_ELR_ERRSYN(l3celr), L3C_ELR_ERRWAY(l3celr), + L3C_ELR_AGENTID(l3celr), L3C_ELR_OPTYPE(l3celr)); + /* + * NOTE: Address [41:38] in L3C_ELR_PADDRHIGH(l3celr). + * Address [37:6] in l3caelr. Lower 6 bits are zero. + */ + dev_err(edac_dev->dev, "L3C error address 0x%08X.%08X bank %d\n", + L3C_ELR_PADDRHIGH(l3celr) << 6 | (l3caelr >> 26), + (l3caelr & 0x3FFFFFFF) << 6, L3C_BELR_BANK(l3cbelr)); + dev_err(edac_dev->dev, + "L3C error status register value 0x%X\n", l3cesr); + + /* Clear L3C error interrupt */ + writel(0, ctx->dev_csr + L3C_ESR); + + if (l3cesr & L3C_ESR_CERR_MASK) + edac_device_handle_ce(edac_dev, 0, 0, edac_dev->ctl_name); + if (l3cesr & L3C_ESR_UCERR_MASK) + edac_device_handle_ue(edac_dev, 0, 0, edac_dev->ctl_name); +} + +static irqreturn_t xgene_edac_l3_isr(int irq, void *dev_id) +{ + struct edac_device_ctl_info *edac_dev = dev_id; + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; + u32 l3cesr; + + l3cesr = readl(ctx->dev_csr + L3C_ESR); + if (!(l3cesr & (L3C_ESR_UCERRINTR_MASK | L3C_ESR_CERRINTR_MASK))) + return IRQ_NONE; + + xgene_edac_l3_check(edac_dev); + + return IRQ_HANDLED; +} + +static void xgene_edac_l3_hw_init(struct edac_device_ctl_info *edac_dev, + bool enable) +{ + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; + u32 val; + + val = readl(ctx->dev_csr + L3C_ECR); + val |= L3C_UCERREN | L3C_CERREN; + /* On disable, we just disable interrupt but keep error enabled */ + if (edac_dev->op_state == OP_RUNNING_INTERRUPT) { + if (enable) + val |= L3C_ECR_UCINTREN | L3C_ECR_CINTREN; + else + val &= ~(L3C_ECR_UCINTREN | L3C_ECR_CINTREN); + } + writel(val, ctx->dev_csr + L3C_ECR); + + mutex_lock(&xgene_edac_lock); + + if (edac_dev->op_state == OP_RUNNING_INTERRUPT) { + /* Enable L3C error top level interrupt */ + val = readl(ctx->pcp_csr + PCPHPERRINTMSK); + if (enable) + val &= ~L3C_UNCORR_ERR_MASK; + else + val |= L3C_UNCORR_ERR_MASK; + writel(val, ctx->pcp_csr + PCPHPERRINTMSK); + val = readl(ctx->pcp_csr + PCPLPERRINTMSK); + if (enable) + val &= ~L3C_CORR_ERR_MASK; + else + val |= L3C_CORR_ERR_MASK; + writel(val, ctx->pcp_csr + PCPLPERRINTMSK); + } + + mutex_unlock(&xgene_edac_lock); +} + +static ssize_t xgene_edac_l3_inject_ctrl_show( + struct edac_device_ctl_info *edac_dev, char *data) +{ + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; + + return sprintf(data, "0x%08X", readl(ctx->dev_csr + L3C_ESR)); +} + +static ssize_t xgene_edac_l3_inject_ctrl_store( + struct edac_device_ctl_info *edac_dev, const char *data, size_t count) +{ + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; + u32 val; + + if (isdigit(*data)) { + if (kstrtou32(data, 0, &val)) + return 0; + writel(val, ctx->dev_csr + L3C_ESR); + return count; + } + return 0; +} + +static struct edac_dev_sysfs_attribute xgene_edac_l3_sysfs_attributes[] = { + { .attr = { + .name = "inject_ctrl", + .mode = (S_IRUGO | S_IWUSR) + }, + .show = xgene_edac_l3_inject_ctrl_show, + .store = xgene_edac_l3_inject_ctrl_store }, + + /* End of list */ + { .attr = {.name = NULL } } +}; + +static int xgene_edac_l3_probe(struct platform_device *pdev) +{ + struct edac_device_ctl_info *edac_dev; + struct xgene_edac_dev_ctx *ctx; + struct resource *res; + int rc = 0; + + if (!devres_open_group(&pdev->dev, xgene_edac_l3_probe, GFP_KERNEL)) + return -ENOMEM; + + edac_dev = edac_device_alloc_ctl_info(sizeof(*ctx), + "l3c", 1, "l3c", 1, 0, NULL, 0, + edac_device_alloc_index()); + if (!edac_dev) { + rc = -ENOMEM; + goto err; + } + + ctx = edac_dev->pvt_info; + ctx->name = "xgene_l3_err"; + edac_dev->dev = &pdev->dev; + dev_set_drvdata(edac_dev->dev, edac_dev); + edac_dev->ctl_name = ctx->name; + edac_dev->dev_name = ctx->name; + edac_dev->mod_name = EDAC_MOD_STR; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + ctx->pcp_csr = devm_ioremap(&pdev->dev, res->start, resource_size(res)); + if (IS_ERR(ctx->pcp_csr)) { + dev_err(&pdev->dev, "no PCP resource address\n"); + rc = PTR_ERR(ctx->pcp_csr); + goto err1; + } + + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + ctx->dev_csr = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(ctx->dev_csr)) { + dev_err(&pdev->dev, "no L3 resource address\n"); + rc = PTR_ERR(ctx->dev_csr); + goto err1; + } + + if (edac_op_state == EDAC_OPSTATE_POLL) + edac_dev->edac_check = xgene_edac_l3_check; + + edac_dev->sysfs_attributes = xgene_edac_l3_sysfs_attributes; + + rc = edac_device_add_device(edac_dev); + if (rc > 0) { + dev_err(&pdev->dev, "failed edac_device_add_device()\n"); + /* + * NOTE: Can't use return value from edac_device_add_device + * as it is 1 on failure + */ + rc = -ENOMEM; + goto err1; + } + + if (edac_op_state == EDAC_OPSTATE_INT) { + int irq; + int i; + + for (i = 0; i < 2; i++) { + irq = platform_get_irq(pdev, i); + if (irq < 0) { + dev_err(&pdev->dev, "No IRQ resource\n"); + rc = -EINVAL; + goto err2; + } + rc = devm_request_irq(&pdev->dev, irq, + xgene_edac_l3_isr, IRQF_SHARED, + dev_name(&pdev->dev), edac_dev); + if (rc) { + dev_err(&pdev->dev, + "Could not request IRQ %d\n", irq); + goto err2; + } + } + edac_dev->op_state = OP_RUNNING_INTERRUPT; + } + + xgene_edac_l3_hw_init(edac_dev, 1); + + devres_remove_group(&pdev->dev, xgene_edac_l3_probe); + + dev_info(&pdev->dev, "X-Gene EDAC L3 registered\n"); + return 0; + +err2: + edac_device_del_device(&pdev->dev); +err1: + edac_device_free_ctl_info(edac_dev); +err: + devres_release_group(&pdev->dev, xgene_edac_l3_probe); + return rc; +} + +static int xgene_edac_l3_remove(struct platform_device *pdev) +{ + struct edac_device_ctl_info *edac_dev = dev_get_drvdata(&pdev->dev); + + xgene_edac_l3_hw_init(edac_dev, 0); + edac_device_del_device(&pdev->dev); + edac_device_free_ctl_info(edac_dev); + return 0; +} + +#ifdef CONFIG_OF +static struct of_device_id xgene_edac_l3_of_match[] = { + { .compatible = "apm,xgene-edac-l3" }, + {}, +}; +MODULE_DEVICE_TABLE(of, xgene_edac_l3_of_match); +#endif + +static struct platform_driver xgene_edac_l3_driver = { + .probe = xgene_edac_l3_probe, + .remove = xgene_edac_l3_remove, + .driver = { + .name = "xgene-edac-l3", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(xgene_edac_l3_of_match), + }, +}; + +/* SoC Error device */ +#define IOBAXIS0TRANSERRINTSTS 0x0000 +#define IOBAXIS0_M_ILLEGAL_ACCESS_MASK 0x00000002 +#define IOBAXIS0_ILLEGAL_ACCESS_MASK 0x00000001 +#define IOBAXIS0TRANSERRINTMSK 0x0004 +#define IOBAXIS0TRANSERRREQINFOL 0x0008 +#define IOBAXIS0TRANSERRREQINFOH 0x000c +#define REQTYPE_RD(src) (((src) & 0x00000001)) +#define ERRADDRH_RD(src) (((src) & 0xffc00000) >> 22) +#define IOBAXIS1TRANSERRINTSTS 0x0010 +#define IOBAXIS1TRANSERRINTMSK 0x0014 +#define IOBAXIS1TRANSERRREQINFOL 0x0018 +#define IOBAXIS1TRANSERRREQINFOH 0x001c +#define IOBPATRANSERRINTSTS 0x0020 +#define IOBPA_M_REQIDRAM_CORRUPT_MASK 0x00000080 +#define IOBPA_REQIDRAM_CORRUPT_MASK 0x00000040 +#define IOBPA_M_TRANS_CORRUPT_MASK 0x00000020 +#define IOBPA_TRANS_CORRUPT_MASK 0x00000010 +#define IOBPA_M_WDATA_CORRUPT_MASK 0x00000008 +#define IOBPA_WDATA_CORRUPT_MASK 0x00000004 +#define IOBPA_M_RDATA_CORRUPT_MASK 0x00000002 +#define IOBPA_RDATA_CORRUPT_MASK 0x00000001 +#define IOBBATRANSERRINTSTS 0x0030 +#define M_ILLEGAL_ACCESS_MASK 0x00008000 +#define ILLEGAL_ACCESS_MASK 0x00004000 +#define M_WIDRAM_CORRUPT_MASK 0x00002000 +#define WIDRAM_CORRUPT_MASK 0x00001000 +#define M_RIDRAM_CORRUPT_MASK 0x00000800 +#define RIDRAM_CORRUPT_MASK 0x00000400 +#define M_TRANS_CORRUPT_MASK 0x00000200 +#define TRANS_CORRUPT_MASK 0x00000100 +#define M_WDATA_CORRUPT_MASK 0x00000080 +#define WDATA_CORRUPT_MASK 0x00000040 +#define M_RBM_POISONED_REQ_MASK 0x00000020 +#define RBM_POISONED_REQ_MASK 0x00000010 +#define M_XGIC_POISONED_REQ_MASK 0x00000008 +#define XGIC_POISONED_REQ_MASK 0x00000004 +#define M_WRERR_RESP_MASK 0x00000002 +#define WRERR_RESP_MASK 0x00000001 +#define IOBBATRANSERRREQINFOL 0x0038 +#define IOBBATRANSERRREQINFOH 0x003c +#define REQTYPE_F2_RD(src) (((src) & 0x00000001)) +#define ERRADDRH_F2_RD(src) (((src) & 0xffc00000) >> 22) +#define IOBBATRANSERRCSWREQID 0x0040 +#define XGICTRANSERRINTSTS 0x0050 +#define M_WR_ACCESS_ERR_MASK 0x00000008 +#define WR_ACCESS_ERR_MASK 0x00000004 +#define M_RD_ACCESS_ERR_MASK 0x00000002 +#define RD_ACCESS_ERR_MASK 0x00000001 +#define XGICTRANSERRINTMSK 0x0054 +#define XGICTRANSERRREQINFO 0x0058 +#define REQTYPE_MASK 0x04000000 +#define ERRADDR_RD(src) ((src) & 0x03ffffff) +#define GLBL_ERR_STS 0x0800 +#define MDED_ERR_MASK 0x00000008 +#define DED_ERR_MASK 0x00000004 +#define MSEC_ERR_MASK 0x00000002 +#define SEC_ERR_MASK 0x00000001 +#define GLBL_SEC_ERRL 0x0810 +#define GLBL_SEC_ERRH 0x0818 +#define GLBL_MSEC_ERRL 0x0820 +#define GLBL_MSEC_ERRH 0x0828 +#define GLBL_DED_ERRL 0x0830 +#define GLBL_DED_ERRLMASK 0x0834 +#define GLBL_DED_ERRH 0x0838 +#define GLBL_DED_ERRHMASK 0x083c +#define GLBL_MDED_ERRL 0x0840 +#define GLBL_MDED_ERRLMASK 0x0844 +#define GLBL_MDED_ERRH 0x0848 +#define GLBL_MDED_ERRHMASK 0x084c + +static void xgene_edac_iob_gic_report(struct edac_device_ctl_info *edac_dev) +{ + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; + u32 err_addr_lo; + u32 err_addr_hi; + u32 reg; + u32 info; + + /* GIC transaction error interrupt */ + reg = readl(ctx->dev_csr + XGICTRANSERRINTSTS); + if (reg) { + dev_err(edac_dev->dev, "XGIC transaction error\n"); + if (reg & RD_ACCESS_ERR_MASK) + dev_err(edac_dev->dev, "XGIC read size error\n"); + if (reg & M_RD_ACCESS_ERR_MASK) + dev_err(edac_dev->dev, + "Multiple XGIC read size error\n"); + if (reg & WR_ACCESS_ERR_MASK) + dev_err(edac_dev->dev, "XGIC write size error\n"); + if (reg & M_WR_ACCESS_ERR_MASK) + dev_err(edac_dev->dev, + "Multiple XGIC write size error\n"); + info = readl(ctx->dev_csr + XGICTRANSERRREQINFO); + dev_err(edac_dev->dev, "XGIC %s access @ 0x%08X (0x%08X)\n", + info & REQTYPE_MASK ? "read" : "write", + ERRADDR_RD(info), info); + writel(reg, ctx->dev_csr + XGICTRANSERRINTSTS); + } + + /* IOB memory error */ + reg = readl(ctx->dev_csr + GLBL_ERR_STS); + if (reg) { + if (reg & SEC_ERR_MASK) { + err_addr_lo = readl(ctx->dev_csr + GLBL_SEC_ERRL); + err_addr_hi = readl(ctx->dev_csr + GLBL_SEC_ERRH); + dev_err(edac_dev->dev, + "IOB single-bit correctable memory at 0x%08X.%08X error\n", + err_addr_lo, err_addr_hi); + writel(err_addr_lo, ctx->dev_csr + GLBL_SEC_ERRL); + writel(err_addr_hi, ctx->dev_csr + GLBL_SEC_ERRH); + } + if (reg & MSEC_ERR_MASK) { + err_addr_lo = readl(ctx->dev_csr + GLBL_MSEC_ERRL); + err_addr_hi = readl(ctx->dev_csr + GLBL_MSEC_ERRH); + dev_err(edac_dev->dev, + "IOB multiple single-bit correctable memory at 0x%08X.%08X error\n", + err_addr_lo, err_addr_hi); + writel(err_addr_lo, ctx->dev_csr + GLBL_MSEC_ERRL); + writel(err_addr_hi, ctx->dev_csr + GLBL_MSEC_ERRH); + } + if (reg & (SEC_ERR_MASK | MSEC_ERR_MASK)) + edac_device_handle_ce(edac_dev, 0, 0, + edac_dev->ctl_name); + + if (reg & DED_ERR_MASK) { + err_addr_lo = readl(ctx->dev_csr + GLBL_DED_ERRL); + err_addr_hi = readl(ctx->dev_csr + GLBL_DED_ERRH); + dev_err(edac_dev->dev, + "IOB double-bit uncorrectable memory at 0x%08X.%08X error\n", + err_addr_lo, err_addr_hi); + writel(err_addr_lo, ctx->dev_csr + GLBL_DED_ERRL); + writel(err_addr_hi, ctx->dev_csr + GLBL_DED_ERRH); + } + if (reg & MDED_ERR_MASK) { + err_addr_lo = readl(ctx->dev_csr + GLBL_MDED_ERRL); + err_addr_hi = readl(ctx->dev_csr + GLBL_MDED_ERRH); + dev_err(edac_dev->dev, + "Multiple IOB double-bit uncorrectable memory at 0x%08X.%08X error\n", + err_addr_lo, err_addr_hi); + writel(err_addr_lo, ctx->dev_csr + GLBL_MDED_ERRL); + writel(err_addr_hi, ctx->dev_csr + GLBL_MDED_ERRH); + } + if (reg & (DED_ERR_MASK | MDED_ERR_MASK)) + edac_device_handle_ue(edac_dev, 0, 0, + edac_dev->ctl_name); + } +} + +static void xgene_edac_rb_report(struct edac_device_ctl_info *edac_dev) +{ + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; + u32 err_addr_lo; + u32 err_addr_hi; + u32 reg; + + /* IOB Bridge agent transaction error interrupt */ + reg = readl(ctx->dev_csr + IOBBATRANSERRINTSTS); + if (!reg) + return; + + dev_err(edac_dev->dev, "IOB bridge agent (BA) transaction error\n"); + if (reg & WRERR_RESP_MASK) + dev_err(edac_dev->dev, "IOB BA write response error\n"); + if (reg & M_WRERR_RESP_MASK) + dev_err(edac_dev->dev, + "Multiple IOB BA write response error\n"); + if (reg & XGIC_POISONED_REQ_MASK) + dev_err(edac_dev->dev, "IOB BA XGIC poisoned write error\n"); + if (reg & M_XGIC_POISONED_REQ_MASK) + dev_err(edac_dev->dev, + "Multiple IOB BA XGIC poisoned write error\n"); + if (reg & RBM_POISONED_REQ_MASK) + dev_err(edac_dev->dev, "IOB BA RBM poisoned write error\n"); + if (reg & M_RBM_POISONED_REQ_MASK) + dev_err(edac_dev->dev, + "Multiple IOB BA RBM poisoned write error\n"); + if (reg & WDATA_CORRUPT_MASK) + dev_err(edac_dev->dev, "IOB BA write error\n"); + if (reg & M_WDATA_CORRUPT_MASK) + dev_err(edac_dev->dev, "Multiple IOB BA write error\n"); + if (reg & TRANS_CORRUPT_MASK) + dev_err(edac_dev->dev, "IOB BA transaction error\n"); + if (reg & M_TRANS_CORRUPT_MASK) + dev_err(edac_dev->dev, "Multiple IOB BA transaction error\n"); + if (reg & RIDRAM_CORRUPT_MASK) + dev_err(edac_dev->dev, + "IOB BA RDIDRAM read transaction ID error\n"); + if (reg & M_RIDRAM_CORRUPT_MASK) + dev_err(edac_dev->dev, + "Multiple IOB BA RDIDRAM read transaction ID error\n"); + if (reg & WIDRAM_CORRUPT_MASK) + dev_err(edac_dev->dev, + "IOB BA RDIDRAM write transaction ID error\n"); + if (reg & M_WIDRAM_CORRUPT_MASK) + dev_err(edac_dev->dev, + "Multiple IOB BA RDIDRAM write transaction ID error\n"); + if (reg & ILLEGAL_ACCESS_MASK) + dev_err(edac_dev->dev, + "IOB BA XGIC/RB illegal access error\n"); + if (reg & M_ILLEGAL_ACCESS_MASK) + dev_err(edac_dev->dev, + "Multiple IOB BA XGIC/RB illegal access error\n"); + + err_addr_lo = readl(ctx->dev_csr + IOBBATRANSERRREQINFOL); + err_addr_hi = readl(ctx->dev_csr + IOBBATRANSERRREQINFOH); + dev_err(edac_dev->dev, "IOB BA %s access at 0x%02X.%08X (0x%08X)\n", + REQTYPE_F2_RD(err_addr_hi) ? "read" : "write", + ERRADDRH_F2_RD(err_addr_hi), err_addr_lo, err_addr_hi); + if (reg & WRERR_RESP_MASK) + dev_err(edac_dev->dev, "IOB BA requestor ID 0x%08X\n", + readl(ctx->dev_csr + IOBBATRANSERRCSWREQID)); + writel(reg, ctx->dev_csr + IOBBATRANSERRINTSTS); +} + +static void xgene_edac_pa_report(struct edac_device_ctl_info *edac_dev) +{ + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; + u32 err_addr_lo; + u32 err_addr_hi; + u32 reg; + + /* IOB Processing agent transaction error interrupt */ + reg = readl(ctx->dev_csr + IOBPATRANSERRINTSTS); + if (reg) { + dev_err(edac_dev->dev, + "IOB procesing agent (PA) transaction error\n"); + if (reg & IOBPA_RDATA_CORRUPT_MASK) + dev_err(edac_dev->dev, "IOB PA read data RAM error\n"); + if (reg & IOBPA_M_RDATA_CORRUPT_MASK) + dev_err(edac_dev->dev, + "Mutilple IOB PA read data RAM error\n"); + if (reg & IOBPA_WDATA_CORRUPT_MASK) + dev_err(edac_dev->dev, + "IOB PA write data RAM error\n"); + if (reg & IOBPA_M_WDATA_CORRUPT_MASK) + dev_err(edac_dev->dev, + "Mutilple IOB PA write data RAM error\n"); + if (reg & IOBPA_TRANS_CORRUPT_MASK) + dev_err(edac_dev->dev, "IOB PA transaction error\n"); + if (reg & IOBPA_M_TRANS_CORRUPT_MASK) + dev_err(edac_dev->dev, + "Mutilple IOB PA transaction error\n"); + if (reg & IOBPA_REQIDRAM_CORRUPT_MASK) + dev_err(edac_dev->dev, + "IOB PA transaction ID RAM error\n"); + if (reg & IOBPA_M_REQIDRAM_CORRUPT_MASK) + dev_err(edac_dev->dev, + "Multiple IOB PA transaction ID RAM error\n"); + writel(reg, ctx->dev_csr + IOBPATRANSERRINTSTS); + } + + /* IOB AXI0 Error */ + reg = readl(ctx->dev_csr + IOBAXIS0TRANSERRINTSTS); + if (reg) { + err_addr_lo = readl(ctx->dev_csr + IOBAXIS0TRANSERRREQINFOL); + err_addr_hi = readl(ctx->dev_csr + IOBAXIS0TRANSERRREQINFOH); + dev_err(edac_dev->dev, + "%sAXI slave 0 illegal %s access @ 0x%02X.%08X (0x%08X)\n", + reg & IOBAXIS0_M_ILLEGAL_ACCESS_MASK ? "Multiple " : "", + REQTYPE_RD(err_addr_hi) ? "read" : "write", + ERRADDRH_RD(err_addr_hi), err_addr_lo, err_addr_hi); + writel(reg, ctx->dev_csr + IOBAXIS0TRANSERRINTSTS); + } + + /* IOB AXI1 Error */ + reg = readl(ctx->dev_csr + IOBAXIS1TRANSERRINTSTS); + if (reg) { + err_addr_lo = readl(ctx->dev_csr + IOBAXIS1TRANSERRREQINFOL); + err_addr_hi = readl(ctx->dev_csr + IOBAXIS1TRANSERRREQINFOH); + dev_err(edac_dev->dev, + "%sAXI slave 1 illegal %s access @ 0x%02X.%08X (0x%08X)\n", + reg & IOBAXIS0_M_ILLEGAL_ACCESS_MASK ? "Multiple " : "", + REQTYPE_RD(err_addr_hi) ? "read" : "write", + ERRADDRH_RD(err_addr_hi), err_addr_lo, err_addr_hi); + writel(reg, ctx->dev_csr + IOBAXIS1TRANSERRINTSTS); + } +} + +static void xgene_edac_soc_check(struct edac_device_ctl_info *edac_dev) +{ + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; + static char *mem_err_ip[] = { + "10GbE0", + "10GbE1", + "Security", + "SATA45", + "SATA23/ETH23", + "SATA01/ETH01", + "USB1", + "USB0", + "QML", + "QM0", + "QM1 (XGbE01)", + "PCIE4", + "PCIE3", + "PCIE2", + "PCIE1", + "PCIE0", + "CTX Manager", + "OCM", + "1GbE", + "CLE", + "AHBC", + "PktDMA", + "GFC", + "MSLIM", + "10GbE2", + "10GbE3", + "QM2 (XGbE23)", + "IOB", + "unknown", + "unknown", + "unknown", + "unknown", + }; + u32 pcp_hp_stat; + u32 pcp_lp_stat; + u32 reg; + int i; + + pcp_hp_stat = readl(ctx->pcp_csr + PCPHPERRINTSTS); + pcp_lp_stat = readl(ctx->pcp_csr + PCPLPERRINTSTS); + reg = readl(ctx->pcp_csr + MEMERRINTSTS); + if (!((pcp_hp_stat & (IOB_PA_ERR_MASK | IOB_BA_ERR_MASK | + IOB_XGIC_ERR_MASK | IOB_RB_ERR_MASK)) || + (pcp_lp_stat & CSW_SWITCH_TRACE_ERR_MASK) || reg)) + return; + + if (pcp_hp_stat & IOB_XGIC_ERR_MASK) + xgene_edac_iob_gic_report(edac_dev); + + if (pcp_hp_stat & (IOB_RB_ERR_MASK | IOB_BA_ERR_MASK)) + xgene_edac_rb_report(edac_dev); + + if (pcp_hp_stat & IOB_PA_ERR_MASK) + xgene_edac_pa_report(edac_dev); + + if (pcp_lp_stat & CSW_SWITCH_TRACE_ERR_MASK) { + dev_info(edac_dev->dev, + "CSW switch trace correctable memory parity error\n"); + edac_device_handle_ce(edac_dev, 0, 0, edac_dev->ctl_name); + } + + for (i = 0; i < 31; i++) { + if (reg & (1 << i)) { + dev_err(edac_dev->dev, "%s memory parity error\n", + mem_err_ip[i]); + edac_device_handle_ue(edac_dev, 0, 0, + edac_dev->ctl_name); + } + } +} + +static irqreturn_t xgene_edac_soc_isr(int irq, void *dev_id) +{ + struct edac_device_ctl_info *edac_dev = dev_id; + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; + u32 pcp_hp_stat; + u32 pcp_lp_stat; + u32 reg; + + pcp_hp_stat = readl(ctx->pcp_csr + PCPHPERRINTSTS); + pcp_lp_stat = readl(ctx->pcp_csr + PCPLPERRINTSTS); + reg = readl(ctx->pcp_csr + MEMERRINTSTS); + if (!((pcp_hp_stat & (IOB_PA_ERR_MASK | IOB_BA_ERR_MASK | + IOB_XGIC_ERR_MASK | IOB_RB_ERR_MASK)) || + (pcp_lp_stat & CSW_SWITCH_TRACE_ERR_MASK) || reg)) + return IRQ_NONE; + + xgene_edac_soc_check(edac_dev); + + return IRQ_HANDLED; +} + +static void xgene_edac_soc_hw_init(struct edac_device_ctl_info *edac_dev, + bool enable) +{ + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; + u32 val; + + /* Enable SoC IP error interrupt */ + if (edac_dev->op_state == OP_RUNNING_INTERRUPT) { + mutex_lock(&xgene_edac_lock); + + val = readl(ctx->pcp_csr + PCPHPERRINTMSK); + if (enable) + val &= ~(IOB_PA_ERR_MASK | IOB_BA_ERR_MASK | + IOB_XGIC_ERR_MASK | IOB_RB_ERR_MASK); + else + val |= IOB_PA_ERR_MASK | IOB_BA_ERR_MASK | + IOB_XGIC_ERR_MASK | IOB_RB_ERR_MASK; + writel(val, ctx->pcp_csr + PCPHPERRINTMSK); + val = readl(ctx->pcp_csr + PCPLPERRINTMSK); + if (enable) + val &= ~CSW_SWITCH_TRACE_ERR_MASK; + else + val |= CSW_SWITCH_TRACE_ERR_MASK; + writel(val, ctx->pcp_csr + PCPLPERRINTMSK); + + mutex_unlock(&xgene_edac_lock); + + writel(enable ? 0x0 : 0xFFFFFFFF, + ctx->dev_csr + IOBAXIS0TRANSERRINTMSK); + writel(enable ? 0x0 : 0xFFFFFFFF, + ctx->dev_csr + IOBAXIS1TRANSERRINTMSK); + writel(enable ? 0x0 : 0xFFFFFFFF, + ctx->dev_csr + XGICTRANSERRINTMSK); + + writel(enable ? 0x0 : 0xFFFFFFFF, ctx->pcp_csr + MEMERRINTMSK); + } +} + +static int xgene_edac_soc_probe(struct platform_device *pdev) +{ + struct edac_device_ctl_info *edac_dev; + struct xgene_edac_dev_ctx *ctx; + struct resource *res; + int rc = 0; + + if (!devres_open_group(&pdev->dev, xgene_edac_soc_probe, GFP_KERNEL)) + return -ENOMEM; + + edac_dev = edac_device_alloc_ctl_info(sizeof(*ctx), + "SOC", 1, "SOC", 1, 2, NULL, 0, + edac_device_alloc_index()); + if (!edac_dev) { + rc = -ENOMEM; + goto err; + } + + ctx = edac_dev->pvt_info; + ctx->name = "xgene_soc_err"; + edac_dev->dev = &pdev->dev; + dev_set_drvdata(edac_dev->dev, edac_dev); + edac_dev->ctl_name = ctx->name; + edac_dev->dev_name = ctx->name; + edac_dev->mod_name = EDAC_MOD_STR; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + ctx->pcp_csr = devm_ioremap(&pdev->dev, res->start, + resource_size(res)); + if (IS_ERR(ctx->pcp_csr)) { + dev_err(&pdev->dev, "no PCP resource address\n"); + rc = PTR_ERR(ctx->pcp_csr); + goto err1; + } + + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + ctx->dev_csr = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(ctx->dev_csr)) { + dev_err(&pdev->dev, "no SoC resource address\n"); + rc = PTR_ERR(ctx->dev_csr); + goto err1; + } + + if (edac_op_state == EDAC_OPSTATE_POLL) + edac_dev->edac_check = xgene_edac_soc_check; + + rc = edac_device_add_device(edac_dev); + if (rc > 0) { + dev_err(&pdev->dev, "failed edac_device_add_device()\n"); + /* + * NOTE: Can't use return value from edac_device_add_device + * as it is 1 on failure + */ + rc = -ENOMEM; + goto err1; + } + + if (edac_op_state == EDAC_OPSTATE_INT) { + int irq; + int i; + + /* + * Register for SoC un-correctable and correctable errors + */ + for (i = 0; i < 3; i++) { + irq = platform_get_irq(pdev, i); + if (irq < 0) { + dev_err(&pdev->dev, "No IRQ resource\n"); + rc = -EINVAL; + goto err2; + } + rc = devm_request_irq(&pdev->dev, irq, + xgene_edac_soc_isr, IRQF_SHARED, + dev_name(&pdev->dev), edac_dev); + if (rc) { + dev_err(&pdev->dev, + "Could not request IRQ %d\n", + irq); + goto err2; + } + } + + edac_dev->op_state = OP_RUNNING_INTERRUPT; + } + + xgene_edac_soc_hw_init(edac_dev, 1); + + devres_remove_group(&pdev->dev, xgene_edac_soc_probe); + + dev_info(&pdev->dev, "X-Gene EDAC SoC registered\n"); + return 0; + +err2: + edac_device_del_device(&pdev->dev); +err1: + edac_device_free_ctl_info(edac_dev); +err: + devres_release_group(&pdev->dev, xgene_edac_soc_probe); + return rc; +} + +static int xgene_edac_soc_remove(struct platform_device *pdev) +{ + struct edac_device_ctl_info *edac_dev = dev_get_drvdata(&pdev->dev); + + xgene_edac_soc_hw_init(edac_dev, 0); + edac_device_del_device(&pdev->dev); + edac_device_free_ctl_info(edac_dev); + return 0; +} + +#ifdef CONFIG_OF +static struct of_device_id xgene_edac_soc_of_match[] = { + { .compatible = "apm,xgene-edac-soc" }, + {}, +}; +MODULE_DEVICE_TABLE(of, xgene_edac_soc_of_match); +#endif + +static struct platform_driver xgene_edac_soc_driver = { + .probe = xgene_edac_soc_probe, + .remove = xgene_edac_soc_remove, + .driver = { + .name = "xgene-edac-soc", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(xgene_edac_soc_of_match), + }, +}; + +static int __init xgene_edac_init(void) +{ + int rc; + + /* make sure error reporting method is sane */ + switch (edac_op_state) { + case EDAC_OPSTATE_POLL: + case EDAC_OPSTATE_INT: + break; + default: + edac_op_state = EDAC_OPSTATE_INT; + break; + } + + rc = platform_driver_register(&xgene_edac_mc_driver); + if (rc) + pr_warn(EDAC_MOD_STR "MCU fails to register\n"); + rc = platform_driver_register(&xgene_edac_pmd_driver); + if (rc) + pr_warn(EDAC_MOD_STR "PMD fails to register\n"); + rc = platform_driver_register(&xgene_edac_l3_driver); + if (rc) + pr_warn(EDAC_MOD_STR "L3 fails to register\n"); + rc = platform_driver_register(&xgene_edac_soc_driver); + if (rc) + pr_warn(EDAC_MOD_STR "SoC fails to register\n"); + return rc; +} +module_init(xgene_edac_init); + +static void __exit xgene_edac_exit(void) +{ + platform_driver_unregister(&xgene_edac_soc_driver); + platform_driver_unregister(&xgene_edac_l3_driver); + platform_driver_unregister(&xgene_edac_pmd_driver); + platform_driver_unregister(&xgene_edac_mc_driver); +} +module_exit(xgene_edac_exit); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Feng Kan <fkan@apm.com>"); +MODULE_DESCRIPTION("APM X-Gene EDAC driver"); +module_param(edac_op_state, int, 0444); +MODULE_PARM_DESC(edac_op_state, + "EDAC Error Reporting state: 0=Poll, 2=Interrupt"); -- 1.5.5 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/4] arm64: Add APM X-Gene SoC EDAC DTS entries 2014-05-08 23:03 ` [PATCH 3/4] edac: Add APM X-Gene SoC EDAC driver Loc Ho @ 2014-05-08 23:03 ` Loc Ho 2014-05-20 19:39 ` [PATCH 3/4] edac: Add APM X-Gene SoC EDAC driver Borislav Petkov 1 sibling, 0 replies; 11+ messages in thread From: Loc Ho @ 2014-05-08 23:03 UTC (permalink / raw) To: linux-arm-kernel This patch adds APM X-Gene SoC EDAC DTS entries. Signed-off-by: Feng Kan <fkan@apm.com> Signed-off-by: Loc Ho <lho@apm.com> --- arch/arm64/boot/dts/apm-storm.dtsi | 89 ++++++++++++++++++++++++++++++++++++ 1 files changed, 89 insertions(+), 0 deletions(-) diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi index 93f4b2d..aff6821 100644 --- a/arch/arm64/boot/dts/apm-storm.dtsi +++ b/arch/arm64/boot/dts/apm-storm.dtsi @@ -269,6 +269,95 @@ interrupts = <0x0 0x4c 0x4>; }; + edacmc0: edacmc0 at 7e800000 { + compatible = "apm,xgene-edac-mc"; + reg = <0x0 0x78800000 0x0 0x1000>, + <0x0 0x7e200000 0x0 0x1000>, + <0x0 0x7e700000 0x0 0x1000>, + <0x0 0x7e720000 0x0 0x1000>, + <0x0 0x7e800000 0x0 0x1000>; + interrupts = <0x0 0x20 0x4>; + }; + + edacmc1: edacmc1 at 7e840000 { + compatible = "apm,xgene-edac-mc"; + reg = <0x0 0x78800000 0x0 0x1000>, + <0x0 0x7e200000 0x0 0x1000>, + <0x0 0x7e700000 0x0 0x1000>, + <0x0 0x7e720000 0x0 0x1000>, + <0x0 0x7e840000 0x0 0x1000>; + interrupts = <0x0 0x20 0x4>; + }; + + edacmc2: edacmc2 at 7e880000 { + compatible = "apm,xgene-edac-mc"; + reg = <0x0 0x78800000 0x0 0x1000>, + <0x0 0x7e200000 0x0 0x1000>, + <0x0 0x7e700000 0x0 0x1000>, + <0x0 0x7e720000 0x0 0x1000>, + <0x0 0x7e880000 0x0 0x1000>; + interrupts = <0x0 0x20 0x4>; + }; + + edacmc3: edacmc3 at 7e8c0000 { + compatible = "apm,xgene-edac-mc"; + reg = <0x0 0x78800000 0x0 0x1000>, + <0x0 0x7e200000 0x0 0x1000>, + <0x0 0x7e700000 0x0 0x1000>, + <0x0 0x7e720000 0x0 0x1000>, + <0x0 0x7e8c0000 0x0 0x1000>; + interrupts = <0x0 0x20 0x4>; + }; + + edacpmd0: edacpmd0 at 7c000000 { + compatible = "apm,xgene-edac-pmd"; + reg = <0x0 0x78800000 0x0 0x1000>, + <0x0 0x7c000000 0x0 0x200000>; + interrupts = <0x0 0x20 0x4>, + <0x0 0x21 0x4>; + }; + + edacpmd1: edacpmd1 at 7c200000 { + compatible = "apm,xgene-edac-pmd"; + reg = <0x0 0x78800000 0x0 0x1000>, + <0x0 0x7c200000 0x0 0x200000>; + interrupts = <0x0 0x20 0x4>, + <0x0 0x21 0x4>; + }; + + edacpmd2: edacpmd2 at 7c400000 { + compatible = "apm,xgene-edac-pmd"; + reg = <0x0 0x78800000 0x0 0x1000>, + <0x0 0x7c400000 0x0 0x200000>; + interrupts = <0x0 0x20 0x4>, + <0x0 0x21 0x4>; + }; + + edacpmd3: edacpmd3 at 7c600000 { + compatible = "apm,xgene-edac-pmd"; + reg = <0x0 0x78800000 0x0 0x1000>, + <0x0 0x7c600000 0x0 0x200000>; + interrupts = <0x0 0x20 0x4>, + <0x0 0x21 0x4>; + }; + + edacl3: edacl3 at 7e600000 { + compatible = "apm,xgene-edac-l3"; + reg = <0x0 0x78800000 0x0 0x1000>, + <0x0 0x7e600000 0x0 0x1000>; + interrupts = <0x0 0x20 0x4>, + <0x0 0x21 0x4>; + }; + + edacsoc: edacsoc at 7e930000 { + compatible = "apm,xgene-edac-soc"; + reg = <0x0 0x78800000 0x0 0x1000>, + <0x0 0x7e930000 0x0 0x1000>; + interrupts = <0x0 0x20 0x4>, + <0x0 0x21 0x4>, + <0x0 0x27 0x4>; + }; + phy1: phy at 1f21a000 { compatible = "apm,xgene-phy"; reg = <0x0 0x1f21a000 0x0 0x100>; -- 1.5.5 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/4] edac: Add APM X-Gene SoC EDAC driver 2014-05-08 23:03 ` [PATCH 3/4] edac: Add APM X-Gene SoC EDAC driver Loc Ho 2014-05-08 23:03 ` [PATCH 4/4] arm64: Add APM X-Gene SoC EDAC DTS entries Loc Ho @ 2014-05-20 19:39 ` Borislav Petkov 2014-05-23 16:26 ` Loc Ho 1 sibling, 1 reply; 11+ messages in thread From: Borislav Petkov @ 2014-05-20 19:39 UTC (permalink / raw) To: linux-arm-kernel On Thu, May 08, 2014 at 05:03:18PM -0600, Loc Ho wrote: > This patch adds support for the APM X-Gene SoC EDAC driver and > requires ARM64 EDAC support patch [1] to compile. > > [1] http://www.spinics.net/lists/arm-kernel/msg324093.html > > Signed-off-by: Feng Kan <fkan@apm.com> > Signed-off-by: Loc Ho <lho@apm.com> > --- > drivers/edac/Kconfig | 9 +- > drivers/edac/Makefile | 3 + > drivers/edac/xgene_edac.c | 1915 +++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 1926 insertions(+), 1 deletions(-) > create mode 100644 drivers/edac/xgene_edac.c > > diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig > index 878f090..a945bfe 100644 > --- a/drivers/edac/Kconfig > +++ b/drivers/edac/Kconfig > @@ -10,7 +10,7 @@ config EDAC_SUPPORT > menuconfig EDAC > bool "EDAC (Error Detection And Correction) reporting" > depends on HAS_IOMEM > - depends on X86 || PPC || TILE || ARM || EDAC_SUPPORT > + depends on X86 || PPC || TILE || ARM || ARM64 || EDAC_SUPPORT > help > EDAC is designed to report errors in the core system. > These are low-level errors that are reported in the CPU or > @@ -368,4 +368,11 @@ config EDAC_OCTEON_PCI > Support for error detection and correction on the > Cavium Octeon family of SOCs. > > +config EDAC_XGENE > + tristate "APM X-Gene SoC Caches" you can drop "Caches". > + depends on EDAC_MM_EDAC && ARM64 > + help > + Support for error detection and correction on the > + APM X-Gene family of SOCs. > + > endif # EDAC > diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile > index 4154ed6..f408be4 100644 > --- a/drivers/edac/Makefile > +++ b/drivers/edac/Makefile > @@ -64,3 +64,6 @@ obj-$(CONFIG_EDAC_OCTEON_PC) += octeon_edac-pc.o > obj-$(CONFIG_EDAC_OCTEON_L2C) += octeon_edac-l2c.o > obj-$(CONFIG_EDAC_OCTEON_LMC) += octeon_edac-lmc.o > obj-$(CONFIG_EDAC_OCTEON_PCI) += octeon_edac-pci.o > + > +obj-$(CONFIG_EDAC_XGENE) += xgene_edac.o > + > diff --git a/drivers/edac/xgene_edac.c b/drivers/edac/xgene_edac.c > new file mode 100644 > index 0000000..4e05d50 > --- /dev/null > +++ b/drivers/edac/xgene_edac.c > @@ -0,0 +1,1915 @@ > +/* > + * APM X-Gene SoC EDAC (error detection and correction) Module > + * > + * Copyright (c) 2014, Applied Micro Circuits Corporation > + * Author: Feng Kan <fkan@apm.com> > + * Loc Ho <lho@apm.com> > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License as published by the > + * Free Software Foundation; either version 2 of the License, or (at your > + * option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program. If not, see <http://www.gnu.org/licenses/>. > + */ > + > +#include <linux/module.h> > +#include <linux/interrupt.h> > +#include <linux/ctype.h> > +#include <linux/edac.h> > +#include <linux/of.h> > +#include "edac_core.h" > + > +#define EDAC_MOD_STR "xgene_edac" > + > +static int edac_mc_idx; > +static DEFINE_MUTEX(xgene_edac_lock); > + > +/* Global Error CSR registers */ > +#define PCPHPERRINTSTS 0x0000 > +#define PCPHPERRINTMSK 0x0004 > +#define MCU_CTL_ERR_MASK 0x00001000 > +#define IOB_PA_ERR_MASK 0x00000800 > +#define IOB_BA_ERR_MASK 0x00000400 > +#define IOB_XGIC_ERR_MASK 0x00000200 > +#define IOB_RB_ERR_MASK 0x00000100 > +#define L3C_UNCORR_ERR_MASK 0x00000020 > +#define MCU_UNCORR_ERR_MASK 0x00000010 > +#define PMD3_MERR_MASK 0x00000008 > +#define PMD2_MERR_MASK 0x00000004 > +#define PMD1_MERR_MASK 0x00000002 > +#define PMD0_MERR_MASK 0x00000001 > +#define PCPLPERRINTSTS 0x0008 > +#define PCPLPERRINTMSK 0x000C > +#define CSW_SWITCH_TRACE_ERR_MASK 0x00000004 > +#define L3C_CORR_ERR_MASK 0x00000002 > +#define MCU_CORR_ERR_MASK 0x00000001 > +#define MEMERRINTSTS 0x0010 > +#define MEMERRINTMSK 0x0014 > + > +/* Memory Controller Error CSR/defines */ > +#define MCU_MAX_RANK 8 > +#define MCU_RANK_STRIDE 0x40 > + > +#define MCUGESR 0x0114 > +#define MCU_GESR_ADDRNOMATCH_ERR_MASK 0x00000080 > +#define MCU_GESR_ADDRMULTIMATCH_ERR_MASK 0x00000040 > +#define MCU_GESR_PHYP_ERR_MASK 0x00000008 > +#define MCUESRR0 0x0314 > +#define MCU_ESRR_MULTUCERR_MASK 0x00000008 > +#define MCU_ESRR_BACKUCERR_MASK 0x00000004 > +#define MCU_ESRR_DEMANDUCERR_MASK 0x00000002 > +#define MCU_ESRR_CERR_MASK 0x00000001 > +#define MCUESRRA0 0x0318 > +#define MCUEBLRR0 0x031c > +#define MCU_EBLRR_ERRBANK_RD(src) (((src) & 0x00000007) >> 0) > +#define MCUERCRR0 0x0320 > +#define MCU_ERCRR_ERRROW_RD(src) (((src) & 0xFFFF0000) >> 16) > +#define MCU_ERCRR_ERRCOL_RD(src) ((src) & 0x00000FFF) > +#define MCUSBECNT0 0x0324 > +#define MCU_SBECNT_COUNT(src) ((src) & 0xFFFF) > + > +#define CSW_CSWCR 0x0000 > +#define CSW_CSWCR_DUALMCB_MASK 0x00000001 > + > +#define MCBADDRMR 0x0000 > +#define MCBADDRMR_MCU_INTLV_MODE_MASK 0x00000008 > +#define MCBADDRMR_DUALMCU_MODE_MASK 0x00000004 > +#define MCBADDRMR_MCB_INTLV_MODE_MASK 0x00000002 > +#define MCBADDRMR_ADDRESS_MODE_MASK 0x00000001 For the single bits above you can use the BIT/BIT_64 macros for better readability. For example: #define MCBADDRMR_ADDRESS_MODE_MASK BIT(0) #define MCBADDRMR_MCB_INTLV_MODE_MASK BIT(1) and so on. Ditto for the defines below. > + > +struct xgene_edac_mc_ctx { > + char *name; > + void __iomem *pcp_csr; > + void __iomem *csw_csr; > + void __iomem *mcba_csr; > + void __iomem *mcbb_csr; > + void __iomem *mcu_csr; > +}; > + > +#define to_mci(k) container_of(k, struct mem_ctl_info, dev) > + > +static ssize_t xgene_edac_mc_inject_ctrl_show(struct device *dev, > + struct device_attribute *mattr, > + char *data) > +{ > + struct mem_ctl_info *mci = to_mci(dev); > + struct xgene_edac_mc_ctx *ctx = mci->pvt_info; > + int i; > + ssize_t ret_size = 0; > + > + for (i = 0; i < MCU_MAX_RANK; i++) { > + ret_size += sprintf(data, "0x%08X", > + readl(ctx->mcu_csr + MCUESRRA0 + > + i * MCU_RANK_STRIDE)); > + data += 10; > + if (i != (MCU_MAX_RANK - 1)) { > + ret_size += sprintf(data, " "); > + data++; > + } > + } > + return ret_size; > +} > + > +static ssize_t xgene_edac_mc_inject_ctrl_store(struct device *dev, > + struct device_attribute *mattr, > + const char *data, size_t count) > +{ > + struct mem_ctl_info *mci = to_mci(dev); > + struct xgene_edac_mc_ctx *ctx = mci->pvt_info; > + u32 val; > + int i; > + > + if (isdigit(*data)) { > + if (kstrtou32(data, 0, &val)) > + return 0; > + for (i = 0; i < MCU_MAX_RANK; i++) { > + writel(val, > + ctx->mcu_csr + MCUESRRA0 + i * MCU_RANK_STRIDE); > + } > + return count; > + } > + return 0; > +} > + > +DEVICE_ATTR(inject_ctrl, S_IRUGO | S_IWUSR, > + xgene_edac_mc_inject_ctrl_show, xgene_edac_mc_inject_ctrl_store); > + > +static int xgene_edac_mc_create_sysfs_attributes(struct mem_ctl_info *mci) > +{ > + return device_create_file(&mci->dev, &dev_attr_inject_ctrl); > +} > + > +static void xgene_edac_mc_remove_sysfs_attributes(struct mem_ctl_info *mci) > +{ > + device_remove_file(&mci->dev, &dev_attr_inject_ctrl); You want to have error injection functionality enabled by default? Not a good idea IMO as anyone would be able to inject. Normally, this functionality is behind CONFIG_EDAC_DEBUG or even a separate Kconfig option, off by default; see drivers/edac/Kconfig. > +static void xgene_edac_mc_check(struct mem_ctl_info *mci) > +{ > + struct xgene_edac_mc_ctx *ctx = mci->pvt_info; > + u32 pcp_hp_stat; > + u32 pcp_lp_stat; > + u32 reg; > + u32 rank; > + u32 bank; > + u32 count; > + u32 col_row; > + > + pcp_hp_stat = readl(ctx->pcp_csr + PCPHPERRINTSTS); > + pcp_lp_stat = readl(ctx->pcp_csr + PCPLPERRINTSTS); > + if (!((MCU_UNCORR_ERR_MASK & pcp_hp_stat) || > + (MCU_CTL_ERR_MASK & pcp_hp_stat) || > + (MCU_CORR_ERR_MASK & pcp_lp_stat))) > + return; > + > + for (rank = 0; rank < MCU_MAX_RANK; rank++) { > + reg = readl(ctx->mcu_csr + MCUESRR0 + rank * MCU_RANK_STRIDE); > + > + /* Detect uncorrectable memory error */ > + if (reg & (MCU_ESRR_DEMANDUCERR_MASK | > + MCU_ESRR_BACKUCERR_MASK)) { > + /* Detected uncorrectable memory error */ > + edac_mc_chipset_printk(mci, KERN_ERR, "X-Gene", > + "MCU uncorrectable error at rank %d\n", rank); > + > + /* Notify upper layer */ No need for that comment. > + edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, > + 1, 0, 0, 0, 0, 0, -1, mci->ctl_name, ""); > + } > + > + /* Detect correctable memory error */ > + if (reg & MCU_ESRR_CERR_MASK) { > + bank = readl(ctx->mcu_csr + MCUEBLRR0 + > + rank * MCU_RANK_STRIDE); > + col_row = readl(ctx->mcu_csr + MCUERCRR0 + > + rank * MCU_RANK_STRIDE); > + count = readl(ctx->mcu_csr + MCUSBECNT0 + > + rank * MCU_RANK_STRIDE); > + edac_mc_chipset_printk(mci, KERN_WARNING, "X-Gene", > + "MCU correctable error at rank %d bank %d column %d row %d count %d\n", > + rank, MCU_EBLRR_ERRBANK_RD(bank), > + MCU_ERCRR_ERRCOL_RD(col_row), > + MCU_ERCRR_ERRROW_RD(col_row), > + MCU_SBECNT_COUNT(count)); > + > + /* Notify upper layer */ Ditto. > + edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, > + 1, 0, 0, 0, 0, 0, -1, mci->ctl_name, ""); > + } > + > + /* Clear all error registers */ > + writel(0x0, ctx->mcu_csr + MCUEBLRR0 + rank * MCU_RANK_STRIDE); > + writel(0x0, ctx->mcu_csr + MCUERCRR0 + rank * MCU_RANK_STRIDE); > + writel(0x0, ctx->mcu_csr + MCUSBECNT0 + > + rank * MCU_RANK_STRIDE); > + writel(reg, ctx->mcu_csr + MCUESRR0 + rank * MCU_RANK_STRIDE); > + } > + > + /* Detect memory controller error */ > + reg = readl(ctx->mcu_csr + MCUGESR); > + if (reg) { > + if (reg & MCU_GESR_ADDRNOMATCH_ERR_MASK) > + edac_mc_chipset_printk(mci, KERN_WARNING, "X-Gene", > + "MCU address miss-match error\n"); > + if (reg & MCU_GESR_ADDRMULTIMATCH_ERR_MASK) > + edac_mc_chipset_printk(mci, KERN_WARNING, "X-Gene", > + "MCU address multi-match error\n"); > + > + writel(reg, ctx->mcu_csr + MCUGESR); > + } > +} > + > +static irqreturn_t xgene_edac_mc_isr(int irq, void *dev_id) > +{ > + struct mem_ctl_info *mci = dev_id; > + struct xgene_edac_mc_ctx *ctx = mci->pvt_info; > + u32 pcp_hp_stat; > + u32 pcp_lp_stat; > + > + pcp_hp_stat = readl(ctx->pcp_csr + PCPHPERRINTSTS); > + pcp_lp_stat = readl(ctx->pcp_csr + PCPLPERRINTSTS); > + if (!((MCU_UNCORR_ERR_MASK & pcp_hp_stat) || > + (MCU_CTL_ERR_MASK & pcp_hp_stat) || > + (MCU_CORR_ERR_MASK & pcp_lp_stat))) > + return IRQ_NONE; > + > + xgene_edac_mc_check(mci); > + > + return IRQ_HANDLED; > +} > + > +static void xgene_edac_mc_hw_init(struct mem_ctl_info *mci, bool enable) This function does init and deinit but it is called "..._init" - call it xgene_edac_mc_irq_control or ..._toggle or something in that sense. > +{ > + struct xgene_edac_mc_ctx *ctx = mci->pvt_info; > + u32 val; > + > + if (edac_op_state != EDAC_OPSTATE_INT) > + return; > + > + mutex_lock(&xgene_edac_lock); > + > + if (enable) { > + /* Enable memory controller top level interrupt */ > + val = readl(ctx->pcp_csr + PCPHPERRINTMSK); > + val &= ~(MCU_UNCORR_ERR_MASK | MCU_CTL_ERR_MASK); > + writel(val, ctx->pcp_csr + PCPHPERRINTMSK); > + } else { > + /* Disable memory controller top level interrupt */ > + val = readl(ctx->pcp_csr + PCPHPERRINTMSK); > + val |= MCU_UNCORR_ERR_MASK | MCU_CTL_ERR_MASK; > + writel(val, ctx->pcp_csr + PCPHPERRINTMSK); > + } > + > + mutex_unlock(&xgene_edac_lock); > +} > + > +static int xgene_edac_mc_is_active(struct xgene_edac_mc_ctx *ctx, int mc_idx) > +{ > + u32 reg; > + u32 mcu_mask; > + > + reg = readl(ctx->csw_csr + CSW_CSWCR); > + if (reg & CSW_CSWCR_DUALMCB_MASK) { > + /* > + * Dual MCB active - Determine if all 4 activie or just MCU0 Spellcheck: "activie" > + * and MCU2 active > + */ > + reg = readl(ctx->mcbb_csr + MCBADDRMR); > + mcu_mask = (reg & MCBADDRMR_DUALMCU_MODE_MASK) ? 0xF : 0x5; > + } else { > + /* > + * Single MCB active - Determine if MCU0/MCU1 or just MCU0 > + * active > + */ > + reg = readl(ctx->mcba_csr + MCBADDRMR); > + mcu_mask = (reg & MCBADDRMR_DUALMCU_MODE_MASK) ? 0x3 : 0x1; > + } > + > + return (mcu_mask & (1 << mc_idx)) ? 1 : 0; > +} > + > +static int xgene_edac_mc_probe(struct platform_device *pdev) > +{ > + struct mem_ctl_info *mci; > + struct edac_mc_layer layers[2]; > + struct xgene_edac_mc_ctx *ctx; > + struct resource *res; > + int rc = 0; > + > + if (!devres_open_group(&pdev->dev, xgene_edac_mc_probe, GFP_KERNEL)) > + return -ENOMEM; > + > + layers[0].type = EDAC_MC_LAYER_CHIP_SELECT; > + layers[0].size = 4; > + layers[0].is_virt_csrow = true; > + layers[1].type = EDAC_MC_LAYER_CHANNEL; > + layers[1].size = 2; > + layers[1].is_virt_csrow = false; > + mci = edac_mc_alloc(edac_mc_idx++, ARRAY_SIZE(layers), layers, > + sizeof(*ctx)); > + if (!mci) { > + rc = -ENOMEM; > + goto err_group; > + } > + > + ctx = mci->pvt_info; > + ctx->name = "xgene_edac_mc_err"; > + mci->pdev = &pdev->dev; > + dev_set_drvdata(mci->pdev, mci); > + mci->ctl_name = ctx->name; > + mci->dev_name = ctx->name; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + ctx->pcp_csr = devm_ioremap(&pdev->dev, res->start, > + resource_size(res)); > + if (IS_ERR(ctx->pcp_csr)) { > + dev_err(&pdev->dev, "no PCP resource address\n"); edac_printk(KERN_ERR, "X-Gene", ... Ditto for all other dev_err calls. > + rc = PTR_ERR(ctx->pcp_csr); > + goto err_free; > + } > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); > + ctx->csw_csr = devm_ioremap(&pdev->dev, res->start, > + resource_size(res)); > + if (IS_ERR(ctx->csw_csr)) { > + dev_err(&pdev->dev, "no CSW resource address\n"); > + rc = PTR_ERR(ctx->csw_csr); > + goto err_free; > + } > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 2); > + ctx->mcba_csr = devm_ioremap(&pdev->dev, res->start, > + resource_size(res)); > + if (IS_ERR(ctx->mcba_csr)) { > + dev_err(&pdev->dev, "no MCBA resource address\n"); > + rc = PTR_ERR(ctx->mcba_csr); > + goto err_free; > + } > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 3); > + ctx->mcbb_csr = devm_ioremap(&pdev->dev, res->start, > + resource_size(res)); > + if (IS_ERR(ctx->mcbb_csr)) { > + dev_err(&pdev->dev, "no MCBB resource address\n"); > + rc = PTR_ERR(ctx->mcbb_csr); > + goto err_free; > + } > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 4); > + ctx->mcu_csr = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(ctx->mcu_csr)) { > + dev_err(&pdev->dev, "no MCU resource address\n"); > + rc = PTR_ERR(ctx->mcu_csr); > + goto err_free; > + } > + /* Ignore non-active MCU */ > + if (!xgene_edac_mc_is_active(ctx, ((res->start >> 16) & 0xF) / 4)) { > + rc = -ENODEV; > + goto err_free; > + } You could move edac_mc_alloc() here, after the resources have been collected successfully and simplify the unwinding path. > + > + mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_RDDR2 | MEM_FLAG_RDDR3 | > + MEM_FLAG_DDR | MEM_FLAG_DDR2 | MEM_FLAG_DDR3; > + mci->edac_ctl_cap = EDAC_FLAG_SECDED; > + mci->edac_cap = EDAC_FLAG_SECDED; > + mci->mod_name = EDAC_MOD_STR; > + mci->mod_ver = "0.1"; > + mci->ctl_page_to_phys = NULL; > + mci->scrub_cap = SCRUB_FLAG_HW_SRC; > + mci->scrub_mode = SCRUB_HW_SRC; > + > + if (edac_op_state == EDAC_OPSTATE_POLL) > + mci->edac_check = xgene_edac_mc_check; > + > + if (edac_mc_add_mc(mci)) { > + dev_err(&pdev->dev, "failed add edac mc\n"); "edac_mc_add_mc failed\n" > + rc = -EINVAL; > + goto err_free; > + } > + > + if (xgene_edac_mc_create_sysfs_attributes(mci)) { > + dev_err(&pdev->dev, "failed create edac sysfs\n"); "Failed creating sysfs injection node\n" > + goto err_del; > + } > + > + if (edac_op_state == EDAC_OPSTATE_INT) { > + int irq = platform_get_irq(pdev, 0); > + if (irq < 0) { > + dev_err(&pdev->dev, "No IRQ resource\n"); > + rc = -EINVAL; > + goto err_sysfs; > + } > + rc = devm_request_irq(&pdev->dev, irq, > + xgene_edac_mc_isr, IRQF_SHARED, > + dev_name(&pdev->dev), mci); > + if (rc) { > + dev_err(&pdev->dev, "Could not request IRQ\n"); > + goto err_sysfs; > + } > + } > + > + xgene_edac_mc_hw_init(mci, 1); , true); > + > + devres_remove_group(&pdev->dev, xgene_edac_mc_probe); > + > + dev_info(&pdev->dev, "X-Gene EDAC MC registered\n"); > + return 0; > + > +err_sysfs: > + xgene_edac_mc_remove_sysfs_attributes(mci); > +err_del: > + edac_mc_del_mc(&pdev->dev); > +err_free: > + edac_mc_free(mci); > +err_group: > + devres_release_group(&pdev->dev, xgene_edac_mc_probe); > + return rc; > +} > + > +static int xgene_edac_mc_remove(struct platform_device *pdev) > +{ > + struct mem_ctl_info *mci = dev_get_drvdata(&pdev->dev); > + > + xgene_edac_mc_hw_init(mci, 0); false); > + xgene_edac_mc_remove_sysfs_attributes(mci); > + edac_mc_del_mc(&pdev->dev); > + edac_mc_free(mci); > + return 0; > +} > + > +#ifdef CONFIG_OF > +static struct of_device_id xgene_edac_mc_of_match[] = { > + { .compatible = "apm,xgene-edac-mc" }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, xgene_edac_of_match); > +#endif > + > +static struct platform_driver xgene_edac_mc_driver = { > + .probe = xgene_edac_mc_probe, > + .remove = xgene_edac_mc_remove, > + .driver = { > + .name = "xgene-edac-mc", > + .owner = THIS_MODULE, > + .of_match_table = of_match_ptr(xgene_edac_mc_of_match), > + }, > +}; > + > +/* CPU L1/L2 error device */ > +#define MAX_CPU_PER_PMD 2 > +#define CPU_CSR_STRIDE 0x00100000 > +#define CPU_L2C_PAGE 0x000D0000 > +#define CPU_MEMERR_L2C_PAGE 0x000E0000 > +#define CPU_MEMERR_CPU_PAGE 0x000F0000 > + > +#define MEMERR_CPU_ICFECR_PAGE_OFFSET 0x0000 > +#define MEMERR_CPU_ICFESR_PAGE_OFFSET 0x0004 > +#define MEMERR_CPU_ICFESR_ERRWAY_RD(src) (((src) & 0xFF000000) >> 24) > +#define MEMERR_CPU_ICFESR_ERRINDEX_RD(src) (((src) & 0x003F0000) >> 16) > +#define MEMERR_CPU_ICFESR_ERRINFO_RD(src) (((src) & 0x0000FF00) >> 8) > +#define MEMERR_CPU_ICFESR_ERRTYPE_RD(src) (((src) & 0x00000070) >> 4) > +#define MEMERR_CPU_ICFESR_MULTCERR_MASK 0x00000004 > +#define MEMERR_CPU_ICFESR_CERR_MASK 0x00000001 > +#define MEMERR_CPU_LSUESR_PAGE_OFFSET 0x000c > +#define MEMERR_CPU_LSUESR_ERRWAY_RD(src) (((src) & 0xFF000000) >> 24) > +#define MEMERR_CPU_LSUESR_ERRINDEX_RD(src) (((src) & 0x003F0000) >> 16) > +#define MEMERR_CPU_LSUESR_ERRINFO_RD(src) (((src) & 0x0000FF00) >> 8) > +#define MEMERR_CPU_LSUESR_ERRTYPE_RD(src) (((src) & 0x00000070) >> 4) > +#define MEMERR_CPU_LSUESR_MULTCERR_MASK 0x00000004 > +#define MEMERR_CPU_LSUESR_CERR_MASK 0x00000001 > +#define MEMERR_CPU_LSUECR_PAGE_OFFSET 0x0008 > +#define MEMERR_CPU_MMUECR_PAGE_OFFSET 0x0010 > +#define MEMERR_CPU_MMUESR_PAGE_OFFSET 0x0014 > +#define MEMERR_CPU_ICFESRA_PAGE_OFFSET 0x0804 > +#define MEMERR_CPU_LSUESRA_PAGE_OFFSET 0x080c > +#define MEMERR_CPU_MMUESRA_PAGE_OFFSET 0x0814 > + > +#define MEMERR_L2C_L2ECR_PAGE_OFFSET 0x0000 > +#define MEMERR_L2C_L2ESR_PAGE_OFFSET 0x0004 > +#define MEMERR_L2C_L2ESR_ERRSYN_RD(src) (((src) & 0xFF000000) >> 24) > +#define MEMERR_L2C_L2ESR_ERRWAY_RD(src) (((src) & 0x00FC0000) >> 18) > +#define MEMERR_L2C_L2ESR_ERRCPU_RD(src) (((src) & 0x00020000) >> 17) > +#define MEMERR_L2C_L2ESR_ERRGROUP_RD(src) (((src) & 0x0000E000) >> 13) > +#define MEMERR_L2C_L2ESR_ERRACTION_RD(src) (((src) & 0x00001C00) >> 10) > +#define MEMERR_L2C_L2ESR_ERRTYPE_RD(src) (((src) & 0x00000300) >> 8) > +#define MEMERR_L2C_L2ESR_MULTUCERR_MASK 0x00000008 > +#define MEMERR_L2C_L2ESR_MULTICERR_MASK 0x00000004 > +#define MEMERR_L2C_L2ESR_UCERR_MASK 0x00000002 > +#define MEMERR_L2C_L2ESR_ERR_MASK 0x00000001 > +#define MEMERR_L2C_L2EALR_PAGE_OFFSET 0x0008 > +#define CPUX_L2C_L2RTOCR_PAGE_OFFSET 0x0010 > +#define MEMERR_L2C_L2EAHR_PAGE_OFFSET 0x000c > +#define CPUX_L2C_L2RTOSR_PAGE_OFFSET 0x0014 > +#define CPUX_L2C_L2RTOALR_PAGE_OFFSET 0x0018 > +#define CPUX_L2C_L2RTOAHR_PAGE_OFFSET 0x001c > +#define MEMERR_L2C_L2ESRA_PAGE_OFFSET 0x0804 BIT() for the single bit definitions. > + > +struct xgene_edac_pmd_ctx { This is where you could use a comment. What is that PMD thing? > + struct device *dev; > + char *name; > + void __iomem *pcp_csr; > + void __iomem *pmd_csr; > + int pmd; > +}; > + > +static void xgene_edac_pmd_check(struct edac_device_ctl_info *edac_dev) > +{ > + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; > + u32 __iomem *pg_d; > + u32 __iomem *pg_e; > + u32 __iomem *pg_f; > + u32 pcp_hp_stat; > + u32 val_hi; > + u32 val_lo; > + u32 val; > + int i; > + > + pcp_hp_stat = readl(ctx->pcp_csr + PCPHPERRINTSTS); > + if (!((PMD0_MERR_MASK << ctx->pmd) & pcp_hp_stat)) > + return; > + > + /* Check CPU L1 error */ > + for (i = 0; i < MAX_CPU_PER_PMD; i++) { > + pg_f = ctx->pmd_csr + i * CPU_CSR_STRIDE + CPU_MEMERR_CPU_PAGE; > + > + val = readl(pg_f + MEMERR_CPU_ICFESR_PAGE_OFFSET); > + if (val) { > + dev_err(edac_dev->dev, > + "CPU%d L1 memory error ICF 0x%08X Way 0x%02X Index 0x%02X Info 0x%02X\n", > + ctx->pmd * MAX_CPU_PER_PMD + i, val, > + MEMERR_CPU_ICFESR_ERRWAY_RD(val), > + MEMERR_CPU_ICFESR_ERRINDEX_RD(val), > + MEMERR_CPU_ICFESR_ERRINFO_RD(val)); > + if (val & MEMERR_CPU_ICFESR_CERR_MASK) > + dev_err(edac_dev->dev, > + "One or more correctable error\n"); > + if (val & MEMERR_CPU_ICFESR_MULTCERR_MASK) > + dev_err(edac_dev->dev, > + "Multiple correctable error\n"); > + switch (MEMERR_CPU_ICFESR_ERRTYPE_RD(val)) { > + case 1: > + dev_err(edac_dev->dev, > + "L1 TLB multiple hit\n"); > + break; > + case 2: > + dev_err(edac_dev->dev, > + "Way select multiple hit\n"); > + break; > + case 3: > + dev_err(edac_dev->dev, > + "Physical tag parity error\n"); > + break; > + case 4: > + case 5: > + dev_err(edac_dev->dev, > + "L1 data parity error\n"); > + break; > + case 6: > + dev_err(edac_dev->dev, > + "L1 pre-decode parity error\n"); > + break; > + } > + writel(val, pg_f + MEMERR_CPU_ICFESRA_PAGE_OFFSET); > + if (val & (MEMERR_CPU_ICFESR_CERR_MASK | > + MEMERR_CPU_ICFESR_MULTCERR_MASK)) > + edac_device_handle_ce(edac_dev, 0, 0, > + edac_dev->ctl_name); > + } > + > + val = readl(pg_f + MEMERR_CPU_LSUESR_PAGE_OFFSET); > + if (val) { > + dev_err(edac_dev->dev, > + "CPU%d memory error LSU 0x%08X Way 0x%02X Index 0x%02X Info 0x%02X\n", > + ctx->pmd * MAX_CPU_PER_PMD + i, val, > + MEMERR_CPU_LSUESR_ERRWAY_RD(val), > + MEMERR_CPU_LSUESR_ERRINDEX_RD(val), > + MEMERR_CPU_LSUESR_ERRINFO_RD(val)); > + if (val & MEMERR_CPU_LSUESR_CERR_MASK) > + dev_err(edac_dev->dev, > + "One or more correctable error\n"); > + if (val & MEMERR_CPU_LSUESR_MULTCERR_MASK) > + dev_err(edac_dev->dev, > + "Multiple correctable error\n"); > + switch (MEMERR_CPU_LSUESR_ERRTYPE_RD(val)) { > + case 0: > + dev_err(edac_dev->dev, "Load tag error\n"); > + break; > + case 1: > + dev_err(edac_dev->dev, "Load data error\n"); > + break; > + case 2: > + dev_err(edac_dev->dev, "WSL multihit error\n"); > + break; > + case 3: > + dev_err(edac_dev->dev, "Store tag error\n"); > + break; > + case 4: > + dev_err(edac_dev->dev, > + "DTB multihit from load pipeline error\n"); > + break; > + case 5: > + dev_err(edac_dev->dev, > + "DTB multihit from store pipeline error\n"); > + break; > + } > + writel(val, pg_f + MEMERR_CPU_LSUESRA_PAGE_OFFSET); > + if (val & (MEMERR_CPU_LSUESR_CERR_MASK | > + MEMERR_CPU_LSUESR_MULTCERR_MASK)) > + edac_device_handle_ce(edac_dev, 0, 0, > + edac_dev->ctl_name); > + else > + edac_device_handle_ue(edac_dev, 0, 0, > + edac_dev->ctl_name); > + } > + > + val = readl(pg_f + MEMERR_CPU_MMUESR_PAGE_OFFSET); > + if (val) { > + dev_err(edac_dev->dev, > + "CPU%d memory error MMU 0x%08X\n", > + ctx->pmd * MAX_CPU_PER_PMD + i, val); > + writel(val, pg_f + MEMERR_CPU_MMUESRA_PAGE_OFFSET); > + edac_device_handle_ue(edac_dev, 0, 0, > + edac_dev->ctl_name); > + } > + } Up to here could be a separate function called __check_pmd_l1(u32 val, ) ... called by xgene_edac_pmd_check() > + > + /* Check L2 */ > + pg_e = ctx->pmd_csr + CPU_MEMERR_L2C_PAGE; > + val = readl(pg_e + MEMERR_L2C_L2ESR_PAGE_OFFSET); > + if (val) { > + val_lo = readl(pg_e + MEMERR_L2C_L2EALR_PAGE_OFFSET); > + val_hi = readl(pg_e + MEMERR_L2C_L2EAHR_PAGE_OFFSET); > + dev_err(edac_dev->dev, > + "PMD%d memory error L2C L2ESR 0x%08X @ 0x%08X.%08X\n", > + ctx->pmd, val, val_hi, val_lo); > + dev_err(edac_dev->dev, > + "ErrSyndrome 0x%02X ErrWay 0x%02X ErrCpu %d ErrGroup 0x%02X ErrAction 0x%02X\n", > + MEMERR_L2C_L2ESR_ERRSYN_RD(val), > + MEMERR_L2C_L2ESR_ERRWAY_RD(val), > + MEMERR_L2C_L2ESR_ERRCPU_RD(val), > + MEMERR_L2C_L2ESR_ERRGROUP_RD(val), > + MEMERR_L2C_L2ESR_ERRACTION_RD(val)); > + > + if (val & MEMERR_L2C_L2ESR_ERR_MASK) > + dev_err(edac_dev->dev, > + "One or more correctable error\n"); > + if (val & MEMERR_L2C_L2ESR_MULTICERR_MASK) > + dev_err(edac_dev->dev, "Multiple correctable error\n"); > + if (val & MEMERR_L2C_L2ESR_UCERR_MASK) > + dev_err(edac_dev->dev, > + "One or more uncorrectable error\n"); > + if (val & MEMERR_L2C_L2ESR_MULTUCERR_MASK) > + dev_err(edac_dev->dev, > + "Multiple uncorrectable error\n"); > + > + switch (MEMERR_L2C_L2ESR_ERRTYPE_RD(val)) { > + case 0: > + dev_err(edac_dev->dev, "Outbound SDB parity error\n"); > + break; > + case 1: > + dev_err(edac_dev->dev, "Inbound SDB parity error\n"); > + break; > + case 2: > + dev_err(edac_dev->dev, "Tag ECC error\n"); > + break; > + case 3: > + dev_err(edac_dev->dev, "Data ECC error\n"); > + break; > + } > + > + writel(0x0, pg_e + MEMERR_L2C_L2EALR_PAGE_OFFSET); > + writel(0x0, pg_e + MEMERR_L2C_L2EAHR_PAGE_OFFSET); > + writel(val, pg_e + MEMERR_L2C_L2ESRA_PAGE_OFFSET); > + > + if (val & (MEMERR_L2C_L2ESR_ERR_MASK | > + MEMERR_L2C_L2ESR_MULTICERR_MASK)) > + edac_device_handle_ce(edac_dev, 0, 0, > + edac_dev->ctl_name); > + if (val & (MEMERR_L2C_L2ESR_UCERR_MASK | > + MEMERR_L2C_L2ESR_MULTUCERR_MASK)) > + edac_device_handle_ue(edac_dev, 0, 0, > + edac_dev->ctl_name); > + } > + > + /* Check if any memory request timed out on L2 cache */ > + pg_d = ctx->pmd_csr + CPU_L2C_PAGE; > + val = readl(pg_d + CPUX_L2C_L2RTOSR_PAGE_OFFSET); > + if (val) { > + val_lo = readl(pg_d + CPUX_L2C_L2RTOALR_PAGE_OFFSET); > + val_hi = readl(pg_d + CPUX_L2C_L2RTOAHR_PAGE_OFFSET); > + dev_err(edac_dev->dev, > + "PMD%d L2C error L2C RTOSR 0x%08X @ 0x%08X.%08X\n", > + ctx->pmd, val, val_hi, val_lo); > + writel(0x0, pg_d + CPUX_L2C_L2RTOALR_PAGE_OFFSET); > + writel(0x0, pg_d + CPUX_L2C_L2RTOAHR_PAGE_OFFSET); > + writel(0x0, pg_d + CPUX_L2C_L2RTOSR_PAGE_OFFSET); > + } And this rest could be __check_pmd_l2(...) > +} > + > +static irqreturn_t xgene_edac_pmd_isr(int irq, void *dev_id) > +{ > + struct edac_device_ctl_info *edac_dev = dev_id; > + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; > + u32 pcp_hp_stat; > + > + pcp_hp_stat = readl(ctx->pcp_csr + PCPHPERRINTSTS); > + if (!(pcp_hp_stat & (PMD0_MERR_MASK << ctx->pmd))) > + return IRQ_NONE; > + > + xgene_edac_pmd_check(edac_dev); > + > + return IRQ_HANDLED; > +} > + > +static void xgene_edac_pmd_cpu_hw_cfg(struct edac_device_ctl_info *edac_dev, > + int cpu) > +{ > + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; > + void __iomem *pg_f = ctx->pmd_csr + cpu * CPU_CSR_STRIDE + > + CPU_MEMERR_CPU_PAGE; > + > + /* > + * Clear CPU memory error: > + * MEMERR_CPU_ICFESRA, MEMERR_CPU_LSUESRA, and MEMERR_CPU_MMUESRA > + */ > + writel(0x00000000, pg_f + MEMERR_CPU_ICFESRA_PAGE_OFFSET); > + writel(0x00000000, pg_f + MEMERR_CPU_LSUESRA_PAGE_OFFSET); > + writel(0x00000000, pg_f + MEMERR_CPU_MMUESRA_PAGE_OFFSET); > + > + /* > + * Enable CPU memory error: > + * MEMERR_CPU_ICFESRA, MEMERR_CPU_LSUESRA, and MEMERR_CPU_MMUESRA > + */ > + writel(0x00000301, pg_f + MEMERR_CPU_ICFECR_PAGE_OFFSET); > + writel(0x00000301, pg_f + MEMERR_CPU_LSUECR_PAGE_OFFSET); > + writel(0x00000101, pg_f + MEMERR_CPU_MMUECR_PAGE_OFFSET); > +} > + > +static void xgene_edac_pmd_hw_cfg(struct edac_device_ctl_info *edac_dev) > +{ > + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; > + void __iomem *pg_d = ctx->pmd_csr + CPU_L2C_PAGE; > + void __iomem *pg_e = ctx->pmd_csr + CPU_MEMERR_L2C_PAGE; > + > + /* > + * Clear PMD memory error: > + * MEMERR_L2C_L2ESRA, MEMERR_L2C_L2EALR, and MEMERR_L2C_L2EAHR > + */ > + writel(0x00000000, pg_e + MEMERR_L2C_L2ESRA_PAGE_OFFSET); > + writel(0x00000000, pg_e + MEMERR_L2C_L2EALR_PAGE_OFFSET); > + writel(0x00000000, pg_e + MEMERR_L2C_L2EAHR_PAGE_OFFSET); > + > + /* > + * Clear L2 error: > + * L2C_L2RTOSR, L2C_L2RTOALR, L2C_L2RTOAHR > + */ > + writel(0x00000000, pg_d + CPUX_L2C_L2RTOSR_PAGE_OFFSET); > + writel(0x00000000, pg_d + CPUX_L2C_L2RTOALR_PAGE_OFFSET); > + writel(0x00000000, pg_d + CPUX_L2C_L2RTOAHR_PAGE_OFFSET); > + > + /* Enable PMD memory error - MEMERR_L2C_L2ECR and L2C_L2RTOCR */ > + writel(0x00000703, pg_e + MEMERR_L2C_L2ECR_PAGE_OFFSET); > + writel(0x00000119, pg_d + CPUX_L2C_L2RTOCR_PAGE_OFFSET); > +} > + > +static void xgene_edac_pmd_hw_init(struct edac_device_ctl_info *edac_dev, Same issue: "_init" is misleading if it uninits too. > + bool enable) > +{ > + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; > + u32 val; > + > + /* Enable PMD error interrupt */ > + if (edac_dev->op_state == OP_RUNNING_INTERRUPT) { > + mutex_lock(&xgene_edac_lock); > + > + val = readl(ctx->pcp_csr + PCPHPERRINTMSK); > + if (enable) > + val &= ~(PMD0_MERR_MASK << ctx->pmd); > + else > + val |= PMD0_MERR_MASK << ctx->pmd; > + writel(val, ctx->pcp_csr + PCPHPERRINTMSK); > + > + mutex_unlock(&xgene_edac_lock); > + } > + > + if (enable) { > + xgene_edac_pmd_hw_cfg(edac_dev); > + > + /* Two CPU's per an PMD */ > + xgene_edac_pmd_cpu_hw_cfg(edac_dev, 0); > + xgene_edac_pmd_cpu_hw_cfg(edac_dev, 1); Why can't you do a loop for each cpu instead of passing it as an arg? > + } > +} > + > +static ssize_t xgene_edac_pmd_l1_inject_ctrl_show( > + struct edac_device_ctl_info *edac_dev, char *data) > +{ > + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; > + void __iomem *cpu0_pg_f = ctx->pmd_csr + CPU_MEMERR_CPU_PAGE; > + void __iomem *cpu1_pg_f = ctx->pmd_csr + CPU_CSR_STRIDE + > + CPU_MEMERR_CPU_PAGE; > + > + return sprintf(data, "0x%08X 0x%08X 0x%08X 0x%08X 0x%08X 0x%08X", > + readl(cpu0_pg_f + MEMERR_CPU_ICFESRA_PAGE_OFFSET), > + readl(cpu0_pg_f + MEMERR_CPU_LSUESRA_PAGE_OFFSET), > + readl(cpu0_pg_f + MEMERR_CPU_MMUESRA_PAGE_OFFSET), > + readl(cpu1_pg_f + MEMERR_CPU_ICFESRA_PAGE_OFFSET), > + readl(cpu1_pg_f + MEMERR_CPU_LSUESRA_PAGE_OFFSET), > + readl(cpu1_pg_f + MEMERR_CPU_MMUESRA_PAGE_OFFSET)); > +} > + > +static ssize_t xgene_edac_pmd_l1_inject_ctrl_store( > + struct edac_device_ctl_info *edac_dev, const char *data, size_t count) > +{ > + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; > + void __iomem *cpu0_pg_f = ctx->pmd_csr + CPU_MEMERR_CPU_PAGE; > + void __iomem *cpu1_pg_f = ctx->pmd_csr + CPU_CSR_STRIDE + > + CPU_MEMERR_CPU_PAGE; > + u32 val; > + > + if (isdigit(*data)) { > + if (kstrtou32(data, 0, &val)) > + return 0; > + writel(val, cpu0_pg_f + MEMERR_CPU_ICFESRA_PAGE_OFFSET); > + writel(val, cpu0_pg_f + MEMERR_CPU_LSUESRA_PAGE_OFFSET); > + writel(val, cpu0_pg_f + MEMERR_CPU_MMUESRA_PAGE_OFFSET); > + writel(val, cpu1_pg_f + MEMERR_CPU_ICFESRA_PAGE_OFFSET); > + writel(val, cpu1_pg_f + MEMERR_CPU_LSUESRA_PAGE_OFFSET); > + writel(val, cpu1_pg_f + MEMERR_CPU_MMUESRA_PAGE_OFFSET); > + return count; > + } > + return 0; > +} > + > +static ssize_t xgene_edac_pmd_l2_inject_ctrl_show( > + struct edac_device_ctl_info *edac_dev, char *data) > +{ > + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; > + void __iomem *pg_e = ctx->pmd_csr + CPU_MEMERR_L2C_PAGE; > + > + return sprintf(data, "0x%08X", > + readl(pg_e + MEMERR_L2C_L2ESRA_PAGE_OFFSET)); > +} > + > +static ssize_t xgene_edac_pmd_l2_inject_ctrl_store( > + struct edac_device_ctl_info *edac_dev, const char *data, size_t count) > +{ > + struct xgene_edac_pmd_ctx *ctx = edac_dev->pvt_info; > + void __iomem *pg_e = ctx->pmd_csr + CPU_MEMERR_L2C_PAGE; > + u32 val; > + > + if (isdigit(*data)) { > + if (kstrtou32(data, 0, &val)) > + return 0; > + writel(val, > + pg_e + MEMERR_L2C_L2ESRA_PAGE_OFFSET); > + return count; > + } > + return 0; > +} > + > +static struct edac_dev_sysfs_attribute xgene_edac_pmd_sysfs_attributes[] = { > + { .attr = { > + .name = "l1_inject_ctrl", > + .mode = (S_IRUGO | S_IWUSR) > + }, > + .show = xgene_edac_pmd_l1_inject_ctrl_show, > + .store = xgene_edac_pmd_l1_inject_ctrl_store }, > + { .attr = { > + .name = "l2_inject_ctrl", > + .mode = (S_IRUGO | S_IWUSR) > + }, > + .show = xgene_edac_pmd_l2_inject_ctrl_show, > + .store = xgene_edac_pmd_l2_inject_ctrl_store }, > + > + /* End of list */ > + { .attr = {.name = NULL } } > +}; Same issue: injection should not be enabled by default. > + > +static int xgene_edac_pmd_probe(struct platform_device *pdev) > +{ > + struct edac_device_ctl_info *edac_dev; > + struct xgene_edac_pmd_ctx *ctx; > + char edac_name[10]; > + struct resource *res; > + int pmd; > + int rc = 0; > + > + if (!devres_open_group(&pdev->dev, xgene_edac_pmd_probe, GFP_KERNEL)) > + return -ENOMEM; > + > + /* Find the PMD number from its address */ > + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); > + if (resource_size(res) <= 0) { > + rc = -ENODEV; > + goto err_group; > + } > + pmd = ((res->start >> 20) & 0x1E) / 2; "/ 2" can be done faster with ">> 1". > + > + sprintf(edac_name, "l2c%d", pmd); > + edac_dev = edac_device_alloc_ctl_info(sizeof(*ctx), > + edac_name, 1, "l2c", 1, 2, NULL, > + 0, edac_device_alloc_index()); > + if (!edac_dev) { > + rc = -ENOMEM; > + goto err_group; > + } > + > + ctx = edac_dev->pvt_info; > + ctx->name = "xgene_pmd_err"; > + ctx->pmd = pmd; > + edac_dev->dev = &pdev->dev; > + dev_set_drvdata(edac_dev->dev, edac_dev); > + edac_dev->ctl_name = ctx->name; > + edac_dev->dev_name = ctx->name; > + edac_dev->mod_name = EDAC_MOD_STR; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res can be NULL here and resource_size derefs it. > + ctx->pcp_csr = devm_ioremap(&pdev->dev, res->start, resource_size(res)); > + if (IS_ERR(ctx->pcp_csr)) { > + dev_err(&pdev->dev, "no PCP resource address\n"); > + rc = PTR_ERR(ctx->pcp_csr); > + goto err_free; > + } > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); Ditto. > + ctx->pmd_csr = devm_ioremap(&pdev->dev, res->start, resource_size(res)); > + if (IS_ERR(ctx->pmd_csr)) { > + dev_err(&pdev->dev, "no PMD resource address\n"); > + rc = PTR_ERR(ctx->pmd_csr); > + goto err_free; > + } > + > + if (edac_op_state == EDAC_OPSTATE_POLL) > + edac_dev->edac_check = xgene_edac_pmd_check; > + > + edac_dev->sysfs_attributes = xgene_edac_pmd_sysfs_attributes; > + > + rc = edac_device_add_device(edac_dev); > + if (rc > 0) { > + dev_err(&pdev->dev, "failed edac_device_add_device()\n"); > + /* > + * NOTE: Can't use return value from edac_device_add_device > + * as it is 1 on failure > + */ > + rc = -ENOMEM; > + goto err_free; > + } > + > + if (edac_op_state == EDAC_OPSTATE_INT) { > + int irq = platform_get_irq(pdev, 0); > + if (irq < 0) { > + dev_err(&pdev->dev, "No IRQ resource\n"); > + rc = -EINVAL; > + goto err_del; > + } > + rc = devm_request_irq(&pdev->dev, irq, > + xgene_edac_pmd_isr, IRQF_SHARED, > + dev_name(&pdev->dev), edac_dev); > + if (rc) { > + dev_err(&pdev->dev, "Could not request IRQ %d\n", irq); > + goto err_del; > + } > + edac_dev->op_state = OP_RUNNING_INTERRUPT; > + } > + > + xgene_edac_pmd_hw_init(edac_dev, 1); > + > + devres_remove_group(&pdev->dev, xgene_edac_pmd_probe); > + > + dev_info(&pdev->dev, "X-Gene EDAC PMD registered\n"); > + return 0; > + > +err_del: > + edac_device_del_device(&pdev->dev); > +err_free: > + edac_device_free_ctl_info(edac_dev); > +err_group: > + devres_release_group(&pdev->dev, xgene_edac_pmd_probe); > + return rc; > +} > + > +static int xgene_edac_pmd_remove(struct platform_device *pdev) > +{ > + struct edac_device_ctl_info *edac_dev = dev_get_drvdata(&pdev->dev); > + > + xgene_edac_pmd_hw_init(edac_dev, 0); > + edac_device_del_device(&pdev->dev); > + edac_device_free_ctl_info(edac_dev); > + return 0; > +} > + > +#ifdef CONFIG_OF > +static struct of_device_id xgene_edac_pmd_of_match[] = { > + { .compatible = "apm,xgene-edac-pmd" }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, xgene_edac_pmd_of_match); > +#endif > + > +static struct platform_driver xgene_edac_pmd_driver = { > + .probe = xgene_edac_pmd_probe, > + .remove = xgene_edac_pmd_remove, > + .driver = { > + .name = "xgene-edac-pmd", > + .owner = THIS_MODULE, > + .of_match_table = of_match_ptr(xgene_edac_pmd_of_match), > + }, > +}; > + > +/* L3 Error device */ > +#define L3C_ESR (0x0A * 4) > +#define L3C_ESR_DATATAG_MASK 0x00000200 > +#define L3C_ESR_MULTIHIT_MASK 0x00000100 > +#define L3C_ESR_UCEVICT_MASK 0x00000040 > +#define L3C_ESR_MULTIUCERR_MASK 0x00000020 > +#define L3C_ESR_MULTICERR_MASK 0x00000010 > +#define L3C_ESR_UCERR_MASK 0x00000008 > +#define L3C_ESR_CERR_MASK 0x00000004 > +#define L3C_ESR_UCERRINTR_MASK 0x00000002 > +#define L3C_ESR_CERRINTR_MASK 0x00000001 > +#define L3C_ECR (0x0B * 4) > +#define L3C_ECR_UCINTREN 0x00000008 > +#define L3C_ECR_CINTREN 0x00000004 > +#define L3C_UCERREN 0x00000002 > +#define L3C_CERREN 0x00000001 > +#define L3C_ELR (0x0C * 4) > +#define L3C_ELR_ERRSYN(src) ((src & 0xFF800000) >> 23) > +#define L3C_ELR_ERRWAY(src) ((src & 0x007E0000) >> 17) > +#define L3C_ELR_AGENTID(src) ((src & 0x0001E000) >> 13) > +#define L3C_ELR_ERRGRP(src) ((src & 0x00000F00) >> 8) > +#define L3C_ELR_OPTYPE(src) ((src & 0x000000F0) >> 4) > +#define L3C_ELR_PADDRHIGH(src) (src & 0x0000000F) > +#define L3C_AELR (0x0D * 4) > +#define L3C_BELR (0x0E * 4) > +#define L3C_BELR_BANK(src) (src & 0x0000000F) BIT() for the single bit defines. > + > +struct xgene_edac_dev_ctx { > + char *name; > + int edac_idx; > + void __iomem *pcp_csr; > + void __iomem *dev_csr; > +}; > + > +static void xgene_edac_l3_check(struct edac_device_ctl_info *edac_dev) > +{ > + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; > + u32 l3cesr; > + u32 l3celr; > + u32 l3caelr; > + u32 l3cbelr; > + > + l3cesr = readl(ctx->dev_csr + L3C_ESR); > + if (!(l3cesr & (L3C_ESR_UCERR_MASK | L3C_ESR_CERR_MASK))) > + return; > + > + if (l3cesr & L3C_ESR_UCERR_MASK) > + dev_err(edac_dev->dev, "L3C uncorrectable error\n"); > + if (l3cesr & L3C_ESR_CERR_MASK) > + dev_warn(edac_dev->dev, "L3C correctable error\n"); > + > + l3celr = readl(ctx->dev_csr + L3C_ELR); > + l3caelr = readl(ctx->dev_csr + L3C_AELR); > + l3cbelr = readl(ctx->dev_csr + L3C_BELR); > + if (l3cesr & L3C_ESR_MULTIHIT_MASK) > + dev_err(edac_dev->dev, "L3C multiple hit error\n"); > + if (l3cesr & L3C_ESR_UCEVICT_MASK) > + dev_err(edac_dev->dev, > + "L3C dropped eviction of line with error\n"); > + if (l3cesr & L3C_ESR_MULTIUCERR_MASK) > + dev_err(edac_dev->dev, "L3C multiple uncorrectable error\n"); > + if (l3cesr & L3C_ESR_DATATAG_MASK) > + dev_err(edac_dev->dev, > + "L3C data error syndrome 0x%X group 0x%X\n", > + L3C_ELR_ERRSYN(l3celr), L3C_ELR_ERRGRP(l3celr)); > + else > + dev_err(edac_dev->dev, > + "L3C tag error syndrome 0x%X Way of Tag 0x%X Agent ID 0x%X Operation type 0x%X\n", > + L3C_ELR_ERRSYN(l3celr), L3C_ELR_ERRWAY(l3celr), > + L3C_ELR_AGENTID(l3celr), L3C_ELR_OPTYPE(l3celr)); > + /* > + * NOTE: Address [41:38] in L3C_ELR_PADDRHIGH(l3celr). > + * Address [37:6] in l3caelr. Lower 6 bits are zero. > + */ > + dev_err(edac_dev->dev, "L3C error address 0x%08X.%08X bank %d\n", > + L3C_ELR_PADDRHIGH(l3celr) << 6 | (l3caelr >> 26), > + (l3caelr & 0x3FFFFFFF) << 6, L3C_BELR_BANK(l3cbelr)); > + dev_err(edac_dev->dev, > + "L3C error status register value 0x%X\n", l3cesr); > + > + /* Clear L3C error interrupt */ > + writel(0, ctx->dev_csr + L3C_ESR); > + > + if (l3cesr & L3C_ESR_CERR_MASK) > + edac_device_handle_ce(edac_dev, 0, 0, edac_dev->ctl_name); > + if (l3cesr & L3C_ESR_UCERR_MASK) > + edac_device_handle_ue(edac_dev, 0, 0, edac_dev->ctl_name); > +} > + > +static irqreturn_t xgene_edac_l3_isr(int irq, void *dev_id) > +{ > + struct edac_device_ctl_info *edac_dev = dev_id; > + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; > + u32 l3cesr; > + > + l3cesr = readl(ctx->dev_csr + L3C_ESR); > + if (!(l3cesr & (L3C_ESR_UCERRINTR_MASK | L3C_ESR_CERRINTR_MASK))) > + return IRQ_NONE; > + > + xgene_edac_l3_check(edac_dev); > + > + return IRQ_HANDLED; > +} > + > +static void xgene_edac_l3_hw_init(struct edac_device_ctl_info *edac_dev, > + bool enable) As above, _init should be something else, _control, _toggle, whatever. > +{ > + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; > + u32 val; > + > + val = readl(ctx->dev_csr + L3C_ECR); > + val |= L3C_UCERREN | L3C_CERREN; > + /* On disable, we just disable interrupt but keep error enabled */ > + if (edac_dev->op_state == OP_RUNNING_INTERRUPT) { > + if (enable) > + val |= L3C_ECR_UCINTREN | L3C_ECR_CINTREN; > + else > + val &= ~(L3C_ECR_UCINTREN | L3C_ECR_CINTREN); > + } > + writel(val, ctx->dev_csr + L3C_ECR); > + > + mutex_lock(&xgene_edac_lock); > + > + if (edac_dev->op_state == OP_RUNNING_INTERRUPT) { > + /* Enable L3C error top level interrupt */ > + val = readl(ctx->pcp_csr + PCPHPERRINTMSK); > + if (enable) > + val &= ~L3C_UNCORR_ERR_MASK; > + else > + val |= L3C_UNCORR_ERR_MASK; > + writel(val, ctx->pcp_csr + PCPHPERRINTMSK); > + val = readl(ctx->pcp_csr + PCPLPERRINTMSK); > + if (enable) > + val &= ~L3C_CORR_ERR_MASK; > + else > + val |= L3C_CORR_ERR_MASK; > + writel(val, ctx->pcp_csr + PCPLPERRINTMSK); > + } > + > + mutex_unlock(&xgene_edac_lock); > +} > + > +static ssize_t xgene_edac_l3_inject_ctrl_show( > + struct edac_device_ctl_info *edac_dev, char *data) > +{ > + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; > + > + return sprintf(data, "0x%08X", readl(ctx->dev_csr + L3C_ESR)); > +} > + > +static ssize_t xgene_edac_l3_inject_ctrl_store( > + struct edac_device_ctl_info *edac_dev, const char *data, size_t count) > +{ > + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; > + u32 val; > + > + if (isdigit(*data)) { > + if (kstrtou32(data, 0, &val)) > + return 0; > + writel(val, ctx->dev_csr + L3C_ESR); > + return count; > + } > + return 0; > +} > + > +static struct edac_dev_sysfs_attribute xgene_edac_l3_sysfs_attributes[] = { > + { .attr = { > + .name = "inject_ctrl", > + .mode = (S_IRUGO | S_IWUSR) > + }, > + .show = xgene_edac_l3_inject_ctrl_show, > + .store = xgene_edac_l3_inject_ctrl_store }, > + > + /* End of list */ > + { .attr = {.name = NULL } } > +}; Ditto about exposing error injection by default. > + > +static int xgene_edac_l3_probe(struct platform_device *pdev) > +{ > + struct edac_device_ctl_info *edac_dev; > + struct xgene_edac_dev_ctx *ctx; > + struct resource *res; > + int rc = 0; > + > + if (!devres_open_group(&pdev->dev, xgene_edac_l3_probe, GFP_KERNEL)) > + return -ENOMEM; > + > + edac_dev = edac_device_alloc_ctl_info(sizeof(*ctx), > + "l3c", 1, "l3c", 1, 0, NULL, 0, > + edac_device_alloc_index()); > + if (!edac_dev) { > + rc = -ENOMEM; > + goto err; > + } > + > + ctx = edac_dev->pvt_info; > + ctx->name = "xgene_l3_err"; > + edac_dev->dev = &pdev->dev; > + dev_set_drvdata(edac_dev->dev, edac_dev); > + edac_dev->ctl_name = ctx->name; > + edac_dev->dev_name = ctx->name; > + edac_dev->mod_name = EDAC_MOD_STR; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); You need to check res. Ditto for the rest of the driver where you stick platform_get_resource retval into resource_size(). > + ctx->pcp_csr = devm_ioremap(&pdev->dev, res->start, resource_size(res)); > + if (IS_ERR(ctx->pcp_csr)) { > + dev_err(&pdev->dev, "no PCP resource address\n"); > + rc = PTR_ERR(ctx->pcp_csr); > + goto err1; > + } > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); > + ctx->dev_csr = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(ctx->dev_csr)) { > + dev_err(&pdev->dev, "no L3 resource address\n"); > + rc = PTR_ERR(ctx->dev_csr); > + goto err1; > + } > + > + if (edac_op_state == EDAC_OPSTATE_POLL) > + edac_dev->edac_check = xgene_edac_l3_check; > + > + edac_dev->sysfs_attributes = xgene_edac_l3_sysfs_attributes; > + > + rc = edac_device_add_device(edac_dev); > + if (rc > 0) { > + dev_err(&pdev->dev, "failed edac_device_add_device()\n"); > + /* > + * NOTE: Can't use return value from edac_device_add_device > + * as it is 1 on failure > + */ No need for that comment. > + rc = -ENOMEM; > + goto err1; > + } > + > + if (edac_op_state == EDAC_OPSTATE_INT) { > + int irq; > + int i; > + > + for (i = 0; i < 2; i++) { > + irq = platform_get_irq(pdev, i); > + if (irq < 0) { > + dev_err(&pdev->dev, "No IRQ resource\n"); > + rc = -EINVAL; > + goto err2; > + } > + rc = devm_request_irq(&pdev->dev, irq, > + xgene_edac_l3_isr, IRQF_SHARED, > + dev_name(&pdev->dev), edac_dev); > + if (rc) { > + dev_err(&pdev->dev, > + "Could not request IRQ %d\n", irq); > + goto err2; > + } > + } > + edac_dev->op_state = OP_RUNNING_INTERRUPT; > + } > + > + xgene_edac_l3_hw_init(edac_dev, 1); > + > + devres_remove_group(&pdev->dev, xgene_edac_l3_probe); > + > + dev_info(&pdev->dev, "X-Gene EDAC L3 registered\n"); > + return 0; > + > +err2: > + edac_device_del_device(&pdev->dev); > +err1: > + edac_device_free_ctl_info(edac_dev); > +err: > + devres_release_group(&pdev->dev, xgene_edac_l3_probe); > + return rc; > +} > + > +static int xgene_edac_l3_remove(struct platform_device *pdev) > +{ > + struct edac_device_ctl_info *edac_dev = dev_get_drvdata(&pdev->dev); > + > + xgene_edac_l3_hw_init(edac_dev, 0); > + edac_device_del_device(&pdev->dev); > + edac_device_free_ctl_info(edac_dev); > + return 0; > +} > + > +#ifdef CONFIG_OF > +static struct of_device_id xgene_edac_l3_of_match[] = { > + { .compatible = "apm,xgene-edac-l3" }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, xgene_edac_l3_of_match); > +#endif > + > +static struct platform_driver xgene_edac_l3_driver = { > + .probe = xgene_edac_l3_probe, > + .remove = xgene_edac_l3_remove, > + .driver = { > + .name = "xgene-edac-l3", > + .owner = THIS_MODULE, > + .of_match_table = of_match_ptr(xgene_edac_l3_of_match), > + }, > +}; > + > +/* SoC Error device */ > +#define IOBAXIS0TRANSERRINTSTS 0x0000 > +#define IOBAXIS0_M_ILLEGAL_ACCESS_MASK 0x00000002 > +#define IOBAXIS0_ILLEGAL_ACCESS_MASK 0x00000001 > +#define IOBAXIS0TRANSERRINTMSK 0x0004 > +#define IOBAXIS0TRANSERRREQINFOL 0x0008 > +#define IOBAXIS0TRANSERRREQINFOH 0x000c > +#define REQTYPE_RD(src) (((src) & 0x00000001)) > +#define ERRADDRH_RD(src) (((src) & 0xffc00000) >> 22) > +#define IOBAXIS1TRANSERRINTSTS 0x0010 > +#define IOBAXIS1TRANSERRINTMSK 0x0014 > +#define IOBAXIS1TRANSERRREQINFOL 0x0018 > +#define IOBAXIS1TRANSERRREQINFOH 0x001c > +#define IOBPATRANSERRINTSTS 0x0020 > +#define IOBPA_M_REQIDRAM_CORRUPT_MASK 0x00000080 > +#define IOBPA_REQIDRAM_CORRUPT_MASK 0x00000040 > +#define IOBPA_M_TRANS_CORRUPT_MASK 0x00000020 > +#define IOBPA_TRANS_CORRUPT_MASK 0x00000010 > +#define IOBPA_M_WDATA_CORRUPT_MASK 0x00000008 > +#define IOBPA_WDATA_CORRUPT_MASK 0x00000004 > +#define IOBPA_M_RDATA_CORRUPT_MASK 0x00000002 > +#define IOBPA_RDATA_CORRUPT_MASK 0x00000001 > +#define IOBBATRANSERRINTSTS 0x0030 > +#define M_ILLEGAL_ACCESS_MASK 0x00008000 > +#define ILLEGAL_ACCESS_MASK 0x00004000 > +#define M_WIDRAM_CORRUPT_MASK 0x00002000 > +#define WIDRAM_CORRUPT_MASK 0x00001000 > +#define M_RIDRAM_CORRUPT_MASK 0x00000800 > +#define RIDRAM_CORRUPT_MASK 0x00000400 > +#define M_TRANS_CORRUPT_MASK 0x00000200 > +#define TRANS_CORRUPT_MASK 0x00000100 > +#define M_WDATA_CORRUPT_MASK 0x00000080 > +#define WDATA_CORRUPT_MASK 0x00000040 > +#define M_RBM_POISONED_REQ_MASK 0x00000020 > +#define RBM_POISONED_REQ_MASK 0x00000010 > +#define M_XGIC_POISONED_REQ_MASK 0x00000008 > +#define XGIC_POISONED_REQ_MASK 0x00000004 > +#define M_WRERR_RESP_MASK 0x00000002 > +#define WRERR_RESP_MASK 0x00000001 > +#define IOBBATRANSERRREQINFOL 0x0038 > +#define IOBBATRANSERRREQINFOH 0x003c > +#define REQTYPE_F2_RD(src) (((src) & 0x00000001)) > +#define ERRADDRH_F2_RD(src) (((src) & 0xffc00000) >> 22) > +#define IOBBATRANSERRCSWREQID 0x0040 > +#define XGICTRANSERRINTSTS 0x0050 > +#define M_WR_ACCESS_ERR_MASK 0x00000008 > +#define WR_ACCESS_ERR_MASK 0x00000004 > +#define M_RD_ACCESS_ERR_MASK 0x00000002 > +#define RD_ACCESS_ERR_MASK 0x00000001 > +#define XGICTRANSERRINTMSK 0x0054 > +#define XGICTRANSERRREQINFO 0x0058 > +#define REQTYPE_MASK 0x04000000 > +#define ERRADDR_RD(src) ((src) & 0x03ffffff) > +#define GLBL_ERR_STS 0x0800 > +#define MDED_ERR_MASK 0x00000008 > +#define DED_ERR_MASK 0x00000004 > +#define MSEC_ERR_MASK 0x00000002 > +#define SEC_ERR_MASK 0x00000001 > +#define GLBL_SEC_ERRL 0x0810 > +#define GLBL_SEC_ERRH 0x0818 > +#define GLBL_MSEC_ERRL 0x0820 > +#define GLBL_MSEC_ERRH 0x0828 > +#define GLBL_DED_ERRL 0x0830 > +#define GLBL_DED_ERRLMASK 0x0834 > +#define GLBL_DED_ERRH 0x0838 > +#define GLBL_DED_ERRHMASK 0x083c > +#define GLBL_MDED_ERRL 0x0840 > +#define GLBL_MDED_ERRLMASK 0x0844 > +#define GLBL_MDED_ERRH 0x0848 > +#define GLBL_MDED_ERRHMASK 0x084c BIT()... > + > +static void xgene_edac_iob_gic_report(struct edac_device_ctl_info *edac_dev) > +{ > + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; > + u32 err_addr_lo; > + u32 err_addr_hi; > + u32 reg; > + u32 info; > + > + /* GIC transaction error interrupt */ > + reg = readl(ctx->dev_csr + XGICTRANSERRINTSTS); > + if (reg) { > + dev_err(edac_dev->dev, "XGIC transaction error\n"); > + if (reg & RD_ACCESS_ERR_MASK) > + dev_err(edac_dev->dev, "XGIC read size error\n"); > + if (reg & M_RD_ACCESS_ERR_MASK) > + dev_err(edac_dev->dev, > + "Multiple XGIC read size error\n"); > + if (reg & WR_ACCESS_ERR_MASK) > + dev_err(edac_dev->dev, "XGIC write size error\n"); > + if (reg & M_WR_ACCESS_ERR_MASK) > + dev_err(edac_dev->dev, > + "Multiple XGIC write size error\n"); > + info = readl(ctx->dev_csr + XGICTRANSERRREQINFO); > + dev_err(edac_dev->dev, "XGIC %s access @ 0x%08X (0x%08X)\n", > + info & REQTYPE_MASK ? "read" : "write", > + ERRADDR_RD(info), info); > + writel(reg, ctx->dev_csr + XGICTRANSERRINTSTS); > + } > + > + /* IOB memory error */ > + reg = readl(ctx->dev_csr + GLBL_ERR_STS); > + if (reg) { > + if (reg & SEC_ERR_MASK) { > + err_addr_lo = readl(ctx->dev_csr + GLBL_SEC_ERRL); > + err_addr_hi = readl(ctx->dev_csr + GLBL_SEC_ERRH); > + dev_err(edac_dev->dev, > + "IOB single-bit correctable memory at 0x%08X.%08X error\n", > + err_addr_lo, err_addr_hi); > + writel(err_addr_lo, ctx->dev_csr + GLBL_SEC_ERRL); > + writel(err_addr_hi, ctx->dev_csr + GLBL_SEC_ERRH); > + } > + if (reg & MSEC_ERR_MASK) { > + err_addr_lo = readl(ctx->dev_csr + GLBL_MSEC_ERRL); > + err_addr_hi = readl(ctx->dev_csr + GLBL_MSEC_ERRH); > + dev_err(edac_dev->dev, > + "IOB multiple single-bit correctable memory at 0x%08X.%08X error\n", > + err_addr_lo, err_addr_hi); > + writel(err_addr_lo, ctx->dev_csr + GLBL_MSEC_ERRL); > + writel(err_addr_hi, ctx->dev_csr + GLBL_MSEC_ERRH); > + } > + if (reg & (SEC_ERR_MASK | MSEC_ERR_MASK)) > + edac_device_handle_ce(edac_dev, 0, 0, > + edac_dev->ctl_name); > + > + if (reg & DED_ERR_MASK) { > + err_addr_lo = readl(ctx->dev_csr + GLBL_DED_ERRL); > + err_addr_hi = readl(ctx->dev_csr + GLBL_DED_ERRH); > + dev_err(edac_dev->dev, > + "IOB double-bit uncorrectable memory at 0x%08X.%08X error\n", > + err_addr_lo, err_addr_hi); > + writel(err_addr_lo, ctx->dev_csr + GLBL_DED_ERRL); > + writel(err_addr_hi, ctx->dev_csr + GLBL_DED_ERRH); > + } > + if (reg & MDED_ERR_MASK) { > + err_addr_lo = readl(ctx->dev_csr + GLBL_MDED_ERRL); > + err_addr_hi = readl(ctx->dev_csr + GLBL_MDED_ERRH); > + dev_err(edac_dev->dev, > + "Multiple IOB double-bit uncorrectable memory at 0x%08X.%08X error\n", > + err_addr_lo, err_addr_hi); > + writel(err_addr_lo, ctx->dev_csr + GLBL_MDED_ERRL); > + writel(err_addr_hi, ctx->dev_csr + GLBL_MDED_ERRH); > + } > + if (reg & (DED_ERR_MASK | MDED_ERR_MASK)) > + edac_device_handle_ue(edac_dev, 0, 0, > + edac_dev->ctl_name); > + } > +} > + > +static void xgene_edac_rb_report(struct edac_device_ctl_info *edac_dev) > +{ > + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; > + u32 err_addr_lo; > + u32 err_addr_hi; > + u32 reg; > + > + /* IOB Bridge agent transaction error interrupt */ > + reg = readl(ctx->dev_csr + IOBBATRANSERRINTSTS); > + if (!reg) > + return; > + > + dev_err(edac_dev->dev, "IOB bridge agent (BA) transaction error\n"); > + if (reg & WRERR_RESP_MASK) > + dev_err(edac_dev->dev, "IOB BA write response error\n"); > + if (reg & M_WRERR_RESP_MASK) > + dev_err(edac_dev->dev, > + "Multiple IOB BA write response error\n"); > + if (reg & XGIC_POISONED_REQ_MASK) > + dev_err(edac_dev->dev, "IOB BA XGIC poisoned write error\n"); > + if (reg & M_XGIC_POISONED_REQ_MASK) > + dev_err(edac_dev->dev, > + "Multiple IOB BA XGIC poisoned write error\n"); > + if (reg & RBM_POISONED_REQ_MASK) > + dev_err(edac_dev->dev, "IOB BA RBM poisoned write error\n"); > + if (reg & M_RBM_POISONED_REQ_MASK) > + dev_err(edac_dev->dev, > + "Multiple IOB BA RBM poisoned write error\n"); > + if (reg & WDATA_CORRUPT_MASK) > + dev_err(edac_dev->dev, "IOB BA write error\n"); > + if (reg & M_WDATA_CORRUPT_MASK) > + dev_err(edac_dev->dev, "Multiple IOB BA write error\n"); > + if (reg & TRANS_CORRUPT_MASK) > + dev_err(edac_dev->dev, "IOB BA transaction error\n"); > + if (reg & M_TRANS_CORRUPT_MASK) > + dev_err(edac_dev->dev, "Multiple IOB BA transaction error\n"); > + if (reg & RIDRAM_CORRUPT_MASK) > + dev_err(edac_dev->dev, > + "IOB BA RDIDRAM read transaction ID error\n"); > + if (reg & M_RIDRAM_CORRUPT_MASK) > + dev_err(edac_dev->dev, > + "Multiple IOB BA RDIDRAM read transaction ID error\n"); > + if (reg & WIDRAM_CORRUPT_MASK) > + dev_err(edac_dev->dev, > + "IOB BA RDIDRAM write transaction ID error\n"); > + if (reg & M_WIDRAM_CORRUPT_MASK) > + dev_err(edac_dev->dev, > + "Multiple IOB BA RDIDRAM write transaction ID error\n"); > + if (reg & ILLEGAL_ACCESS_MASK) > + dev_err(edac_dev->dev, > + "IOB BA XGIC/RB illegal access error\n"); > + if (reg & M_ILLEGAL_ACCESS_MASK) > + dev_err(edac_dev->dev, > + "Multiple IOB BA XGIC/RB illegal access error\n"); > + > + err_addr_lo = readl(ctx->dev_csr + IOBBATRANSERRREQINFOL); > + err_addr_hi = readl(ctx->dev_csr + IOBBATRANSERRREQINFOH); > + dev_err(edac_dev->dev, "IOB BA %s access at 0x%02X.%08X (0x%08X)\n", > + REQTYPE_F2_RD(err_addr_hi) ? "read" : "write", > + ERRADDRH_F2_RD(err_addr_hi), err_addr_lo, err_addr_hi); > + if (reg & WRERR_RESP_MASK) > + dev_err(edac_dev->dev, "IOB BA requestor ID 0x%08X\n", > + readl(ctx->dev_csr + IOBBATRANSERRCSWREQID)); > + writel(reg, ctx->dev_csr + IOBBATRANSERRINTSTS); > +} > + > +static void xgene_edac_pa_report(struct edac_device_ctl_info *edac_dev) > +{ > + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; > + u32 err_addr_lo; > + u32 err_addr_hi; > + u32 reg; > + > + /* IOB Processing agent transaction error interrupt */ > + reg = readl(ctx->dev_csr + IOBPATRANSERRINTSTS); > + if (reg) { > + dev_err(edac_dev->dev, > + "IOB procesing agent (PA) transaction error\n"); > + if (reg & IOBPA_RDATA_CORRUPT_MASK) > + dev_err(edac_dev->dev, "IOB PA read data RAM error\n"); > + if (reg & IOBPA_M_RDATA_CORRUPT_MASK) > + dev_err(edac_dev->dev, > + "Mutilple IOB PA read data RAM error\n"); > + if (reg & IOBPA_WDATA_CORRUPT_MASK) > + dev_err(edac_dev->dev, > + "IOB PA write data RAM error\n"); > + if (reg & IOBPA_M_WDATA_CORRUPT_MASK) > + dev_err(edac_dev->dev, > + "Mutilple IOB PA write data RAM error\n"); > + if (reg & IOBPA_TRANS_CORRUPT_MASK) > + dev_err(edac_dev->dev, "IOB PA transaction error\n"); > + if (reg & IOBPA_M_TRANS_CORRUPT_MASK) > + dev_err(edac_dev->dev, > + "Mutilple IOB PA transaction error\n"); > + if (reg & IOBPA_REQIDRAM_CORRUPT_MASK) > + dev_err(edac_dev->dev, > + "IOB PA transaction ID RAM error\n"); > + if (reg & IOBPA_M_REQIDRAM_CORRUPT_MASK) > + dev_err(edac_dev->dev, > + "Multiple IOB PA transaction ID RAM error\n"); > + writel(reg, ctx->dev_csr + IOBPATRANSERRINTSTS); > + } > + > + /* IOB AXI0 Error */ > + reg = readl(ctx->dev_csr + IOBAXIS0TRANSERRINTSTS); > + if (reg) { > + err_addr_lo = readl(ctx->dev_csr + IOBAXIS0TRANSERRREQINFOL); > + err_addr_hi = readl(ctx->dev_csr + IOBAXIS0TRANSERRREQINFOH); > + dev_err(edac_dev->dev, > + "%sAXI slave 0 illegal %s access @ 0x%02X.%08X (0x%08X)\n", > + reg & IOBAXIS0_M_ILLEGAL_ACCESS_MASK ? "Multiple " : "", > + REQTYPE_RD(err_addr_hi) ? "read" : "write", > + ERRADDRH_RD(err_addr_hi), err_addr_lo, err_addr_hi); > + writel(reg, ctx->dev_csr + IOBAXIS0TRANSERRINTSTS); > + } > + > + /* IOB AXI1 Error */ > + reg = readl(ctx->dev_csr + IOBAXIS1TRANSERRINTSTS); > + if (reg) { > + err_addr_lo = readl(ctx->dev_csr + IOBAXIS1TRANSERRREQINFOL); > + err_addr_hi = readl(ctx->dev_csr + IOBAXIS1TRANSERRREQINFOH); > + dev_err(edac_dev->dev, > + "%sAXI slave 1 illegal %s access @ 0x%02X.%08X (0x%08X)\n", > + reg & IOBAXIS0_M_ILLEGAL_ACCESS_MASK ? "Multiple " : "", > + REQTYPE_RD(err_addr_hi) ? "read" : "write", > + ERRADDRH_RD(err_addr_hi), err_addr_lo, err_addr_hi); > + writel(reg, ctx->dev_csr + IOBAXIS1TRANSERRINTSTS); > + } > +} > + > +static void xgene_edac_soc_check(struct edac_device_ctl_info *edac_dev) > +{ > + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; > + static char *mem_err_ip[] = { > + "10GbE0", > + "10GbE1", > + "Security", > + "SATA45", > + "SATA23/ETH23", > + "SATA01/ETH01", > + "USB1", > + "USB0", > + "QML", > + "QM0", > + "QM1 (XGbE01)", > + "PCIE4", > + "PCIE3", > + "PCIE2", > + "PCIE1", > + "PCIE0", > + "CTX Manager", > + "OCM", > + "1GbE", > + "CLE", > + "AHBC", > + "PktDMA", > + "GFC", > + "MSLIM", > + "10GbE2", > + "10GbE3", > + "QM2 (XGbE23)", > + "IOB", > + "unknown", > + "unknown", > + "unknown", > + "unknown", > + }; WARNING: char * array declaration might be better as static const #1682: FILE: drivers/edac/xgene_edac.c:1611: + static char *mem_err_ip[] = { Please run your patches through checkpatch.pl. > + u32 pcp_hp_stat; > + u32 pcp_lp_stat; > + u32 reg; > + int i; > + > + pcp_hp_stat = readl(ctx->pcp_csr + PCPHPERRINTSTS); > + pcp_lp_stat = readl(ctx->pcp_csr + PCPLPERRINTSTS); > + reg = readl(ctx->pcp_csr + MEMERRINTSTS); > + if (!((pcp_hp_stat & (IOB_PA_ERR_MASK | IOB_BA_ERR_MASK | > + IOB_XGIC_ERR_MASK | IOB_RB_ERR_MASK)) || > + (pcp_lp_stat & CSW_SWITCH_TRACE_ERR_MASK) || reg)) > + return; > + > + if (pcp_hp_stat & IOB_XGIC_ERR_MASK) > + xgene_edac_iob_gic_report(edac_dev); > + > + if (pcp_hp_stat & (IOB_RB_ERR_MASK | IOB_BA_ERR_MASK)) > + xgene_edac_rb_report(edac_dev); > + > + if (pcp_hp_stat & IOB_PA_ERR_MASK) > + xgene_edac_pa_report(edac_dev); > + > + if (pcp_lp_stat & CSW_SWITCH_TRACE_ERR_MASK) { > + dev_info(edac_dev->dev, > + "CSW switch trace correctable memory parity error\n"); > + edac_device_handle_ce(edac_dev, 0, 0, edac_dev->ctl_name); > + } > + > + for (i = 0; i < 31; i++) { > + if (reg & (1 << i)) { > + dev_err(edac_dev->dev, "%s memory parity error\n", > + mem_err_ip[i]); > + edac_device_handle_ue(edac_dev, 0, 0, > + edac_dev->ctl_name); > + } > + } > +} > + > +static irqreturn_t xgene_edac_soc_isr(int irq, void *dev_id) > +{ > + struct edac_device_ctl_info *edac_dev = dev_id; > + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; > + u32 pcp_hp_stat; > + u32 pcp_lp_stat; > + u32 reg; > + > + pcp_hp_stat = readl(ctx->pcp_csr + PCPHPERRINTSTS); > + pcp_lp_stat = readl(ctx->pcp_csr + PCPLPERRINTSTS); > + reg = readl(ctx->pcp_csr + MEMERRINTSTS); > + if (!((pcp_hp_stat & (IOB_PA_ERR_MASK | IOB_BA_ERR_MASK | > + IOB_XGIC_ERR_MASK | IOB_RB_ERR_MASK)) || > + (pcp_lp_stat & CSW_SWITCH_TRACE_ERR_MASK) || reg)) > + return IRQ_NONE; > + > + xgene_edac_soc_check(edac_dev); > + > + return IRQ_HANDLED; > +} > + > +static void xgene_edac_soc_hw_init(struct edac_device_ctl_info *edac_dev, > + bool enable) Naming: ..._init() > +{ > + struct xgene_edac_dev_ctx *ctx = edac_dev->pvt_info; > + u32 val; > + > + /* Enable SoC IP error interrupt */ > + if (edac_dev->op_state == OP_RUNNING_INTERRUPT) { > + mutex_lock(&xgene_edac_lock); > + > + val = readl(ctx->pcp_csr + PCPHPERRINTMSK); > + if (enable) > + val &= ~(IOB_PA_ERR_MASK | IOB_BA_ERR_MASK | > + IOB_XGIC_ERR_MASK | IOB_RB_ERR_MASK); > + else > + val |= IOB_PA_ERR_MASK | IOB_BA_ERR_MASK | > + IOB_XGIC_ERR_MASK | IOB_RB_ERR_MASK; > + writel(val, ctx->pcp_csr + PCPHPERRINTMSK); > + val = readl(ctx->pcp_csr + PCPLPERRINTMSK); > + if (enable) > + val &= ~CSW_SWITCH_TRACE_ERR_MASK; > + else > + val |= CSW_SWITCH_TRACE_ERR_MASK; > + writel(val, ctx->pcp_csr + PCPLPERRINTMSK); > + > + mutex_unlock(&xgene_edac_lock); > + > + writel(enable ? 0x0 : 0xFFFFFFFF, > + ctx->dev_csr + IOBAXIS0TRANSERRINTMSK); > + writel(enable ? 0x0 : 0xFFFFFFFF, > + ctx->dev_csr + IOBAXIS1TRANSERRINTMSK); > + writel(enable ? 0x0 : 0xFFFFFFFF, > + ctx->dev_csr + XGICTRANSERRINTMSK); > + > + writel(enable ? 0x0 : 0xFFFFFFFF, ctx->pcp_csr + MEMERRINTMSK); > + } > +} > + > +static int xgene_edac_soc_probe(struct platform_device *pdev) > +{ > + struct edac_device_ctl_info *edac_dev; > + struct xgene_edac_dev_ctx *ctx; > + struct resource *res; > + int rc = 0; > + > + if (!devres_open_group(&pdev->dev, xgene_edac_soc_probe, GFP_KERNEL)) > + return -ENOMEM; > + > + edac_dev = edac_device_alloc_ctl_info(sizeof(*ctx), > + "SOC", 1, "SOC", 1, 2, NULL, 0, > + edac_device_alloc_index()); > + if (!edac_dev) { > + rc = -ENOMEM; > + goto err; > + } > + > + ctx = edac_dev->pvt_info; > + ctx->name = "xgene_soc_err"; > + edac_dev->dev = &pdev->dev; > + dev_set_drvdata(edac_dev->dev, edac_dev); > + edac_dev->ctl_name = ctx->name; > + edac_dev->dev_name = ctx->name; > + edac_dev->mod_name = EDAC_MOD_STR; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + ctx->pcp_csr = devm_ioremap(&pdev->dev, res->start, > + resource_size(res)); > + if (IS_ERR(ctx->pcp_csr)) { > + dev_err(&pdev->dev, "no PCP resource address\n"); > + rc = PTR_ERR(ctx->pcp_csr); > + goto err1; > + } > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); > + ctx->dev_csr = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(ctx->dev_csr)) { > + dev_err(&pdev->dev, "no SoC resource address\n"); > + rc = PTR_ERR(ctx->dev_csr); > + goto err1; > + } > + > + if (edac_op_state == EDAC_OPSTATE_POLL) > + edac_dev->edac_check = xgene_edac_soc_check; > + > + rc = edac_device_add_device(edac_dev); > + if (rc > 0) { > + dev_err(&pdev->dev, "failed edac_device_add_device()\n"); > + /* > + * NOTE: Can't use return value from edac_device_add_device > + * as it is 1 on failure > + */ > + rc = -ENOMEM; > + goto err1; > + } > + > + if (edac_op_state == EDAC_OPSTATE_INT) { > + int irq; > + int i; > + > + /* > + * Register for SoC un-correctable and correctable errors > + */ > + for (i = 0; i < 3; i++) { > + irq = platform_get_irq(pdev, i); > + if (irq < 0) { > + dev_err(&pdev->dev, "No IRQ resource\n"); > + rc = -EINVAL; > + goto err2; > + } > + rc = devm_request_irq(&pdev->dev, irq, > + xgene_edac_soc_isr, IRQF_SHARED, > + dev_name(&pdev->dev), edac_dev); > + if (rc) { > + dev_err(&pdev->dev, > + "Could not request IRQ %d\n", > + irq); > + goto err2; > + } > + } > + > + edac_dev->op_state = OP_RUNNING_INTERRUPT; > + } > + > + xgene_edac_soc_hw_init(edac_dev, 1); > + > + devres_remove_group(&pdev->dev, xgene_edac_soc_probe); > + > + dev_info(&pdev->dev, "X-Gene EDAC SoC registered\n"); > + return 0; > + > +err2: > + edac_device_del_device(&pdev->dev); > +err1: > + edac_device_free_ctl_info(edac_dev); > +err: > + devres_release_group(&pdev->dev, xgene_edac_soc_probe); > + return rc; > +} > + > +static int xgene_edac_soc_remove(struct platform_device *pdev) > +{ > + struct edac_device_ctl_info *edac_dev = dev_get_drvdata(&pdev->dev); > + > + xgene_edac_soc_hw_init(edac_dev, 0); > + edac_device_del_device(&pdev->dev); > + edac_device_free_ctl_info(edac_dev); > + return 0; > +} > + > +#ifdef CONFIG_OF > +static struct of_device_id xgene_edac_soc_of_match[] = { > + { .compatible = "apm,xgene-edac-soc" }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, xgene_edac_soc_of_match); > +#endif > + > +static struct platform_driver xgene_edac_soc_driver = { > + .probe = xgene_edac_soc_probe, > + .remove = xgene_edac_soc_remove, > + .driver = { > + .name = "xgene-edac-soc", > + .owner = THIS_MODULE, > + .of_match_table = of_match_ptr(xgene_edac_soc_of_match), > + }, > +}; > + > +static int __init xgene_edac_init(void) > +{ > + int rc; > + > + /* make sure error reporting method is sane */ > + switch (edac_op_state) { > + case EDAC_OPSTATE_POLL: > + case EDAC_OPSTATE_INT: > + break; > + default: > + edac_op_state = EDAC_OPSTATE_INT; > + break; > + } > + > + rc = platform_driver_register(&xgene_edac_mc_driver); > + if (rc) > + pr_warn(EDAC_MOD_STR "MCU fails to register\n"); > + rc = platform_driver_register(&xgene_edac_pmd_driver); > + if (rc) > + pr_warn(EDAC_MOD_STR "PMD fails to register\n"); > + rc = platform_driver_register(&xgene_edac_l3_driver); > + if (rc) > + pr_warn(EDAC_MOD_STR "L3 fails to register\n"); > + rc = platform_driver_register(&xgene_edac_soc_driver); > + if (rc) > + pr_warn(EDAC_MOD_STR "SoC fails to register\n"); > + return rc; This is not enough - you need to unreg all drivers before the one which has failed to register and unwind all work done. > +} > +module_init(xgene_edac_init); > + > +static void __exit xgene_edac_exit(void) > +{ > + platform_driver_unregister(&xgene_edac_soc_driver); > + platform_driver_unregister(&xgene_edac_l3_driver); > + platform_driver_unregister(&xgene_edac_pmd_driver); > + platform_driver_unregister(&xgene_edac_mc_driver); > +} > +module_exit(xgene_edac_exit); > + > +MODULE_LICENSE("GPL"); > +MODULE_AUTHOR("Feng Kan <fkan@apm.com>"); > +MODULE_DESCRIPTION("APM X-Gene EDAC driver"); > +module_param(edac_op_state, int, 0444); > +MODULE_PARM_DESC(edac_op_state, > + "EDAC Error Reporting state: 0=Poll, 2=Interrupt"); > -- > 1.5.5 > > -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 3/4] edac: Add APM X-Gene SoC EDAC driver 2014-05-20 19:39 ` [PATCH 3/4] edac: Add APM X-Gene SoC EDAC driver Borislav Petkov @ 2014-05-23 16:26 ` Loc Ho 2014-05-23 17:20 ` Borislav Petkov 0 siblings, 1 reply; 11+ messages in thread From: Loc Ho @ 2014-05-23 16:26 UTC (permalink / raw) To: linux-arm-kernel Hi, >> +static int xgene_edac_mc_is_active(struct xgene_edac_mc_ctx *ctx, int mc_idx) >> +{ >> + u32 reg; >> + u32 mcu_mask; >> + >> + reg = readl(ctx->csw_csr + CSW_CSWCR); >> + if (reg & CSW_CSWCR_DUALMCB_MASK) { >> + /* >> + * Dual MCB active - Determine if all 4 activie or just MCU0 > > Spellcheck: "activie" The proper spelling is "active" from online dictionary. >> + ctx = mci->pvt_info; >> + ctx->name = "xgene_edac_mc_err"; >> + mci->pdev = &pdev->dev; >> + dev_set_drvdata(mci->pdev, mci); >> + mci->ctl_name = ctx->name; >> + mci->dev_name = ctx->name; >> + >> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >> + ctx->pcp_csr = devm_ioremap(&pdev->dev, res->start, >> + resource_size(res)); >> + if (IS_ERR(ctx->pcp_csr)) { >> + dev_err(&pdev->dev, "no PCP resource address\n"); > > edac_printk(KERN_ERR, "X-Gene", ... Ditto for all other dev_err calls. Are you sure about this? With dev_err, it prints the device node info as well. This allows one to determine which instance that has issue. X-Gene has 4 instance of memory controllers. >> + >> + res = platform_get_resource(pdev, IORESOURCE_MEM, 4); >> + ctx->mcu_csr = devm_ioremap_resource(&pdev->dev, res); >> + if (IS_ERR(ctx->mcu_csr)) { >> + dev_err(&pdev->dev, "no MCU resource address\n"); >> + rc = PTR_ERR(ctx->mcu_csr); >> + goto err_free; >> + } >> + /* Ignore non-active MCU */ >> + if (!xgene_edac_mc_is_active(ctx, ((res->start >> 16) & 0xF) / 4)) { >> + rc = -ENODEV; >> + goto err_free; >> + } > > You could move edac_mc_alloc() here, after the resources have been > collected successfully and simplify the unwinding path. I need the ctx pointer which is part of the edac_mc_alloc. Can't move it here. -Loc ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 3/4] edac: Add APM X-Gene SoC EDAC driver 2014-05-23 16:26 ` Loc Ho @ 2014-05-23 17:20 ` Borislav Petkov 0 siblings, 0 replies; 11+ messages in thread From: Borislav Petkov @ 2014-05-23 17:20 UTC (permalink / raw) To: linux-arm-kernel On Fri, May 23, 2014 at 09:26:12AM -0700, Loc Ho wrote: > Hi, > > >> +static int xgene_edac_mc_is_active(struct xgene_edac_mc_ctx *ctx, int mc_idx) > >> +{ > >> + u32 reg; > >> + u32 mcu_mask; > >> + > >> + reg = readl(ctx->csw_csr + CSW_CSWCR); > >> + if (reg & CSW_CSWCR_DUALMCB_MASK) { > >> + /* > >> + * Dual MCB active - Determine if all 4 activie or just MCU0 > > > > Spellcheck: "activie" > > The proper spelling is "active" from online dictionary. Oh really?! Thanks for teaching me that. Let me try again, this time with pointers: > >> + * Dual MCB active - Determine if all 4 activie or just MCU0 ^ | | ---------WRONG SPELLING HERE---------------------------------+ You need to open this with an editor that doesn't damage whitespace to see where the arrow points at. > Are you sure about this? With dev_err, it prints the device node info > as well. This allows one to determine which instance that has issue. > X-Gene has 4 instance of memory controllers. Ok, we don't have a corresponding functionality in edac for that. > >> + > >> + res = platform_get_resource(pdev, IORESOURCE_MEM, 4); > >> + ctx->mcu_csr = devm_ioremap_resource(&pdev->dev, res); > >> + if (IS_ERR(ctx->mcu_csr)) { > >> + dev_err(&pdev->dev, "no MCU resource address\n"); > >> + rc = PTR_ERR(ctx->mcu_csr); > >> + goto err_free; > >> + } > >> + /* Ignore non-active MCU */ > >> + if (!xgene_edac_mc_is_active(ctx, ((res->start >> 16) & 0xF) / 4)) { > >> + rc = -ENODEV; > >> + goto err_free; > >> + } > > > > You could move edac_mc_alloc() here, after the resources have been > > collected successfully and simplify the unwinding path. > > I need the ctx pointer which is part of the edac_mc_alloc. Can't move it here. Of course you can - you can use a local ctx and copy it. edac_mc_alloc is a heavy call and I'd keep it after the lighter platform_get_resource() have completed successfully so that you don't have to undo it with edac_mc_del_mc. But hey, this is your driver so it's your decision in the end. Which reminds me, I'd need an entry for MAINTAINERS from you or someone who's going to take care of this driver and whom I should direct bug reports to. Thanks. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/4] Documentation: Add documentation for the APM X-Gene SoC EDAC DTS binding 2014-05-08 23:03 ` [PATCH 2/4] Documentation: Add documentation for the APM X-Gene SoC EDAC DTS binding Loc Ho 2014-05-08 23:03 ` [PATCH 3/4] edac: Add APM X-Gene SoC EDAC driver Loc Ho @ 2014-05-14 12:01 ` Borislav Petkov 1 sibling, 0 replies; 11+ messages in thread From: Borislav Petkov @ 2014-05-14 12:01 UTC (permalink / raw) To: linux-arm-kernel On Thu, May 08, 2014 at 05:03:17PM -0600, Loc Ho wrote: > This patch adds documentation for the APM X-Gene SoC EDAC DTS binding. > > Signed-off-by: Feng Kan <fkan@apm.com> > Signed-off-by: Loc Ho <lho@apm.com> I guess I'm going to need an ack from a device tree maintainer if I'm going to pick up the whole series through the edac tree. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/4] edac: Fix MC scrub mode comparsion bug for correctable error 2014-05-08 23:03 ` [PATCH 1/4] edac: Fix MC scrub mode comparsion bug for correctable error Loc Ho 2014-05-08 23:03 ` [PATCH 2/4] Documentation: Add documentation for the APM X-Gene SoC EDAC DTS binding Loc Ho @ 2014-05-09 7:38 ` Borislav Petkov 2014-05-09 16:17 ` Loc Ho 1 sibling, 1 reply; 11+ messages in thread From: Borislav Petkov @ 2014-05-09 7:38 UTC (permalink / raw) To: linux-arm-kernel On Thu, May 08, 2014 at 05:03:16PM -0600, Loc Ho wrote: > This patch fixes the MC scrub mode comparsion bug by replacing > '&' with '=='. The MC structure field scrub_mode is integer > type - not bit field. > > Signed-off-by: Loc Ho <lho@apm.com> Applied, thanks. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/4] edac: Fix MC scrub mode comparsion bug for correctable error 2014-05-09 7:38 ` [PATCH 1/4] edac: Fix MC scrub mode comparsion bug for correctable error Borislav Petkov @ 2014-05-09 16:17 ` Loc Ho 0 siblings, 0 replies; 11+ messages in thread From: Loc Ho @ 2014-05-09 16:17 UTC (permalink / raw) To: linux-arm-kernel Hi, >> This patch fixes the MC scrub mode comparsion bug by replacing >> '&' with '=='. The MC structure field scrub_mode is integer >> type - not bit field. >> >> Signed-off-by: Loc Ho <lho@apm.com> > > Applied, thanks. If I should need to submit future version of the X-Gene EDAC driver, I will not include this patch. -Loc ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2014-05-23 17:20 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-05-08 23:03 [PATCH 0/4] edac: Add APM X-Gene SoC EDAC driver Loc Ho 2014-05-08 23:03 ` [PATCH 1/4] edac: Fix MC scrub mode comparsion bug for correctable error Loc Ho 2014-05-08 23:03 ` [PATCH 2/4] Documentation: Add documentation for the APM X-Gene SoC EDAC DTS binding Loc Ho 2014-05-08 23:03 ` [PATCH 3/4] edac: Add APM X-Gene SoC EDAC driver Loc Ho 2014-05-08 23:03 ` [PATCH 4/4] arm64: Add APM X-Gene SoC EDAC DTS entries Loc Ho 2014-05-20 19:39 ` [PATCH 3/4] edac: Add APM X-Gene SoC EDAC driver Borislav Petkov 2014-05-23 16:26 ` Loc Ho 2014-05-23 17:20 ` Borislav Petkov 2014-05-14 12:01 ` [PATCH 2/4] Documentation: Add documentation for the APM X-Gene SoC EDAC DTS binding Borislav Petkov 2014-05-09 7:38 ` [PATCH 1/4] edac: Fix MC scrub mode comparsion bug for correctable error Borislav Petkov 2014-05-09 16:17 ` Loc Ho
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox