From patchwork Fri Jan 9 02:53:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tthayer@opensource.altera.com X-Patchwork-Id: 5596531 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 50B2BC058D for ; Fri, 9 Jan 2015 03:13:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2300920547 for ; Fri, 9 Jan 2015 03:13:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 954F62054B for ; Fri, 9 Jan 2015 03:13:33 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y9PzZ-0002ys-8J; Fri, 09 Jan 2015 03:12:05 +0000 Received: from mail-bl2on0643.outbound.protection.outlook.com ([2a01:111:f400:fc09::643] helo=na01-bl2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y9Pj5-00018Q-U4 for linux-arm-kernel@lists.infradead.org; Fri, 09 Jan 2015 02:55:05 +0000 Received: from localhost.localdomain (64.129.157.38) by BY2PR0301MB0629.namprd03.prod.outlook.com (25.160.125.27) with Microsoft SMTP Server (TLS) id 15.1.53.17; Fri, 9 Jan 2015 02:54:50 +0000 From: To: , , , , , , , , , , Subject: [PATCHv6 2/5] arm: socfpga: Enable OCRAM ECC on startup. Date: Thu, 8 Jan 2015 20:53:53 -0600 Message-ID: <1420772036-3112-3-git-send-email-tthayer@opensource.altera.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1420772036-3112-1-git-send-email-tthayer@opensource.altera.com> References: <1420772036-3112-1-git-send-email-tthayer@opensource.altera.com> MIME-Version: 1.0 X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: BLUPR05CA0058.namprd05.prod.outlook.com (10.141.20.28) To BY2PR0301MB0629.namprd03.prod.outlook.com (25.160.125.27) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=tthayer@opensource.altera.com; X-DmarcAction: None X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(3005003);SRVR:BY2PR0301MB0629; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004); SRVR:BY2PR0301MB0629; X-Forefront-PRVS: 04519BA941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(199003)(189002)(22564002)(86362001)(48376002)(40100003)(106356001)(50466002)(50986999)(76176999)(101416001)(2950100001)(97736003)(42186005)(50226001)(4396001)(19580395003)(120916001)(19580405001)(105586002)(122386002)(99396003)(33646002)(229853001)(68736005)(31966008)(107046002)(20776003)(15975445007)(64706001)(66066001)(46102003)(77156002)(2201001)(92566001)(89996001)(21056001)(86152002)(62966003)(47776003)(87976001)(921003)(217873001)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0629; H:localhost.localdomain; FPR:; SPF:None; MLV:sfv; PTR:InfoNoRecords; A:0; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: opensource.altera.com does not designate permitted sender hosts) X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:; SRVR:BY2PR0301MB0629; X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jan 2015 02:54:50.9418 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB0629 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150108_185504_179050_D61DCABE X-CRM114-Status: GOOD ( 15.52 ) X-Spam-Score: -0.0 (/) Cc: devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, tthayer.linux@gmail.com, tthayer@opensource.altera.com, linux-arm-kernel@lists.infradead.org, linux-edac@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Thor Thayer This patch enables the ECC for On-Chip RAM on machine startup. The ECC has to be enabled before data is is stored in memory otherwise the ECC will fail on reads. Signed-off-by: Thor Thayer --- v2: Split OCRAM ECC portion separately. Addition of iounmap() and reorganization of gen_pool_free. Remove defconfig from patch. v3/4: No change v5: Remove ocram.h, use io.h instead of clk-provider.h Check prop in correct place. Add ECC EN defines. v6: Implement OCRAM discovery changes from community. Add of_node_put(). Remove be32_to_cpup(). Use __init() which allows removal of .init_machine(). Update year in header. --- arch/arm/mach-socfpga/Makefile | 1 + arch/arm/mach-socfpga/ocram.c | 97 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 arch/arm/mach-socfpga/ocram.c diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile index 142609e..1552ca5 100644 --- a/arch/arm/mach-socfpga/Makefile +++ b/arch/arm/mach-socfpga/Makefile @@ -5,3 +5,4 @@ obj-y := socfpga.o obj-$(CONFIG_SMP) += headsmp.o platsmp.o obj-$(CONFIG_EDAC_ALTERA_L2C) += l2_cache.o +obj-$(CONFIG_EDAC_ALTERA_OCRAM) += ocram.o diff --git a/arch/arm/mach-socfpga/ocram.c b/arch/arm/mach-socfpga/ocram.c new file mode 100644 index 0000000..1f12a38 --- /dev/null +++ b/arch/arm/mach-socfpga/ocram.c @@ -0,0 +1,97 @@ +/* + * Copyright Altera Corporation (C) 2015. All rights reserved. + * + * 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 . + */ +#include +#include +#include +#include +#include + +#define ALTR_OCRAM_CLEAR_ECC 0x00000018 +#define ALTR_OCRAM_ECC_EN 0x00000019 + +static int __init socfpga_init_ocram_ecc(void) +{ + struct device_node *np; + struct resource res; + u32 iram_addr; + void __iomem *mapped_ocr_edac_addr; + resource_size_t size; + struct gen_pool *gp; + int ret; + + /* Get the size of the on-chip RAM */ + np = of_find_compatible_node(NULL, NULL, "mmio-sram"); + if (!np) { + pr_err("%s: Unable to find mmio-sram in dtb\n", __func__); + return -ENODEV; + } + + ret = of_address_to_resource(np, 0, &res); + if (ret) { + of_node_put(np); + pr_err("%s: Problem getting SRAM address in dtb\n", __func__); + return -ENODEV; + } + size = resource_size(&res); + of_node_put(np); + + /* Find the OCRAM EDAC device tree node */ + np = of_find_compatible_node(NULL, NULL, "altr,ocram-edac"); + if (!np) { + pr_err("%s: Unable to find altr,ocram-edac\n", __func__); + return -ENODEV; + } + + mapped_ocr_edac_addr = of_iomap(np, 0); + if (!mapped_ocr_edac_addr) { + of_node_put(np); + pr_err("%s: Unable to map OCRAM ecc regs.\n", __func__); + return -ENODEV; + } + + gp = of_get_named_gen_pool(np, "iram", 0); + if (!gp) { + of_node_put(np); + pr_err("%s: OCRAM cannot find gen pool\n", __func__); + return -ENODEV; + } + of_node_put(np); + + iram_addr = gen_pool_alloc(gp, size / sizeof(size_t)); + if (iram_addr == 0) { + pr_err("%s: cannot alloc from gen pool\n", __func__); + return -ENODEV; + } + + /* Clear any pending OCRAM ECC interrupts, then enable ECC */ + writel(ALTR_OCRAM_CLEAR_ECC, mapped_ocr_edac_addr); + writel(ALTR_OCRAM_ECC_EN, mapped_ocr_edac_addr); + + memset((void *)iram_addr, 0, size); + + gen_pool_free(gp, iram_addr, size / sizeof(size_t)); + + iounmap(mapped_ocr_edac_addr); + + return 0; +} + +static void __exit socfpga_exit_ocram_ecc(void) +{ +} + +module_init(socfpga_init_ocram_ecc); +module_exit(socfpga_exit_ocram_ecc);