Re: [PATCH RFT 2/2] ARM: dts: mxs: imx28: Fix NAND hierarchy description

Sébastien Szymanski
2023-12-21T12:24:15Z

Hello Stefan,

On 12/18/23 14:06, Stefan Wahren wrote:
> The size-cells for GPMI are wrong in imx28.dtsi, which causes the
> following warning:
>
> nand-controller@8000c000: #size-cells:0:0: 0 was expected
>
> The reason for this is the definition of the partitions directly
> below the nand controller node. According to nand-controller.yaml
> the NAND chip must be defined as a child of the controller. Even
> the fixed partitions must be kept in a partitions container.
>
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
> ---
>
> Hi,
> unfortunately i don't have access to MSR M28CU3 or an Armadeus Systems APF28
> so it would be nice if someone can give a try.

I have tried this patch on an APF28. Unfortunately it doesn't work:

[ 0.000000] Booting Linux on physical CPU 0x0
[ 0.000000] Linux version 6.7.0-rc6 (sszy@gentoo)
(arm-buildroot-linux-gnueabi-gcc.br_real (Buildroot
armadeus-7.0-387-g06d2e893315e-dirty) 12.3.0, GNU ld (GNU Binutils)
2.40) #1 Thu Dec 21 10:24:41 CET 2023

...

[ 4.224482] nand: device found, Manufacturer ID: 0x2c, Chip ID: 0xda
[ 4.231238] nand: Micron MT29F2G08ABAEAWP
[ 4.235399] nand: 256 MiB, SLC, erase size: 128 KiB, page size: 2048,
OOB size: 64
[ 4.245851] Scanning device for bad blocks
[ 4.252904] Bad eraseblock 0 at 0x000000000000
[ 4.257842] Bad eraseblock 1 at 0x000000020000
[ 4.262972] Bad eraseblock 2 at 0x000000040000
[ 4.267886] Bad eraseblock 3 at 0x000000060000
[ 4.272994] Bad eraseblock 4 at 0x000000080000
[ 4.277900] Bad eraseblock 5 at 0x0000000a0000
[ 4.283007] Bad eraseblock 6 at 0x0000000c0000
[ 4.287916] Bad eraseblock 7 at 0x0000000e0000
[ 5.443712] gpmi-nand: ofpart partition
/apb@80000000/apbh@80000000/nand-controller@8000c000/nand@0
(/apb@80000000/apbh@80000000/nand-controller@8000c000) #size-cells is
wrongly set to <0>, assuming <1> for parsing partitions.
[ 5.464436] gpmi-nand: error parsing ofpart partition
/apb@80000000/apbh@80000000/nand-controller@8000c000/nand@0
(/apb@80000000/apbh@80000000/nand-controller@8000c000)
[ 5.523845] gpmi-nand 8000c000.nand-controller: driver registered.

Without this patch:

[ 5.443988] 7 fixed-partitions partitions found on MTD device gpmi-nand
[ 5.450992] Creating 7 MTD partitions on "gpmi-nand":
[ 5.456234] 0x000000000000-0x000000300000 : "u-boot"
[ 5.506409] 0x000000300000-0x000000380000 : "env"
[ 5.537298] 0x000000380000-0x000000400000 : "env2"
[ 5.568253] 0x000000400000-0x000000480000 : "dtb"
[ 5.598940] 0x000000480000-0x000000500000 : "splash"
[ 5.629766] 0x000000500000-0x000000d00000 : "kernel"
[ 5.661523] 0x000000d00000-0x000010000000 : "rootfs"
[ 5.710012] gpmi-nand 8000c000.nand-controller: driver registered.

Regards,

