| Message ID | 1419458210-4079-1-git-send-email-m-karicheri2@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 24 Dec 2014 16:56:50 -0500 , Murali Karicheri <m-karicheri2@ti.com> wrote: > When call to of_dma_get_range() fails, the code currently set size > to dev->coherent_dma_mask instead of dev->coherent_dma_mask + 1. Fix this > to make the code consistent with the case when size is obtained from > dma-range property. > > Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> > Reviewed-by: Arnd Bergmann <arnd@arndb.de> Looks okay to me. I've merged it into my tree. g. > --- > drivers/of/platform.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/of/platform.c b/drivers/of/platform.c > index a54ec10..af9aef1 100644 > --- a/drivers/of/platform.c > +++ b/drivers/of/platform.c > @@ -185,7 +185,7 @@ static void of_dma_configure(struct device *dev) > ret = of_dma_get_range(dev->of_node, &dma_addr, &paddr, &size); > if (ret < 0) { > dma_addr = offset = 0; > - size = dev->coherent_dma_mask; > + size = dev->coherent_dma_mask + 1; > } else { > offset = PFN_DOWN(paddr - dma_addr); > dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset); > -- > 1.7.9.5 >
On Thu, Mar 19, 2015 at 7:25 PM, Grant Likely <grant.likely@linaro.org> wrote: > On Wed, 24 Dec 2014 16:56:50 -0500 > , Murali Karicheri <m-karicheri2@ti.com> > wrote: >> When call to of_dma_get_range() fails, the code currently set size >> to dev->coherent_dma_mask instead of dev->coherent_dma_mask + 1. Fix this >> to make the code consistent with the case when size is obtained from >> dma-range property. >> >> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> >> Reviewed-by: Arnd Bergmann <arnd@arndb.de> > > Looks okay to me. I've merged it into my tree. Oops, never mind. I see that it's been rolled into the series going through Bjorn's tree. Sorry for the noise. g.
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index a54ec10..af9aef1 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -185,7 +185,7 @@ static void of_dma_configure(struct device *dev) ret = of_dma_get_range(dev->of_node, &dma_addr, &paddr, &size); if (ret < 0) { dma_addr = offset = 0; - size = dev->coherent_dma_mask; + size = dev->coherent_dma_mask + 1; } else { offset = PFN_DOWN(paddr - dma_addr); dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset);