OF: Retire dma-ranges mask workaround
authorRobin Murphy <robin.murphy@arm.com>
Fri, 19 Apr 2024 16:54:40 +0000 (17:54 +0100)
committerJoerg Roedel <jroedel@suse.de>
Fri, 26 Apr 2024 10:07:22 +0000 (12:07 +0200)
The fixup adding 1 to the dma-ranges size may have been for the benefit
of some early AMD Seattle DTs, or may have merely been a just-in-case,
but either way anyone who might have deserved to get the message has
hopefully seen the warning in the 9 years we've had it there. The modern
dma_range_map mechanism should happily handle odd-sized ranges with no
ill effect, so there's little need to care anyway now. Clean it up.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/26620039901fdae52079ec1c8a4b2b324964a13e.1713523152.git.robin.murphy@arm.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/of/device.c

index de89f99063758a84d30cf2a8346925feddcc84ca..a988bee2ee5ad17d16d5998a33d0657f0703b807 100644 (file)
@@ -129,22 +129,6 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,
                                dma_end = r->dma_start + r->size;
                }
                size = dma_end - dma_start;
-
-               /*
-                * Add a work around to treat the size as mask + 1 in case
-                * it is defined in DT as a mask.
-                */
-               if (size & 1) {
-                       dev_warn(dev, "Invalid size 0x%llx for dma-range(s)\n",
-                                size);
-                       size = size + 1;
-               }
-
-               if (!size) {
-                       dev_err(dev, "Adjusted size 0x%llx invalid\n", size);
-                       kfree(map);
-                       return -EINVAL;
-               }
        }
 
        /*