[PATCH 0/5] DMA engine driver for Freescale MPC85xx processors.

[PATCH 0/5] DMA engine driver for Freescale MPC85xx processors.

[Zhang Wei]

Hi,

These patches are DMA engine driver for Freescale MPC85xx processors
which the update for supporting new DMA engine API.

[PATCH 1/5] Add Freescale DMA and DMA channel to Documentation/powerpc/booting-without-of.txt file.
[PATCH 2/5] Add Freescale DMA engine driver maintainer.
[PATCH 3/5] Add DMA of-node to mpc8641hpcn board dts
[PATCH 4/5] Add of-device and DMA bus support to MPC8641HPCN board.
[PATCH 5/5] Add DMA engine driver for Freescale MPC85xx processors.

Best Regards,
Zhang Wei

[PATCH 1/5] Add Freescale DMA and DMA channel to Documentation/powerpc/booting-without-of.txt file.

[Zhang Wei]

This patch adds Freescale DMA and DMA channel definition to
Documentation/powerpc/booting-without-of.txt file.

Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
Signed-off-by: Ebony Zhu <ebony.zhu@freescale.com>
---
 Documentation/powerpc/booting-without-of.txt |   67 ++++++++++++++++++++++++++
 1 files changed, 67 insertions(+), 0 deletions(-)

diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index 76733a3..d114edf 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -52,6 +52,8 @@ Table of Contents
       i) Freescale QUICC Engine module (QE)
       j) Flash chip nodes
       k) Global Utilities Block
+      l) Freescale DMA
+      m) Freescale DMA channel
 
   VII - Specifying interrupt information for devices
     1) interrupts property
@@ -1824,6 +1826,71 @@ platforms are moved over to use the flattened-device-tree model.
 		fsl,has-rstcr;
 	};
 
+   l) Freescale DMA
+
+   The DMA for dma-engine driver of Freescale MPC8540 silicon DMA
+   controller which also fit for MPC8560, MPC8555,
+   MPC8548, MPC8641 and MPC8349 silicon DMA controller,
+
+   For each DMA node, you should define channels included.
+   Please see below 'm) Freescale DMA channel' for DMA channel's definition.
+
+   Required properties:
+
+    - compatible : Should be "fsl,dma".
+    - reg : Offset and length of DMA general status register.
+    - ranges : Should be defined as specified in 1) to describe the
+               DMA controller channels.
+
+  Example:
+	dma@21000 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "fsl,dma";
+		reg = <21300 4>;
+		ranges = <0 21100 200>;
+		dma-channel@0 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "fsl,mpc8540-dma-channel";
+			reg = <0 80>;
+			interrupt-parent = <&mpic>;
+			interrupts = <14 2>;
+		};
+		dma-channel@80 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "fsl,mpc8540-dma-channel";
+			reg = <80 80>;
+			interrupt-parent = <&mpic>;
+			interrupts = <15 2>;
+		};
+		dma-channel@100 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "fsl,mpc8540-dma-channel";
+			reg = <100 80>;
+			interrupt-parent = <&mpic>;
+			interrupts = <16 2>;
+		};
+		dma-channel@180 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "fsl,mpc8540-dma-channel";
+			reg = <180 80>;
+			interrupt-parent = <&mpic>;
+			interrupts = <17 2>;
+		};
+	};
+
+   m) Freescale DMA channel
+
+   Required properties:
+
+    - compatible : Should be "fsl,mpc8540-dma-channel"
+                   or "fsl,mpc8349-dma-channel"
+    - reg : Offset and length of the register set for the DMA channel.
+
    More devices will be defined as this spec matures.
 
 VII - Specifying interrupt information for devices
-- 
1.5.2

[PATCH 2/5] Add Freescale DMA engine driver maintainer.

[Zhang Wei]

This patch adds Freescale DMA engine driver maintainer.

Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
---
 MAINTAINERS |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 01f222e..1be4f23 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1527,6 +1527,13 @@ L:	linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 W:	http://linux-fbdev.sourceforge.net/
 S:	Maintained
 
