Skip to contentSkip to conversation

mtd: rawnand: denali-spl: Add missing hardware init

PATCH New Marek Vasut 2 participants 15 messages Jan 9, 2020 – Jan 10, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 mtd: rawnand: denali-spl: Add missing hardware init

While the Denali NAND is initialized by the BootROM in SPL, there are still a couple of settings which are missing. These can trigger subtle corruption of the data read out of the NAND. Fill these settings in just like they are filled in by the full Denali NAND driver in denali_hw_init().

Cc Masahiro Yamada <[email protected]>
---
 drivers/mtd/nand/raw/denali_spl.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/mtd/nand/raw/denali_spl.c +7 -0
index dbaba3cab2..b8b29812aa 100644
@@ -173,6 +173,13 @@ void nand_init(void)
 	page_size = readl(denali_flash_reg + DEVICE_MAIN_AREA_SIZE);
 	oob_size = readl(denali_flash_reg + DEVICE_SPARE_AREA_SIZE);
 	pages_per_block = readl(denali_flash_reg + PAGES_PER_BLOCK);
+
+	/* Do as denali_hw_init() does. */
+	writel(CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES,
+	       denali_flash_reg + SPARE_AREA_SKIP_BYTES);
+	writel(0x0F, denali_flash_reg + RB_PIN_ENABLED);
+	writel(CHIP_EN_DONT_CARE__FLAG, denali_flash_reg + CHIP_ENABLE_DONT_CARE);
+	writel(0xffff, denali_flash_reg + SPARE_AREA_MARKER);
 }
 
 int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst)
Signature · 1 line
2.24.1
#1 lore raw

PATCH 2/3 mtd: rawnand: denali: Allow operation without clock driver

The SoCFPGA Gen5 does not have a clock driver yet, let the NAND driver work without a clock driver by falling back to the default frequencies.

Cc Masahiro Yamada <[email protected]>
---
 drivers/mtd/nand/raw/denali_dt.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/mtd/nand/raw/denali_dt.c +8 -4
index 0ce81324b9..2c9e249ab6 100644
@@ -62,7 +62,6 @@ static int denali_dt_probe(struct udevice *dev)
 {
 	struct denali_nand_info *denali = dev_get_priv(dev);
 	const struct denali_dt_data *data;
-	struct clk clk, clk_x, clk_ecc;
 	struct resource res;
 	int ret;
 
@@ -87,11 +86,14 @@ static int denali_dt_probe(struct udevice *dev)
 
 	denali->host = devm_ioremap(dev, res.start, resource_size(&res));
 
+#if CONFIG_IS_ENABLED(CLK)
+	struct clk clk, clk_x, clk_ecc;
+
 	ret = clk_get_by_name(dev, "nand", &clk);
 	if (ret)
 		ret = clk_get_by_index(dev, 0, &clk);
 	if (ret)
-		return ret;
+		clk.dev = NULL;
 
 	ret = clk_get_by_name(dev, "nand_x", &clk_x);
 	if (ret)
@@ -117,10 +119,12 @@ static int denali_dt_probe(struct udevice *dev)
 			return ret;
 	}
 
