From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754805AbcHXAxV (ORCPT ); Tue, 23 Aug 2016 20:53:21 -0400 Received: from mail-bn3nam01on0079.outbound.protection.outlook.com ([104.47.33.79]:63446 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753211AbcHXAxR (ORCPT ); Tue, 23 Aug 2016 20:53:17 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=fail action=none header.from=nxp.com; From: York Sun To: CC: , , , , York Sun , Catalin Marinas , Will Deacon , Doug Thompson , Mauro Carvalho Chehab , , Subject: [Patch v5 8/9] driver/edac/layerscape_edac: Add Layerscape EDAC support Date: Tue, 23 Aug 2016 15:14:03 -0700 Message-ID: <1471990465-27443-1-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131164640628676284;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(199003)(54534003)(189002)(68736007)(50986999)(4326007)(2906002)(5660300001)(189998001)(97736004)(92566002)(33646002)(47776003)(11100500001)(50466002)(77096005)(48376002)(104016004)(586003)(105606002)(305945005)(7416002)(50226002)(5003940100001)(19580405001)(19580395003)(36756003)(110136002)(626004)(2351001)(86362001)(106466001)(81156014)(81166006)(8936002)(229853001)(7846002)(356003)(87936001)(85426001)(8676002)(8666005)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR03MB442;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD034;1:AtyTgLGNwQe1UKxFxqF7g68uslzVmtmEXDLuS4XMdkcQ4m/JR9qxvujv2XOXp4C/JtcJk2QOmB2U8gqAGg4N1khQVTtmHeeo0b8JY//4DNm/OIhqkMhsGm1XOpyB3zAQkRdDDN8VGQ84nHv8VWuMRcmyI2zXCTO64g0Z6db+olLm7BZEOHySb1ce7A84u8yc02uTpqZ1qKZdqTXz08+V7okJkW/HoUOUr9NtE0EjbP3cjaOqvHyHJXluRs6qWjdx7tXoW4mJVLjbQECPzTP16bvCJv1b46kbaaQatPEbfk8lm3ofnPL6c1G+wM3UokUeWFgmyxeOGmhkIATJz04Rxb0bAU0fsJqwW7bTrgRd/mMkJt8KmD/LrckqqhJDKttHWadO3gr/ndmM+zQkbcpdV+rYnalp6EtMOKGGrfWzgS0gakkpP1799YCwQMPua92ecB4Xgu6GMV1ckE9yeccGdNtG17Z496A78SEq0Mbzt9s6if/HgavC2o+9Z88bQPH0XjjqgLplPL2LaZQbrbvDcc+ofahzX2OpjgS6UlynMyaePb2ViHlNpZfQvmgC30IYcgUeFOnk3Rtnl3rw1+Dgb1E9xEsnVRPcIHPyxgr3zrg= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 1ab392cf-8c5d-450c-96bc-08d3cba2d63a X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB442;2:SvI+Xn6bpFzX/0PiQfzyto5se8RDY5bSm0TqiT0zPV9O8Embydxh7TDtLFWU5+NnPr52M5iCgcuyziLZPsfYixFKCUSU9u14vzx/x6/tFAVku5Js/rC3UrQTNmdD2oVkfnFiWrYxVVx6rHoBYx2udKK19C/EMY2XJ/c8WHojVL7K9hhADVkxSu61Fq6MZGB7;3:zm86z792B/bRUXQu6ppHbjPfDgWp7NFLvj8YT5obs0gNcpZ/osWXDN7G+fwMNQLDTyscHsY+hkWerSetVR+U+T0nUagx4lpTLdgQ9Vg4srhe4PamNmEVYrkHkyCFRzBhU97Q+qFlSVJ3LMMBpLhH1rXobC2KtIFEGnSTZl0Xb8ELLWbwk1YTqpYNa2Q17Kk+WPfsONKwekoAHuaOR4T0L5+n0vMqswMphVvy/wTJmhw=;25:wbhvoXOZX06REd6Sx86r/JyzbUDyG/8Yau735jM/rycwHZ3SQdUVF6I3SJZ8stBSFrdL6Hp57eGLdas5IcaWk74PP6UNimztO8s0nM243wC9SU4LMSj7yWfFjxRcOTOVhm6fltzRoXjyLYXCAE9b45mgATie9LMeba59nLGH/ErgLqoYpkIazOjza0cPZ9PzcY1Su4CgDIOjsQ1cXCt/BVN796F9rMGZbDWNhqc/BU0ndZKfgWQ/oQSP/F0tKpc44fha8PjGwtBM9RyINieym3vvBO73WRYqbeZVEMDu7qnfDXhYv9UrPlFf/lG0dZsiApmUz8nEbirFeh/a2nFX0ca6BSDZchYGdOB9ObaoFLGEFJXrIyXMUEmzNyP7RkQpVdSGi4IkSoxLjzRYKZFsGGTkm3yUDQNL6nT8FiRQkD8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB442; X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB442;31:mEMINB2KVcUlft3++6CA2xjQyARBmLGo1cQOohe7maRe/jK35oSF4cb8s0EawscsNbMn0AmG9xIoJEvxvZoHTZ7jjMWbd53hgl0bWbuiz2NY/sIszrvb+fzf/PIAfzDLHTdey+jHrrSX2JxPD+RBpVM2giG+GfXeA3flQVRri68aXu055gwUJaAOCLKTymMXGmnmYh5cPZSJgQGJ5lfmsOzd4D2tXy4v3AqIBO1ZhMY=;4:vK6w4nGtFVsq9L0BIodviyWTW5bNutXOMtax+X/CJgET/D3RUwXfhwz3xNMTXKLNvVn6sliOkuRvz8nbvWYs4T+gxlbjmcaeP2REXLh4xmM7JA6XAVxV0MKOhOeO0mSOgvQ6oXDK0z9t6uepA5gxlWfTqN/Lb7Fv5XbAdf1XIbRr6JJ2D2FJh/QS5uzuSUZ4QJ3oJAjF2P9fzh2buxYcr18kwiWMNnnaNukBpLjUX8j8lamhd5s2xVBfDCm10DmZzYNjRBhaLWX/5vnv6oWLw/8gFqmuEKIrQoGIAKevQRbAf1K+Lvevht5mmypsuP+MVXlTTWMR+R5tVMseFcsT8/rjmuszDQqo0G0Chgz9mVT6i3pVJs93jiybCl2lVLcpB7rNUN5ANlbHgyQqR+58NF+8241Xidxs2+7fxEvc4i5vokKdJHIvCiisGizYmivaaWGYpC7Cikc84BTdbCaQ89sXhk6NHRVYvA6E6NWdkSgQcOxLtitLGynCdYX+zddDy9mVVek4CgmAgjaUTXe0ktS3xcpXAzEOZfRkLdGBmWBdqJghkOK37qF5z0rQqVle X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(211171220733660); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(13015025)(13017025)(13023025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026);SRVR:BY2PR03MB442;BCL:0;PCL:0;RULEID:(400006);SRVR:BY2PR03MB442; X-Forefront-PRVS: 004395A01C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR03MB442;23:tbd47bwALpAnUiGRy+PrHc5mdwIr8acMMJ9LDOnN3/?= =?us-ascii?Q?r8KsqQqrV/zX/Um0facyEcIZddSRHIpavijnnLZj47dSEJd8KLkK2i6Rq3z3?= =?us-ascii?Q?D0hj2h6024Q3nWZsWb8gLyaSInLpd+KhZwBTzv5OXnTqt8QqduFz4tY3d7ia?= =?us-ascii?Q?NQBvN+Ut7z7MFjRHr3sJDgrAwdJ2Ig41Xj9uVTOrM737lmJb6tfLs0Ee5MKm?= =?us-ascii?Q?jljFdYyTuxqjfLM4cgkSMr2e/J3BmfFQvaQbqIIi4C/FXJSv6ugvBnHWAZhs?= =?us-ascii?Q?WPILciaoDU7o0xh7BJHWC6s6nrtwFMFhC9NkhxrdpK9Cr8BEURdLcQJNBTJJ?= =?us-ascii?Q?0cTLLYz6x8c9CS8+SyxfyJTTMTxpj7W2XthcQVFNdYer8ejNNeXqbH8UZ9yt?= =?us-ascii?Q?Ov10m7DSQLAj1Nc3f+pCahyNfU9cVIyue2SkZ4PP/N4w+H6J99ontg06ecFu?= =?us-ascii?Q?vbA4UVlHGfIELf59vn/4NGLrj71fyL3iPxVZNVVewXjLJzupssozUCsyECwD?= =?us-ascii?Q?1Krdx670u58rfZsBQAWgiSIX90/J03vRRl05Xbem97H59+zcrqq6qrOBHa3C?= =?us-ascii?Q?RXVXXToACvRwz5fRym4rv7j8NC97MKORWFUNghtLaTdz0PA9bOH5egZPvNCV?= =?us-ascii?Q?YoUwSKh85yDaCSWko3ehndLukt1VtiosUHXlvyP0xEFbY/4I1Dr9rTmAxPHf?= =?us-ascii?Q?YnUM2O4EMIoxsCFGWqCZPWPZyVgwAKdFySqmIS8V9hHpPThyw3QI9u/w+AjU?= =?us-ascii?Q?o+7r7v+clF6QUC0x49l0eRS+s4n1TlARkVifuC9ag1WoKRQFeZAwhG8ur6M5?= =?us-ascii?Q?Zf1Eiz8ic9s+JnKqQ0FoTupD0J/gq5GkLW+VvKA5J5jYIYKvLPFx8jnwOU5R?= =?us-ascii?Q?xonvV6QcHXj8E27EX/lsGvEMBZxJ8QAD3wMgj6+ZkHCSHSyD6Tec+H2J9KWV?= =?us-ascii?Q?5616D+cuLUnb+yFsvf028U8s5rkgUJT9rESGcqw2QtXVuQ9G4Oa1z83wXGja?= =?us-ascii?Q?ALx1pvJF5RG+e9/u94YlXutT+XgZ5MWiwyJXzcEaR4j6F9GlKj+C0lx9DLZQ?= =?us-ascii?Q?dTD/vmAbIguNh9bPOJ9axIGGDotUxJCbEtTMuLJE3zx/F/3a9+Py3qaLYoKu?= =?us-ascii?Q?TaFN6EX7XHeQx0WKxAYxZV5qHv+3DcsCmg6HHh0i750yGQUt9Nqg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB442;6:aJWQA0tPU3dec/xgLQg123HfFPwTykGoFXxNwvMD7HgXxps+zlco3+fJvKseeNqYNzM082i3Gd4OYty3FpH2A50qT+8us9Ec9tjyjLJt2sqpjVFS8fRXHrQgTeC7Q0AGvy517H/ZSmXBk+NkPmhJbJ6avkdUnLSbUHXwP9mZZ5ayPWx8b7nicODZfI8WohUz9QnNIkyGjGNEt3b/RRnPVmO59aorOvx9p8LAjYi9Nw4KGupMJvRBc4YYJPyucWsNpBEFcbEkdTTDSHeTZVnMiNIWP61yde5DccSAQxQymFA=;5:wNrQRRwvR/UTwkm+0m6P8Ne2ZDY+pEqgyfG3/supv35sfh9lX4XD7ui9n/8kKNGsVo1wK+gmmWSSAyqN+q84jndyxU85cuk0RbdOtzPAKuv/wIx5g5KUZvW5UwZE3r/V8FK97WHXn5f7Casp4rOYmga3BsvCWhHYTGUTGqFNPcs=;24:pLm2xBOYV/A6YhMQGxzXlyPHOekhqvew/5SjuwoniupsHoiOaVY8f79BSnlc467Bc/IY/ywGpEWpx5GlCYHxGR0JHWqsj++L6AcvLZscRe0=;7:5APoHrckc+m2DJsleI4PwW221M3M3vC8z67kQwB0IhcBd7Xb4JBgXbHCH6hVhDLQx/BuvqN/2h6yJQhLH4lUU/21tL38Wbffpli3Nxpyaqlq057YPsmcD2SI6MAtJ8Z+z9Vc56dbNjPWA80FmWW9DHeE+wNTABefhoijuKvcKDs8IUIq5xrA5AWtznJ0k4v9LBEvO5etypZVFyL4EAMYnnZylVMjOQpgrrRjRo4spjf+vRHb0ePab8HqWaXpf3XR SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2016 22:14:22.6336 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB442 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add DDR EDAC for ARM-based compatible controllers. Both big-endian and little-endian are supported, as specified in device tree. Signed-off-by: York Sun --- Change log v5: Update author and copyright for the new driver Drop initializing varaible with 0 Add pr_fmt macro v4: Drop adding atomic_scrub() for armv8 Drop NO_IRQ v3: no change v2: Create new driver using shared DDR object arch/arm64/Kconfig.platforms | 1 + drivers/edac/Kconfig | 7 ++++ drivers/edac/Makefile | 3 ++ drivers/edac/fsl_ddr_edac.c | 2 +- drivers/edac/layerscape_edac.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 drivers/edac/layerscape_edac.c diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index bb2616b..52f30a6 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -55,6 +55,7 @@ config ARCH_EXYNOS config ARCH_LAYERSCAPE bool "ARMv8 based Freescale Layerscape SoC family" + select EDAC_SUPPORT help This enables support for the Freescale Layerscape SoC family. diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 394cd16..49d7900 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -258,6 +258,13 @@ config EDAC_MPC85XX Support for error detection and correction on the Freescale MPC8349, MPC8560, MPC8540, MPC8548, T4240 +config EDAC_LAYERSCAPE + tristate "Freescale Layerscape DDR" + depends on EDAC_MM_EDAC && ARCH_LAYERSCAPE + help + Support for error detection and correction on Freescale memory + controllers on Layerscape SoCs. + config EDAC_MV64X60 tristate "Marvell MV64x60" depends on EDAC_MM_EDAC && MV64X60 diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile index ee047a4..910dc83 100644 --- a/drivers/edac/Makefile +++ b/drivers/edac/Makefile @@ -54,6 +54,9 @@ obj-$(CONFIG_EDAC_PASEMI) += pasemi_edac.o mpc85xx_edac_mod-y := fsl_ddr_edac.o mpc85xx_edac.o obj-$(CONFIG_EDAC_MPC85XX) += mpc85xx_edac_mod.o +layerscape_edac_mod-y := fsl_ddr_edac.o layerscape_edac.o +obj-$(CONFIG_EDAC_LAYERSCAPE) += layerscape_edac_mod.o + obj-$(CONFIG_EDAC_MV64X60) += mv64x60_edac.o obj-$(CONFIG_EDAC_CELL) += cell_edac.o obj-$(CONFIG_EDAC_PPC4XX) += ppc4xx_edac.o diff --git a/drivers/edac/fsl_ddr_edac.c b/drivers/edac/fsl_ddr_edac.c index d8ce1f6..afade14 100644 --- a/drivers/edac/fsl_ddr_edac.c +++ b/drivers/edac/fsl_ddr_edac.c @@ -26,6 +26,7 @@ #include #include +#include #include "edac_module.h" #include "edac_core.h" #include "fsl_ddr_edac.h" @@ -478,7 +479,6 @@ int fsl_mc_err_probe(struct platform_device *op) pdata = mci->pvt_info; pdata->name = "fsl_mc_err"; - pdata->irq = NO_IRQ; mci->pdev = &op->dev; pdata->edac_idx = edac_mc_idx++; dev_set_drvdata(mci->pdev, mci); diff --git a/drivers/edac/layerscape_edac.c b/drivers/edac/layerscape_edac.c new file mode 100644 index 0000000..6c59d89 --- /dev/null +++ b/drivers/edac/layerscape_edac.c @@ -0,0 +1,73 @@ +/* + * Freescale Memory Controller kernel module + * + * Author: York Sun + * + * Copyright 2016 NXP Semiconductor + * + * Derived from mpc85xx_edac.c + * Author: Dave Jiang + * + * 2006-2007 (c) MontaVista Software, Inc. This file is licensed under + * the terms of the GNU General Public License version 2. This program + * is licensed "as is" without any warranty of any kind, whether express + * or implied. + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include "edac_core.h" +#include "fsl_ddr_edac.h" + +static const struct of_device_id fsl_ddr_mc_err_of_match[] = { + { .compatible = "fsl,qoriq-memory-controller", }, + {}, +}; +MODULE_DEVICE_TABLE(of, fsl_ddr_mc_err_of_match); + +static struct platform_driver fsl_ddr_mc_err_driver = { + .probe = fsl_mc_err_probe, + .remove = fsl_mc_err_remove, + .driver = { + .name = "fsl_ddr_mc_err", + .of_match_table = fsl_ddr_mc_err_of_match, + }, +}; + +static int __init fsl_ddr_mc_init(void) +{ + int res; + + /* 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; + } + + res = platform_driver_register(&fsl_ddr_mc_err_driver); + if (res) { + pr_err("MC fails to register\n"); + return res; + } + + return 0; +} + +module_init(fsl_ddr_mc_init); + +static void __exit fsl_ddr_mc_exit(void) +{ + platform_driver_unregister(&fsl_ddr_mc_err_driver); +} + +module_exit(fsl_ddr_mc_exit); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("NXP Semiconductor"); +module_param(edac_op_state, int, 0444); +MODULE_PARM_DESC(edac_op_state, + "EDAC Error Reporting state: 0=Poll, 2=Interrupt"); -- 2.7.4