+FREESCALE DMA DRIVER
+P;	Zhang Wei
+M:	wei.zhang@freescale.com
+L:	linuxppc-embedded@ozlabs.org
+L:	linux-kernel@vger.kernel.org
+S:	Maintained
+
 FREESCALE SOC FS_ENET DRIVER
 P:	Pantelis Antoniou
 M:	pantelis.antoniou@gmail.com
-- 
1.5.2

[PATCH 3/5] Add DMA of-node to mpc8641hpcn board dts

[Zhang Wei]

This patch adds DMA of-node to MPC8641HPCN board dts.

Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
Signed-off-by: Ebony Zhu <ebony.zhu@freescale.com>
---
 arch/powerpc/boot/dts/mpc8641_hpcn.dts |   40 ++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index 5d82709..e0175a4 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -433,5 +433,45 @@
 			device_type = "open-pic";
 			big-endian;
 		};
+
+		dma@21000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "fsl,dma";
+			reg = <21300 4>;
+			ranges = <0 21100 200>;
+			dma-channel@0 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				compatible = "fsl,mpc8540-dma-channel";
+				reg = <0 80>;
+				interrupt-parent = <&mpic>;
+				interrupts = <14 2>;
+			};
+			dma-channel@80 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				compatible = "fsl,mpc8540-dma-channel";
+				reg = <80 80>;
+				interrupt-parent = <&mpic>;
+				interrupts = <15 2>;
+			};
+			dma-channel@100 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				compatible = "fsl,mpc8540-dma-channel";
+				reg = <100 80>;
+				interrupt-parent = <&mpic>;
+				interrupts = <16 2>;
+			};
+			dma-channel@180 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				compatible = "fsl,mpc8540-dma-channel";
+				reg = <180 80>;
+				interrupt-parent = <&mpic>;
+				interrupts = <17 2>;
+			};
+		};
 	};
 };
-- 
1.5.2

[PATCH 4/5] Add of-device and DMA bus support to MPC8641HPCN board.

[Zhang Wei]

This patch adds of-device and DMA device bus support
to MPC8641HPCN board.

Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
---
 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index e9eaa07..e141259 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -18,6 +18,7 @@
 #include <linux/kdev_t.h>
 #include <linux/delay.h>
 #include <linux/seq_file.h>
+#include <linux/of_platform.h>
 
 #include <asm/system.h>
 #include <asm/time.h>
@@ -444,3 +445,19 @@ define_machine(mpc86xx_hpcn) {
 	.progress		= udbg_progress,
 	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,
 };
+
+static struct of_device_id mpc86xx_of_ids[] = {
+	{ .type = "soc", },
+	{ .compatible = "fsl,dma", },
+	{},
+};
+
+static __init int mpc86xx_of_device_init(void)
+{
+	if (!machine_is(mpc86xx_hpcn))
+		return 0;
+
+	return of_platform_bus_probe(NULL, mpc86xx_of_ids, NULL);
+}
+
+device_initcall(mpc86xx_of_device_init);
-- 
1.5.2

Re: [PATCH 3/5] Add DMA of-node to mpc8641hpcn board dts

[Scott Wood]

