ipq806x: introduce nandc boot layout mode

ipq806x have different ecc configuration for boot partition and rootfs partition. Add support for this to fix IO error on mtd block scan.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

diff --git a/target/linux/ipq806x/patches-5.10/099-1-mtd-nand-raw-qcom_nandc-add-boot_layout_mode-support.patch b/target/linux/ipq806x/patches-5.10/099-1-mtd-nand-raw-qcom_nandc-add-boot_layout_mode-support.patch
new file mode 100644 (file)
index 0000000..06b8423
--- /dev/null
+++ b/target/linux/ipq806x/patches-5.10/099-1-mtd-nand-raw-qcom_nandc-add-boot_layout_mode-support.patch
@@ -0,0 +1,245 @@
+From 6949d651e3be3ebbfedb6bbd5b541cfda6ee58a9 Mon Sep 17 00:00:00 2001
+From: Ansuel Smith <ansuelsmth@gmail.com>
+Date: Wed, 10 Feb 2021 10:40:17 +0100
+Subject: [PATCH 1/2] mtd: nand: raw: qcom_nandc: add boot_layout_mode support
+
+ipq806x nand have a special ecc configuration for the boot pages. The
+use of the non-boot pages configuration on boot pages cause I/O error
+and can cause broken data written to the nand. Add support for this
+special configuration if the page to be read/write is in the size of the
+boot pages set by the dts.
+
+Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+---
+ drivers/mtd/nand/raw/qcom_nandc.c | 82 +++++++++++++++++++++++++++++--
+ 1 file changed, 77 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c
+index 667e4bfe369f..69be86898d7a 100644
+--- a/drivers/mtd/nand/raw/qcom_nandc.c
++++ b/drivers/mtd/nand/raw/qcom_nandc.c
+@@ -160,6 +160,11 @@
+ /* NAND_CTRL bits */
+ #define       BAM_MODE_EN                     BIT(0)
+ 
++
++#define UD_SIZE_BYTES_MASK    (0x3ff << UD_SIZE_BYTES)
++#define SPARE_SIZE_BYTES_MASK (0xf << SPARE_SIZE_BYTES)
++#define ECC_NUM_DATA_BYTES_MASK       (0x3ff << ECC_NUM_DATA_BYTES)
++
+ /*
+  * the NAND controller performs reads/writes with ECC in 516 byte chunks.
+  * the driver calls the chunks 'step' or 'codeword' interchangeably
+@@ -431,6 +436,13 @@ struct qcom_nand_controller {
+  * @cfg0, cfg1, cfg0_raw..:   NANDc register configurations needed for
+  *                            ecc/non-ecc mode for the current nand flash
+  *                            device
++ *
++ * @boot_pages_conf:          keep track of the current ecc configuration used by
++ *                            the driver for read/write operation. (boot pages
++ *                            have different configuration than normal page)
++ * @boot_pages:                       number of pages starting from 0 used as boot pages
++ *                            where the driver will use the boot pages ecc
++ *                            configuration for read/write operation
+  */
+ struct qcom_nand_host {
+       struct nand_chip chip;
+@@ -453,6 +465,9 @@ struct qcom_nand_host {
+       u32 ecc_bch_cfg;
+       u32 clrflashstatus;
+       u32 clrreadstatus;
++
++      bool boot_pages_conf;
++      u32 boot_pages;
+ };
+ 
+ /*
+@@ -462,6 +477,7 @@ struct qcom_nand_host {
+  * @ecc_modes - ecc mode for NAND
+  * @is_bam - whether NAND controller is using BAM
+  * @is_qpic - whether NAND CTRL is part of qpic IP
++ * @has_boot_pages - whether NAND has different ecc settings for boot pages
+  * @dev_cmd_reg_start - NAND_DEV_CMD_* registers starting offset
+  */
+ struct qcom_nandc_props {
+@@ -469,6 +485,7 @@ struct qcom_nandc_props {
+       bool is_bam;
+       bool is_qpic;
++      bool has_boot_pages;
+       u32 dev_cmd_reg_start;
+ };
+ 
+ /* Frees the BAM transaction memory */
+@@ -1622,7 +1639,7 @@ qcom_nandc_read_cw_raw(struct mtd_info *mtd, struct nand_chip *chip,
+       data_size1 = mtd->writesize - host->cw_size * (ecc->steps - 1);
+       oob_size1 = host->bbm_size;
+ 
+-      if (cw == (ecc->steps - 1)) {
++      if (cw == (ecc->steps - 1) && !host->boot_pages_conf) {
+               data_size2 = ecc->size - data_size1 -
+                            ((ecc->steps - 1) * 4);
+               oob_size2 = (ecc->steps * 4) + host->ecc_bytes_hw +
+@@ -1703,7 +1720,7 @@ check_for_erased_page(struct qcom_nand_host *host, u8 *data_buf,
+       }
+ 
+       for_each_set_bit(cw, &uncorrectable_cws, ecc->steps) {
+-              if (cw == (ecc->steps - 1)) {
++              if (cw == (ecc->steps - 1) && !host->boot_pages_conf) {
+                       data_size = ecc->size - ((ecc->steps - 1) * 4);
+                       oob_size = (ecc->steps * 4) + host->ecc_bytes_hw;
+               } else {
+@@ -1862,7 +1879,7 @@ static int read_page_ecc(struct qcom_nand_host *host, u8 *data_buf,
+       for (i = 0; i < ecc->steps; i++) {
+               int data_size, oob_size;
+ 
+-              if (i == (ecc->steps - 1)) {
++              if (i == (ecc->steps - 1) && !host->boot_pages_conf) {
+                       data_size = ecc->size - ((ecc->steps - 1) << 2);
+                       oob_size = (ecc->steps << 2) + host->ecc_bytes_hw +
+                                  host->spare_bytes;
+@@ -1959,6 +1976,30 @@ static int copy_last_cw(struct qcom_nand_host *host, int page)
+       return ret;
+ }
+ 
++static void
++check_boot_pages_conf(struct qcom_nand_host *host, int page)
++{
++      bool boot_pages_conf = page < host->boot_pages;
++
++      /* Skip conf write if we are already in the correct mode */
++      if (boot_pages_conf != host->boot_pages_conf) {
++              host->boot_pages_conf = boot_pages_conf;
++
++              host->cw_data = boot_pages_conf ? 512 : 516;
++              host->spare_bytes = host->cw_size - host->ecc_bytes_hw -
++                                  host->bbm_size - host->cw_data;
++
++              host->cfg0 &= ~(SPARE_SIZE_BYTES_MASK | UD_SIZE_BYTES_MASK);
++              host->cfg0 |= host->spare_bytes << SPARE_SIZE_BYTES |
++                            host->cw_data << UD_SIZE_BYTES;
++
++              host->ecc_bch_cfg &= ~ECC_NUM_DATA_BYTES_MASK;
++              host->ecc_bch_cfg |= host->cw_data << ECC_NUM_DATA_BYTES;
++              host->ecc_buf_cfg = (boot_pages_conf ? 0x1ff : 0x203) <<
++                                   NUM_STEPS;
++      }
++}
++
+ /* implements ecc->read_page() */
+ static int qcom_nandc_read_page(struct nand_chip *chip, uint8_t *buf,
+                               int oob_required, int page)
+@@ -1967,6 +2008,9 @@ static int qcom_nandc_read_page(struct nand_chip *chip, uint8_t *buf,
+       struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip);
+       u8 *data_buf, *oob_buf = NULL;
+ 
++      if (host->boot_pages)
++              check_boot_pages_conf(host, page);
++
+       nand_read_page_op(chip, page, 0, NULL, 0);
+       data_buf = buf;
+       oob_buf = oob_required ? chip->oob_poi : NULL;
+@@ -1986,6 +2030,9 @@ static int qcom_nandc_read_page_raw(struct nand_chip *chip, uint8_t *buf,
+       int cw, ret;
+       u8 *data_buf = buf, *oob_buf = chip->oob_poi;
+ 
++      if (host->boot_pages)
++              check_boot_pages_conf(host, page);
++
+       for (cw = 0; cw < ecc->steps; cw++) {
+               ret = qcom_nandc_read_cw_raw(mtd, chip, data_buf, oob_buf,
+                                            page, cw);
+@@ -2006,6 +2053,9 @@ static int qcom_nandc_read_oob(struct nand_chip *chip, int page)
+       struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip);
+       struct nand_ecc_ctrl *ecc = &chip->ecc;
+ 
++      if (host->boot_pages)
++              check_boot_pages_conf(host, page);
++
+       clear_read_regs(nandc);
+       clear_bam_transaction(nandc);
+ 
+@@ -2026,6 +2076,9 @@ static int qcom_nandc_write_page(struct nand_chip *chip, const uint8_t *buf,
+       u8 *data_buf, *oob_buf;
+       int i, ret;
+ 
++      if (host->boot_pages)
++              check_boot_pages_conf(host, page);
++
+       nand_prog_page_begin_op(chip, page, 0, NULL, 0);
+ 
+       clear_read_regs(nandc);
+@@ -2041,7 +2094,7 @@ static int qcom_nandc_write_page(struct nand_chip *chip, const uint8_t *buf,
+       for (i = 0; i < ecc->steps; i++) {
+               int data_size, oob_size;
+ 
+-              if (i == (ecc->steps - 1)) {
++              if (i == (ecc->steps - 1) && !host->boot_pages_conf) {
+                       data_size = ecc->size - ((ecc->steps - 1) << 2);
+                       oob_size = (ecc->steps << 2) + host->ecc_bytes_hw +
+                                  host->spare_bytes;
+@@ -2098,6 +2151,9 @@ static int qcom_nandc_write_page_raw(struct nand_chip *chip,
+       u8 *data_buf, *oob_buf;
+       int i, ret;
+ 
++      if (host->boot_pages)
++              check_boot_pages_conf(host, page);
++
+       nand_prog_page_begin_op(chip, page, 0, NULL, 0);
+       clear_read_regs(nandc);
+       clear_bam_transaction(nandc);
+@@ -2116,7 +2172,7 @@ static int qcom_nandc_write_page_raw(struct nand_chip *chip,
+               data_size1 = mtd->writesize - host->cw_size * (ecc->steps - 1);
+               oob_size1 = host->bbm_size;
+ 
+-              if (i == (ecc->steps - 1)) {
++              if (i == (ecc->steps - 1) && !host->boot_pages_conf) {
+                       data_size2 = ecc->size - data_size1 -
+                                    ((ecc->steps - 1) << 2);
+                       oob_size2 = (ecc->steps << 2) + host->ecc_bytes_hw +
+@@ -2176,6 +2232,9 @@ static int qcom_nandc_write_oob(struct nand_chip *chip, int page)
+       int data_size, oob_size;
+       int ret;
+ 
++      if (host->boot_pages)
++              check_boot_pages_conf(host, page);
++
+       host->use_ecc = true;
+       clear_bam_transaction(nandc);
+ 
+@@ -2828,6 +2887,7 @@ static int qcom_nand_host_init_and_register(struct qcom_nand_controller *nandc,
+       struct nand_chip *chip = &host->chip;
+       struct mtd_info *mtd = nand_to_mtd(chip);
+       struct device *dev = nandc->dev;
++      u32 boot_pages_size;
+       int ret;
+ 
+       ret = of_property_read_u32(dn, "reg", &host->cs);
+@@ -2888,6 +2948,17 @@ static int qcom_nand_host_init_and_register(struct qcom_nand_controller *nandc,
+       if (ret)
+               nand_cleanup(chip);
+ 
++      if (nandc->props->has_boot_pages &&
++          of_property_read_bool(dn, "nand-is-boot-medium")) {
++              ret = of_property_read_u32(dn, "qcom,boot_pages_size",
++                                         &boot_pages_size);
++              if (ret)
++                      dev_warn(dev, "can't get boot pages size");
++              else
++                      /* Convert size to nand pages */
++                      host->boot_pages = boot_pages_size / mtd->writesize;
++      }
++
+       return ret;
+ }
+ 
+@@ -3057,6 +3128,7 @@ static int qcom_nandc_remove(struct platform_device *pdev)
+ static const struct qcom_nandc_props ipq806x_nandc_props = {
+       .ecc_modes = (ECC_RS_4BIT | ECC_BCH_8BIT),
+       .is_bam = false,
++      .has_boot_pages = true,
+       .dev_cmd_reg_start = 0x0,
+ };
+ 
+-- 
+2.29.2
+

diff --git a/target/linux/ipq806x/patches-5.10/099-2-Documentation-devicetree-mtd-qcom_nandc-document-qco.patch b/target/linux/ipq806x/patches-5.10/099-2-Documentation-devicetree-mtd-qcom_nandc-document-qco.patch
new file mode 100644 (file)
index 0000000..2bef1da
--- /dev/null
+++ b/target/linux/ipq806x/patches-5.10/099-2-Documentation-devicetree-mtd-qcom_nandc-document-qco.patch
@@ -0,0 +1,47 @@
+From 6fb003a7a117f97a35b078ba726c84adeae29c4c Mon Sep 17 00:00:00 2001
+From: Ansuel Smith <ansuelsmth@gmail.com>
+Date: Wed, 10 Feb 2021 10:54:19 +0100
+Subject: [PATCH 2/2] Documentation: devicetree: mtd: qcom_nandc: document
+ qcom,boot_layout_size binding
+
+Document new qcom,boot_layout_size binding used to apply special
+read/write confituation to boots partitions.
+
+Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+---
+ Documentation/devicetree/bindings/mtd/qcom_nandc.txt | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/Documentation/devicetree/bindings/mtd/qcom_nandc.txt b/Documentation/devicetree/bindings/mtd/qcom_nandc.txt
+index 5647913d8837..3cf1dd5ebad2 100644
+--- a/Documentation/devicetree/bindings/mtd/qcom_nandc.txt
++++ b/Documentation/devicetree/bindings/mtd/qcom_nandc.txt
+@@ -56,6 +56,15 @@ Optional properties:
+                       be used according to chip requirement and available
+                       OOB size.
+ 
++EBI2 specific properties:
++- nand-is-boot-medium:        nand contains boot partitions and different ecc configuration
++                      should be used for these partitions.
++- qcom,boot_pages_size:       should contain the size of the total boot partitions
++                      where the boot layout read/write specific configuration
++                      should be used. The boot layout is considered from the
++                      start of the nand to the value set in this binding.
++                      Only used in combination with 'nand-is-boot-medium'.
++
+ Each nandcs device node may optionally contain a 'partitions' sub-node, which
+ further contains sub-nodes describing the flash partition mapping. See
+ partition.txt for more detail.
+@@ -84,6 +93,9 @@ nand-controller@1ac00000 {
+               nand-ecc-strength = <4>;
+               nand-bus-width = <8>;
+ 
++              nand-is-boot-medium;
++              qcom,boot_pages_size: <0x58a0000>;
++
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+-- 
+2.29.2
+