From: Rob Herring <robh@kernel.org> To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Nicolas Saenz Julienne <nsaenzjulienne@suse.de>, Robin Murphy <robin.murphy@arm.com>, Florian Fainelli <f.fainelli@gmail.com>, Stefan Wahren <wahrenst@gmx.net>, Frank Rowand <frowand.list@gmail.com>, Arnd Bergmann <arnd@arndb.de>, Marek Vasut <marek.vasut@gmail.com>, Geert Uytterhoeven <geert+renesas@glider.be>, Simon Horman <horms+renesas@verge.net.au>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Oza Pawandeep <oza.oza@broadcom.com> Subject: [PATCH 08/11] of: Factor out #{addr,size}-cells parsing Date: Thu, 26 Sep 2019 19:24:52 -0500 [thread overview] Message-ID: <20190927002455.13169-9-robh@kernel.org> (raw) In-Reply-To: <20190927002455.13169-1-robh@kernel.org> From: Robin Murphy <robin.murphy@arm.com> In some cases such as PCI host controllers, we may have a "parent bus" which is an OF leaf node, but still need to correctly parse ranges from the point of view of that bus. For that, factor out variants of the "#addr-cells" and "#size-cells" parsers which do not assume they have a device node and thus immediately traverse upwards before reading the relevant property. Signed-off-by: Robin Murphy <robin.murphy@arm.com> [robh: don't make of_bus_n_{addr,size}_cells() public] Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/of/address.c | 2 ++ drivers/of/base.c | 32 ++++++++++++++++++++++---------- drivers/of/of_private.h | 3 +++ 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/drivers/of/address.c b/drivers/of/address.c index 3fd34f7ad772..887c0413f648 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -14,6 +14,8 @@ #include <linux/slab.h> #include <linux/string.h> +#include "of_private.h" + /* Max address size we deal with */ #define OF_MAX_ADDR_CELLS 4 #define OF_CHECK_ADDR_COUNT(na) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS) diff --git a/drivers/of/base.c b/drivers/of/base.c index 55e7f5bb0549..12b2e9287117 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -86,34 +86,46 @@ static bool __of_node_is_type(const struct device_node *np, const char *type) return np && match && type && !strcmp(match, type); } -int of_n_addr_cells(struct device_node *np) +int of_bus_n_addr_cells(struct device_node *np) { u32 cells; - do { - if (np->parent) - np = np->parent; + for (; np; np = np->parent) if (!of_property_read_u32(np, "#address-cells", &cells)) return cells; - } while (np->parent); + /* No #address-cells property for the root node */ return OF_ROOT_NODE_ADDR_CELLS_DEFAULT; } + +int of_n_addr_cells(struct device_node *np) +{ + if (np->parent) + np = np->parent; + + return of_bus_n_addr_cells(np); +} EXPORT_SYMBOL(of_n_addr_cells); -int of_n_size_cells(struct device_node *np) +int of_bus_n_size_cells(struct device_node *np) { u32 cells; - do { - if (np->parent) - np = np->parent; + for (; np; np = np->parent) if (!of_property_read_u32(np, "#size-cells", &cells)) return cells; - } while (np->parent); + /* No #size-cells property for the root node */ return OF_ROOT_NODE_SIZE_CELLS_DEFAULT; } + +int of_n_size_cells(struct device_node *np) +{ + if (np->parent) + np = np->parent; + + return of_bus_n_size_cells(np); +} EXPORT_SYMBOL(of_n_size_cells); #ifdef CONFIG_NUMA diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h index f8c58615c393..66294d29942a 100644 --- a/drivers/of/of_private.h +++ b/drivers/of/of_private.h @@ -158,6 +158,9 @@ extern void __of_sysfs_remove_bin_file(struct device_node *np, #define for_each_transaction_entry_reverse(_oft, _te) \ list_for_each_entry_reverse(_te, &(_oft)->te_list, node) +extern int of_bus_n_addr_cells(struct device_node *np); +extern int of_bus_n_size_cells(struct device_node *np); + #ifdef CONFIG_OF_ADDRESS extern int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *size); -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Rob Herring <robh@kernel.org> To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli <f.fainelli@gmail.com>, Arnd Bergmann <arnd@arndb.de>, Frank Rowand <frowand.list@gmail.com>, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Marek Vasut <marek.vasut@gmail.com>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Oza Pawandeep <oza.oza@broadcom.com>, Stefan Wahren <wahrenst@gmx.net>, Simon Horman <horms+renesas@verge.net.au>, Geert Uytterhoeven <geert+renesas@glider.be>, Robin Murphy <robin.murphy@arm.com>, Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Subject: [PATCH 08/11] of: Factor out #{addr,size}-cells parsing Date: Thu, 26 Sep 2019 19:24:52 -0500 [thread overview] Message-ID: <20190927002455.13169-9-robh@kernel.org> (raw) In-Reply-To: <20190927002455.13169-1-robh@kernel.org> From: Robin Murphy <robin.murphy@arm.com> In some cases such as PCI host controllers, we may have a "parent bus" which is an OF leaf node, but still need to correctly parse ranges from the point of view of that bus. For that, factor out variants of the "#addr-cells" and "#size-cells" parsers which do not assume they have a device node and thus immediately traverse upwards before reading the relevant property. Signed-off-by: Robin Murphy <robin.murphy@arm.com> [robh: don't make of_bus_n_{addr,size}_cells() public] Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/of/address.c | 2 ++ drivers/of/base.c | 32 ++++++++++++++++++++++---------- drivers/of/of_private.h | 3 +++ 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/drivers/of/address.c b/drivers/of/address.c index 3fd34f7ad772..887c0413f648 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -14,6 +14,8 @@ #include <linux/slab.h> #include <linux/string.h> +#include "of_private.h" + /* Max address size we deal with */ #define OF_MAX_ADDR_CELLS 4 #define OF_CHECK_ADDR_COUNT(na) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS) diff --git a/drivers/of/base.c b/drivers/of/base.c index 55e7f5bb0549..12b2e9287117 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -86,34 +86,46 @@ static bool __of_node_is_type(const struct device_node *np, const char *type) return np && match && type && !strcmp(match, type); } -int of_n_addr_cells(struct device_node *np) +int of_bus_n_addr_cells(struct device_node *np) { u32 cells; - do { - if (np->parent) - np = np->parent; + for (; np; np = np->parent) if (!of_property_read_u32(np, "#address-cells", &cells)) return cells; - } while (np->parent); + /* No #address-cells property for the root node */ return OF_ROOT_NODE_ADDR_CELLS_DEFAULT; } + +int of_n_addr_cells(struct device_node *np) +{ + if (np->parent) + np = np->parent; + + return of_bus_n_addr_cells(np); +} EXPORT_SYMBOL(of_n_addr_cells); -int of_n_size_cells(struct device_node *np) +int of_bus_n_size_cells(struct device_node *np) { u32 cells; - do { - if (np->parent) - np = np->parent; + for (; np; np = np->parent) if (!of_property_read_u32(np, "#size-cells", &cells)) return cells; - } while (np->parent); + /* No #size-cells property for the root node */ return OF_ROOT_NODE_SIZE_CELLS_DEFAULT; } + +int of_n_size_cells(struct device_node *np) +{ + if (np->parent) + np = np->parent; + + return of_bus_n_size_cells(np); +} EXPORT_SYMBOL(of_n_size_cells); #ifdef CONFIG_NUMA diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h index f8c58615c393..66294d29942a 100644 --- a/drivers/of/of_private.h +++ b/drivers/of/of_private.h @@ -158,6 +158,9 @@ extern void __of_sysfs_remove_bin_file(struct device_node *np, #define for_each_transaction_entry_reverse(_oft, _te) \ list_for_each_entry_reverse(_te, &(_oft)->te_list, node) +extern int of_bus_n_addr_cells(struct device_node *np); +extern int of_bus_n_size_cells(struct device_node *np); + #ifdef CONFIG_OF_ADDRESS extern int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *size); -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-09-27 0:25 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-09-27 0:24 [PATCH 00/11] of: dma-ranges fixes and improvements Rob Herring 2019-09-27 0:24 ` Rob Herring 2019-09-27 0:24 ` [PATCH 01/11] of: Remove unused of_find_matching_node_by_address() Rob Herring 2019-09-27 0:24 ` Rob Herring 2019-09-27 9:17 ` Geert Uytterhoeven 2019-09-27 9:17 ` Geert Uytterhoeven 2019-09-27 9:17 ` Geert Uytterhoeven 2019-09-30 12:49 ` Christoph Hellwig 2019-09-30 12:49 ` Christoph Hellwig 2019-09-27 0:24 ` [PATCH 02/11] of: Make of_dma_get_range() private Rob Herring 2019-09-27 0:24 ` Rob Herring 2019-09-27 9:18 ` Geert Uytterhoeven 2019-09-27 9:18 ` Geert Uytterhoeven 2019-09-27 9:18 ` Geert Uytterhoeven 2019-09-30 12:53 ` Christoph Hellwig 2019-09-30 12:53 ` Christoph Hellwig 2019-09-27 0:24 ` [PATCH 03/11] of: address: Report of_dma_get_range() errors meaningfully Rob Herring 2019-09-27 0:24 ` Rob Herring 2019-09-27 9:15 ` Geert Uytterhoeven 2019-09-27 9:15 ` Geert Uytterhoeven 2019-09-27 9:15 ` Geert Uytterhoeven 2019-09-30 12:54 ` Christoph Hellwig 2019-09-30 12:54 ` Christoph Hellwig 2019-09-27 0:24 ` [PATCH 04/11] of/unittest: Add dma-ranges address translation tests Rob Herring 2019-09-27 0:24 ` Rob Herring 2019-09-27 0:24 ` [PATCH 05/11] of: Ratify of_dma_configure() interface Rob Herring 2019-09-27 0:24 ` Rob Herring 2019-09-30 12:57 ` Christoph Hellwig 2019-09-30 12:57 ` Christoph Hellwig 2019-09-30 13:32 ` Nicolas Saenz Julienne 2019-09-30 13:32 ` Nicolas Saenz Julienne 2019-09-30 21:24 ` Rob Herring 2019-09-30 21:24 ` Rob Herring 2019-09-30 21:24 ` Rob Herring 2019-10-01 15:43 ` Nicolas Saenz Julienne 2019-10-01 15:43 ` Nicolas Saenz Julienne 2019-10-01 15:43 ` Nicolas Saenz Julienne 2019-10-04 1:53 ` Rob Herring 2019-10-04 1:53 ` Rob Herring 2019-10-04 1:53 ` Rob Herring 2019-10-07 17:51 ` Nicolas Saenz Julienne 2019-10-07 17:51 ` Nicolas Saenz Julienne 2019-10-07 17:51 ` Nicolas Saenz Julienne 2019-09-27 0:24 ` [PATCH 06/11] of/address: Introduce of_get_next_dma_parent() helper Rob Herring 2019-09-27 0:24 ` Rob Herring 2019-09-27 9:24 ` Geert Uytterhoeven 2019-09-27 9:24 ` Geert Uytterhoeven 2019-09-27 9:24 ` Geert Uytterhoeven 2019-09-27 0:24 ` [PATCH 07/11] of: address: Follow DMA parent for "dma-coherent" Rob Herring 2019-09-27 0:24 ` Rob Herring 2019-09-27 0:24 ` Rob Herring [this message] 2019-09-27 0:24 ` [PATCH 08/11] of: Factor out #{addr,size}-cells parsing Rob Herring 2019-09-27 9:27 ` Geert Uytterhoeven 2019-09-27 9:27 ` Geert Uytterhoeven 2019-09-27 9:27 ` Geert Uytterhoeven 2019-09-27 0:24 ` [PATCH 09/11] of: Make of_dma_get_range() work on bus nodes Rob Herring 2019-09-27 0:24 ` Rob Herring 2019-09-27 0:24 ` [PATCH 10/11] of/address: Translate 'dma-ranges' for parent nodes missing 'dma-ranges' Rob Herring 2019-09-27 0:24 ` Rob Herring 2019-09-27 0:24 ` [PATCH 11/11] of/address: Fix of_pci_range_parser_one translation of DMA addresses Rob Herring 2019-09-27 0:24 ` Rob Herring 2019-09-29 11:16 ` [PATCH 00/11] of: dma-ranges fixes and improvements Arnd Bergmann 2019-09-29 11:16 ` Arnd Bergmann 2019-09-29 11:16 ` Arnd Bergmann 2019-09-30 8:20 ` Christoph Hellwig 2019-09-30 8:20 ` Christoph Hellwig 2019-09-30 8:56 ` Thierry Reding 2019-09-30 8:56 ` Thierry Reding 2019-09-30 9:55 ` Robin Murphy 2019-09-30 9:55 ` Robin Murphy 2019-09-30 13:35 ` Thierry Reding 2019-09-30 13:35 ` Thierry Reding 2019-09-30 9:20 ` Nicolas Saenz Julienne 2019-09-30 9:20 ` Nicolas Saenz Julienne 2019-09-30 12:40 ` Marek Vasut 2019-09-30 12:40 ` Marek Vasut 2019-09-30 12:52 ` Robin Murphy 2019-09-30 12:52 ` Robin Murphy 2019-09-30 12:54 ` Marek Vasut 2019-09-30 12:54 ` Marek Vasut 2019-09-30 13:05 ` Robin Murphy 2019-09-30 13:05 ` Robin Murphy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190927002455.13169-9-robh@kernel.org \ --to=robh@kernel.org \ --cc=arnd@arndb.de \ --cc=devicetree@vger.kernel.org \ --cc=f.fainelli@gmail.com \ --cc=frowand.list@gmail.com \ --cc=geert+renesas@glider.be \ --cc=horms+renesas@verge.net.au \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=marek.vasut@gmail.com \ --cc=nsaenzjulienne@suse.de \ --cc=oza.oza@broadcom.com \ --cc=robin.murphy@arm.com \ --cc=wahrenst@gmx.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.