From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: linux-mtd@lists.infradead.org
Cc: Enrico Jorns <ejo@pengutronix.de>,
Artem Bityutskiy <artem.bityutskiy@linux.intel.com>,
Dinh Nguyen <dinguyen@kernel.org>,
Boris Brezillon <boris.brezillon@free-electrons.com>,
Marek Vasut <marek.vasut@gmail.com>,
Graham Moore <grmoore@opensource.altera.com>,
David Woodhouse <dwmw2@infradead.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Chuanxiao Dong <chuanxiao.dong@intel.com>,
Jassi Brar <jaswinder.singh@linaro.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Brian Norris <computersforpeace@gmail.com>,
Richard Weinberger <richard@nod.at>,
Cyrille Pitchen <cyrille.pitchen@atmel.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Subject: [PATCH v3 14/37] mtd: nand: denali: support "nand-ecc-strength" DT property
Date: Thu, 30 Mar 2017 15:46:00 +0900 [thread overview]
Message-ID: <1490856383-31560-15-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1490856383-31560-1-git-send-email-yamada.masahiro@socionext.com>
Historically, this driver tried to choose as big ECC strength as
possible, but it would be reasonable to allow DT to set a particular
ECC strength with "nand-ecc-strength" property. This is useful
when a particular ECC setting is hard-coded by firmware (or hard-
wired by boot ROM).
If no ECC strength is specified in DT, "nand-ecc-maximize" is implied
since this was the original behavior.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Rob Herring <robh@kernel.org>
---
Changes in v3: None
Changes in v2:
- Add available values in the binding document
Documentation/devicetree/bindings/mtd/denali-nand.txt | 6 ++++++
drivers/mtd/nand/denali.c | 18 ++++++++++++++++--
drivers/mtd/nand/denali_pci.c | 1 +
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/mtd/denali-nand.txt b/Documentation/devicetree/bindings/mtd/denali-nand.txt
index 25313c7..647618e 100644
--- a/Documentation/devicetree/bindings/mtd/denali-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/denali-nand.txt
@@ -11,6 +11,12 @@ Optional properties:
- nand-ecc-step-size: must be 512 or 1024. If not specified, default to:
512 for "altr,socfpga-denali-nand"
see nand.txt for details.
+ - nand-ecc-strength: see nand.txt for details. Available values are:
+ 8, 15 for "altr,socfpga-denali-nand"
+ - nand-ecc-maximize: see nand.txt for details
+
+Note:
+Either nand-ecc-strength or nand-ecc-maximize should be specified.
The device tree may optionally contain sub-nodes describing partitions of the
address space. See partition.txt for more detail.
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
index ce87b95..2f796e3 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -1641,9 +1641,23 @@ int denali_init(struct denali_nand_info *denali)
goto failed_req_irq;
}
- ret = denali_set_max_ecc_strength(denali);
- if (ret)
+ if (!chip->ecc.strength && !(chip->ecc.options & NAND_ECC_MAXIMIZE)) {
+ dev_info(denali->dev,
+ "No ECC strength strategy is specified. Maximizing ECC strength\n");
+ chip->ecc.options |= NAND_ECC_MAXIMIZE;
+ }
+
+ if (chip->ecc.options & NAND_ECC_MAXIMIZE) {
+ ret = denali_set_max_ecc_strength(denali);
+ if (ret)
+ goto failed_req_irq;
+ } else if (!(denali->ecc_strength_avail & BIT(chip->ecc.strength))) {
+ dev_err(denali->dev,
+ "ECC strength %d is not supported on this controller.\n",
+ chip->ecc.strength);
+ ret = -EINVAL;
goto failed_req_irq;
+ }
chip->ecc.bytes = denali_calc_ecc_bytes(chip->ecc.size,
chip->ecc.strength);
diff --git a/drivers/mtd/nand/denali_pci.c b/drivers/mtd/nand/denali_pci.c
index a1ee9f8..a39682a5 100644
--- a/drivers/mtd/nand/denali_pci.c
+++ b/drivers/mtd/nand/denali_pci.c
@@ -87,6 +87,7 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
denali->ecc_strength_avail = BIT(15) | BIT(8);
denali->caps |= DENALI_CAP_ECC_SIZE_512;
+ denali->nand.ecc.options |= NAND_ECC_MAXIMIZE;
ret = denali_init(denali);
if (ret)
--
2.7.4
next prev parent reply other threads:[~2017-03-30 6:54 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-30 6:45 [PATCH v3 00/37] mtd: nand: denali: 2nd round of Denali NAND IP patch bomb Masahiro Yamada
2017-03-30 6:45 ` [PATCH v3 01/37] mtd: nand: relax ecc.read_page() return value for uncorrectable ECC Masahiro Yamada
2017-03-30 6:45 ` [PATCH v3 02/37] mtd: nand: denali: allow to override mtd->name from label DT property Masahiro Yamada
2017-03-30 6:45 ` [PATCH v3 03/37] mtd: nand: denali: remove meaningless pipeline read-ahead operation Masahiro Yamada
2017-03-30 6:45 ` [PATCH v3 04/37] mtd: nand: denali: fix bitflips calculation in handle_ecc() Masahiro Yamada
2017-03-30 6:45 ` [PATCH v3 05/37] mtd: nand: denali: fix erased page checking Masahiro Yamada
2017-03-30 6:45 ` [PATCH v3 06/37] mtd: nand: denali: support HW_ECC_FIXUP capability Masahiro Yamada
2017-03-30 6:45 ` [PATCH v3 07/37] mtd: nand: denali_dt: enable HW_ECC_FIXUP for Altera SOCFPGA variant Masahiro Yamada
2017-03-30 6:45 ` [PATCH v3 08/37] mtd: nand: denali: support 64bit capable DMA engine Masahiro Yamada
2017-03-30 6:45 ` [PATCH v3 09/37] mtd: nand: denali_dt: remove dma-mask DT property Masahiro Yamada
2017-03-30 6:45 ` [PATCH v3 10/37] mtd: nand: denali_dt: use pdev instead of ofdev for platform_device Masahiro Yamada
2017-03-30 6:45 ` [PATCH v3 11/37] mtd: nand: denali: allow to override revision number Masahiro Yamada
2017-03-30 6:45 ` [PATCH v3 12/37] mtd: nand: denali: support 1024 byte ECC step size Masahiro Yamada
2017-04-01 8:43 ` Masahiro Yamada
2017-03-30 6:45 ` [PATCH v3 13/37] mtd: nand: denali: avoid hard-coding ecc.strength and ecc.bytes Masahiro Yamada
2017-03-31 9:09 ` Boris Brezillon
2017-03-30 6:46 ` Masahiro Yamada [this message]
2017-03-30 14:02 ` [PATCH v3 14/37] mtd: nand: denali: support "nand-ecc-strength" DT property Boris Brezillon
2017-03-31 5:06 ` Masahiro Yamada
2017-03-31 9:46 ` Boris Brezillon
2017-04-03 3:16 ` Masahiro Yamada
2017-04-09 16:33 ` Boris Brezillon
2017-04-11 6:19 ` Masahiro Yamada
2017-04-11 7:56 ` Boris Brezillon
2017-04-14 7:57 ` Masahiro Yamada
2017-04-14 8:19 ` Boris Brezillon
2017-04-22 15:00 ` Masahiro Yamada
2017-03-30 6:46 ` [PATCH v3 15/37] mtd: nand: denali: remove Toshiba and Hynix specific fixup code Masahiro Yamada
2017-03-30 6:46 ` [PATCH v3 16/37] mtd: nand: denali_dt: add compatible strings for UniPhier SoC variants Masahiro Yamada
2017-04-03 15:46 ` Rob Herring
2017-03-30 6:46 ` [PATCH v3 17/37] mtd: nand: denali: set NAND_ECC_CUSTOM_PAGE_ACCESS Masahiro Yamada
2017-03-30 6:46 ` [PATCH v3 18/37] mtd: nand: denali: do not propagate NAND_STATUS_FAIL to waitfunc() Masahiro Yamada
2017-03-30 15:17 ` Boris Brezillon
2017-03-30 6:46 ` [PATCH v3 19/37] mtd: nand: denali: use BIT() and GENMASK() for register macros Masahiro Yamada
2017-03-30 6:46 ` [PATCH v3 20/37] mtd: nand: denali: remove unneeded find_valid_banks() Masahiro Yamada
2017-03-30 6:46 ` [PATCH v3 21/37] mtd: nand: denali: handle timing parameters by setup_data_interface() Masahiro Yamada
2017-03-30 6:46 ` [PATCH v3 22/37] mtd: nand: denali: rework interrupt handling Masahiro Yamada
2017-03-30 6:46 ` [PATCH v3 23/37] mtd: nand: denali: fix NAND_CMD_STATUS handling Masahiro Yamada
2017-03-30 6:46 ` [PATCH v3 24/37] mtd: nand: denali: fix NAND_CMD_PARAM handling Masahiro Yamada
2017-03-30 6:46 ` [PATCH v3 25/37] mtd: nand: denali: switch over to cmd_ctrl instead of cmdfunc Masahiro Yamada
2017-03-30 15:55 ` Boris Brezillon
2017-03-30 6:46 ` [PATCH v3 26/37] mtd: nand: denali: fix bank reset function Masahiro Yamada
2017-03-30 16:16 ` Boris Brezillon
2017-04-03 7:05 ` Masahiro Yamada
2017-03-30 6:46 ` [PATCH v3 27/37] mtd: nand: denali: use interrupt instead of polling for bank reset Masahiro Yamada
2017-03-30 6:46 ` [PATCH v3 28/37] mtd: nand: denali: propagate page to helpers via function argument Masahiro Yamada
2017-03-30 6:46 ` [PATCH v3 29/37] mtd: nand: denali: merge struct nand_buf into struct denali_nand_info Masahiro Yamada
2017-03-30 6:46 ` [PATCH v3 30/37] mtd: nand: denali: use flag instead of register macro for direction Masahiro Yamada
2017-03-30 16:38 ` [PATCH v3 00/37] mtd: nand: denali: 2nd round of Denali NAND IP patch bomb Boris Brezillon
2017-03-31 4:05 ` Masahiro Yamada
2017-03-31 8:27 ` Boris Brezillon
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=1490856383-31560-15-git-send-email-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=artem.bityutskiy@linux.intel.com \
--cc=boris.brezillon@free-electrons.com \
--cc=chuanxiao.dong@intel.com \
--cc=computersforpeace@gmail.com \
--cc=cyrille.pitchen@atmel.com \
--cc=devicetree@vger.kernel.org \
--cc=dinguyen@kernel.org \
--cc=dwmw2@infradead.org \
--cc=ejo@pengutronix.de \
--cc=grmoore@opensource.altera.com \
--cc=jaswinder.singh@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=mark.rutland@arm.com \
--cc=mhiramat@kernel.org \
--cc=richard@nod.at \
--cc=robh+dt@kernel.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).