Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mtd: parsers: ofpart: add workaround for #size-cells 0

Add a mechanism to handle the case in which partitions are present as
direct child of the nand controller node and #size-cells is set to <0>.

This could happen if the nand-controller node in the DTS is supposed to
have #size-cells set to 0, but for some historical reason/bug it was set
to 1 in the past, and the firmware (e.g. U-Boot) is adding the partition
as direct children of the nand-controller defaulting to #size-cells
being to 1.

This prevents a real boot failure on colibri-imx7 that happened during v6.1
development cycles.

Link: https://lore.kernel.org/all/Y4dgBTGNWpM6SQXI@francesco-nb.int.toradex.com/
Link: https://lore.kernel.org/all/20221202071900.1143950-1-francesco@dolcini.it/
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20230124104444.330913-1-francesco@dolcini.it

authored by

Francesco Dolcini and committed by
Miquel Raynal
84549c81 c705e63a

+19
+19
drivers/mtd/parsers/ofpart_core.c
··· 122 122 123 123 a_cells = of_n_addr_cells(pp); 124 124 s_cells = of_n_size_cells(pp); 125 + if (!dedicated && s_cells == 0) { 126 + /* 127 + * This is a ugly workaround to not create 128 + * regression on devices that are still creating 129 + * partitions as direct children of the nand controller. 130 + * This can happen in case the nand controller node has 131 + * #size-cells equal to 0 and the firmware (e.g. 132 + * U-Boot) just add the partitions there assuming 133 + * 32-bit addressing. 134 + * 135 + * If you get this warning your firmware and/or DTS 136 + * should be really fixed. 137 + * 138 + * This is working only for devices smaller than 4GiB. 139 + */ 140 + pr_warn("%s: ofpart partition %pOF (%pOF) #size-cells is wrongly set to <0>, assuming <1> for parsing partitions.\n", 141 + master->name, pp, mtd_node); 142 + s_cells = 1; 143 + } 125 144 if (len / 4 != a_cells + s_cells) { 126 145 pr_debug("%s: ofpart partition %pOF (%pOF) error parsing reg property.\n", 127 146 master->name, pp,