[PATCH 0/4] minor fixes for 2.6.26

[PATCH 0/4] minor fixes for 2.6.26

[Kumar Gala]

Please pull from 'for-2.6.26' branch of

	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.26

to receive the following updates:

 arch/powerpc/boot/.gitignore          |   15 ++-------------
 arch/powerpc/boot/Makefile            |    4 ++--
 arch/powerpc/boot/dts/mpc8377_mds.dts |   18 +++++++++++++-----
 lib/lmb.c                             |    2 +-
 4 files changed, 18 insertions(+), 21 deletions(-)

Kumar Gala (4):
      lmb: Fix compile warning
      [POWERPC] Remove generated files on make clean
      [POWERPC] Update arch/powerpc/boot/.gitignore
      [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec

[PATCH 1/4] lmb: Fix compile warning

[Kumar Gala]

lib/lmb.c: In function 'lmb_dump_all':
lib/lmb.c:51: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'u64'

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 lib/lmb.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/lmb.c b/lib/lmb.c
index 867f7b5..553a47c 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -48,7 +48,7 @@ void lmb_dump_all(void)
 	}
 
 	pr_info("    reserved.cnt	  = 0x%lx\n", lmb.reserved.cnt);
-	pr_info("    reserved.size	  = 0x%lx\n", lmb.reserved.size);
+	pr_info("    reserved.size	  = 0x%llx\n", lmb.reserved.size);
 	for (i=0; i < lmb.reserved.cnt ;i++) {
 		pr_info("    reserved.region[0x%lx].base       = 0x%llx\n",
 		    i, (unsigned long long)lmb.reserved.region[i].base);
-- 
1.5.4.5

[PATCH 2/4] [POWERPC] Remove generated files on make clean

[Kumar Gala]

dtbImage.* and several zImage. targets get created but never cleaned up.

Also, moved zImage to the clean-files line associated with all other image
results (was previously duplicated).

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 arch/powerpc/boot/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 7822d25..08bed36 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -99,7 +99,7 @@ $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds: $(obj)/%: $(srct
 	@cp $< $@
 
 clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \
-		empty.c zImage zImage.coff.lds zImage.ps3.lds zImage.lds
+		empty.c zImage.coff.lds zImage.ps3.lds zImage.lds
 
 quiet_cmd_bootcc = BOOTCC  $@
       cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<
@@ -339,7 +339,7 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
 	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $<
 
 # anything not in $(targets)
-clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \
+clean-files += $(image-) $(initrd-) zImage zImage.* cuImage.* dtbImage.* treeImage.* \
 	otheros.bld *.dtb
 
 # clean up files cached by wrapper
-- 
1.5.4.5

[PATCH 3/4] [POWERPC] Update arch/powerpc/boot/.gitignore

[Kumar Gala]

* Add dtbImage.*
* Simplify zImages to zImage and zImage.*

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 arch/powerpc/boot/.gitignore |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index 2347294..ea2fcaf 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -20,21 +20,10 @@ kernel-vmlinux.strip.gz
 mktree
 uImage
 cuImage.*
+dtbImage.*
 treeImage.*
 zImage
-zImage.bin.*
-zImage.chrp
-zImage.coff
-zImage.coff.lds
-zImage.ep*
-zImage.iseries
-zImage.*lds
-zImage.miboot
-zImage.pmac
-zImage.pseries
-zImage.redboot*
-zImage.sandpoint
-zImage.vmode
+zImage.*
 zconf.h
 zlib.h
 zutil.h
-- 
1.5.4.5

[PATCH 4/4] [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec

[Kumar Gala]

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 arch/powerpc/boot/dts/mpc8377_mds.dts |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts
index 1e7802c..fea5925 100644
--- a/arch/powerpc/boot/dts/mpc8377_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8377_mds.dts
@@ -271,27 +271,35 @@
 		dma@82a8 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-			compatible = "fsl,mpc8349-dma";
+			compatible = "fsl,mpc8377-dma", "fsl,elo-dma";
 			reg = <0x82a8 4>;
 			ranges = <0 0x8100 0x1a8>;
 			interrupt-parent = <&ipic>;
 			interrupts = <0x47 8>;
 			cell-index = <0>;
 			dma-channel@0 {
-				compatible = "fsl,mpc8349-dma-channel";
+				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
 				reg = <0 0x80>;
+				interrupt-parent = <&ipic>;
+				interrupts = <0x47 8>;
 			};
 			dma-channel@80 {
-				compatible = "fsl,mpc8349-dma-channel";
+				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
 				reg = <0x80 0x80>;
+				interrupt-parent = <&ipic>;
+				interrupts = <0x47 8>;
 			};
 			dma-channel@100 {
-				compatible = "fsl,mpc8349-dma-channel";
+				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
 				reg = <0x100 0x80>;
+				interrupt-parent = <&ipic>;
+				interrupts = <0x47 8>;
 			};
 			dma-channel@180 {
-				compatible = "fsl,mpc8349-dma-channel";
+				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
 				reg = <0x180 0x28>;
+				interrupt-parent = <&ipic>;
+				interrupts = <0x47 8>;
 			};
 		};
 
-- 
1.5.4.5

Re: [PATCH 1/4] lmb: Fix compile warning

[David Miller]

From: Kumar Gala <galak@kernel.crashing.org>
Date: Sun, 18 May 2008 13:44:53 -0500

> lib/lmb.c: In function 'lmb_dump_all':
> lib/lmb.c:51: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'u64'
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

That's not right either.

We'll need to cast this argument because it's a different type on sparc
vs sparc64 vs powerpc.

u64 != unsigned long long

[PATCH v2] lmb: Fix compile warning

[Kumar Gala]

lib/lmb.c: In function 'lmb_dump_all':
lib/lmb.c:51: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'u64'

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---

Cast so it works everywhere.

- k

 lib/lmb.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lib/lmb.c b/lib/lmb.c
index 867f7b5..5d7b928 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -48,7 +48,8 @@ void lmb_dump_all(void)
 	}

 	pr_info("    reserved.cnt	  = 0x%lx\n", lmb.reserved.cnt);
-	pr_info("    reserved.size	  = 0x%lx\n", lmb.reserved.size);
+	pr_info("    reserved.size	  = 0x%llx\n",
+	    (unsigned long long)lmb.memory.size);
 	for (i=0; i < lmb.reserved.cnt ;i++) {
 		pr_info("    reserved.region[0x%lx].base       = 0x%llx\n",
 		    i, (unsigned long long)lmb.reserved.region[i].base);
-- 
1.5.4.5

Re: [PATCH 0/4] minor fixes for 2.6.26

[Kumar Gala]

On May 18, 2008, at 1:44 PM, Kumar Gala wrote:

> Please pull from 'for-2.6.26' branch of
>
> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git  
> for-2.6.26
>
> to receive the following updates:
>
> arch/powerpc/boot/.gitignore          |   15 ++-------------
> arch/powerpc/boot/Makefile            |    4 ++--
> arch/powerpc/boot/dts/mpc8377_mds.dts |   18 +++++++++++++-----
> lib/lmb.c                             |    2 +-
> 4 files changed, 18 insertions(+), 21 deletions(-)
>
> Kumar Gala (4):
>      lmb: Fix compile warning
>      [POWERPC] Remove generated files on make clean
>      [POWERPC] Update arch/powerpc/boot/.gitignore
>      [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec

Paul,

FYI, I've updated the git tree with v2 of the lmb patch if you decided  
to pull these patches from there.

- k

Re: [PATCH v2] lmb: Fix compile warning

[David Miller]

From: Kumar Gala <galak@kernel.crashing.org>
Date: Sun, 18 May 2008 23:34:36 -0500 (CDT)

> lib/lmb.c: In function 'lmb_dump_all':
> lib/lmb.c:51: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'u64'
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

Acked-by: David S. Miller <davem@davemloft.net>

Re: [PATCH 0/4] minor fixes for 2.6.26

[Paul Mackerras]

Kumar Gala writes:

> > Kumar Gala (4):
> >      lmb: Fix compile warning
> >      [POWERPC] Remove generated files on make clean

I think that adding zImage.* to clean-files is a bad idea, because we
have zImage.lds.S, zImage.coff.lds.S and zImage.ps3.lds.S in
arch/powerpc/boot that we don't want deleted.  It would be OK for
compiling with a separate object directory but would be bad for
compiling in the source directory.

Paul.

Re: [PATCH 0/4] minor fixes for 2.6.26

[David Gibson]

On Tue, May 20, 2008 at 09:07:14AM +1000, Paul Mackerras wrote:
> Kumar Gala writes:
> 
> > > Kumar Gala (4):
> > >      lmb: Fix compile warning
> > >      [POWERPC] Remove generated files on make clean
> 
> I think that adding zImage.* to clean-files is a bad idea, because we
> have zImage.lds.S, zImage.coff.lds.S and zImage.ps3.lds.S in
> arch/powerpc/boot that we don't want deleted.  It would be OK for
> compiling with a separate object directory but would be bad for
> compiling in the source directory.

Arguably this suggests we should rename either the lds files or the
zImages so that we *can* get a pattern to match.

-- 
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 0/4] minor fixes for 2.6.26

[Segher Boessenkool]

>> I think that adding zImage.* to clean-files is a bad idea, because we
>> have zImage.lds.S, zImage.coff.lds.S and zImage.ps3.lds.S in
>> arch/powerpc/boot that we don't want deleted.  It would be OK for
>> compiling with a separate object directory but would be bad for
>> compiling in the source directory.
>
> Arguably this suggests we should rename either the lds files or the
> zImages so that we *can* get a pattern to match.

Not really.  Just define a $(ALL_ZIMAGES) var and use that everywhere.
I would be pretty upset if "make clean" decided to delete my 
zImage.backup,
etc.


Segher

Re: [PATCH 0/4] minor fixes for 2.6.26

[David Gibson]

On Tue, May 20, 2008 at 04:03:47AM +0200, Segher Boessenkool wrote:
>>> I think that adding zImage.* to clean-files is a bad idea, because we
>>> have zImage.lds.S, zImage.coff.lds.S and zImage.ps3.lds.S in
>>> arch/powerpc/boot that we don't want deleted.  It would be OK for
>>> compiling with a separate object directory but would be bad for
>>> compiling in the source directory.
>>
>> Arguably this suggests we should rename either the lds files or the
>> zImages so that we *can* get a pattern to match.
>
> Not really.  Just define a $(ALL_ZIMAGES) var and use that everywhere.
> I would be pretty upset if "make clean" decided to delete my  
> zImage.backup,
> etc.

That won't work for .gitignore.  Besides it's hard to generate, since
zImage.<allsortsofthings> can be generated based on dts names.

Oh, and variables like that are usually a bad idea for clean rules,
because if new things have just been added/removed from the list, it
will fail to clean up things built before the makefile change was
made.

-- 
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 0/4] minor fixes for 2.6.26

[Segher Boessenkool]

>>> Arguably this suggests we should rename either the lds files or the
>>> zImages so that we *can* get a pattern to match.
>>
>> Not really.  Just define a $(ALL_ZIMAGES) var and use that everywhere.
>> I would be pretty upset if "make clean" decided to delete my
>> zImage.backup,
>> etc.
>
> That won't work for .gitignore.

Sure, * is fine in .gitignore (and then un-ignore the few files you
don't want ignored).  .gitignore is just a convenience thing, after
all.

> Besides it's hard to generate, since
> zImage.<allsortsofthings> can be generated based on dts names.

Tricky.  But if make can generate the name _at all_ (and it can),
it can do it here, too.  It just needs some fairy dust sprinkling.

> Oh, and variables like that are usually a bad idea for clean rules,
> because if new things have just been added/removed from the list, it
> will fail to clean up things built before the makefile change was
> made.

Yes.  OTOH, using xx* in "make clean" is an even worse idea.


Segher

Re: [PATCH 0/4] minor fixes for 2.6.26

[David Gibson]

On Tue, May 20, 2008 at 04:22:40AM +0200, Segher Boessenkool wrote:
>>>> Arguably this suggests we should rename either the lds files or the
>>>> zImages so that we *can* get a pattern to match.
>>>
>>> Not really.  Just define a $(ALL_ZIMAGES) var and use that everywhere.
>>> I would be pretty upset if "make clean" decided to delete my
>>> zImage.backup,
>>> etc.
>>
>> That won't work for .gitignore.
>
> Sure, * is fine in .gitignore (and then un-ignore the few files you
> don't want ignored).  .gitignore is just a convenience thing, after
> all.
>
>> Besides it's hard to generate, since
>> zImage.<allsortsofthings> can be generated based on dts names.
>
> Tricky.  But if make can generate the name _at all_ (and it can),
> it can do it here, too.  It just needs some fairy dust sprinkling.
>
>> Oh, and variables like that are usually a bad idea for clean rules,
>> because if new things have just been added/removed from the list, it
>> will fail to clean up things built before the makefile change was
>> made.
>
> Yes.  OTOH, using xx* in "make clean" is an even worse idea.

Well, yeah, hence with the name-changing...

-- 
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 0/4] minor fixes for 2.6.26

[Kumar Gala]

On May 19, 2008, at 6:07 PM, Paul Mackerras wrote:

> Kumar Gala writes:
>
>>> Kumar Gala (4):
>>>     lmb: Fix compile warning
>>>     [POWERPC] Remove generated files on make clean
>
> I think that adding zImage.* to clean-files is a bad idea, because we
> have zImage.lds.S, zImage.coff.lds.S and zImage.ps3.lds.S in
> arch/powerpc/boot that we don't want deleted.  It would be OK for
> compiling with a separate object directory but would be bad for
> compiling in the source directory.

We already had them in clean-files:

clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \
                 empty.c zImage zImage.coff.lds zImage.ps3.lds  
zImage.lds

- k

Re: [PATCH 0/4] minor fixes for 2.6.26

[David Gibson]

On Mon, May 19, 2008 at 11:52:31PM -0500, Kumar Gala wrote:
>
> On May 19, 2008, at 6:07 PM, Paul Mackerras wrote:
>
>> Kumar Gala writes:
>>
>>>> Kumar Gala (4):
>>>>     lmb: Fix compile warning
>>>>     [POWERPC] Remove generated files on make clean
>>
>> I think that adding zImage.* to clean-files is a bad idea, because we
>> have zImage.lds.S, zImage.coff.lds.S and zImage.ps3.lds.S in
>> arch/powerpc/boot that we don't want deleted.  It would be OK for
>> compiling with a separate object directory but would be bad for
>> compiling in the source directory.
>
> We already had them in clean-files:
>
> clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \
>                 empty.c zImage zImage.coff.lds zImage.ps3.lds zImage.lds

Not quite.  Those are the zImage.lds files, Paul is talking about the
zImage.lds.S files from which the former are generated.

-- 
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 0/4] minor fixes for 2.6.26

[Kumar Gala]

On May 20, 2008, at 12:10 AM, David Gibson wrote:

> On Mon, May 19, 2008 at 11:52:31PM -0500, Kumar Gala wrote:
>>
>> On May 19, 2008, at 6:07 PM, Paul Mackerras wrote:
>>
>>> Kumar Gala writes:
>>>
>>>>> Kumar Gala (4):
>>>>>    lmb: Fix compile warning
>>>>>    [POWERPC] Remove generated files on make clean
>>>
>>> I think that adding zImage.* to clean-files is a bad idea, because  
>>> we
>>> have zImage.lds.S, zImage.coff.lds.S and zImage.ps3.lds.S in
>>> arch/powerpc/boot that we don't want deleted.  It would be OK for
>>> compiling with a separate object directory but would be bad for
>>> compiling in the source directory.
>>
>> We already had them in clean-files:
>>
>> clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \
>>                empty.c zImage zImage.coff.lds zImage.ps3.lds  
>> zImage.lds
>
> Not quite.  Those are the zImage.lds files, Paul is talking about the
> zImage.lds.S files from which the former are generated.

Ah, missed that minor detail.

- k