-	if (clk_x.dev) {
+	if (clk.dev && clk_x.dev) {
 		denali->clk_rate = clk_get_rate(&clk);
 		denali->clk_x_rate = clk_get_rate(&clk_x);
-	} else {
+	} else
+#endif
+	{
 		/*
 		 * Hardcode the clock rates for the backward compatibility.
 		 * This works for both SOCFPGA and UniPhier.
Signature · 1 line
2.24.1
#2 lore raw

PATCH 2/3 mtd: rawnand: denali: Allow operation without clock driver

Quoted 6 lines · Marek Vasut

The SoCFPGA Gen5 does not have a clock driver yet, let the NAND driver work without a clock driver by falling back to the default frequencies.

Cc Masahiro Yamada <[email protected]>

Why do you need this?

denali_dt_probe() succeeds without CONFIG_CLK, doesn't it?

Quoted 50 lines
---
 drivers/mtd/nand/raw/denali_dt.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/mtd/nand/raw/denali_dt.c +8 -5
index 0ce81324b9..2c9e249ab6 100644
@@ -62,7 +62,6 @@ static int denali_dt_probe(struct udevice *dev)
 {
        struct denali_nand_info *denali = dev_get_priv(dev);
        const struct denali_dt_data *data;
-       struct clk clk, clk_x, clk_ecc;
        struct resource res;
        int ret;
 
@@ -87,11 +86,14 @@ static int denali_dt_probe(struct udevice *dev)
 
        denali->host = devm_ioremap(dev, res.start, resource_size(&res));
 
+#if CONFIG_IS_ENABLED(CLK)
+       struct clk clk, clk_x, clk_ecc;
+
        ret = clk_get_by_name(dev, "nand", &clk);
        if (ret)
                ret = clk_get_by_index(dev, 0, &clk);
        if (ret)
-               return ret;
+               clk.dev = NULL;
 
        ret = clk_get_by_name(dev, "nand_x", &clk_x);
        if (ret)
@@ -117,10 +119,12 @@ static int denali_dt_probe(struct udevice *dev)
                        return ret;
        }
 
-       if (clk_x.dev) {
+       if (clk.dev && clk_x.dev) {
                denali->clk_rate = clk_get_rate(&clk);
                denali->clk_x_rate = clk_get_rate(&clk_x);
-       } else {
+       } else
+#endif
+       {
                /*
                 * Hardcode the clock rates for the backward compatibility.
                 * This works for both SOCFPGA and UniPhier.
--

2.24.1

Signature · 2 lines
Best Regards
Masahiro Yamada
#3 lore raw

PATCH 2/3 mtd: rawnand: denali: Allow operation without clock driver

Quoted 5 lines · Masahiro Yamada
Quoted 4 lines · Marek Vasut

The SoCFPGA Gen5 does not have a clock driver yet, let the NAND driver work without a clock driver by falling back to the default frequencies.

Quoted 7 lines
Quoted 2 lines
Cc Masahiro Yamada <[email protected]>

Why do you need this?

denali_dt_probe() succeeds without CONFIG_CLK, doesn't it?

No, if you don't have the NAND clock, this fails.
This could be reverted once there is DM/DT capable clock driver for SoCFPGA Gen5, until then this is needed.

[...]

#4 lore raw

PATCH 2/3 mtd: rawnand: denali: Allow operation without clock driver

Quoted 11 lines · Marek Vasut
Quoted 9 lines · Masahiro Yamada
Quoted 6 lines · Marek Vasut

The SoCFPGA Gen5 does not have a clock driver yet, let the NAND driver work without a clock driver by falling back to the default frequencies.

Cc Masahiro Yamada <[email protected]>
Quoted 7 lines
Quoted 3 lines

Why do you need this?

denali_dt_probe() succeeds without CONFIG_CLK, doesn't it?

No, if you don't have the NAND clock, this fails.
This could be reverted once there is DM/DT capable clock driver for SoCFPGA Gen5, until then this is needed.

Oh, sorry, I read the code in a wrong way.
But, this ifdef is ugly.

How about this alternative one?
http://patchwork.ozlabs.org/patch/1220337/

--
Best Regards
Masahiro Yamada

#5 lore raw

PATCH 2/3 mtd: rawnand: denali: Allow operation without clock driver

Quoted 20 lines · Masahiro Yamada
Quoted 11 lines · Marek Vasut
Quoted 9 lines · Masahiro Yamada
Quoted 6 lines · Marek Vasut

The SoCFPGA Gen5 does not have a clock driver yet, let the NAND driver work without a clock driver by falling back to the default frequencies.

Cc Masahiro Yamada <[email protected]>
Quoted 7 lines
Quoted 3 lines

Why do you need this?

denali_dt_probe() succeeds without CONFIG_CLK, doesn't it?

No, if you don't have the NAND clock, this fails.
This could be reverted once there is DM/DT capable clock driver for SoCFPGA Gen5, until then this is needed.

Quoted 5 lines

Oh, sorry, I read the code in a wrong way.
But, this ifdef is ugly.

How about this alternative one?
http://patchwork.ozlabs.org/patch/1220337/

The clock code takes space for no reason in that patch, I prefer this one to keep the size in check.

#6 lore raw

PATCH 3/3 mtd: rawnand: denali: Do not reset the block on SoCFPGA

In reply to Marek Vasut

Legacy kernel versions for SoCFPGA may not implement proper reset handling. Apply the same approach as SoCFPGA reset driver, check environment variable "socfpga_legacy_reset_compat", and if it is set, do not reset the IP before booting Linux. This way, even the older kernel versions can be booted by up to date U-Boot.

Cc Masahiro Yamada <[email protected]>
---
 drivers/mtd/nand/raw/denali_dt.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/mtd/nand/raw/denali_dt.c +12 -0
index 2c9e249ab6..d35f2a3543 100644
@@ -148,6 +148,18 @@ static int denali_dt_remove(struct udevice *dev)
 {
 	struct denali_nand_info *denali = dev_get_priv(dev);
 
+#if CONFIG_IS_ENABLED(ARCH_SOCFPGA)
+	/*
+	 * Legacy kernel versions do not implement proper reset handling on
+	 * SoCFPGA. To let those older kernel versions work, reuse the same
+	 * approach as the SoCFPGA reset driver does -- check environment
+	 * variable socfpga_legacy_reset_compat and avoid resetting the IP
+	 * before booting the kernel if it is set to 1.
+	 */
+	if (env_get_ulong("socfpga_legacy_reset_compat", 10, 0))
+		return 0;
+#endif
+
 	return reset_release_bulk(&denali->resets);
 }
 
Signature · 1 line
2.24.1
#7 lore raw

PATCH 3/3 mtd: rawnand: denali: Do not reset the block on SoCFPGA

Quoted 25 lines · Marek Vasut

Legacy kernel versions for SoCFPGA may not implement proper reset handling. Apply the same approach as SoCFPGA reset driver, check environment variable "socfpga_legacy_reset_compat", and if it is set, do not reset the IP before booting Linux. This way, even the older kernel versions can be booted by up to date U-Boot.

Cc Masahiro Yamada <[email protected]>
---
 drivers/mtd/nand/raw/denali_dt.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/mtd/nand/raw/denali_dt.c +4 -0
index 2c9e249ab6..d35f2a3543 100644
@@ -148,6 +148,18 @@ static int denali_dt_remove(struct udevice *dev)
 {
        struct denali_nand_info *denali = dev_get_priv(dev);
 
+#if CONFIG_IS_ENABLED(ARCH_SOCFPGA)
+       /*
+        * Legacy kernel versions do not implement proper reset handling on
+        * SoCFPGA. To let those older kernel versions work, reuse the same

drivers/mtd/nand/raw/denali_dt.c static int denali_dt_remove(struct udevice *dev) · line 164

Quoted 10 lines
drivers/mtd/nand/raw/denali_dt.c +8 -0
+        * approach as the SoCFPGA reset driver does -- check environment
+        * variable socfpga_legacy_reset_compat and avoid resetting the IP
+        * before booting the kernel if it is set to 1.
+        */
+       if (env_get_ulong("socfpga_legacy_reset_compat", 10, 0))
+               return 0;
+#endif
+
        return reset_release_bulk(&denali->resets);
 }

Why don't you simply remove reset_release_bulk() ?

Quoted 4 lines
drivers/mtd/nand/raw/denali_dt.c +0 -1
--

2.24.1

Signature · 2 lines
Best Regards
Masahiro Yamada
#8 lore raw

PATCH 3/3 mtd: rawnand: denali: Do not reset the block on SoCFPGA

Quoted 31 lines · Masahiro Yamada
Quoted 30 lines · Marek Vasut

Legacy kernel versions for SoCFPGA may not implement proper reset handling. Apply the same approach as SoCFPGA reset driver, check environment variable "socfpga_legacy_reset_compat", and if it is set, do not reset the IP before booting Linux. This way, even the older kernel versions can be booted by up to date U-Boot.

Cc Masahiro Yamada <[email protected]>
---
 drivers/mtd/nand/raw/denali_dt.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/mtd/nand/raw/denali_dt.c +9 -0
index 2c9e249ab6..d35f2a3543 100644
@@ -148,6 +148,18 @@ static int denali_dt_remove(struct udevice *dev)
 {
        struct denali_nand_info *denali = dev_get_priv(dev);
 
+#if CONFIG_IS_ENABLED(ARCH_SOCFPGA)
+       /*
+        * Legacy kernel versions do not implement proper reset handling on
+        * SoCFPGA. To let those older kernel versions work, reuse the same
+        * approach as the SoCFPGA reset driver does -- check environment
+        * variable socfpga_legacy_reset_compat and avoid resetting the IP
+        * before booting the kernel if it is set to 1.
+        */
+       if (env_get_ulong("socfpga_legacy_reset_compat", 10, 0))
Quoted 8 lines

drivers/mtd/nand/raw/denali_dt.c static int denali_dt_remove(struct udevice *dev) · line 164

Quoted 5 lines
drivers/mtd/nand/raw/denali_dt.c +3 -0
+               return 0;
+#endif
+
        return reset_release_bulk(&denali->resets);
 }

Why don't you simply remove reset_release_bulk() ?

Because once mainline has proper reset handling, this can be used only for legacy kernel versions.

#9 lore raw

PATCH 3/3 mtd: rawnand: denali: Do not reset the block on SoCFPGA

Quoted 42 lines · Marek Vasut
Quoted 31 lines · Masahiro Yamada
Quoted 30 lines · Marek Vasut

Legacy kernel versions for SoCFPGA may not implement proper reset handling. Apply the same approach as SoCFPGA reset driver, check environment variable "socfpga_legacy_reset_compat", and if it is set, do not reset the IP before booting Linux. This way, even the older kernel versions can be booted by up to date U-Boot.

Cc Masahiro Yamada <[email protected]>
---
 drivers/mtd/nand/raw/denali_dt.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/mtd/nand/raw/denali_dt.c +9 -0
index 2c9e249ab6..d35f2a3543 100644
@@ -148,6 +148,18 @@ static int denali_dt_remove(struct udevice *dev)
 {
        struct denali_nand_info *denali = dev_get_priv(dev);
 
+#if CONFIG_IS_ENABLED(ARCH_SOCFPGA)
+       /*
+        * Legacy kernel versions do not implement proper reset handling on
+        * SoCFPGA. To let those older kernel versions work, reuse the same
+        * approach as the SoCFPGA reset driver does -- check environment
+        * variable socfpga_legacy_reset_compat and avoid resetting the IP
+        * before booting the kernel if it is set to 1.
+        */
+       if (env_get_ulong("socfpga_legacy_reset_compat", 10, 0))
Quoted 8 lines

drivers/mtd/nand/raw/denali_dt.c static int denali_dt_remove(struct udevice *dev) · line 164

Quoted 5 lines
drivers/mtd/nand/raw/denali_dt.c +3 -0
+               return 0;
+#endif
+
        return reset_release_bulk(&denali->resets);
 }

Why don't you simply remove reset_release_bulk() ?

Quoted 2 lines

Because once mainline has proper reset handling, this can be used only for legacy kernel versions.

I am suffering for the same problem for the uniphier platform.

The reset driver support for Linux will never be back-ported. So, it will continue to be a problem for Linux v4.19, v5.4, etc.

reset_release_bulk() should go away.

Signature · 2 lines
Best Regards
Masahiro Yamada
#10 lore raw

PATCH 3/3 mtd: rawnand: denali: Do not reset the block on SoCFPGA

Quoted 43 lines · Masahiro Yamada
Quoted 42 lines · Marek Vasut
Quoted 39 lines · Masahiro Yamada
Quoted 25 lines · Marek Vasut

Legacy kernel versions for SoCFPGA may not implement proper reset handling. Apply the same approach as SoCFPGA reset driver, check environment variable "socfpga_legacy_reset_compat", and if it is set, do not reset the IP before booting Linux. This way, even the older kernel versions can be booted by up to date U-Boot.

Cc Masahiro Yamada <[email protected]>
---
 drivers/mtd/nand/raw/denali_dt.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/mtd/nand/raw/denali_dt.c +4 -0
index 2c9e249ab6..d35f2a3543 100644
@@ -148,6 +148,18 @@ static int denali_dt_remove(struct udevice *dev)
 {
        struct denali_nand_info *denali = dev_get_priv(dev);
 
+#if CONFIG_IS_ENABLED(ARCH_SOCFPGA)
+       /*
+        * Legacy kernel versions do not implement proper reset handling on
+        * SoCFPGA. To let those older kernel versions work, reuse the same

drivers/mtd/nand/raw/denali_dt.c static int denali_dt_remove(struct udevice *dev) · line 164

Quoted 10 lines
drivers/mtd/nand/raw/denali_dt.c +8 -0
+        * approach as the SoCFPGA reset driver does -- check environment
+        * variable socfpga_legacy_reset_compat and avoid resetting the IP
+        * before booting the kernel if it is set to 1.
+        */
+       if (env_get_ulong("socfpga_legacy_reset_compat", 10, 0))
+               return 0;
+#endif
+
        return reset_release_bulk(&denali->resets);
 }

Why don't you simply remove reset_release_bulk() ?

Quoted 5 lines
Quoted 2 lines

Because once mainline has proper reset handling, this can be used only for legacy kernel versions.

I am suffering for the same problem for the uniphier platform.

The Denali NAND patches for Linux are currently stuck on your review too.

Quoted 4 lines

The reset driver support for Linux will never be back-ported. So, it will continue to be a problem for Linux v4.19, v5.4, etc.

reset_release_bulk() should go away.

Once the Linux patches are upstream, we can just reset the NAND controller without problems. And that's the right thing to do, sometimes you don't want NAND to be available in Linux, and then it should be kept in reset.

#11 lore raw

PATCH 3/3 mtd: rawnand: denali: Do not reset the block on SoCFPGA

Quoted 45 lines · Marek Vasut
Quoted 43 lines · Masahiro Yamada
Quoted 42 lines · Marek Vasut
Quoted 39 lines · Masahiro Yamada
Quoted 25 lines · Marek Vasut

Legacy kernel versions for SoCFPGA may not implement proper reset handling. Apply the same approach as SoCFPGA reset driver, check environment variable "socfpga_legacy_reset_compat", and if it is set, do not reset the IP before booting Linux. This way, even the older kernel versions can be booted by up to date U-Boot.

Cc Masahiro Yamada <[email protected]>
---
 drivers/mtd/nand/raw/denali_dt.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/mtd/nand/raw/denali_dt.c +4 -0
index 2c9e249ab6..d35f2a3543 100644
@@ -148,6 +148,18 @@ static int denali_dt_remove(struct udevice *dev)
 {
        struct denali_nand_info *denali = dev_get_priv(dev);
 
+#if CONFIG_IS_ENABLED(ARCH_SOCFPGA)
+       /*
+        * Legacy kernel versions do not implement proper reset handling on
+        * SoCFPGA. To let those older kernel versions work, reuse the same

drivers/mtd/nand/raw/denali_dt.c static int denali_dt_remove(struct udevice *dev) · line 164

Quoted 10 lines
drivers/mtd/nand/raw/denali_dt.c +8 -0
+        * approach as the SoCFPGA reset driver does -- check environment
+        * variable socfpga_legacy_reset_compat and avoid resetting the IP
+        * before booting the kernel if it is set to 1.
+        */
+       if (env_get_ulong("socfpga_legacy_reset_compat", 10, 0))
+               return 0;
+#endif
+
        return reset_release_bulk(&denali->resets);
 }

Why don't you simply remove reset_release_bulk() ?

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Because once mainline has proper reset handling, this can be used only for legacy kernel versions.

I am suffering for the same problem for the uniphier platform.

The Denali NAND patches for Linux are currently stuck on your review too.

Huh?

Which patch in Linux is stuck on my review?

Quoted 9 lines
Quoted 4 lines

The reset driver support for Linux will never be back-ported. So, it will continue to be a problem for Linux v4.19, v5.4, etc.

reset_release_bulk() should go away.

Once the Linux patches are upstream, we can just reset the NAND controller without problems. And that's the right thing to do, sometimes you don't want NAND to be available in Linux, and then it should be kept in reset.

The NAND reset in Linux will be available in the future version (if my patch is applied).

The stable kernels are maintained in 6 years.

https://www.kernel.org/category/releases.html

The EOF of Linux 5.4 is set at 2021.12, but
following the recent rules, it will be extended
to 2026 or so.

Signature · 2 lines
Best Regards
Masahiro Yamada
#12 lore raw

PATCH 3/3 mtd: rawnand: denali: Do not reset the block on SoCFPGA

Quoted 50 lines · Masahiro Yamada
Quoted 49 lines · Marek Vasut
Quoted 47 lines · Masahiro Yamada
Quoted 44 lines · Marek Vasut
Quoted 31 lines · Masahiro Yamada
Quoted 30 lines · Marek Vasut

Legacy kernel versions for SoCFPGA may not implement proper reset handling. Apply the same approach as SoCFPGA reset driver, check environment variable "socfpga_legacy_reset_compat", and if it is set, do not reset the IP before booting Linux. This way, even the older kernel versions can be booted by up to date U-Boot.

Cc Masahiro Yamada <[email protected]>
---
 drivers/mtd/nand/raw/denali_dt.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/mtd/nand/raw/denali_dt.c +9 -0
index 2c9e249ab6..d35f2a3543 100644
@@ -148,6 +148,18 @@ static int denali_dt_remove(struct udevice *dev)
 {
        struct denali_nand_info *denali = dev_get_priv(dev);
 
+#if CONFIG_IS_ENABLED(ARCH_SOCFPGA)
+       /*
+        * Legacy kernel versions do not implement proper reset handling on
+        * SoCFPGA. To let those older kernel versions work, reuse the same
+        * approach as the SoCFPGA reset driver does -- check environment
+        * variable socfpga_legacy_reset_compat and avoid resetting the IP
+        * before booting the kernel if it is set to 1.
+        */
+       if (env_get_ulong("socfpga_legacy_reset_compat", 10, 0))
Quoted 8 lines

drivers/mtd/nand/raw/denali_dt.c static int denali_dt_remove(struct udevice *dev) · line 164

Quoted 5 lines
drivers/mtd/nand/raw/denali_dt.c +3 -0
+               return 0;
+#endif
+
        return reset_release_bulk(&denali->resets);
 }

Why don't you simply remove reset_release_bulk() ?

Because once mainline has proper reset handling, this can be used only for legacy kernel versions.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

I am suffering for the same problem for the uniphier platform.

The Denali NAND patches for Linux are currently stuck on your review too.

Huh?

Which patch in Linux is stuck on my review?

[PATCH V2] mtd: rawnand: denali_dt: Add support for configuring SPARE_AREA_SKIP_BYTES

Quoted 5 lines
Quoted 5 lines
Quoted 4 lines

The reset driver support for Linux will never be back-ported. So, it will continue to be a problem for Linux v4.19, v5.4, etc.

reset_release_bulk() should go away.

Quoted 8 lines
Quoted 4 lines

Once the Linux patches are upstream, we can just reset the NAND controller without problems. And that's the right thing to do, sometimes you don't want NAND to be available in Linux, and then it should be kept in reset.

The NAND reset in Linux will be available in the future version (if my patch is applied).

Which patch ?

Quoted 3 lines

The stable kernels are maintained in 6 years.

https://www.kernel.org/category/releases.html

How is this relevant ?

Quoted 3 lines

The EOF of Linux 5.4 is set at 2021.12, but
following the recent rules, it will be extended
to 2026 or so.

So, for all legacy kernel versions, enable this backward compatibility thingie.

#13 lore raw

PATCH 1/3 mtd: rawnand: denali-spl: Add missing hardware init

In reply to Marek Vasut
Quoted 20 lines · Marek Vasut

While the Denali NAND is initialized by the BootROM in SPL, there are still a couple of settings which are missing. These can trigger subtle corruption of the data read out of the NAND. Fill these settings in just like they are filled in by the full Denali NAND driver in denali_hw_init().

Cc Masahiro Yamada <[email protected]>
---
 drivers/mtd/nand/raw/denali_spl.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/mtd/nand/raw/denali_spl.c +0 -0
index dbaba3cab2..b8b29812aa 100644
@@ -173,6 +173,13 @@ void nand_init(void)
        page_size = readl(denali_flash_reg + DEVICE_MAIN_AREA_SIZE);
        oob_size = readl(denali_flash_reg + DEVICE_SPARE_AREA_SIZE);

drivers/mtd/nand/raw/denali_spl.c void nand_init(void) · line 184

Quoted 10 lines
drivers/mtd/nand/raw/denali_spl.c +7 -0
        pages_per_block = readl(denali_flash_reg + PAGES_PER_BLOCK);
+
+       /* Do as denali_hw_init() does. */
+       writel(CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES,
+              denali_flash_reg + SPARE_AREA_SKIP_BYTES);
+       writel(0x0F, denali_flash_reg + RB_PIN_ENABLED);
+       writel(CHIP_EN_DONT_CARE__FLAG, denali_flash_reg + CHIP_ENABLE_DONT_CARE);
+       writel(0xffff, denali_flash_reg + SPARE_AREA_MARKER);
 }
 

