diff options
author | Rob Herring <robh@kernel.org> | 2019-09-04 11:43:30 +0100 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2019-10-08 13:55:26 -0500 |
commit | 81db12ee15cb83926e290a8a3654a2dfebc80935 (patch) | |
tree | 0376a0382cb3e0af5f370a1e8e123436213c98e5 /drivers/of/address.c | |
parent | 04db93a95aef392a98f9ffa8745da2e7c58ba75b (diff) | |
download | linux-stable-81db12ee15cb83926e290a8a3654a2dfebc80935.tar.gz linux-stable-81db12ee15cb83926e290a8a3654a2dfebc80935.tar.bz2 linux-stable-81db12ee15cb83926e290a8a3654a2dfebc80935.zip |
of/address: Translate 'dma-ranges' for parent nodes missing 'dma-ranges'
'dma-ranges' frequently exists without parent nodes having 'dma-ranges'.
While this is an error for 'ranges', this is fine because DMA capable
devices always have a translatable DMA address. Also, with no
'dma-ranges' at all, the assumption is that DMA addresses are 1:1 with
no restrictions unless perhaps the device itself has implicit
restrictions.
Cc: Robin Murphy <robin.murphy@arm.com>
Tested-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of/address.c')
-rw-r--r-- | drivers/of/address.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index 887c0413f648..1c291bd6bce2 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -519,9 +519,13 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, * * As far as we know, this damage only exists on Apple machines, so * This code is only enabled on powerpc. --gcl + * + * This quirk also applies for 'dma-ranges' which frequently exist in + * child nodes without 'dma-ranges' in the parent nodes. --RobH */ ranges = of_get_property(parent, rprop, &rlen); - if (ranges == NULL && !of_empty_ranges_quirk(parent)) { + if (ranges == NULL && !of_empty_ranges_quirk(parent) && + strcmp(rprop, "dma-ranges")) { pr_debug("no ranges; cannot translate\n"); return 1; } |