mtd: ofpart: don't complain about missing 'partitions' node too loudly
Subsystems (2)
PATCH 1/2 mtd: ofpart: don't complain about missing 'partitions' node too loudly
The ofpart partition parser might be run on DT-enabled systems that don't have any "ofpart" partition subnodes at all, since "ofpart" is in the default parser list. So don't complain loudly on every boot.
Example: using m25p80.c with no intent to use ofpart:
&spi2 {
status = "okay";
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
};
};I see this warning:
[ 0.588471] m25p80 spi2.0: gd25q32 (4096 Kbytes) [ 0.593091] spi2.0: 'partitions' subnode not found on /spi@ff130000/flash@0. Trying to parse direct subnodes as partitions.
---
This one really seems like we should put it into 4.4. Basically everyone with a DT-enabled MTD using the default parsers will get this warning, even if they're not intending to use ofpart at all.
drivers/mtd/ofpart.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/mtd/ofpart.c +7 -2
@@ -46,8 +46,13 @@ static int parse_ofpart_partitions(struct mtd_info *master, ofpart_node =of_get_child_by_name (mtd_node,"partitions" );if (!ofpart_node) { -pr_warn ("%s: 'partitions' subnode not found on %s. Trying to parse direct subnodes as partitions.\n" , - master->name, mtd_node->full_name); +/* +* 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 %s. Trying to parse direct subnodes as partitions.\n" , + master->name, mtd_node->full_name); ofpart_node = mtd_node; dedicated = false; }
Signature · 6 lines
2.6.0.rc2.230.g3dd15c0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1449194529-145705-1-git-send-email-computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
PATCH 2/2 doc: dt: mtd: partitions: add compatible property to "partitions" node
As noted here [1], there are potentially future conflicts if we try to use MTD's "partitions" subnode to describe anything besides just the fixed-in-the-device-tree partitions currently described in this document. Particularly, there was a proposal to use this node for the AFS parser too.
It can pose a (small) problem to try to differentiate the following nodes:
// using binding as currently specified
partitions {
#address-cells = <x>;
#size-cells = <y>;
partition@0 {
...;
};
};and
// proposed future binding
partitions {
compatible = "arm,arm-flash-structure";
};It's especially difficult if other uses of this node start having subnodes.
So, since the "partitions" node is new in v4.4, let's fixup the binding before release so that it requires a compatible property, so it's much clearer to distinguish. e.g.:
// proposed
partitions {
compatible = "partitions";
#address-cells = <x>;
#size-cells = <y>;
partition@0 {
...;
};
};[1] Subject: "mtd: create a partition type device tree binding"
http://lkml.kernel.org/g/[email protected] http://lists.infradead.org/pipermail/linux-mtd/2015-November/063355.html http://lists.infradead.org/pipermail/linux-mtd/2015-November/063364.html
---
This one is more of a future proofing patch. We should probably take this for 4.4, before the binding "stabilizes" (I don't actually see any users yet), or else we'll have to find some other (possibly more complicated) way to avoid this potential collision on future development.
Documentation/devicetree/bindings/mtd/partition.txt | 7 ++++++- drivers/mtd/ofpart.c | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/mtd/partition.txt +6 -1
@@ -6,7 +6,9 @@ used for what purposes, but which don't use an on-flash partition table such as RedBoot. The partition table should be a subnode of the mtd node and should be named -'partitions'. Partitions are defined in subnodes of the partitions node. +'partitions'. This node should have the following property: +- compatible : (required) must be "partitions" +Partitions are then defined in subnodes of the partitions node. For backwards compatibility partitions as direct subnodes of the mtd device are supported. This use is discouraged.
@@ -36,6 +38,7 @@ Examples: flash@0 { partitions { + compatible = "partitions"; #address-cells = <1>; #size-cells = <1>;
@@ -53,6 +56,7 @@ flash@0 { flash@1 { partitions { + compatible = "partitions"; #address-cells = <1>; #size-cells = <2>;
@@ -66,6 +70,7 @@ flash@1 { flash@2 { partitions { + compatible = "partitions"; #address-cells = <2>; #size-cells = <2>;
drivers/mtd/ofpart.c +3 -0
@@ -55,6 +55,9 @@ static int parse_ofpart_partitions(struct mtd_info *master, master->name, mtd_node->full_name); ofpart_node = mtd_node; dedicated = false; + }else if (!of_device_is_compatible (ofpart_node,"partitions" )) { +/* The 'partitions' subnode might be used by another parser */ +return 0 ; }/* First count the subnodes */
Signature · 6 lines
2.6.0.rc2.230.g3dd15c0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1449194529-145705-2-git-send-email-computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Rob Herring
Acked-byRe: [PATCH for-4.4 2/2] doc: dt: mtd: partitions: add compatible property to "partitions" node
Quoted 47 lines · Brian Norris
As noted here [1], there are potentially future conflicts if we try to use MTD's "partitions" subnode to describe anything besides just the fixed-in-the-device-tree partitions currently described in this document. Particularly, there was a proposal to use this node for the AFS parser too.
It can pose a (small) problem to try to differentiate the following nodes:
// using binding as currently specified partitions { #address-cells = <x>; #size-cells = <y>; partition@0 { ...; }; };and
// proposed future binding partitions { compatible = "arm,arm-flash-structure"; };It's especially difficult if other uses of this node start having subnodes.
So, since the "partitions" node is new in v4.4, let's fixup the binding before release so that it requires a compatible property, so it's much clearer to distinguish. e.g.:
// proposed partitions { compatible = "partitions"; #address-cells = <x>; #size-cells = <y>; partition@0 { ...; }; };[1] Subject: "mtd: create a partition type device tree binding"
http://lkml.kernel.org/g/[email protected] http://lists.infradead.org/pipermail/linux-mtd/2015-November/063355.html http://lists.infradead.org/pipermail/linux-mtd/2015-November/063364.html
Quoted 7 lines
Cc Michal Suchanek <[email protected]>Signed-off-by Brian Norris <[email protected]>---
This one is more of a future proofing patch. We should probably take this for 4.4, before the binding "stabilizes" (I don't actually see any users yet), or else we'll have to find some other (possibly more complicated) way to avoid this potential collision on future development.
Quoted 61 lines
Documentation/devicetree/bindings/mtd/partition.txt | 7 ++++++- drivers/mtd/ofpart.c | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/mtd/partition.txt +6
-1@@ -6,7 +6,9 @@ used for what purposes, but which don't use an on-flash partition table such as RedBoot. The partition table should be a subnode of the mtd node and should be named -'partitions'. Partitions are defined in subnodes of the partitions node. +'partitions'. This node should have the following property: +- compatible : (required) must be "partitions" +Partitions are then defined in subnodes of the partitions node. For backwards compatibility partitions as direct subnodes of the mtd device are supported. This use is discouraged.@@ -36,6 +38,7 @@ Examples: flash@0 { partitions { + compatible = "partitions"; #address-cells = <1>; #size-cells = <1>;@@ -53,6 +56,7 @@ flash@0 { flash@1 { partitions { + compatible = "partitions"; #address-cells = <1>; #size-cells = <2>;@@ -66,6 +70,7 @@ flash@1 { flash@2 { partitions { + compatible = "partitions"; #address-cells = <2>; #size-cells = <2>;drivers/mtd/ofpart.c +3
-0@@ -55,6 +55,9 @@ static int parse_ofpart_partitions(struct mtd_info *master, master->name, mtd_node->full_name); ofpart_node = mtd_node; dedicated = false; + }else if (!of_device_is_compatible (ofpart_node,"partitions" )) { +/* The 'partitions' subnode might be used by another parser */ +return 0 ; }/* First count the subnodes */ Signature · 1 line
2.6.0.rc2.230.g3dd15c0
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH for-4.4 2/2] doc: dt: mtd: partitions: add compatible property to "partitions" node
In reply to a message not in the archiveQuoted 28 lines · Brian Norris
As noted here [1], there are potentially future conflicts if we try to use MTD's "partitions" subnode to describe anything besides just the fixed-in-the-device-tree partitions currently described in this document. Particularly, there was a proposal to use this node for the AFS parser too.
It can pose a (small) problem to try to differentiate the following nodes:
// using binding as currently specified partitions { #address-cells = <x>; #size-cells = <y>; partition@0 { ...; }; };and
// proposed future binding partitions { compatible = "arm,arm-flash-structure"; };It's especially difficult if other uses of this node start having subnodes.
Quoted 7 lines
So, since the "partitions" node is new in v4.4, let's fixup the binding before release so that it requires a compatible property, so it's much clearer to distinguish. e.g.:
// proposed partitions { compatible = "partitions";
"partitions" sounds mode like a device_type thing than a compatible name, maybe "fixed-partitions"? IMHO that would describe better what these are, and doesn't invite to think using compatible = "arm,arm-flash-structure", "partitions"; is a good idea.
Quoted 6 lines
#address-cells = <x>;
#size-cells = <y>;
partition@0 {
...;
};
};Jonas
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): CAOiHx=kP8hT-UH=tfUZYYpr__i458-ZL3bOhcAJb8hmSbqBdCA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH for-4.4 2/2] doc: dt: mtd: partitions: add compatible property to "partitions" node
Quoted 10 lines · Jonas Gorski
Quoted 3 lines · Brian Norris
// proposed partitions { compatible = "partitions";"partitions" sounds mode like a
device_typething than a compatible name, maybe "fixed-partitions"? IMHO that would describe better what these are, and doesn't invite to think using compatible = "arm,arm-flash-structure", "partitions"; is a good idea.
"fixed-partitions" sounds OK to me. If no objections, I'll apply these patches, with (approximately) a:
s/"partitions"/"fixed-partitions"/
Thanks,
Brian
Quoted 6 lines
Quoted 6 lines
#address-cells = <x>; #size-cells = <y>; partition@0 { ...; }; };
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Brian Norris
AppliedRe: [PATCH for-4.4 2/2] doc: dt: mtd: partitions: add compatible property to "partitions" node
Quoted 12 lines · Brian Norris
Quoted 10 lines · Jonas Gorski
Quoted 3 lines · Brian Norris
// proposed partitions { compatible = "partitions";"partitions" sounds mode like a
device_typething than a compatible name, maybe "fixed-partitions"? IMHO that would describe better what these are, and doesn't invite to think using compatible = "arm,arm-flash-structure", "partitions"; is a good idea.
Quoted 4 lines
"fixed-partitions" sounds OK to me. If no objections, I'll apply these patches, with (approximately) a:
s/"partitions"/"fixed-partitions"/
Pushed to linux-mtd.git with the above change.
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH for-4.4 2/2] doc: dt: mtd: partitions: add compatible property to "partitions" node
Hi Brian,
Quoted 13 lines · Brian Norris
Quoted 12 lines · Brian Norris
Quoted 10 lines · Jonas Gorski
Quoted 3 lines · Brian Norris
// proposed partitions { compatible = "partitions";"partitions" sounds mode like a
device_typething than a compatible name, maybe "fixed-partitions"? IMHO that would describe better what these are, and doesn't invite to think using compatible = "arm,arm-flash-structure", "partitions"; is a good idea.
Quoted 6 lines
Quoted 4 lines
"fixed-partitions" sounds OK to me. If no objections, I'll apply these patches, with (approximately) a:
s/"partitions"/"fixed-partitions"/
Pushed to linux-mtd.git with the above change.
Aarghl, hadn't seen this patch before.
This breaks the users that have already added the partitions subnodes (armada-xp-lenovo-ix4-300d.dts and a few shmobile).
Will send patches to fix it...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): CAMuHMdVGW-7dQ3vAqVpUN_S7=T7dVp+jkMJR7nyZ9ePd+NnsyQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH for-4.4 2/2] doc: dt: mtd: partitions: add compatible property to "partitions" node
Quoted 18 lines · Geert Uytterhoeven
Quoted 16 lines · Brian Norris
Quoted 15 lines · Brian Norris
Quoted 10 lines · Jonas Gorski
Quoted 3 lines · Brian Norris
// proposed partitions { compatible = "partitions";"partitions" sounds mode like a
device_typething than a compatible name, maybe "fixed-partitions"? IMHO that would describe better what these are, and doesn't invite to think using compatible = "arm,arm-flash-structure", "partitions"; is a good idea."fixed-partitions" sounds OK to me. If no objections, I'll apply these patches, with (approximately) a:
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
s/"partitions"/"fixed-partitions"/
Pushed to linux-mtd.git with the above change.
Aarghl, hadn't seen this patch before.
This breaks the users that have already added the partitions subnodes (
armada-xp-lenovo-ix4-300d.dtsand a few shmobile).
Sorry, I checked Linus' master and not linux-next :(
Quoted 1 line
Will send patches to fix it...
Thanks.
Brian
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html