Zhang Wei wrote:
> This patch adds DMA of-node to MPC8641HPCN board dts.
> 
> Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
> Signed-off-by: Ebony Zhu <ebony.zhu@freescale.com>
> ---
>  arch/powerpc/boot/dts/mpc8641_hpcn.dts |   40 ++++++++++++++++++++++++++++++++
>  1 files changed, 40 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> index 5d82709..e0175a4 100644
> --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> @@ -433,5 +433,45 @@
>  			device_type = "open-pic";
>  			big-endian;
>  		};
> +
> +		dma@21000 {
> +			#address-cells = <1>;
> +			#size-cells = <1>;
> +			compatible = "fsl,dma";
> +			reg = <21300 4>;
> +			ranges = <0 21100 200>;
> +			dma-channel@0 {
> +				#address-cells = <1>;
> +				#size-cells = <1>;

The channels aren't buses; only the parent dma node needs #address-cells 
and #size-cells.

-Scott

Re: [PATCH 2/5] Add Freescale DMA engine driver maintainer.

[David Gibson]

On Fri, Sep 07, 2007 at 06:53:53PM +0800, Zhang Wei wrote:
> This patch adds Freescale DMA engine driver maintainer.

This is meaningless without the actual driver, so it shouldn't be a
separate patch.  Fold it into the patch that actually adds the driver
support.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

RE: [PATCH 2/5] Add Freescale DMA engine driver maintainer.

[Zhang Wei-r63237]

I'll merge them.

Thanks!=20
- zw

> -----Original Message-----
> From: David Gibson [mailto:david@gibson.dropbear.id.au]=20
> Sent: Monday, September 10, 2007 11:28 AM
> To: Zhang Wei-r63237
> Cc: paulus@samba.org; linuxppc-dev@ozlabs.org
> Subject: Re: [PATCH 2/5] Add Freescale DMA engine driver maintainer.
>=20
> On Fri, Sep 07, 2007 at 06:53:53PM +0800, Zhang Wei wrote:
> > This patch adds Freescale DMA engine driver maintainer.
>=20
> This is meaningless without the actual driver, so it shouldn't be a
> separate patch.  Fold it into the patch that actually adds the driver
> support.
>=20
> --=20
> David Gibson			| I'll have my music baroque,=20
> and my code
> david AT gibson.dropbear.id.au	| minimalist, thank=20
> you.  NOT _the_ _other_
> 				| _way_ _around_!
> http://www.ozlabs.org/~dgibson
>=20

Re: [PATCH 1/5] Add Freescale DMA and DMA channel to Documentation/powerpc/booting-without-of.txt file.

[Segher Boessenkool]

> +   l) Freescale DMA

> +    - compatible : Should be "fsl,dma".

Please choose some more specific name.  "fsl,mpc8540-dma" would
be a reasonable choice perhaps.

> +    - reg : Offset and length of DMA general status register.
> +    - ranges : Should be defined as specified in 1) to describe the
> +               DMA controller channels.
> +
> +  Example:
> +	dma@21000 {
> +		reg = <21300 4>;

Those don't agree.  It's probably best to describe the whole
DMA controller register block in this node.  Why do you need
subnodes for the channels at all?


Segher

Re: [PATCH 1/5] Add Freescale DMA and DMA channel to Documentation/powerpc/booting-without-of.txt file.

[Scott Wood]

On Fri, Sep 07, 2007 at 04:43:35PM +0200, Segher Boessenkool wrote:
> Those don't agree.  It's probably best to describe the whole
> DMA controller register block in this node.  Why do you need
> subnodes for the channels at all?

The channels have separate registers and sometimes separate interrupts --
it's simpler to bind to a channel at a time than to parse a list of reg
blocks and interrupts.  It's also more flexible in case a new chip comes
out with more/fewer channels, or if certain channels are not general
purpose.

-Scott

Re: [PATCH 1/5] Add Freescale DMA and DMA channel to Documentation/powerpc/booting-without-of.txt file.

[Segher Boessenkool]

>> Those don't agree.  It's probably best to describe the whole
>> DMA controller register block in this node.  Why do you need
>> subnodes for the channels at all?
>
> The channels have separate registers and sometimes separate interrupts 
> --
> it's simpler to bind to a channel at a time than to parse a list of reg
> blocks and interrupts.  It's also more flexible in case a new chip 
> comes
> out with more/fewer channels, or if certain channels are not general
> purpose.

I don't see this as more flexible, but no problem, it will work
for sure.

The "reg" vs. textual unit address issue needs to be solved though.


Segher

Re: [PATCH 1/5] Add Freescale DMA and DMA channel to Documentation/powerpc/booting-without-of.txt file.

[David Gibson]

On Fri, Sep 07, 2007 at 04:43:35PM +0200, Segher Boessenkool wrote:
> > +   l) Freescale DMA
> 
> > +    - compatible : Should be "fsl,dma".
> 
> Please choose some more specific name.  "fsl,mpc8540-dma" would
> be a reasonable choice perhaps.

More precisely, the compatible property should always have an specific
entry based on the exact chip the DMA engine resides in, as well as a
more general entry for any fsl dma engine of this type.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

