| Message ID | 20190927002455.13169-4-robh@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | of: dma-ranges fixes and improvements | expand |
On Fri, Sep 27, 2019 at 2:25 AM Rob Herring <robh@kernel.org> wrote: > From: Robin Murphy <robin.murphy@arm.com> > > If we failed to translate a DMA address, at least show the offending > address rather than the uninitialised contents of the destination > argument. > > Signed-off-by: Robin Murphy <robin.murphy@arm.com> > Signed-off-by: Rob Herring <robh@kernel.org> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > drivers/of/address.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/of/address.c b/drivers/of/address.c > index 8e354d12fb04..53d2656c2269 100644 > --- a/drivers/of/address.c > +++ b/drivers/of/address.c > @@ -955,8 +955,8 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz > dmaaddr = of_read_number(ranges, naddr); > *paddr = of_translate_dma_address(np, ranges); > if (*paddr == OF_BAD_ADDR) { > - pr_err("translation of DMA address(%pad) to CPU address failed node(%pOF)\n", Yeah, the %pad was wrong on 32-bit without CONFIG_PHYS_ADDR_T_64BIT. > - dma_addr, np); > + pr_err("translation of DMA address(%llx) to CPU address failed node(%pOF)\n", > + dmaaddr, np); > ret = -EINVAL; > goto out; > } Gr{oetje,eeting}s, Geert
On Thu, Sep 26, 2019 at 07:24:47PM -0500, Rob Herring wrote: > From: Robin Murphy <robin.murphy@arm.com> > > If we failed to translate a DMA address, at least show the offending > address rather than the uninitialised contents of the destination > argument. > > Signed-off-by: Robin Murphy <robin.murphy@arm.com> > Signed-off-by: Rob Herring <robh@kernel.org> Looks good, Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/drivers/of/address.c b/drivers/of/address.c index 8e354d12fb04..53d2656c2269 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -955,8 +955,8 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz dmaaddr = of_read_number(ranges, naddr); *paddr = of_translate_dma_address(np, ranges); if (*paddr == OF_BAD_ADDR) { - pr_err("translation of DMA address(%pad) to CPU address failed node(%pOF)\n", - dma_addr, np); + pr_err("translation of DMA address(%llx) to CPU address failed node(%pOF)\n", + dmaaddr, np); ret = -EINVAL; goto out; }