mtd: parsers: ofpart: fix parsing subpartitions
PATCH 1/1 mtd: parsers: ofpart: fix parsing subpartitions
From: Rafał Miłecki <[email protected]>
ofpart was recently patched to not scan random partition nodes as subpartitions. That change unfortunately broke scanning valid subpartitions like:
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
compatible = "fixed-partitions";
label = "bootloader";
reg = <0x0 0x100000>;
partition@0 {
label = "config";
reg = <0x80000 0x80000>;
};
};
};Fix that regression by adding 1 more code path. We actually need 3 conditional blocks to support 3 possible cases. This change also makes code easier to understand & follow.
--- drivers/mtd/parsers/ofpart_core.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
drivers/mtd/parsers/ofpart_core.c +14 -12
@@ -57,20 +57,22 @@ static int parse_fixed_partitions(struct mtd_info *master,if (!mtd_node)return 0 ; - ofpart_node =of_get_child_by_name (mtd_node,"partitions" ); -if (!ofpart_node && !master->parent) { -/* -* We might get here even when ofpart isn't used at all (e.g., -* when using another parser), so don't be louder than -* KERN_DEBUG -*/ -pr_debug ("%s: 'partitions' subnode not found on %pOF. Trying to parse direct subnodes as partitions.\n" , - master->name, mtd_node); +if (!master->parent) {/* Master */ + ofpart_node =of_get_child_by_name (mtd_node,"partitions" ); +if (!ofpart_node) { +/* +* We might get here even when ofpart isn't used at all (e.g., +* when using another parser), so don't be louder than +* KERN_DEBUG +*/ +pr_debug ("%s: 'partitions' subnode not found on %pOF. Trying to parse direct subnodes as partitions.\n" , + master->name, mtd_node); + ofpart_node = mtd_node; + dedicated = false; + } + }else {/* Partition */ ofpart_node = mtd_node; - dedicated = false; } -if (!ofpart_node) -return 0 ; of_id =of_match_node (parse_ofpart_match_table, ofpart_node);if (dedicated && !of_id) {
Signature · 6 lines
2.26.2 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Quoted 23 lines · On Sat, 2021-05-08 at 17:32:14 UTC, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= wrote:
From: Rafał Miłecki <[email protected]>
ofpart was recently patched to not scan random partition nodes as subpartitions. That change unfortunately broke scanning valid subpartitions like:
partitions { compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; partition@0 { compatible = "fixed-partitions"; label = "bootloader"; reg = <0x0 0x100000>; partition@0 { label = "config"; reg = <0x80000 0x80000>; }; }; };
Quoted 8 lines
Fix that regression by adding 1 more code path. We actually need 3 conditional blocks to support 3 possible cases. This change also makes code easier to understand & follow.
Reported-by David Bauer <[email protected]>Fixes 2d751203aacf ("mtd: parsers: ofpart: limit parsing of deprecated DT syntaxSigned-off-by Rafał Miłecki <[email protected]>Tested-by Andrew Cameron <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes, thanks.
Miquel
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/