Skip to contentSkip to conversation

mtd: parsers: ofpart: limit parsing of deprecated DT syntax

PATCH Applied Rafał Miłecki 4 participants 5 messages Mar 3, 2021 – Mar 11, 2021 Memory technology devices (MTD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mtd: parsers: ofpart: limit parsing of deprecated DT syntax

From: Rafał Miłecki <[email protected]>

For backward compatibility ofpart still supports the old syntax like:

spi-flash@0 {
	compatible = "jedec,spi-nor";
	reg = <0x0>;

	partition@0 {
		label = "bootloader";
		reg = <0x0 0x100000>;
	};
};

(without "partitions" subnode).

There is no reason however to support nested partitions without a clear "compatible" string like:

partitions {
	compatible = "fixed-partitions";
	#address-cells = <1>;
	#size-cells = <1>;

	partition@0 {
		label = "bootloader";
		reg = <0x0 0x100000>;

		partition@0 {
			label = "config";
			reg = <0x80000 0x80000>;
		};
	};
};

(we never officially supported or documented that).

Make sure ofpart doesn't attempt to parse above.

---
 drivers/mtd/parsers/ofpart_core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mtd/parsers/ofpart_core.c +3 -1
index 258c06a42283..02658298d99a 100644
@@ -53,7 +53,7 @@ static int parse_fixed_partitions(struct mtd_info *master,
 		return 0;
 
 	ofpart_node = of_get_child_by_name(mtd_node, "partitions");
-	if (!ofpart_node) {
+	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
@@ -64,6 +64,8 @@ static int parse_fixed_partitions(struct mtd_info *master,
 		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/
#1 lore raw

R: [PATCH] mtd: parsers: ofpart: limit parsing of deprecated DT syntax

Quoted 31 lines

From: Rafał Miłecki <[email protected]>

For backward compatibility ofpart still supports the old syntax like:

spi-flash@0 {
	compatible = "jedec,spi-nor";
	reg = <0x0>;

	partition@0 {
		label = "bootloader";
		reg = <0x0 0x100000>;
	};
};

(without "partitions" subnode).

There is no reason however to support nested partitions without a clear "compatible" string like:

partitions {
	compatible = "fixed-partitions";
	#address-cells = <1>;
	#size-cells = <1>;

	partition@0 {
		label = "bootloader";
		reg = <0x0 0x100000>;

		partition@0 {
			label = "config";
			reg = <0x80000 0x80000>;
		};
	};
};
Quoted 4 lines

(we never officially supported or documented that).

Make sure ofpart doesn't attempt to parse above.

I have one question.
From what I can see in the new code, in this example "something" partition won't be parsed with the fixed-partition parser. Correct?

partitions {
	compatible = "fixed-partitions";
	#address-cells = <1>;
	#size-cells = <1>;

	partition@0 {
		label = "bootloader";
		reg = <0x0 0x100000>;
		compatible = "random-parser";

		partition@0 {
			label = "something";
			reg = <0x0 0x100>;
		};
	};
};

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

#2 lore raw

Re: R: [PATCH] mtd: parsers: ofpart: limit parsing of deprecated DT syntax

Quoted 40 lines · On 02.03.2021 20:38, [email protected] wrote:
Quoted 31 lines

From: Rafał Miłecki <[email protected]>

For backward compatibility ofpart still supports the old syntax like:

spi-flash@0 {
	compatible = "jedec,spi-nor";
	reg = <0x0>;

	partition@0 {
		label = "bootloader";
		reg = <0x0 0x100000>;
	};
};

(without "partitions" subnode).

There is no reason however to support nested partitions without a clear "compatible" string like:

partitions {
	compatible = "fixed-partitions";
	#address-cells = <1>;
	#size-cells = <1>;

	partition@0 {
		label = "bootloader";
		reg = <0x0 0x100000>;

		partition@0 {
			label = "config";
			reg = <0x80000 0x80000>;
		};
	};
};
Quoted 4 lines

(we never officially supported or documented that).

Make sure ofpart doesn't attempt to parse above.

I have one question.
From what I can see in the new code, in this example "something"
partition won't be parsed with the fixed-partition parser. Correct?

Quoted 16 lines
partitions {
	compatible = "fixed-partitions";
	#address-cells = <1>;
	#size-cells = <1>;

	partition@0 {
		label = "bootloader";
		reg = <0x0 0x100000>;
		compatible = "random-parser";

		partition@0 {
			label = "something";
			reg = <0x0 0x100>;
		};
	};
};

Correct.

Both: "bootloader" and "something" partitions in your example will have master->parent set to their parents. Parser "ofpart" will NOT attempt to parse "bootloader" subnodes or "something" subnodes.

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

#3 lore raw

Re: R: [PATCH] mtd: parsers: ofpart: limit parsing of deprecated DT syntax

Quoted 58 lines · Rafał Miłecki
Quoted 50 lines · On 02.03.2021 20:38, [email protected] wrote:
Quoted 33 lines

From: Rafał Miłecki <[email protected]>

For backward compatibility ofpart still supports the old syntax like:
spi-flash@0 {
    compatible = "jedec,spi-nor";
    reg = <0x0>;

    partition@0 {
        label = "bootloader";
        reg = <0x0 0x100000>;
    };
};
(without "partitions" subnode).

There is no reason however to support nested partitions without a clear "compatible" string like:
partitions {
    compatible = "fixed-partitions";
    #address-cells = <1>;
    #size-cells = <1>;

    partition@0 {
        label = "bootloader";
        reg = <0x0 0x100000>;

        partition@0 {
            label = "config";
            reg = <0x80000 0x80000>;
        };
    };
};
(we never officially supported or documented that).

Quoted 2 lines

Make sure ofpart doesn't attempt to parse above.

I have one question.
 From what I can see in the new code, in this example "something" partition won't be parsed with the fixed-partition parser. Correct?

partitions {
    compatible = "fixed-partitions";
    #address-cells = <1>;
    #size-cells = <1>;

    partition@0 {
        label = "bootloader";
        reg = <0x0 0x100000>;
        compatible = "random-parser";

Quoted 6 lines

        partition@0 {
            label = "something";
            reg = <0x0 0x100>;
        };
    };
};

Quoted 5 lines

Correct.

Both: "bootloader" and "something" partitions in your example will have master->parent set to their parents. Parser "ofpart" will NOT attempt to parse "bootloader" subnodes or "something" subnodes.

I even verified that with
CONFIG_MTD_PARTITIONED_MASTER=y

as well as with
# CONFIG_MTD_PARTITIONED_MASTER is not set

:)

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

maintainer Applied
#4 lore raw
In reply to Rafał Miłecki
Quoted 31 lines · On Tue, 2021-03-02 at 19:00:12 UTC, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= wrote:

From: Rafał Miłecki <[email protected]>

For backward compatibility ofpart still supports the old syntax like:

spi-flash@0 {
	compatible = "jedec,spi-nor";
	reg = <0x0>;

	partition@0 {
		label = "bootloader";
		reg = <0x0 0x100000>;
	};
};

(without "partitions" subnode).

There is no reason however to support nested partitions without a clear "compatible" string like:

partitions {
	compatible = "fixed-partitions";
	#address-cells = <1>;
	#size-cells = <1>;

	partition@0 {
		label = "bootloader";
		reg = <0x0 0x100000>;

		partition@0 {
			label = "config";
			reg = <0x80000 0x80000>;
		};
	};
};
Quoted 6 lines

(we never officially supported or documented that).

Make sure ofpart doesn't attempt to parse above.

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.

Miquel

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/