>
> arch/arm/boot/dts/nxp/mxs/imx28-apf28.dts | 64 +++++++++++++---------
> arch/arm/boot/dts/nxp/mxs/imx28-m28.dtsi | 2 -
> arch/arm/boot/dts/nxp/mxs/imx28-m28cu3.dts | 28 ++++++----
> arch/arm/boot/dts/nxp/mxs/imx28.dtsi | 2 +-
> 4 files changed, 56 insertions(+), 40 deletions(-)
>
> diff --git a/arch/arm/boot/dts/nxp/mxs/imx28-apf28.dts b/arch/arm/boot/dts/nxp/mxs/imx28-apf28.dts
> index 98672932e41b..10bfac31f672 100644
> --- a/arch/arm/boot/dts/nxp/mxs/imx28-apf28.dts
> +++ b/arch/arm/boot/dts/nxp/mxs/imx28-apf28.dts
> @@ -27,39 +27,49 @@ &gpmi {
> pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
> status = "okay";
>
> - partition@0 {
> - label = "u-boot";
> - reg = <0x0 0x300000>;
> - };
> + nand@0 {
> + reg = <0>;
>
> - partition@300000 {
> - label = "env";
> - reg = <0x300000 0x80000>;
> - };
> + partitions {
> + compatible = "fixed-partitions";
> + #address-cells = <1>;
> + #size-cells = <1>;
>
> - partition@380000 {
> - label = "env2";
> - reg = <0x380000 0x80000>;
> - };
> + partition@0 {
> + label = "u-boot";
> + reg = <0x0 0x300000>;
> + };
>
> - partition@400000 {
> - label = "dtb";
> - reg = <0x400000 0x80000>;
> - };
> + partition@300000 {
> + label = "env";
> + reg = <0x300000 0x80000>;
> + };
>
> - partition@480000 {
> - label = "splash";
> - reg = <0x480000 0x80000>;
> - };
> + partition@380000 {
> + label = "env2";
> + reg = <0x380000 0x80000>;
> + };
>
> - partition@500000 {
> - label = "kernel";
> - reg = <0x500000 0x800000>;
> - };
> + partition@400000 {
> + label = "dtb";
> + reg = <0x400000 0x80000>;
> + };
> +
> + partition@480000 {
> + label = "splash";
> + reg = <0x480000 0x80000>;
> + };
> +
> + partition@500000 {
> + label = "kernel";
> + reg = <0x500000 0x800000>;
> + };
>
> - partition@d00000 {
> - label = "rootfs";
> - reg = <0xd00000 0xf300000>;
> + partition@d00000 {
> + label = "rootfs";
> + reg = <0xd00000 0xf300000>;
> + };
> + };
> };
> };
>
> diff --git a/arch/arm/boot/dts/nxp/mxs/imx28-m28.dtsi b/arch/arm/boot/dts/nxp/mxs/imx28-m28.dtsi
> index 66facef10ba9..54b0f715f091 100644
> --- a/arch/arm/boot/dts/nxp/mxs/imx28-m28.dtsi
> +++ b/arch/arm/boot/dts/nxp/mxs/imx28-m28.dtsi
> @@ -24,8 +24,6 @@ reg_3p3v: regulator-0 {
> };
>
> &gpmi {
> - #address-cells = <1>;
> - #size-cells = <1>;
> pinctrl-names = "default";
> pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
> status = "okay";
> diff --git a/arch/arm/boot/dts/nxp/mxs/imx28-m28cu3.dts b/arch/arm/boot/dts/nxp/mxs/imx28-m28cu3.dts
> index 34b4d3246db1..d069ac907490 100644
> --- a/arch/arm/boot/dts/nxp/mxs/imx28-m28cu3.dts
> +++ b/arch/arm/boot/dts/nxp/mxs/imx28-m28cu3.dts
> @@ -93,21 +93,29 @@ &duart {
> };
>
> &gpmi {
> - #address-cells = <1>;
> - #size-cells = <1>;
> pinctrl-names = "default";
> pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
> status = "okay";
>
> - partition@0 {
> - label = "gpmi-nfc-0-boot";
> - reg = <0x00000000 0x01400000>;
> - read-only;
> - };
> + nand@0 {
> + reg = <0>;
>
> - partition@1 {
> - label = "gpmi-nfc-general-use";
> - reg = <0x01400000 0x0ec00000>;
> + partitions {
> + compatible = "fixed-partitions";
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + partition@0 {
> + label = "gpmi-nfc-0-boot";
> + reg = <0x00000000 0x01400000>;
> + read-only;
> + };
> +
> + partition@1 {
> + label = "gpmi-nfc-general-use";
> + reg = <0x01400000 0x0ec00000>;
> + };
> + };
> };
> };
>
> diff --git a/arch/arm/boot/dts/nxp/mxs/imx28.dtsi b/arch/arm/boot/dts/nxp/mxs/imx28.dtsi
> index 4817fba2d938..9655403b7f90 100644
> --- a/arch/arm/boot/dts/nxp/mxs/imx28.dtsi
> +++ b/arch/arm/boot/dts/nxp/mxs/imx28.dtsi
> @@ -99,7 +99,7 @@ perfmon: perfmon@80006000 {
> gpmi: nand-controller@8000c000 {
> compatible = "fsl,imx28-gpmi-nand";
> #address-cells = <1>;
> - #size-cells = <1>;
> + #size-cells = <0>;
> reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;
> reg-names = "gpmi-nand", "bch";
> interrupts = <41>;
> --
> 2.34.1
>

--
Sébastien Szymanski, Armadeus Systems
Software engineer