Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cc5a5d3 authored by Thor Thayer's avatar Thor Thayer Committed by Borislav Petkov
Browse files

ARM: socfpga: Enable OCRAM ECC on startup 



Enable ECC for On-Chip RAM on machine startup. The ECC has to be enabled
before data is stored in memory otherwise the ECC will fail on reads.

Signed-off-by: default avatarThor Thayer <tthayer@opensource.altera.com>
Acked-by: default avatarDinh Nguyen <dinguyen@opensource.altera.com>
Cc: devicetree@vger.kernel.org
Cc: dougthompson@xmission.com
Cc: galak@codeaurora.org
Cc: grant.likely@linaro.org
Cc: ijc+devicetree@hellion.org.uk
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux@arm.linux.org.uk
Cc: linux-doc@vger.kernel.org
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: mark.rutland@arm.com
Cc: m.chehab@samsung.com
Cc: pawel.moll@arm.com
Cc: robh+dt@kernel.org
Cc: Russell King <linux@arm.linux.org.uk>
Cc: tthayer.linux@gmail.com
Cc: tthayer@opensource.altera.com
Link: http://lkml.kernel.org/r/1455132384-17108-4-git-send-email-tthayer@opensource.altera.com


Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 4d113838

arch/arm/mach-socfpga/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ obj-y := socfpga.o 
obj-$(CONFIG_SMP)	+= headsmp.o platsmp.o

obj-$(CONFIG_SOCFPGA_SUSPEND)	+= pm.o self-refresh.o

obj-$(CONFIG_EDAC_ALTERA_L2C)	+= l2_cache.o

obj-$(CONFIG_EDAC_ALTERA_OCRAM)	+= ocram.o

arch/arm/mach-socfpga/core.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
extern void socfpga_init_clocks(void);

extern void socfpga_sysmgr_init(void);

void socfpga_init_l2_ecc(void);

void socfpga_init_ocram_ecc(void);



extern void __iomem *sys_manager_base_addr;

extern void __iomem *rst_manager_base_addr;

arch/arm/mach-socfpga/ocram.c

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/*

 * Copyright Altera Corporation (C) 2016. 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 <http://www.gnu.org/licenses/>.

 */

#include <linux/io.h>

#include <linux/genalloc.h>

#include <linux/module.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>



#define ALTR_OCRAM_CLEAR_ECC          0x00000018

#define ALTR_OCRAM_ECC_EN             0x00000019



void socfpga_init_ocram_ecc(void)

{

	struct device_node *np;

	void __iomem *mapped_ocr_edac_addr;



	/* Find the OCRAM EDAC device tree node */

	np = of_find_compatible_node(NULL, NULL, "altr,socfpga-ocram-ecc");

	if (!np) {

		pr_err("Unable to find socfpga-ocram-ecc\n");

		return;

	}



	mapped_ocr_edac_addr = of_iomap(np, 0);

	of_node_put(np);

	if (!mapped_ocr_edac_addr) {

		pr_err("Unable to map OCRAM ecc regs.\n");

		return;

	}



	/* 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);



	iounmap(mapped_ocr_edac_addr);

}

arch/arm/mach-socfpga/socfpga.c

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ static void __init socfpga_init_irq(void) 
	socfpga_sysmgr_init();

	if (IS_ENABLED(CONFIG_EDAC_ALTERA_L2C))

		socfpga_init_l2_ecc();



	if (IS_ENABLED(CONFIG_EDAC_ALTERA_OCRAM))

		socfpga_init_ocram_ecc();

}



static void socfpga_cyclone5_restart(enum reboot_mode mode, const char *cmd)