Re: [PATCH -tip 1/3] IA64: fix swiotlb alloc_coherent for non

FUJITA Tomonori
2009-02-02T23:28:46Z

On Fri, 30 Jan 2009 20:24:13 +0900
Yasunori Goto <y-goto@jp.fujitsu.com> wrote:

> > > swiotlb_dma_ops is set by pci_swiotlb_init().
> > > However, it seems to be not called when CONFIG_IA64_DIG/Generic configuration.
> >
> > You are talking about setting dma_ops to swiotlb_dma_ops?
> >
> > I think that swiotlb_dma_init() also sets dma_ops to swiotlb_dma_ops.
>
> Certainly.
> I overlooked the 7th patch of your unifying dma_ops patch set.
> ia64_swiotlb_alloc_coherent was called when I tested again.
> I'm sorry.
>
> However, GFP_DMA is still always on in ia64_swiotlb_alloc_coherent()
> regardless of the value of dev->coherent_dma_mask.
>
> After following patch applied, GFP_DMA is set correctly by your patch.
> Am I still overlooking other your patch?

No, you are not. We need the following change. Somehow I thought that
I already made this change.

Can you resend this to Ingo with the proper description and
Signed-off-by (you can add my Acked-by if you like)?

Thanks,

> Bye.
>
>
>
> ---
> arch/ia64/include/asm/dma-mapping.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: dma_fix_test/arch/ia64/include/asm/dma-mapping.h
> =================================> --- dma_fix_test.orig/arch/ia64/include/asm/dma-mapping.h 2009-01-30 19:36:33.000000000 +0900
> +++ dma_fix_test/arch/ia64/include/asm/dma-mapping.h 2009-01-30 20:20:06.000000000 +0900
> @@ -71,7 +71,7 @@ static inline void *dma_alloc_coherent(s
> dma_addr_t *daddr, gfp_t gfp)
> {
> struct dma_mapping_ops *ops = platform_dma_get_ops(dev);
> - return ops->alloc_coherent(dev, size, daddr, gfp | GFP_DMA);
> + return ops->alloc_coherent(dev, size, daddr, gfp);
> }
>
> static inline void dma_free_coherent(struct device *dev, size_t size,
>
>
> --
> Yasunori Goto
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/