UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

of: address: Retrieve a parent through a callback in __of_translate_address 

The __of_translate_address function is used to translate the device tree
addresses to physical addresses using the various ranges property to create
the offset.

However, it's shared between the CPU addresses (based on the ranges
property) and the DMA addresses (based on dma-ranges). Since we're going to
add support for a DMA parent node that is not the DT parent node, we need
to change the logic a bit to have a callback function that will retrieve
the parent node we should use.

Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Rob Herring <robh@kernel.org>
This commit is contained in:
Maxime Ripard 2019-04-01 10:56:43 +02:00 committed by Rob Herring
parent e5ffa40c03
commit 95835a8d47
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/of/address.c
View File

@ -569,6 +569,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,
* relative to that node. * relative to that node.
*/ */
static u64 __of_translate_address(struct device_node *dev, static u64 __of_translate_address(struct device_node *dev,
struct device_node *(*get_parent)(const struct device_node *),
const __be32 *in_addr, const char *rprop, const __be32 *in_addr, const char *rprop,
struct device_node **host) struct device_node **host)
{ {
@ -585,7 +586,7 @@ static u64 __of_translate_address(struct device_node *dev,
*host = NULL; *host = NULL;
/* Get parent & match bus type */ /* Get parent & match bus type */
parent = of_get_parent(dev); parent = get_parent(dev);
if (parent == NULL) if (parent == NULL)
goto bail; goto bail;
bus = of_match_bus(parent); bus = of_match_bus(parent);
@ -609,7 +610,7 @@ static u64 __of_translate_address(struct device_node *dev,
/* Switch to parent bus */ /* Switch to parent bus */
of_node_put(dev); of_node_put(dev);
dev = parent; dev = parent;
parent = of_get_parent(dev); parent = get_parent(dev);
/* If root, we have finished */ /* If root, we have finished */
if (parent == NULL) { if (parent == NULL) {
@ -665,7 +666,8 @@ u64 of_translate_address(struct device_node *dev, const __be32 *in_addr)
struct device_node *host; struct device_node *host;
u64 ret; u64 ret;
ret = __of_translate_address(dev, in_addr, "ranges", &host); ret = __of_translate_address(dev, of_get_parent,
in_addr, "ranges", &host);
if (host) { if (host) {
of_node_put(host); of_node_put(host);
return OF_BAD_ADDR; return OF_BAD_ADDR;
@ -680,7 +682,8 @@ u64 of_translate_dma_address(struct device_node *dev, const __be32 *in_addr)
struct device_node *host; struct device_node *host;
u64 ret; u64 ret;
ret = __of_translate_address(dev, in_addr, "dma-ranges", &host); ret = __of_translate_address(dev, of_get_parent,
in_addr, "dma-ranges", &host);
if (host) { if (host) {
of_node_put(host); of_node_put(host);
@ -736,7 +739,8 @@ static u64 of_translate_ioport(struct device_node *dev, const __be32 *in_addr,
unsigned long port; unsigned long port;
struct device_node *host; struct device_node *host;
taddr = __of_translate_address(dev, in_addr, "ranges", &host); taddr = __of_translate_address(dev, of_get_parent,
in_addr, "ranges", &host);
if (host) { if (host) {
/* host-specific port access */ /* host-specific port access */
port = logic_pio_trans_hwaddr(&host->fwnode, taddr, size); port = logic_pio_trans_hwaddr(&host->fwnode, taddr, size);