Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1210869 > unrolled thread

CONFIG_OF vs DMA_OF

Started byKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
First post2015-08-21 07:40 +0200
Last post2015-08-24 11:20 +0200
Articles 3 — 2 participants

Back to article view | Back to linux.kernel


Contents

  CONFIG_OF vs DMA_OF Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> - 2015-08-21 07:40 +0200
    Re: CONFIG_OF vs DMA_OF Vinod Koul <vinod.koul@intel.com> - 2015-08-21 10:30 +0200
      Re: [PATCH 1/2] dmaengine: OF DMAEngine API based on CONFIG_DMA_OF  instead of CONFIG_OF Vinod Koul <vinod.koul@intel.com> - 2015-08-24 11:20 +0200

#1210869 — CONFIG_OF vs DMA_OF

FromKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date2015-08-21 07:40 +0200
SubjectCONFIG_OF vs DMA_OF
Message-ID<pZNdv-2Jq-1@gated-at.bofh.it>
Hi Vinod

${LINUX}/drivers/dma/of-dma.c will be compiled if .config has DMA_OF

	obj-$(CONFIG_DMA_OF) += of-dma.o

But, ${LINUX}/include/linux/of_dma.h is based on CONFIG_OF

	#ifdef CONFIG_OF
	extern int of_dma_controller_register(struct device_node *np,
	...
	#else
	static inline int of_dma_controller_register(struct device_node *np,
	...
	#endif

I have issue if .config has CONFIG_OF but not have DMA_OF.
Is this correct patch ?

---------------------------------
diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h
index 98ba752..9440622 100644
--- a/include/linux/of_dma.h
+++ b/include/linux/of_dma.h
@@ -34,7 +34,7 @@ struct of_dma_filter_info {
        dma_filter_fn   filter_fn;
 };
 
-#ifdef CONFIG_OF
+#ifdef DMA_OF
 extern int of_dma_controller_register(struct device_node *np,
                struct dma_chan *(*of_dma_xlate)
                (struct of_phandle_args *, struct of_dma *),
---------------------------------


Best regards
---
Kuninori Morimoto
--
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/

[toc] | [next] | [standalone]


#1211006

FromVinod Koul <vinod.koul@intel.com>
Date2015-08-21 10:30 +0200
Message-ID<pZPS1-6zf-11@gated-at.bofh.it>
In reply to#1210869
On Fri, Aug 21, 2015 at 05:35:58AM +0000, Kuninori Morimoto wrote:
> 
> Hi Vinod
> 
> ${LINUX}/drivers/dma/of-dma.c will be compiled if .config has DMA_OF
> 
> 	obj-$(CONFIG_DMA_OF) += of-dma.o
> 
> But, ${LINUX}/include/linux/of_dma.h is based on CONFIG_OF

Intially it was OF only and then DMA_OF was added. I think we missed it
during the move, so yes your below patch makes sense

Can you please send as formal patch for me to apply

-- 
~Vinod

> 
> 	#ifdef CONFIG_OF
> 	extern int of_dma_controller_register(struct device_node *np,
> 	...
> 	#else
> 	static inline int of_dma_controller_register(struct device_node *np,
> 	...
> 	#endif
> 
> I have issue if .config has CONFIG_OF but not have DMA_OF.
> Is this correct patch ?
> 
> ---------------------------------
> diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h
> index 98ba752..9440622 100644
> --- a/include/linux/of_dma.h
> +++ b/include/linux/of_dma.h
> @@ -34,7 +34,7 @@ struct of_dma_filter_info {
>         dma_filter_fn   filter_fn;
>  };
>  
> -#ifdef CONFIG_OF
> +#ifdef DMA_OF
>  extern int of_dma_controller_register(struct device_node *np,
>                 struct dma_chan *(*of_dma_xlate)
>                 (struct of_phandle_args *, struct of_dma *),
> ---------------------------------
> 
> 
> Best regards
> ---
> Kuninori Morimoto

-- 
-- 
~Vinod
--
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/

[toc] | [prev] | [next] | [standalone]


#1211948 — Re: [PATCH 1/2] dmaengine: OF DMAEngine API based on CONFIG_DMA_OF instead of CONFIG_OF

FromVinod Koul <vinod.koul@intel.com>
Date2015-08-24 11:20 +0200
SubjectRe: [PATCH 1/2] dmaengine: OF DMAEngine API based on CONFIG_DMA_OF instead of CONFIG_OF
Message-ID<q0W55-3om-31@gated-at.bofh.it>
In reply to#1211006
On Fri, Aug 21, 2015 at 11:48:37AM +0000, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> 5fa422c ("dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c")
> moved OF base DMAEngine code to of-dma.c, then it based on CONFIG_DMA_OF.
> But, OF base DMAEngine API on of_dma.h still based on CONFIG_OF now.
> So, current kernel can't find OF base DMAEngine API if .config has CONFIG_OF,
> but not have CONFIG_DMA_OF. This patch tidyup it.

I did a quick build with arm config, but didn't see any failures. But still
am worried about random config and other builds may find.

So I think it would be safer to merge this patch after merge window so that
we have ample time to fix any issue

-- 
~Vinod

> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
>  include/linux/of_dma.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h
> index 98ba752..36112cd 100644
> --- a/include/linux/of_dma.h
> +++ b/include/linux/of_dma.h
> @@ -34,7 +34,7 @@ struct of_dma_filter_info {
>  	dma_filter_fn	filter_fn;
>  };
>  
> -#ifdef CONFIG_OF
> +#ifdef CONFIG_DMA_OF
>  extern int of_dma_controller_register(struct device_node *np,
>  		struct dma_chan *(*of_dma_xlate)
>  		(struct of_phandle_args *, struct of_dma *),
> -- 
> 1.9.1
> 
--
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/

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web