You need this because SOCFPGA SPL resets the nand controller, correct?

https://github.com/u-boot/u-boot/blob/v2020.01/arch/arm/mach-socfpga/spl_gen5.c#L89

--
Best Regards
Masahiro Yamada

#14 lore raw

PATCH 1/3 mtd: rawnand: denali-spl: Add missing hardware init

Quoted 34 lines · Masahiro Yamada
Quoted 20 lines · Marek Vasut

While the Denali NAND is initialized by the BootROM in SPL, there are still a couple of settings which are missing. These can trigger subtle corruption of the data read out of the NAND. Fill these settings in just like they are filled in by the full Denali NAND driver in denali_hw_init().

Cc Masahiro Yamada <[email protected]>
---
 drivers/mtd/nand/raw/denali_spl.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/mtd/nand/raw/denali_spl.c +0 -0
index dbaba3cab2..b8b29812aa 100644
@@ -173,6 +173,13 @@ void nand_init(void)
        page_size = readl(denali_flash_reg + DEVICE_MAIN_AREA_SIZE);
        oob_size = readl(denali_flash_reg + DEVICE_SPARE_AREA_SIZE);

drivers/mtd/nand/raw/denali_spl.c void nand_init(void) · line 184

Quoted 10 lines
drivers/mtd/nand/raw/denali_spl.c +7 -0
        pages_per_block = readl(denali_flash_reg + PAGES_PER_BLOCK);
+
+       /* Do as denali_hw_init() does. */
+       writel(CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES,
+              denali_flash_reg + SPARE_AREA_SKIP_BYTES);
+       writel(0x0F, denali_flash_reg + RB_PIN_ENABLED);
+       writel(CHIP_EN_DONT_CARE__FLAG, denali_flash_reg + CHIP_ENABLE_DONT_CARE);
+       writel(0xffff, denali_flash_reg + SPARE_AREA_MARKER);
 }
 

You need this because SOCFPGA SPL resets the nand controller, correct?

Quoted 1 line

https://github.com/u-boot/u-boot/blob/v2020.01/arch/arm/mach-socfpga/spl_gen5.c#L89

Yes. The driver should init the hardware correctly and fully, which it does not do without this patch.