[PATCH 18/21] UBUNTU: SAUCE: EDAC: Add support for the highbank platform memory
Ike Panhc
ike.pan at canonical.com
Wed Jun 6 12:38:44 UTC 2012
On 06/06/2012 08:29 PM, Ike Panhc wrote:
> From: Rob Herring <rob.herring at calxeda.com>
>
> BugLink: http://launchpad.net/bugs/1008345
>
> Add memory EDAC support for Calxeda Highbank platform
>
> Signed-off-by: Rob Herring <rob.herring at calxeda.com>
>
> Modified so that new config wont apply on omap
>
> Signed-off-by: Ike Panhc <ike.pan at canonical.com>
> ---
> arch/arm/boot/dts/highbank.dts | 6 ++
> drivers/edac/Kconfig | 9 +-
> drivers/edac/Makefile | 2 +
> drivers/edac/highbank_mc_edac.c | 223 +++++++++++++++++++++++++++++++++++++++
> 4 files changed, 239 insertions(+), 1 deletion(-)
> create mode 100644 drivers/edac/highbank_mc_edac.c
>
> diff --git a/arch/arm/boot/dts/highbank.dts b/arch/arm/boot/dts/highbank.dts
> index b220a55..c90ec80 100644
> --- a/arch/arm/boot/dts/highbank.dts
> +++ b/arch/arm/boot/dts/highbank.dts
> @@ -131,6 +131,12 @@
> clocks = <&eclk>;
> };
>
> + memory-controller at fff00000 {
> + compatible = "calxeda,hb-ddr-ctrl";
> + reg = <0xfff00000 0x1000>;
> + interrupts = <0 91 4>;
> + };
> +
> ipc at fff20000 {
> compatible = "arm,pl320", "arm,primecell";
> reg = <0xfff20000 0x1000>;
> diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
> index 5948a21..b0dd75e 100644
> --- a/drivers/edac/Kconfig
> +++ b/drivers/edac/Kconfig
> @@ -7,7 +7,7 @@
> menuconfig EDAC
> bool "EDAC (Error Detection And Correction) reporting"
> depends on HAS_IOMEM
> - depends on X86 || PPC || TILE
> + depends on X86 || PPC || TILE || ARCH_HIGHBANK
The original patch is
+ depends on X86 || PPC || TILE || ARM
Which I am not 100 comfortable because it will affect omap as well
> help
> EDAC is designed to report errors in the core system.
> These are low-level errors that are reported in the CPU or
> @@ -294,4 +294,11 @@ config EDAC_TILE
> Support for error detection and correction on the
> Tilera memory controller.
>
> +config EDAC_HIGHBANK_MC
> + tristate "Highbank Memory Controller"
> + depends on EDAC_MM_EDAC && ARCH_HIGHBANK
> + help
> + Support for error detection and correction on the
> + Calxeda Highbank memory controller.
> +
> endif # EDAC
> diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile
> index 196a63d..44f2044 100644
> --- a/drivers/edac/Makefile
> +++ b/drivers/edac/Makefile
> @@ -55,3 +55,5 @@ obj-$(CONFIG_EDAC_AMD8111) += amd8111_edac.o
> obj-$(CONFIG_EDAC_AMD8131) += amd8131_edac.o
>
> obj-$(CONFIG_EDAC_TILE) += tile_edac.o
> +
> +obj-$(CONFIG_EDAC_HIGHBANK_MC) += highbank_mc_edac.o
> diff --git a/drivers/edac/highbank_mc_edac.c b/drivers/edac/highbank_mc_edac.c
> new file mode 100644
> index 0000000..5e2f41b
> --- /dev/null
> +++ b/drivers/edac/highbank_mc_edac.c
> @@ -0,0 +1,223 @@
> +/*
> + * Copyright 2011 Calxeda, Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2, as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope 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/types.h>
> +#include <linux/kernel.h>
> +#include <linux/ctype.h>
> +#include <linux/edac.h>
> +#include <linux/interrupt.h>
> +#include <linux/platform_device.h>
> +#include <linux/of_platform.h>
> +
> +#include "edac_core.h"
> +#include "edac_module.h"
> +
> +/* DDR Ctrlr Error Registers */
> +#define HB_DDR_ECC_OPT 0x128
> +#define HB_DDR_ECC_U_ERR_ADDR 0x130
> +#define HB_DDR_ECC_U_ERR_STAT 0x134
> +#define HB_DDR_ECC_U_ERR_DATAL 0x138
> +#define HB_DDR_ECC_U_ERR_DATAH 0x13c
> +#define HB_DDR_ECC_C_ERR_ADDR 0x140
> +#define HB_DDR_ECC_C_ERR_STAT 0x144
> +#define HB_DDR_ECC_C_ERR_DATAL 0x148
> +#define HB_DDR_ECC_C_ERR_DATAH 0x14c
> +#define HB_DDR_ECC_INT_STATUS 0x180
> +#define HB_DDR_ECC_INT_ACK 0x184
> +#define HB_DDR_ECC_U_ERR_ID 0x424
> +#define HB_DDR_ECC_C_ERR_ID 0x428
> +
> +#define HB_DDR_ECC_INT_STAT_CE 0x8
> +#define HB_DDR_ECC_INT_STAT_DOUBLE_CE 0x10
> +#define HB_DDR_ECC_INT_STAT_UE 0x20
> +#define HB_DDR_ECC_INT_STAT_DOUBLE_UE 0x40
> +
> +struct hb_mc_drvdata {
> + void __iomem *mc_vbase;
> +};
> +
> +static irqreturn_t highbank_mc_err_handler(int irq, void *dev_id)
> +{
> + struct mem_ctl_info *mci = dev_id;
> + struct hb_mc_drvdata *drvdata = mci->pvt_info;
> + u32 status, err_addr;
> +
> + /* Read the interrupt status register */
> + status = readl(drvdata->mc_vbase + HB_DDR_ECC_INT_STATUS);
> +
> + if (status & HB_DDR_ECC_INT_STAT_UE) {
> + err_addr = readl(drvdata->mc_vbase + HB_DDR_ECC_U_ERR_ADDR);
> + edac_mc_handle_ue(mci, err_addr >> PAGE_SHIFT,
> + err_addr & ~PAGE_MASK, 0, mci->ctl_name);
> + }
> + if (status & HB_DDR_ECC_INT_STAT_CE) {
> + u32 syndrome = readl(drvdata->mc_vbase + HB_DDR_ECC_C_ERR_STAT);
> + syndrome = (syndrome >> 8) & 0xff;
> + err_addr = readl(drvdata->mc_vbase + HB_DDR_ECC_C_ERR_ADDR);
> + edac_mc_handle_ce(mci, err_addr >> PAGE_SHIFT,
> + err_addr & ~PAGE_MASK, syndrome, 0, 0,
> + mci->ctl_name);
> + }
> +
> + /* clear the error, clears the interrupt */
> + writel(status, drvdata->mc_vbase + HB_DDR_ECC_INT_ACK);
> + return IRQ_HANDLED;
> +}
> +
> +static ssize_t highbank_mc_inject_ctrl_store(struct mem_ctl_info *mci,
> + const char *data, size_t count)
> +{
> + struct hb_mc_drvdata *pdata = mci->pvt_info;
> + u32 reg;
> + if (!isdigit(*data))
> + return 0;
> +
> + reg = readl(pdata->mc_vbase + HB_DDR_ECC_OPT) & 0x3;
> + reg |= simple_strtoul(data, NULL, 0) << 16;
> + reg |= 0x100;
> + writel(reg, pdata->mc_vbase + HB_DDR_ECC_OPT);
> + return count;
> +}
> +
> +static struct mcidev_sysfs_attribute highbank_mc_sysfs_attributes[] = {
> + {
> + .attr = {
> + .name = "inject_ctrl",
> + .mode = (S_IRUGO | S_IWUSR)
> + },
> + .store = highbank_mc_inject_ctrl_store
> + },
> + {
> + .attr = {.name = NULL} /* End of list */
> + }
> +};
> +
> +static int __devinit highbank_mc_probe(struct platform_device *pdev)
> +{
> + struct mem_ctl_info *mci;
> + struct hb_mc_drvdata *drvdata;
> + struct csrow_info *csi;
> + struct resource *r;
> + u32 control;
> + int irq;
> + int res = 0;
> +
> + mci = edac_mc_alloc(sizeof(struct hb_mc_drvdata), 1, 1, 0);
> + if (!mci)
> + return -ENOMEM;
> +
> + drvdata = mci->pvt_info;
> + mci->dev = &pdev->dev;
> + platform_set_drvdata(pdev, mci);
> +
> + if (!devres_open_group(&pdev->dev, NULL, GFP_KERNEL))
> + return -ENOMEM;
> +
> + r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + if (!r) {
> + dev_err(&pdev->dev, "Unable to get mem resource\n");
> + res = -ENODEV;
> + goto err;
> + }
> +
> + if (!devm_request_mem_region(&pdev->dev, r->start,
> + resource_size(r), dev_name(&pdev->dev))) {
> + dev_err(&pdev->dev, "Error while requesting mem region\n");
> + res = -EBUSY;
> + goto err;
> + }
> +
> + drvdata->mc_vbase = devm_ioremap(&pdev->dev,
> + r->start, resource_size(r));
> + if (!drvdata->mc_vbase) {
> + dev_err(&pdev->dev, "Unable to map regs\n");
> + res = -ENOMEM;
> + goto err;
> + }
> +
> + control = readl(drvdata->mc_vbase + HB_DDR_ECC_OPT) & 0x3;
> + if (!control || (control == 0x2)) {
> + dev_err(&pdev->dev, "No ECC present, or ECC disabled\n");
> + res = -ENODEV;
> + goto err;
> + }
> +
> + irq = platform_get_irq(pdev, 0);
> + res = devm_request_irq(&pdev->dev, irq, highbank_mc_err_handler,
> + 0, dev_name(&pdev->dev), mci);
> + if (res < 0) {
> + dev_err(&pdev->dev, "Unable to request irq %d\n", irq);
> + goto err;
> + }
> +
> + mci->mtype_cap = MEM_FLAG_DDR3;
> + mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
> + mci->edac_cap = EDAC_FLAG_SECDED;
> + mci->mod_name = dev_name(&pdev->dev);
> + mci->mod_ver = "1";
> + mci->ctl_name = dev_name(&pdev->dev);
> + mci->scrub_mode = SCRUB_SW_SRC;
> + mci->mc_driver_sysfs_attributes = highbank_mc_sysfs_attributes;
> +
> + csi = mci->csrows;
> + csi->edac_mode = EDAC_SECDED;
> + csi->mtype = MEM_DDR3;
> + csi->first_page = 0;
> + csi->nr_pages = (~0UL >> PAGE_SHIFT) + 1;
> + csi->last_page = csi->first_page + csi->nr_pages - 1;
> + csi->grain = 8;
> + csi->dtype = DEV_UNKNOWN;
> +
> + res = edac_mc_add_mc(mci);
> + if (res < 0)
> + goto err;
> +
> + devres_close_group(&pdev->dev, NULL);
> + return 0;
> +err:
> + devres_release_group(&pdev->dev, NULL);
> + edac_mc_free(mci);
> + return res;
> +}
> +
> +static int highbank_mc_remove(struct platform_device *pdev)
> +{
> + struct mem_ctl_info *mci = platform_get_drvdata(pdev);
> +
> + edac_mc_del_mc(&pdev->dev);
> + edac_mc_free(mci);
> + return 0;
> +}
> +
> +static const struct of_device_id hb_ddr_ctrl_of_match[] = {
> + { .compatible = "calxeda,hb-ddr-ctrl", },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, hb_ddr_ctrl_of_match);
> +
> +static struct platform_driver highbank_mc_edac_driver = {
> + .probe = highbank_mc_probe,
> + .remove = highbank_mc_remove,
> + .driver = {
> + .name = "hb_mc_edac",
> + .of_match_table = hb_ddr_ctrl_of_match,
> + },
> +};
> +
> +module_platform_driver(highbank_mc_edac_driver);
> +
> +MODULE_LICENSE("GPL v2");
> +MODULE_AUTHOR("Calxeda, Inc.");
> +MODULE_DESCRIPTION("EDAC Driver for Highbank");
More information about the kernel-team
mailing list