Skip to contentSkip to conversation

dt-bindings: mtd: brcmnand: Make nand-ecc-strength and nand-ecc-step-size optional

PATCH Superseded Kamal Dasu 4 participants 8 messages May 20, 2019 – May 21, 2019

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Kamal Dasu

author
#0 lore raw

PATCH v2 1/2 dt-bindings: mtd: brcmnand: Make nand-ecc-strength and nand-ecc-step-size optional

nand-ecc-strength and nand-ecc-step-size can be made optional as brcmnand driver can support using raw NAND layer detected values.

---
 Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +2 -2
index bcda1df..29feaba 100644
@@ -101,10 +101,10 @@ Required properties:
                               number (e.g., 0, 1, 2, etc.)
 - #address-cells            : see partition.txt
 - #size-cells               : see partition.txt
-- nand-ecc-strength         : see nand.txt
-- nand-ecc-step-size        : must be 512 or 1024. See nand.txt
 
 Optional properties:
+- nand-ecc-strength         : see nand.txt
+- nand-ecc-step-size        : must be 512 or 1024. See nand.txt
 - nand-on-flash-bbt         : boolean, to enable the on-flash BBT for this
                               chip-select. See nand.txt
 - brcm,nand-oob-sector-size : integer, to denote the spare area sector size
Signature · 1 line
1.9.0.138.g2de3478
author
#1 lore raw

PATCH v2 2/2 mtd: nand: raw: brcmnand: fallback to detected ecc-strength, ecc-step-size

This change supports nand-ecc-step-size and nand-ecc-strength fields in brcmnand DT node to be optional.
see: Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt

If both nand-ecc-strength and nand-ecc-step-size are not specified in device tree node for NAND, raw NAND layer does detect ECC information by reading ONFI extended parameter page for parts using ONFI >= 2.1. In case of non-ONFI NAND parts there could be a nand_id table entry with ECC information. If there is valid device tree entry for nand-ecc-strength and nand-ecc-step-size fields it still shall override the detected values.

---
 drivers/mtd/nand/raw/brcmnand/brcmnand.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +11 -0
index ce0b8ff..a4d2057 100644
@@ -2144,6 +2144,17 @@ static int brcmnand_setup_dev(struct brcmnand_host *host)
 		return -EINVAL;
 	}
 
+	if (chip->ecc.mode != NAND_ECC_NONE &&
+	    (!chip->ecc.size || !chip->ecc.strength)) {
+		if (chip->base.eccreq.step_size && chip->base.eccreq.strength) {
+			/* use detected ECC parameters */
+			chip->ecc.size = chip->base.eccreq.step_size;
+			chip->ecc.strength = chip->base.eccreq.strength;
+			pr_info("Using ECC step-size %d, strength %d\n",
+				chip->ecc.size, chip->ecc.strength);
+		}
+	}
+
 	switch (chip->ecc.size) {
 	case 512:
 		if (chip->ecc.algo == NAND_ECC_HAMMING)
Signature · 1 line
1.9.0.138.g2de3478
#2 lore raw

Re: [PATCH v2 2/2] mtd: nand: raw: brcmnand: fallback to detected ecc-strength, ecc-step-size

Quoted 22 lines · Kamal Dasu

This change supports nand-ecc-step-size and nand-ecc-strength fields in brcmnand DT node to be optional.
see: Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt

If both nand-ecc-strength and nand-ecc-step-size are not specified in device tree node for NAND, raw NAND layer does detect ECC information by reading ONFI extended parameter page for parts using ONFI >= 2.1. In case of non-ONFI NAND parts there could be a nand_id table entry with ECC information. If there is valid device tree entry for nand-ecc-strength and nand-ecc-step-size fields it still shall override the detected values.

---
 drivers/mtd/nand/raw/brcmnand/brcmnand.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +0 -0
index ce0b8ff..a4d2057 100644
@@ -2144,6 +2144,17 @@ static int brcmnand_setup_dev(struct brcmnand_host *host)
 		return -EINVAL;

drivers/mtd/nand/raw/brcmnand/brcmnand.c static int brcmnand_setup_dev(struct brcmnand_host *host) · line 2154

Quoted 10 lines
drivers/mtd/nand/raw/brcmnand/brcmnand.c +8 -0
 	}
 