RE: [PATCH 1/5] Add Freescale DMA and DMA channel to Documentation/powerpc/booting-without-of.txt file.

[Zhang Wei-r63237]

=20
>=20
> On Fri, Sep 07, 2007 at 04:43:35PM +0200, Segher Boessenkool wrote:
> > > +   l) Freescale DMA
> >=20
> > > +    - compatible : Should be "fsl,dma".
> >=20
> > Please choose some more specific name.  "fsl,mpc8540-dma" would
> > be a reasonable choice perhaps.
>=20
> More precisely, the compatible property should always have an specific
> entry based on the exact chip the DMA engine resides in, as well as a
> more general entry for any fsl dma engine of this type.
>=20
There is only difference in DMA channel and not in DMA node now. Does it
need add the precise compatible property name?

Thanks!
- zw

Re: [PATCH 1/5] Add Freescale DMA and DMA channel to Documentation/powerpc/booting-without-of.txt file.

[Scott Wood]

On Tue, Sep 11, 2007 at 06:01:39PM +0800, Zhang Wei-r63237 wrote:
> 
>  
> > 
> > On Fri, Sep 07, 2007 at 04:43:35PM +0200, Segher Boessenkool wrote:
> > > > +   l) Freescale DMA
> > > 
> > > > +    - compatible : Should be "fsl,dma".
> > > 
> > > Please choose some more specific name.  "fsl,mpc8540-dma" would
> > > be a reasonable choice perhaps.
> > 
> > More precisely, the compatible property should always have an specific
> > entry based on the exact chip the DMA engine resides in, as well as a
> > more general entry for any fsl dma engine of this type.
> > 
> There is only difference in DMA channel and not in DMA node now. Does it
> need add the precise compatible property name?

Yes.  First of all, there most likely is a difference -- the endianness
of the shared status summary register.  Secondly, the device tree should
not make assumptions as far as whether the user is going to bind to
individual channels or the whole controller.

-Scott

RE: [PATCH 1/5] Add Freescale DMA and DMA channel to Documentation/powerpc/booting-without-of.txt file.

[Zhang Wei-r63237]

> > >=20
> > > On Fri, Sep 07, 2007 at 04:43:35PM +0200, Segher=20
> Boessenkool wrote:
> > > > > +   l) Freescale DMA
> > > >=20
> > > > > +    - compatible : Should be "fsl,dma".
> > > >=20
> > > > Please choose some more specific name.  "fsl,mpc8540-dma" would
> > > > be a reasonable choice perhaps.
> > >=20
> > > More precisely, the compatible property should always=20
> have an specific
> > > entry based on the exact chip the DMA engine resides in,=20
> as well as a
> > > more general entry for any fsl dma engine of this type.
> > >=20
> > There is only difference in DMA channel and not in DMA node=20
> now. Does it
> > need add the precise compatible property name?
>=20
> Yes.  First of all, there most likely is a difference -- the=20
> endianness
> of the shared status summary register.  Secondly, the device=20
> tree should
> not make assumptions as far as whether the user is going to bind to
> individual channels or the whole controller.

I have a strange issue here. If I rename 'fsl,dma' to 'fsl,mpc8540-dma',
the 'fsl,mpc8540-dma-channel' will be also regarded as DMA device not
DMA channel.

Thanks!
- zw

Re: [PATCH 1/5] Add Freescale DMA and DMA channel to Documentation/powerpc/booting-without-of.txt file.

[Scott Wood]

On Wed, Sep 12, 2007 at 03:13:09AM -0700, Zhang Wei-r63237 wrote:
> I have a strange issue here. If I rename 'fsl,dma' to 'fsl,mpc8540-dma',
> the 'fsl,mpc8540-dma-channel' will be also regarded as DMA device not
> DMA channel.

What tree are you using?  Commit 804ace8881d211ac448082e871dd312132393049
in Paul's git tree should have fixed that.

-Scott

Re: [PATCH 1/5] Add Freescale DMA and DMA channel to Documentation/powerpc/booting-without-of.txt file.

[Segher Boessenkool]

