linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: ls1021a: add platform notifier for dma-coherent requirement
@ 2015-08-07 10:01 Alison Wang
  2015-09-06  7:22 ` Shawn Guo
  0 siblings, 1 reply; 3+ messages in thread
From: Alison Wang @ 2015-08-07 10:01 UTC (permalink / raw)
  To: linux-arm-kernel

This patch adds platform notifier for dma-coherent requirement.
Structure arm_coherent_dma_ops is used instead of arm_dma_ops.

Signed-off-by: Alison Wang <alison.wang@freescale.com>
---
 arch/arm/mach-imx/mach-ls1021a.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/arch/arm/mach-imx/mach-ls1021a.c b/arch/arm/mach-imx/mach-ls1021a.c
index b89c858..6bfc71b 100644
--- a/arch/arm/mach-imx/mach-ls1021a.c
+++ b/arch/arm/mach-imx/mach-ls1021a.c
@@ -7,10 +7,39 @@
  * (at your option) any later version.
  */
 
+#include <linux/dma-mapping.h>
+#include <linux/of_platform.h>
 #include <asm/mach/arch.h>
 
 #include "common.h"
 
+static int ls1021a_platform_notifier(struct notifier_block *nb,
+				  unsigned long event, void *__dev)
+{
+	struct device *dev = __dev;
+
+	if (event != BUS_NOTIFY_ADD_DEVICE)
+		return NOTIFY_DONE;
+
+	if (of_device_is_compatible(dev->of_node, "fsl,etsec2"))
+		set_dma_ops(dev, &arm_coherent_dma_ops);
+	else if (of_property_read_bool(dev->of_node, "dma-coherent"))
+		set_dma_ops(dev, &arm_coherent_dma_ops);
+
+	return NOTIFY_OK;
+}
+
+static struct notifier_block ls1021a_platform_nb = {
+	.notifier_call = ls1021a_platform_notifier,
+};
+
+static void __init ls1021a_init_machine(void)
+{
+	bus_register_notifier(&platform_bus_type, &ls1021a_platform_nb);
+
+	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
 static const char * const ls1021a_dt_compat[] __initconst = {
 	"fsl,ls1021a",
 	NULL,
@@ -18,5 +47,6 @@ static const char * const ls1021a_dt_compat[] __initconst = {
 
 DT_MACHINE_START(LS1021A, "Freescale LS1021A")
 	.smp		= smp_ops(ls1021a_smp_ops),
+	.init_machine   = ls1021a_init_machine,
 	.dt_compat	= ls1021a_dt_compat,
 MACHINE_END
-- 
2.1.0.27.g96db324

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH] ARM: ls1021a: add platform notifier for dma-coherent requirement
  2015-08-07 10:01 [PATCH] ARM: ls1021a: add platform notifier for dma-coherent requirement Alison Wang
@ 2015-09-06  7:22 ` Shawn Guo
  2015-09-07  9:45   ` Huan Wang
  0 siblings, 1 reply; 3+ messages in thread
From: Shawn Guo @ 2015-09-06  7:22 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, Aug 07, 2015 at 06:01:59PM +0800, Alison Wang wrote:
> This patch adds platform notifier for dma-coherent requirement.
> Structure arm_coherent_dma_ops is used instead of arm_dma_ops.
> 
> Signed-off-by: Alison Wang <alison.wang@freescale.com>
> ---
>  arch/arm/mach-imx/mach-ls1021a.c | 30 ++++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
> 
> diff --git a/arch/arm/mach-imx/mach-ls1021a.c b/arch/arm/mach-imx/mach-ls1021a.c
> index b89c858..6bfc71b 100644
> --- a/arch/arm/mach-imx/mach-ls1021a.c
> +++ b/arch/arm/mach-imx/mach-ls1021a.c
> @@ -7,10 +7,39 @@
>   * (at your option) any later version.
>   */
>  
> +#include <linux/dma-mapping.h>
> +#include <linux/of_platform.h>
>  #include <asm/mach/arch.h>
>  
>  #include "common.h"
>  
> +static int ls1021a_platform_notifier(struct notifier_block *nb,
> +				  unsigned long event, void *__dev)
> +{
> +	struct device *dev = __dev;
> +
> +	if (event != BUS_NOTIFY_ADD_DEVICE)
> +		return NOTIFY_DONE;
> +
> +	if (of_device_is_compatible(dev->of_node, "fsl,etsec2"))
> +		set_dma_ops(dev, &arm_coherent_dma_ops);

Why cannot you simply add property dma-coherent for etsec2 node in
device tree?  In that case, of_dma_configure() will just do the job from
of_platform_device_create_pdata().

Shawn

> +	else if (of_property_read_bool(dev->of_node, "dma-coherent"))
> +		set_dma_ops(dev, &arm_coherent_dma_ops);
> +
> +	return NOTIFY_OK;
> +}
> +
> +static struct notifier_block ls1021a_platform_nb = {
> +	.notifier_call = ls1021a_platform_notifier,
> +};
> +
> +static void __init ls1021a_init_machine(void)
> +{
> +	bus_register_notifier(&platform_bus_type, &ls1021a_platform_nb);
> +
> +	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
> +}
> +
>  static const char * const ls1021a_dt_compat[] __initconst = {
>  	"fsl,ls1021a",
>  	NULL,
> @@ -18,5 +47,6 @@ static const char * const ls1021a_dt_compat[] __initconst = {
>  
>  DT_MACHINE_START(LS1021A, "Freescale LS1021A")
>  	.smp		= smp_ops(ls1021a_smp_ops),
> +	.init_machine   = ls1021a_init_machine,
>  	.dt_compat	= ls1021a_dt_compat,
>  MACHINE_END
> -- 
> 2.1.0.27.g96db324
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] ARM: ls1021a: add platform notifier for dma-coherent requirement
  2015-09-06  7:22 ` Shawn Guo
