dt: mtd: ofpart: use compatible for partitions
Subsystems (5)
RFC PATCH 1/2 dt: mtd: ofpart: use compatible for partitions
In reply to a message not in the archiveofpart is confused when nodes without compatible that are not partitions exist so add compatible for partitions to make tevicetrees unambiguous.
--- .../devicetree/bindings/mtd/partition.txt | 7 +++++- drivers/mtd/ofpart.c | 26 +++++++++++++--------- 2 files changed, 22 insertions(+), 11 deletions(-)
Documentation/devicetree/bindings/mtd/partition.txt +6 -1
@@ -4,7 +4,7 @@ Partitions can be represented by sub-nodes of an mtd device. This can be used on platforms which have strong conventions about which portions of a flash are used for what purposes, but which don't use an on-flash partition table such as RedBoot. -NOTE: if the sub-node has a compatible string, then it is not a partition. +NOTE: the subnode should have compatible string linux,ofpart-partition #address-cells & #size-cells must both be present in the mtd device. There are two valid values for both:
@@ -32,12 +32,14 @@ flash at 0 { #size-cells = <1>; partition at 0 { + compatible = "linux,ofpart-partition"; label = "u-boot"; reg = <0x0000000 0x100000>; read-only; }; uimage at 100000 { + compatible = "linux,ofpart-partition"; reg = <0x0100000 0x200000>; }; };
@@ -48,6 +50,7 @@ flash at 1 { /* a 4 GiB partition */ partition at 0 { + compatible = "linux,ofpart-partition"; label = "filesystem"; reg = <0x00000000 0x1 0x00000000>; };
@@ -59,12 +62,14 @@ flash at 2 { /* an 8 GiB partition */ partition at 0 { + compatible = "linux,ofpart-partition"; label = "filesystem #1"; reg = <0x0 0x00000000 0x2 0x00000000>; }; /* a 4 GiB partition */ partition at 200000000 { + compatible = "linux,ofpart-partition"; label = "filesystem #2"; reg = <0x2 0x00000000 0x1 0x00000000>; };
drivers/mtd/ofpart.c +16 -10
@@ -20,9 +20,14 @@#include <linux/slab.h> #include <linux/mtd/partitions.h> -static bool node_has_compatible (struct device_node *pp) +const char *OFPART_COMPATIBLE ="linux,ofpart-partition" ; + +static bool node_is_compatible (struct device_node *pp) { -return of_get_property (pp,"compatible" ,NULL ); +return of_get_property (pp,"reg" ,NULL ) && + (!of_get_property (pp,"compatible" ,NULL ) || + !strcmp (OFPART_COMPATIBLE , +of_get_property (pp,"compatible" ,NULL ))); } static int parse_ofpart_partitions(struct mtd_info *master,
@@ -45,7 +50,7 @@ static int parse_ofpart_partitions(struct mtd_info *master,/* First count the subnodes */ nr_parts =0 ;for_each_child_of_node (node, pp) { -if (node_has_compatible (pp)) +if (!node_is_compatible (pp))continue ; nr_parts++;
@@ -64,14 +69,11 @@ static int parse_ofpart_partitions(struct mtd_info *master,int len;int a_cells, s_cells; -if (node_has_compatible (pp)) +if (!node_is_compatible (pp))continue ; +/* this should exist due to node_is_compatible */ reg =of_get_property (pp,"reg" , &len); -if (!reg) { - nr_parts--; -continue ; - } a_cells =of_n_addr_cells (pp); s_cells =of_n_size_cells (pp);
@@ -89,15 +91,19 @@ static int parse_ofpart_partitions(struct mtd_info *master,if (of_get_property (pp,"lock" , &len)) (*pparts)[i].mask_flags |=MTD_POWERUP_LOCK ; +if (!of_get_property (pp,"compatible" ,NULL )) +pr_warn ("%s: DT subnode without compatible parsed as ofpart partition!\n" , + node->full_name); + i++; }if (!i) {of_node_put (pp); -pr_err ("No valid partition found on %s\n" , node->full_name); +pr_notice ("No valid ofpart partition found on %s\n" , + node->full_name);kfree (*pparts); *pparts =NULL ; -return -EINVAL ; }return nr_parts;
Signature · 1 line
2.1.4
RFC PATCH 2/2 dt: spi: s3c64xx: add compatible to controller-data
In reply to a message not in the archiveThe controller-data subnode has no compatible. This can lead to other drivers getting confused by it. Add a compatible to make devicetreee unambiguous.
--- Documentation/devicetree/bindings/spi/spi-samsung.txt | 3 +++ drivers/spi/spi-s3c64xx.c | 4 ++++ 2 files changed, 7 insertions(+)
Documentation/devicetree/bindings/spi/spi-samsung.txt +3 -0
@@ -92,16 +92,19 @@ Example: spi-max-frequency = <10000>; controller-data { + compatible = "samsung,s3c-controller-data"; samsung,spi-feedback-delay = <0>; }; partition at 0 { + compatible = "linux,ofpart-partition"; label = "U-Boot"; reg = <0x0 0x40000>; read-only; }; partition at 40000 { + compatible = "linux,ofpart-partition"; label = "Kernel"; reg = <0x40000 0xc0000>; };
drivers/spi/spi-s3c64xx.c +4 -0
@@ -760,6 +760,10 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(dev_err (&spi->dev,"child node 'controller-data' not found\n" );return ERR_PTR (-EINVAL ); } +if (!of_get_property (data_np,"compatible" ,NULL ) || +strcmp (of_get_property (data_np,"compatible" ,NULL ), +"samsung,s3c-controller-data" )) +dev_err (&spi->dev,"child node 'controller-data' does not have correct compatible\n" ); cs =kzalloc (sizeof (*cs),GFP_KERNEL );if (!cs) {
Signature · 1 line
2.1.4
Mark Brown
maintainerRe: [RFC PATCH 2/2] dt: spi: s3c64xx: add compatible to controller-data
On Wed, Jul 29, 2015 at 12:19:57PM +0200, Michal Suchanek wrote:
Please use subject lines matching the style for the subsytsem so people can spot that the patch is in some way relevant.
Quoted 3 lines
The controller-data subnode has no compatible. This can lead to other drivers getting confused by it. Add a compatible to make devicetreee unambiguous.
I can't tell from this commit message what the issue you're trying to fix is, sorry. Nodes without compatible strings are entirely normal and don't need compatible strings. It sounds like a bug in whatever other driver is becoming confused.
drivers/spi/spi-s3c64xx.c static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata( · line 766
Quoted 4 lines
drivers/spi/spi-s3c64xx.c +4
-0+if (!of_get_property (data_np,"compatible" ,NULL ) || +strcmp (of_get_property (data_np,"compatible" ,NULL ), +"samsung,s3c-controller-data" )) +dev_err (&spi->dev,"child node 'controller-data' does not have correct compatible\n" );
This will break all existing users which is not acceptable for
mainline, we need to preserve compatibility with existing device trees.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150729/e4a79567/attachment.sig>
Re: [RFC PATCH 2/2] dt: spi: s3c64xx: add compatible to controller-data
Quoted 5 lines · Mark Brown
On Wed, Jul 29, 2015 at 12:19:57PM +0200, Michal Suchanek wrote:
Please use subject lines matching the style for the subsytsem so people can spot that the patch is in some way relevant.
Quoted 8 lines
Quoted 3 lines
The controller-data subnode has no compatible. This can lead to other drivers getting confused by it. Add a compatible to make devicetreee unambiguous.
I can't tell from this commit message what the issue you're trying to fix is, sorry. Nodes without compatible strings are entirely normal and don't need compatible strings. It sounds like a bug in whatever other driver is becoming confused.
The driver that gets confused is ofpart.
The two-line patch to allow it to just ignore controller-data has been rejected on the basis that s3c64xx should use a compatible string because ofpart monopolizes all nodes without compatible which are children of a mtd device. Devicetrees containing such nodes that are not partitions are presumably invalid and should be rejected when ofpart is compiled into the kernel.
Quoted 8 lines
drivers/spi/spi-s3c64xx.c static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata( · line 766
Quoted 5 lines
drivers/spi/spi-s3c64xx.c +4
-0+if (!of_get_property (data_np,"compatible" ,NULL ) || +strcmp (of_get_property (data_np,"compatible" ,NULL ), +"samsung,s3c-controller-data" )) +dev_err (&spi->dev,"child node 'controller-data' does not have correct compatible\n" );This will break all existing users which is not acceptable for mainline, we need to preserve compatibility with existing device trees.
It will not break anything. It will just spam dmesg.
Thanks
Michal
Re: [RFC PATCH 2/2] dt: spi: s3c64xx: add compatible to controller-data
Quoted 15 lines · Michal Suchanek
Quoted 5 lines · Mark Brown
On Wed, Jul 29, 2015 at 12:19:57PM +0200, Michal Suchanek wrote:
Please use subject lines matching the style for the subsytsem so people can spot that the patch is in some way relevant.
Quoted 8 lines
Quoted 3 lines
The controller-data subnode has no compatible. This can lead to other drivers getting confused by it. Add a compatible to make devicetreee unambiguous.
I can't tell from this commit message what the issue you're trying to fix is, sorry. Nodes without compatible strings are entirely normal and don't need compatible strings. It sounds like a bug in whatever other driver is becoming confused.
Quoted 4 lines
The driver that gets confused is ofpart.
The two-line patch to allow it to just ignore controller-data has been rejected on the basis that s3c64xx should use a compatible string
It wasn't outright rejected, but it was questioned.
Quoted 4 lines
because ofpart monopolizes all nodes without compatible which are children of a mtd device. Devicetrees containing such nodes that are not partitions are presumably invalid and should be rejected when ofpart is compiled into the kernel.
That characterization is currently correct. I'm not a fan of what ofpart does in the first place; I'd really like it if its binding was written in a way that made it more precise, but we have to live with what we have.
I also didn't like that you were designing your system such that we were now keying off the fact that your node has no 'reg' property. This seemed awfully fragile. (Admittedly, so is ofpart.c.)
All in all, if you have better suggestions, I'm all ears. (At first glance, I'm liking your patch 1 to help disambiguate both MTD partitions and the 'controller-data' node going forward.)
Brian
Mark Brown
maintainerRe: [RFC PATCH 2/2] dt: spi: s3c64xx: add compatible to controller-data
In reply to Michal SuchanekQuoted 7 lines · Michal Suchanek
Quoted 4 lines · Mark Brown
I can't tell from this commit message what the issue you're trying to fix is, sorry. Nodes without compatible strings are entirely normal and don't need compatible strings. It sounds like a bug in whatever other driver is becoming confused.
Quoted 8 lines
The driver that gets confused is ofpart.
The two-line patch to allow it to just ignore controller-data has been rejected on the basis that s3c64xx should use a compatible string because ofpart monopolizes all nodes without compatible which are children of a mtd device. Devicetrees containing such nodes that are not partitions are presumably invalid and should be rejected when ofpart is compiled into the kernel.
That seems like an extremely limited binding, the normal thing here would be to create a specifically named node to contain the collection of subnodes like many PMICs do for their regulators. As a fix I'd suggest just silently ignoring nodes it can't understand, or printing a warning if that's a serious issue.
Quoted 9 lines
Quoted 7 lines
drivers/spi/spi-s3c64xx.c static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata( · line 766
Quoted 4 lines
drivers/spi/spi-s3c64xx.c +4
-0+if (!of_get_property (data_np,"compatible" ,NULL ) || +strcmp (of_get_property (data_np,"compatible" ,NULL ), +"samsung,s3c-controller-data" )) +dev_err (&spi->dev,"child node 'controller-data' does not have correct compatible\n" );This will break all existing users which is not acceptable for mainline, we need to preserve compatibility with existing device trees.
It will not break anything. It will just spam dmesg.
I'm confused - if all this change does is to spam dmesg then what's the
point?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150729/8d5f2129/attachment-0001.sig>
Re: [RFC PATCH 2/2] dt: spi: s3c64xx: add compatible to controller-data
Quoted 28 lines · Mark Brown
Quoted 7 lines · Michal Suchanek
Quoted 4 lines · Mark Brown
I can't tell from this commit message what the issue you're trying to fix is, sorry. Nodes without compatible strings are entirely normal and don't need compatible strings. It sounds like a bug in whatever other driver is becoming confused.
Quoted 8 lines
The driver that gets confused is ofpart.
The two-line patch to allow it to just ignore controller-data has been rejected on the basis that s3c64xx should use a compatible string because ofpart monopolizes all nodes without compatible which are children of a mtd device. Devicetrees containing such nodes that are not partitions are presumably invalid and should be rejected when ofpart is compiled into the kernel.
That seems like an extremely limited binding, the normal thing here would be to create a specifically named node to contain the collection of subnodes like many PMICs do for their regulators. As a fix I'd suggest just silently ignoring nodes it can't understand, or printing a warning if that's a serious issue.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/spi/spi-s3c64xx.c +4
-0+if (!of_get_property (data_np,"compatible" ,NULL ) || +strcmp (of_get_property (data_np,"compatible" ,NULL ), +"samsung,s3c-controller-data" )) +dev_err (&spi->dev,"child node 'controller-data' does not have correct compatible\n" );
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
This will break all existing users which is not acceptable for mainline, we need to preserve compatibility with existing device trees.
It will not break anything. It will just spam dmesg.
I'm confused - if all this change does is to spam dmesg then what's the point?
Presumably when your SPI NOR flash fails to probe this message will be just above and you will look into the binding doc and add the compatible.
Thanks
Michal
Mark Brown
maintainerRe: [RFC PATCH 2/2] dt: spi: s3c64xx: add compatible to controller-data
Quoted 10 lines · Michal Suchanek
Quoted 4 lines · Mark Brown
Quoted 1 line
It will not break anything. It will just spam dmesg.
I'm confused - if all this change does is to spam dmesg then what's the point?
Presumably when your SPI NOR flash fails to probe this message will be just above and you will look into the binding doc and add the compatible.
If you're looking to add a warning message when the flash device fails to probe then add that in the flash driver when it detects an error, this will cause needless noise for everyone else using this controller purely to work around the broken binding.
And like I say compatible really seems like it isn't an appropriate
property here.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150729/feb69d4f/attachment-0001.sig>
Re: [RFC PATCH 2/2] dt: spi: s3c64xx: add compatible to controller-data
In reply to Michal SuchanekHi Michal,
Quoted 15 lines · On Wed, 29 Jul 2015 12:19:57 +0200 Michal Suchanek <[email protected]> wrote:
The controller-data subnode has no compatible. This can lead to other drivers getting confused by it. Add a compatible to make devicetreee unambiguous.
Signed-off-by Michal Suchanek <[email protected]>--- Documentation/devicetree/bindings/spi/spi-samsung.txt | 3 +++ drivers/spi/spi-s3c64xx.c | 4 ++++ 2 files changed, 7 insertions(+)Documentation/devicetree/bindings/spi/spi-samsung.txt +0
-0
Documentation/devicetree/bindings/spi/spi-samsung.txt Example: · line 95
Quoted 4 lines
Documentation/devicetree/bindings/spi/spi-samsung.txt +1
-0@@ -92,16 +92,19 @@ Example: spi-max-frequency = <10000>; controller-data { + compatible = "samsung,s3c-controller-data";
AFAIK compatible should (as much as possible :-)) only be used to encode HW type, and here you're using it to expose what you want to do with your data in Linux.
Documentation/devicetree/bindings/spi/spi-samsung.txt Example: · line 100
Quoted 5 lines
Documentation/devicetree/bindings/spi/spi-samsung.txt +1
-0samsung,spi-feedback-delay = <0>; }; partition at 0 { + compatible = "linux,ofpart-partition";
Ditto.
Since you have to patch your DTs anyway, how about putting your partitions in a subnode and patch the ofpart code to parse this subnode if it is present (see the following patch).
Best Regards,
Boris
--- >8 ---
Quoted 1 line
From
e342860932bda3a6354a0a6e17540db5c85a14e0Mon Sep 17 00:00:00 2001
From: Boris Brezillon <[email protected]>
Date: Thu, 30 Jul 2015 09:44:07 +0200
Subject: [PATCH] mtd: ofpart: search for a partitions node
The DT partition parser currently assumes the parition definitions are directly stored in the MTD device node, but sometime this device node contains other child nodes used to store device specific information.
Search for a partitions subnode containing the partition definitions, if it is not there, parse the definitions in the device node.
--- drivers/mtd/ofpart.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/mtd/ofpart.c +4 -1
@@ -38,7 +38,10 @@ static int parse_ofpart_partitions(struct mtd_info *master,if (!data)return 0 ; - node = data->of_node; + node =of_get_child_by_name (data->of_node,"partitions" ); +if (!node) + node = data->of_node; +if (!node)return 0 ;
Signature · 1 line
1.9.1
Re: [RFC PATCH 2/2] dt: spi: s3c64xx: add compatible to controller-data
In reply to Mark BrownQuoted 8 lines · Mark Brown
Quoted 6 lines · Michal Suchanek
Quoted 4 lines · Mark Brown
Quoted 1 line
It will not break anything. It will just spam dmesg.
I'm confused - if all this change does is to spam dmesg then what's the point?
Quoted 8 lines
Quoted 3 lines
Presumably when your SPI NOR flash fails to probe this message will be just above and you will look into the binding doc and add the compatible.
If you're looking to add a warning message when the flash device fails to probe then add that in the flash driver when it detects an error, this will cause needless noise for everyone else using this controller purely to work around the broken binding.
Technically nobody needs to see the warning with in-tree boards since the dts can be amended with the compatible.
There is no error in flash device driver.
There is only error parsing partition scheme. In my opinion this should never cause an error. With disk drives failure to parse partition table results in unpartitioned disk. As there are number of partitioning schemes failure to parse one still does not prevent other in succeding.
Quoted 3 lines
And like I say compatible really seems like it isn't an appropriate property here.
So to sum up the discussion adding compatible to s3c64xx controller-data is not desirable and making ofpart more robust is desirable.
I think the suggestion to use a subnode for ofpart gives the most robust solution.
Even adding compatibles to the partition subnodes ofpart still monopolizes the address and cells property of the mtd node which does not pass the 'if another driver did the same would it work together?' test.
So my suggestion is to
1) search of ofpart subnode in mtd node. If present read address and reg from it and search partitions as subnodes of the ofpart node. In this case unknown nodes can cause error.
2) failing that issue a warning and try to parse ofpart partitions from the mtd node itself. In this case unknown nodes cannot cause error for compatibility with other drivers including the already exisitn s3c64xx controller-data node.
The parser code can be the same for both cases and only operate on different node with a flag to reject unknown subnodes or not.
Thanks
Michal
Mark Brown
maintainerRe: [RFC PATCH 2/2] dt: spi: s3c64xx: add compatible to controller-data
In reply to Boris BrezillonQuoted 3 lines · Boris Brezillon
Since you have to patch your DTs anyway, how about putting your partitions in a subnode and patch the ofpart code to parse this subnode if it is present (see the following patch).
This is the best idea, yes - if we're changing the DT for the system
anyway then making a sane binding and using that seems better than
trying to mitigate problems with the old bindings.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150730/7f52e8c2/attachment.sig>
Mark Brown
maintainerRe: [RFC PATCH 2/2] dt: spi: s3c64xx: add compatible to controller-data
In reply to Michal SuchanekQuoted 6 lines · Michal Suchanek
So my suggestion is to
1) search of ofpart subnode in mtd node. If present read address and reg from it and search partitions as subnodes of the ofpart node. In this case unknown nodes can cause error.
Quoted 7 lines
2) failing that issue a warning and try to parse ofpart partitions from the mtd node itself. In this case unknown nodes cannot cause error for compatibility with other drivers including the already exisitn s3c64xx controller-data node.
The parser code can be the same for both cases and only operate on different node with a flag to reject unknown subnodes or not.
That seems reasonable to me.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150730/b635d61a/attachment.sig>