>> I have a strange issue here. If I rename 'fsl,dma' to 
>> 'fsl,mpc8540-dma',
>> the 'fsl,mpc8540-dma-channel' will be also regarded as DMA device not
>> DMA channel.
>
> What tree are you using?  Commit 
> 804ace8881d211ac448082e871dd312132393049
> in Paul's git tree should have fixed that.

Strange, I don't see that commit -- maybe gitweb is broken, or
maybe the patch was superseded, or maybe it just disappeared?
It's still shown in patchworks with this commit id fwiw.


Segher

Re: [PATCH 1/5] Add Freescale DMA and DMA channel to Documentation/powerpc/booting-without-of.txt file.

[Scott Wood]

On Thu, Sep 13, 2007 at 04:09:29AM +0200, Segher Boessenkool wrote:
> >>I have a strange issue here. If I rename 'fsl,dma' to 
> >>'fsl,mpc8540-dma',
> >>the 'fsl,mpc8540-dma-channel' will be also regarded as DMA device not
> >>DMA channel.
> >
> >What tree are you using?  Commit 
> >804ace8881d211ac448082e871dd312132393049
> >in Paul's git tree should have fixed that.
> 
> Strange, I don't see that commit -- maybe gitweb is broken, or
> maybe the patch was superseded, or maybe it just disappeared?
> It's still shown in patchworks with this commit id fwiw.

I see it here:
http://git.kernel.org/?p=linux/kernel/git/paulus/powerpc.git;a=commit;h=804ace8881d211ac448082e871dd312132393049

-Scott

Re: [PATCH 1/5] Add Freescale DMA and DMA channel to Documentation/powerpc/booting-without-of.txt file.

[Kumar Gala]

On Sep 13, 2007, at 9:52 AM, Scott Wood wrote:

> On Thu, Sep 13, 2007 at 04:09:29AM +0200, Segher Boessenkool wrote:
>>>> I have a strange issue here. If I rename 'fsl,dma' to
>>>> 'fsl,mpc8540-dma',
>>>> the 'fsl,mpc8540-dma-channel' will be also regarded as DMA  
>>>> device not
>>>> DMA channel.

Have we closed on what the device-tree parts for this should look  
like?  I'd like to at least get those parts of this patch into my  
tree if possible for 2.6.24.

- k

Re: [PATCH 1/5] Add Freescale DMA and DMA channel to Documentation/powerpc/booting-without-of.txt file.

[Segher Boessenkool]

>>> What tree are you using?  Commit
>>> 804ace8881d211ac448082e871dd312132393049
>>> in Paul's git tree should have fixed that.
>>
>> Strange, I don't see that commit -- maybe gitweb is broken, or
>> maybe the patch was superseded, or maybe it just disappeared?
>> It's still shown in patchworks with this commit id fwiw.
>
> I see it here:
> http://git.kernel.org/?p=linux/kernel/git/paulus/powerpc.git;a=commit; 
> h=804ace8881d211ac448082e871dd312132393049

Ah okay.  The gitweb search functionality is broken.

Shouldn't this patch have gone to .23?  It's a pretty important
bugfix I think.


Segher

Re: [PATCH 1/5] Add Freescale DMA and DMA channel to Documentation/powerpc/booting-without-of.txt file.

[Scott Wood]

Segher Boessenkool wrote:
>>>> What tree are you using?  Commit
>>>> 804ace8881d211ac448082e871dd312132393049
>>>> in Paul's git tree should have fixed that.
>>>
>>> Strange, I don't see that commit -- maybe gitweb is broken, or
>>> maybe the patch was superseded, or maybe it just disappeared?
>>> It's still shown in patchworks with this commit id fwiw.
>>
>> I see it here:
>> http://git.kernel.org/?p=linux/kernel/git/paulus/powerpc.git;a=commit;h=804ace8881d211ac448082e871dd312132393049 
>>
> 
> Ah okay.  The gitweb search functionality is broken.
> 
> Shouldn't this patch have gone to .23?  It's a pretty important
> bugfix I think.

Probably not, in the absence of a specific failing match that's already 
in .23.  It has the potential to break things that were working by chance.

-Scott