From: dinguyen@opensource.altera.com (Dinh Nguyen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv7 2/2] ARM: socfpga: Enable OCRAM ECC on startup
Date: Wed, 28 Oct 2015 15:15:19 -0500 [thread overview]
Message-ID: <56312CD7.5050104@opensource.altera.com> (raw)
In-Reply-To: <20151028105957.GN1166@pengutronix.de>
On 10/28/2015 05:59 AM, Steffen Trumtrar wrote:
> On Tue, Oct 27, 2015 at 03:59:41PM -0500, dinguyen at opensource.altera.com wrote:
>> From: Dinh Nguyen <dinguyen@opensource.altera.com>
>>
>> This patch enables the 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: Thor Thayer <tthayer@opensource.altera.com>
>> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
>> ---
>> v7: enable OCRAM ECC during platform init
>> 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/core.h | 1 +
>> arch/arm/mach-socfpga/ocram.c | 50 +++++++++++++++++++++++++++++++++++++++++
>> arch/arm/mach-socfpga/socfpga.c | 3 +++
>> 4 files changed, 55 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 e9ab7c9..ed15db1 100644
>> --- a/arch/arm/mach-socfpga/Makefile
>> +++ b/arch/arm/mach-socfpga/Makefile
>> @@ -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
>> diff --git a/arch/arm/mach-socfpga/core.h b/arch/arm/mach-socfpga/core.h
>> index eb55d66..575195b 100644
>> --- a/arch/arm/mach-socfpga/core.h
>> +++ b/arch/arm/mach-socfpga/core.h
>> @@ -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;
>> diff --git a/arch/arm/mach-socfpga/ocram.c b/arch/arm/mach-socfpga/ocram.c
>> new file mode 100644
>> index 0000000..336e165
>> --- /dev/null
>> +++ b/arch/arm/mach-socfpga/ocram.c
>> @@ -0,0 +1,50 @@
>> +/*
>> + * 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 <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,ocram-edac");
>> + if (!np) {
>> + pr_err("%s: Unable to find altr,ocram-edac\n", __func__);
>
> Do we need the __func__ info here?
>
Will remove..
>> + return;
>> + }
>> +
>> + mapped_ocr_edac_addr = of_iomap(np, 0);
>> + if (!mapped_ocr_edac_addr) {
>> + of_node_put(np);
I need to remove this of_node_put() here.
>> + pr_err("%s: Unable to map OCRAM ecc regs.\n", __func__);
>
> of_node_full_name?
>
Similar to my comment to the 1/2 patch, not sure if adding
of_node_full_name(np) will help with this error statement.
Dinh
next prev parent reply other threads:[~2015-10-28 20:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-27 20:59 [PATCHv7 1/2] ARM: socfpga: enable L2 cache ECC on startup dinguyen at opensource.altera.com
2015-10-27 20:59 ` [PATCHv7 2/2] ARM: socfpga: Enable OCRAM " dinguyen at opensource.altera.com
2015-10-28 10:59 ` Steffen Trumtrar
2015-10-28 20:15 ` Dinh Nguyen [this message]
2015-10-28 10:58 ` [PATCHv7 1/2] ARM: socfpga: enable L2 cache " Steffen Trumtrar
2015-10-28 19:59 ` Dinh Nguyen
[not found] ` <20160120131654.GA18466@amd>
2016-01-21 9:52 ` ARM: socfpga: SPI NOR support for Linux 4.4? Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56312CD7.5050104@opensource.altera.com \
--to=dinguyen@opensource.altera.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).