+	if (chip->ecc.mode != NAND_ECC_NONE &&
+	    (!chip->ecc.size || !chip->ecc.strength)) {
+		if (chip->base.eccreq.step_size && chip->base.eccreq.strength) {
+			/* use detected ECC parameters */
+			chip->ecc.size = chip->base.eccreq.step_size;
+			chip->ecc.strength = chip->base.eccreq.strength;
+			pr_info("Using ECC step-size %d, strength %d\n",
+				chip->ecc.size, chip->ecc.strength);

Nit: should not we use dev_info(&host->pdev->dev) for printing the message in case we have multiple NAND controllers on chip, that way we can still differentiate them from the prints?

Signature · 1 line
Florian
maintainer
#3 lore raw

Re: [PATCH v2 2/2] mtd: nand: raw: brcmnand: fallback to detected ecc-strength, ecc-step-size

Hi Florian,

Florian Fainelli <[email protected]> wrote on Mon, 20 May 2019 12:11:42 -0700:

Quoted 25 lines · Kamal Dasu
Quoted 24 lines

This change supports nand-ecc-step-size and nand-ecc-strength fields in brcmnand DT node to be optional.
see: Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt

If both nand-ecc-strength and nand-ecc-step-size are not specified in device tree node for NAND, raw NAND layer does detect ECC information by reading ONFI extended parameter page for parts using ONFI >= 2.1. In case of non-ONFI NAND parts there could be a nand_id table entry with ECC information. If there is valid device tree entry for nand-ecc-strength and nand-ecc-step-size fields it still shall override the detected values.

---
 drivers/mtd/nand/raw/brcmnand/brcmnand.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +0 -0
index ce0b8ff..a4d2057 100644
@@ -2144,6 +2144,17 @@ static int brcmnand_setup_dev(struct brcmnand_host *host)
 		return -EINVAL;
 	}
 
Quoted 12 lines

drivers/mtd/nand/raw/brcmnand/brcmnand.c static int brcmnand_setup_dev(struct brcmnand_host *host) · line 2154

Quoted 8 lines
drivers/mtd/nand/raw/brcmnand/brcmnand.c +8 -0
+	if (chip->ecc.mode != NAND_ECC_NONE &&
+	    (!chip->ecc.size || !chip->ecc.strength)) {
+		if (chip->base.eccreq.step_size && chip->base.eccreq.strength) {
+			/* use detected ECC parameters */
+			chip->ecc.size = chip->base.eccreq.step_size;
+			chip->ecc.strength = chip->base.eccreq.strength;
+			pr_info("Using ECC step-size %d, strength %d\n",
+				chip->ecc.size, chip->ecc.strength);  

Nit: should not we use dev_info(&host->pdev->dev) for printing the message in case we have multiple NAND controllers on chip, that way we can still differentiate them from the prints?

Yes, that would fit what the rest of the driver does. After that I think the patchset will be ready.

Thanks,
Miquèl

maintainer Reviewed-by
#4 lore raw

Re: [PATCH v2 2/2] mtd: nand: raw: brcmnand: fallback to detected ecc-strength, ecc-step-size

In reply to Florian Fainelli

Hi Florian,

Florian Fainelli <[email protected]> wrote on Mon, 20 May 2019 12:11:42 -0700:

Quoted 25 lines · Kamal Dasu
Quoted 24 lines

This change supports nand-ecc-step-size and nand-ecc-strength fields in brcmnand DT node to be optional.
see: Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt

If both nand-ecc-strength and nand-ecc-step-size are not specified in device tree node for NAND, raw NAND layer does detect ECC information by reading ONFI extended parameter page for parts using ONFI >= 2.1. In case of non-ONFI NAND parts there could be a nand_id table entry with ECC information. If there is valid device tree entry for nand-ecc-strength and nand-ecc-step-size fields it still shall override the detected values.

---
 drivers/mtd/nand/raw/brcmnand/brcmnand.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +0 -0
index ce0b8ff..a4d2057 100644
@@ -2144,6 +2144,17 @@ static int brcmnand_setup_dev(struct brcmnand_host *host)
 		return -EINVAL;
 	}
 
Quoted 12 lines

drivers/mtd/nand/raw/brcmnand/brcmnand.c static int brcmnand_setup_dev(struct brcmnand_host *host) · line 2154

Quoted 8 lines
drivers/mtd/nand/raw/brcmnand/brcmnand.c +8 -0
+	if (chip->ecc.mode != NAND_ECC_NONE &&
+	    (!chip->ecc.size || !chip->ecc.strength)) {
+		if (chip->base.eccreq.step_size && chip->base.eccreq.strength) {
+			/* use detected ECC parameters */
+			chip->ecc.size = chip->base.eccreq.step_size;
+			chip->ecc.strength = chip->base.eccreq.strength;
+			pr_info("Using ECC step-size %d, strength %d\n",
+				chip->ecc.size, chip->ecc.strength);  

Nit: should not we use dev_info(&host->pdev->dev) for printing the message in case we have multiple NAND controllers on chip, that way we can still differentiate them from the prints?

With the above changed

Thanks,
Miquèl

maintainer Reviewed-by on v2 1/2
#5 lore raw
In reply to Kamal Dasu

Hi Kamal,

Kamal Dasu <[email protected]> wrote on Mon, 20 May 2019 15:05:11 -0400:

Quoted 15 lines

nand-ecc-strength and nand-ecc-step-size can be made optional as brcmnand driver can support using raw NAND layer detected values.

---
 Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +0 -0
index bcda1df..29feaba 100644
@@ -101,10 +101,10 @@ Required properties:
                               number (e.g., 0, 1, 2, etc.)
 - #address-cells            : see partition.txt

Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt Required properties: · line 110

Quoted 10 lines
Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +2 -2
 - #size-cells               : see partition.txt
-- nand-ecc-strength         : see nand.txt
-- nand-ecc-step-size        : must be 512 or 1024. See nand.txt
 
 Optional properties:
+- nand-ecc-strength         : see nand.txt
+- nand-ecc-step-size        : must be 512 or 1024. See nand.txt
 - nand-on-flash-bbt         : boolean, to enable the on-flash BBT for this
                               chip-select. See nand.txt
 - brcm,nand-oob-sector-size : integer, to denote the spare area sector size

Thanks,
Miquèl

#6 lore raw
In reply to Kamal Dasu

Hi Kamal,

Quoted 15 lines · Kamal Dasu

nand-ecc-strength and nand-ecc-step-size can be made optional as brcmnand driver can support using raw NAND layer detected values.

---
  Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +0 -0
index bcda1df..29feaba 100644
@@ -101,10 +101,10 @@ Required properties:
                                number (e.g., 0, 1, 2, etc.)
  - #address-cells            : see partition.txt

Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt Required properties: · line 110

Quoted 10 lines
Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +2 -2
  - #size-cells               : see partition.txt
-- nand-ecc-strength         : see nand.txt
-- nand-ecc-step-size        : must be 512 or 1024. See nand.txt
 
  Optional properties:
+- nand-ecc-strength         : see nand.txt
+- nand-ecc-step-size        : must be 512 or 1024. See nand.txt
  - nand-on-flash-bbt         : boolean, to enable the on-flash BBT for this
                                chip-select. See nand.txt
  - brcm,nand-oob-sector-size : integer, to denote the spare area sector size

I think you also need to change all references to nand.txt. This file was recently moved to nand-controller.yaml.

Regards,
Frieder

maintainer
#7 lore raw

Schrempf Frieder <[email protected]> wrote on Tue, 21 May 2019 09:31:04 +0000:

Quoted 22 lines

Hi Kamal,

Quoted 19 lines · Kamal Dasu

nand-ecc-strength and nand-ecc-step-size can be made optional as brcmnand driver can support using raw NAND layer detected values.

---
  Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +0 -2
index bcda1df..29feaba 100644
@@ -101,10 +101,10 @@ Required properties:
                                number (e.g., 0, 1, 2, etc.)
  - #address-cells            : see partition.txt
  - #size-cells               : see partition.txt
-- nand-ecc-strength         : see nand.txt
-- nand-ecc-step-size        : must be 512 or 1024. See nand.txt
 
Quoted 10 lines

Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt Required properties: · line 110

Quoted 6 lines
Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +2 -0
  Optional properties:
+- nand-ecc-strength         : see nand.txt
+- nand-ecc-step-size        : must be 512 or 1024. See nand.txt
  - nand-on-flash-bbt         : boolean, to enable the on-flash BBT for this
                                chip-select. See nand.txt
  - brcm,nand-oob-sector-size : integer, to denote the spare area sector size  

I think you also need to change all references to nand.txt. This file was recently moved to nand-controller.yaml.

Oops, completely forgot about that *again*. Thanks for pointing it Frieder!

Miquèl