of/unittest: Add test that of_address_to_resource() fails on non-translatable address
Rob Herring (Arm)
maintainerPATCH 1/2 of/unittest: Add test that of_address_to_resource() fails on non-translatable address
of_address_to_resource() on a non-translatable address should return an error. Additionally, this case also triggers a spurious WARN for missing #address-cells/#size-cells.
--- drivers/of/unittest-data/tests-platform.dtsi | 13 +++++++++++++ drivers/of/unittest.c | 14 ++++++++++++++ 2 files changed, 27 insertions(+)
drivers/of/unittest-data/tests-platform.dtsi +13 -0
@@ -34,5 +34,18 @@ dev@100 { }; }; }; + + platform-tests-2 { + // No #address-cells or #size-cells + node { + #address-cells = <1>; + #size-cells = <1>; + + test-device@100 { + compatible = "test-sub-device"; + reg = <0x100 1>; + }; + }; + }; }; };
drivers/of/unittest.c +14 -0
@@ -1380,6 +1380,7 @@ static void __init of_unittest_bus_3cell_ranges(void)static void __init of_unittest_reg (void ) {struct device_node *np; +struct resource res;int ret;u64 addr, size;
@@ -1396,6 +1397,19 @@ static void __init of_unittest_reg(void) np, addr);of_node_put (np); + + np =of_find_node_by_path ("/testcase-data/platform-tests-2/node/test-device@100" ); +if (!np) { +pr_err ("missing testcase data\n" ); +return ; + } + + ret =of_address_to_resource (np,0 , &res); +unittest (ret == -EINVAL ,"of_address_to_resource(%pOF) expected error on untranslatable address\n" , + np); + +of_node_put (np); + }struct of_unittest_expected_res {
Signature · 1 line
2.45.2
Rob Herring (Arm)
maintainerPATCH 2/2 of/address: Fix WARN when attempting translating non-translatable addresses
The recently added WARN() for deprecated #address-cells and #size-cells triggered a WARN when of_platform_populate() (which calls of_address_to_resource()) is used on nodes with non-translatable addresses. This case is expected to return an error.
Rework the bus matching to allow no match and make the default require an #address-cells property. That should be safe to do as any platform missing #address-cells would have a warning already.
--- drivers/of/address.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/of/address.c +15 -3
@@ -340,6 +340,15 @@ static int of_bus_default_flags_match(struct device_node *np)return of_property_present (np,"#address-cells" ) && (of_bus_n_addr_cells (np) ==3 ); } +static int of_bus_default_match (struct device_node *np) +{ +/* +* Check for presence first since of_bus_n_addr_cells() will warn when +* walking parent nodes. +*/ +return of_property_present (np,"#address-cells" ); +} +/* * Array of bus specific translators */
@@ -384,7 +393,7 @@ static const struct of_bus of_busses[] = { { .name = "default", .addresses = "reg", - .match = NULL, + .match = of_bus_default_match, .count_cells = of_bus_default_count_cells, .map = of_bus_default_map, .translate = of_bus_default_translate,
@@ -399,7 +408,6 @@ static const struct of_bus *of_match_bus(struct device_node *np)for (i =0 ; i <ARRAY_SIZE (of_busses); i++)if (!of_busses[i].match || of_busses[i].match (np))return &of_busses[i]; -BUG ();return NULL ; }
@@ -521,6 +529,8 @@ static u64 __of_translate_address(struct device_node *node,if (parent ==NULL )return OF_BAD_ADDR ; bus =of_match_bus (parent); +if (!bus) +return OF_BAD_ADDR ;/* Count address cells & copy address locally */ bus->count_cells (dev, &na, &ns);
@@ -564,6 +574,8 @@ static u64 __of_translate_address(struct device_node *node,/* Get new parent bus and counts */ pbus =of_match_bus (parent); +if (!pbus) +return OF_BAD_ADDR ; pbus->count_cells (dev, &pna, &pns);if (!OF_CHECK_COUNTS (pna, pns)) {pr_err ("Bad cell count for %pOF\n" , dev);
@@ -703,7 +715,7 @@ const __be32 *__of_get_address(struct device_node *dev, int index, int bar_no,/* match the parent's bus type */ bus =of_match_bus (parent); -if (strcmp (bus->name,"pci" ) && (bar_no >=0 )) +if (!bus || (strcmp (bus->name,"pci" ) && (bar_no >=0 )))return NULL ;/* Get "reg" or "assigned-addresses" property */
Signature · 1 line
2.45.2
Re: [PATCH 2/2] of/address: Fix WARN when attempting translating non-translatable addresses
Quoted 71 lines · Rob Herring (Arm)
The recently added
WARN()for deprecated #address-cells and #size-cells triggered a WARN whenof_platform_populate()(which callsof_address_to_resource()) is used on nodes with non-translatable addresses. This case is expected to return an error.Rework the bus matching to allow no match and make the default require an #address-cells property. That should be safe to do as any platform missing #address-cells would have a warning already.
Fixes 045b14ca5c36 ("of: WARN on deprecated #address-cells/#size-cells handling")Signed-off-by Rob Herring (Arm) <[email protected]>--- drivers/of/address.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)drivers/of/address.c +14
-2@@ -340,6 +340,15 @@ static int of_bus_default_flags_match(struct device_node *np)return of_property_present (np,"#address-cells" ) && (of_bus_n_addr_cells (np) ==3 ); } +static int of_bus_default_match (struct device_node *np) +{ +/* +* Check for presence first since of_bus_n_addr_cells() will warn when +* walking parent nodes. +*/ +return of_property_present (np,"#address-cells" ); +} +/* * Array of bus specific translators */ @@ -384,7 +393,7 @@ static const struct of_bus of_busses[] = { { .name = "default", .addresses = "reg", - .match = NULL, + .match = of_bus_default_match, .count_cells = of_bus_default_count_cells, .map = of_bus_default_map, .translate = of_bus_default_translate,@@ -399,7 +408,6 @@ static const struct of_bus *of_match_bus(struct device_node *np)for (i =0 ; i <ARRAY_SIZE (of_busses); i++)if (!of_busses[i].match || of_busses[i].match (np))return &of_busses[i]; -BUG ();return NULL ; }@@ -521,6 +529,8 @@ static u64 __of_translate_address(struct device_node *node,if (parent ==NULL )return OF_BAD_ADDR ; bus =of_match_bus (parent); +if (!bus) +return OF_BAD_ADDR ;/* Count address cells & copy address locally */ bus->count_cells (dev, &na, &ns);@@ -564,6 +574,8 @@ static u64 __of_translate_address(struct device_node *node,/* Get new parent bus and counts */ pbus =of_match_bus (parent); +if (!pbus) +return OF_BAD_ADDR ; pbus->count_cells (dev, &pna, &pns);if (!OF_CHECK_COUNTS (pna, pns)) {pr_err ("Bad cell count for %pOF\n" , dev);
drivers/of/address.c const __be32 *__of_get_address(struct device_node *dev, int index, int bar_no, · line 721
Quoted 8 lines
drivers/of/address.c +1
-1@@ -703,7 +715,7 @@ const __be32 *__of_get_address(struct device_node *dev, int index, int bar_no,/* match the parent's bus type */ bus =of_match_bus (parent); -if (strcmp (bus->name,"pci" ) && (bar_no >=0 )) +if (!bus || (strcmp (bus->name,"pci" ) && (bar_no >=0 )))return NULL ;/* Get "reg" or "assigned-addresses" property */