@ 2015-09-07  9:45   ` Huan Wang
  0 siblings, 0 replies; 3+ messages in thread
From: Huan Wang @ 2015-09-07  9:45 UTC (permalink / raw)
  To: linux-arm-kernel

Hi, Shawn,

> On Fri, Aug 07, 2015 at 06:01:59PM +0800, Alison Wang wrote:
> > This patch adds platform notifier for dma-coherent requirement.
> > Structure arm_coherent_dma_ops is used instead of arm_dma_ops.
> >
> > Signed-off-by: Alison Wang <alison.wang@freescale.com>
> > ---
> >  arch/arm/mach-imx/mach-ls1021a.c | 30 ++++++++++++++++++++++++++++++
> >  1 file changed, 30 insertions(+)
> >
> > diff --git a/arch/arm/mach-imx/mach-ls1021a.c
> > b/arch/arm/mach-imx/mach-ls1021a.c
> > index b89c858..6bfc71b 100644
> > --- a/arch/arm/mach-imx/mach-ls1021a.c
> > +++ b/arch/arm/mach-imx/mach-ls1021a.c
> > @@ -7,10 +7,39 @@
> >   * (at your option) any later version.
> >   */
> >
> > +#include <linux/dma-mapping.h>
> > +#include <linux/of_platform.h>
> >  #include <asm/mach/arch.h>
> >
> >  #include "common.h"
> >
> > +static int ls1021a_platform_notifier(struct notifier_block *nb,
> > +				  unsigned long event, void *__dev) {
> > +	struct device *dev = __dev;
> > +
> > +	if (event != BUS_NOTIFY_ADD_DEVICE)
> > +		return NOTIFY_DONE;
> > +
> > +	if (of_device_is_compatible(dev->of_node, "fsl,etsec2"))
> > +		set_dma_ops(dev, &arm_coherent_dma_ops);
> 
> Why cannot you simply add property dma-coherent for etsec2 node in
> device tree?  In that case, of_dma_configure() will just do the job
> from of_platform_device_create_pdata().
[Alison Wang] Yes, you are right. I will change in v2. Thanks.
> 
> Shawn
> 
> > +	else if (of_property_read_bool(dev->of_node, "dma-coherent"))
> > +		set_dma_ops(dev, &arm_coherent_dma_ops);
> > +
> > +	return NOTIFY_OK;
> > +}
> > +
> > +static struct notifier_block ls1021a_platform_nb = {
> > +	.notifier_call = ls1021a_platform_notifier, };
> > +
> > +static void __init ls1021a_init_machine(void) {
> > +	bus_register_notifier(&platform_bus_type, &ls1021a_platform_nb);
> > +
> > +	of_platform_populate(NULL, of_default_bus_match_table, NULL,
> NULL);
> > +}
> > +
> >  static const char * const ls1021a_dt_compat[] __initconst = {
> >  	"fsl,ls1021a",
> >  	NULL,
> > @@ -18,5 +47,6 @@ static const char * const ls1021a_dt_compat[]
> > __initconst = {
> >
> >  DT_MACHINE_START(LS1021A, "Freescale LS1021A")
> >  	.smp		= smp_ops(ls1021a_smp_ops),
> > +	.init_machine   = ls1021a_init_machine,
> >  	.dt_compat	= ls1021a_dt_compat,
> >  MACHINE_END
> > --
> > 2.1.0.27.g96db324
> >

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-09-07  9:45 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-07 10:01 [PATCH] ARM: ls1021a: add platform notifier for dma-coherent requirement Alison Wang
2015-09-06  7:22 ` Shawn Guo
2015-09-07  9:45   ` Huan Wang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).