Malta build errors with 2.6.26-rc1

Malta build errors with 2.6.26-rc1

[Martin Michlmayr]

Some Malta build errors:

cc1: warnings being treated as errors
arch/mips/mips-boards/malta/malta_int.c: In function ‘gcmp_probe’:
arch/mips/mips-boards/malta/malta_int.c:408: warning: cast to pointer from integer of different size
arch/mips/mips-boards/malta/malta_int.c: In function ‘arch_init_irq’:
arch/mips/mips-boards/malta/malta_int.c:437: warning: cast to pointer from integer of different size
arch/mips/mips-boards/malta/malta_int.c:441: warning: cast to pointer from integer of different size
arch/mips/mips-boards/malta/malta_int.c: In function ‘malta_be_handler’:
arch/mips/mips-boards/malta/malta_int.c:656: warning: cast to pointer from integer of different size
arch/mips/mips-boards/malta/malta_int.c:657: warning: cast to pointer from integer of different size
arch/mips/mips-boards/malta/malta_int.c:658: warning: cast to pointer from integer of different size
arch/mips/mips-boards/malta/malta_int.c:704: warning: cast to pointer from integer of different size
make[5]: *** [arch/mips/mips-boards/malta/malta_int.o] Error 1

and:

arch/mips/mips-boards/generic/amon.c: In function ‘amon_cpu_avail’:
arch/mips/mips-boards/generic/amon.c:31: error: implicit declaration of function ‘KSEG0ADDR’
cc1: warnings being treated as errors
arch/mips/mips-boards/generic/amon.c:31: warning: cast to pointer from integer of different size
arch/mips/mips-boards/generic/amon.c: In function ‘amon_cpu_start’:
arch/mips/mips-boards/generic/amon.c:56: warning: cast to pointer from integer of different size
make[4]: *** [arch/mips/mips-boards/malta] Error 2

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Malta build errors with 2.6.26-rc1

[Martin Michlmayr]

* Martin Michlmayr <tbm@cyrius.com> [2008-05-12 18:31]:
> Some Malta build errors:
> 
> cc1: warnings being treated as errors
> arch/mips/mips-boards/malta/malta_int.c: In function ‘gcmp_probe’:

Sorry, I forgot to mention that this is 64-bit Malta.  32-bit compiles
fine.
-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Malta build errors with 2.6.26-rc1

[Dmitri Vorobiev]

2008/5/12 Martin Michlmayr <tbm@cyrius.com>:
> Some Malta build errors:
>
>  cc1: warnings being treated as errors
>  arch/mips/mips-boards/malta/malta_int.c: In function 'gcmp_probe':
>  arch/mips/mips-boards/malta/malta_int.c:408: warning: cast to pointer from integer of different size
>  arch/mips/mips-boards/malta/malta_int.c: In function 'arch_init_irq':
>  arch/mips/mips-boards/malta/malta_int.c:437: warning: cast to pointer from integer of different size
>  arch/mips/mips-boards/malta/malta_int.c:441: warning: cast to pointer from integer of different size
>  arch/mips/mips-boards/malta/malta_int.c: In function 'malta_be_handler':
>  arch/mips/mips-boards/malta/malta_int.c:656: warning: cast to pointer from integer of different size
>  arch/mips/mips-boards/malta/malta_int.c:657: warning: cast to pointer from integer of different size
>  arch/mips/mips-boards/malta/malta_int.c:658: warning: cast to pointer from integer of different size
>  arch/mips/mips-boards/malta/malta_int.c:704: warning: cast to pointer from integer of different size
>  make[5]: *** [arch/mips/mips-boards/malta/malta_int.o] Error 1
>
>  and:
>
>  arch/mips/mips-boards/generic/amon.c: In function 'amon_cpu_avail':
>  arch/mips/mips-boards/generic/amon.c:31: error: implicit declaration of function 'KSEG0ADDR'
>  cc1: warnings being treated as errors
>  arch/mips/mips-boards/generic/amon.c:31: warning: cast to pointer from integer of different size
>  arch/mips/mips-boards/generic/amon.c: In function 'amon_cpu_start':
>  arch/mips/mips-boards/generic/amon.c:56: warning: cast to pointer from integer of different size
>  make[4]: *** [arch/mips/mips-boards/malta] Error 2
>

Known error. Please see this thread for some suggestions (and be
warned that I did not try any of them):

http://marc.info/?t=120966332300004&r=1&w=2

Dmitri

Re: Malta build errors with 2.6.26-rc1

[Martin Michlmayr]

* Dmitri Vorobiev <dmitri.vorobiev@gmail.com> [2008-05-12 23:46]:
> > Some Malta build errors:
> >
> >  cc1: warnings being treated as errors
> >  arch/mips/mips-boards/malta/malta_int.c: In function 'gcmp_probe':
> >  arch/mips/mips-boards/malta/malta_int.c:408: warning: cast to pointer from integer of different size
> >  arch/mips/mips-boards/malta/malta_int.c: In function 'arch_init_irq':
> >  arch/mips/mips-boards/malta/malta_int.c:437: warning: cast to pointer from integer of different size
> >  arch/mips/mips-boards/malta/malta_int.c:441: warning: cast to pointer from integer of different size
> >  arch/mips/mips-boards/malta/malta_int.c: In function 'malta_be_handler':
> >  arch/mips/mips-boards/malta/malta_int.c:656: warning: cast to pointer from integer of different size
> >  arch/mips/mips-boards/malta/malta_int.c:657: warning: cast to pointer from integer of different size
> >  arch/mips/mips-boards/malta/malta_int.c:658: warning: cast to pointer from integer of different size
> >  arch/mips/mips-boards/malta/malta_int.c:704: warning: cast to pointer from integer of different size
> >  make[5]: *** [arch/mips/mips-boards/malta/malta_int.o] Error 1
> >
> >  and:
> >
> >  arch/mips/mips-boards/generic/amon.c: In function 'amon_cpu_avail':
> >  arch/mips/mips-boards/generic/amon.c:31: error: implicit declaration of function 'KSEG0ADDR'
> >  cc1: warnings being treated as errors
> >  arch/mips/mips-boards/generic/amon.c:31: warning: cast to pointer from integer of different size
> >  arch/mips/mips-boards/generic/amon.c: In function 'amon_cpu_start':
> >  arch/mips/mips-boards/generic/amon.c:56: warning: cast to pointer from integer of different size
> >  make[4]: *** [arch/mips/mips-boards/malta] Error 2
> >
> 
> Known error. Please see this thread for some suggestions (and be
> warned that I did not try any of them):
> http://marc.info/?t=120966332300004&r=1&w=2

Isn't that a completely different issue?  Anyway, I just tried and I
still see the problems above (with 64 bit Malta) still after applying
the traps.c patch from Thomas Bogendoerfer.

Is there a maintainer for Malta?
-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Malta build errors with 2.6.26-rc1

[Thomas Bogendoerfer]

On Wed, May 28, 2008 at 09:12:40AM +0200, Martin Michlmayr wrote:
> * Dmitri Vorobiev <dmitri.vorobiev@gmail.com> [2008-05-12 23:46]:
> > > Some Malta build errors:
> > >
> > >  cc1: warnings being treated as errors
> > >  arch/mips/mips-boards/malta/malta_int.c: In function 'gcmp_probe':
> > >  arch/mips/mips-boards/malta/malta_int.c:408: warning: cast to pointer from integer of different size
> > >  arch/mips/mips-boards/malta/malta_int.c: In function 'arch_init_irq':
> > >  arch/mips/mips-boards/malta/malta_int.c:437: warning: cast to pointer from integer of different size
> > >  arch/mips/mips-boards/malta/malta_int.c:441: warning: cast to pointer from integer of different size
> > >  arch/mips/mips-boards/malta/malta_int.c: In function 'malta_be_handler':
> > >  arch/mips/mips-boards/malta/malta_int.c:656: warning: cast to pointer from integer of different size
> > >  arch/mips/mips-boards/malta/malta_int.c:657: warning: cast to pointer from integer of different size
> > >  arch/mips/mips-boards/malta/malta_int.c:658: warning: cast to pointer from integer of different size
> > >  arch/mips/mips-boards/malta/malta_int.c:704: warning: cast to pointer from integer of different size
> > >  make[5]: *** [arch/mips/mips-boards/malta/malta_int.o] Error 1
> > >
> > >  and:
> > >
> > >  arch/mips/mips-boards/generic/amon.c: In function 'amon_cpu_avail':
> > >  arch/mips/mips-boards/generic/amon.c:31: error: implicit declaration of function 'KSEG0ADDR'
> > >  cc1: warnings being treated as errors
> > >  arch/mips/mips-boards/generic/amon.c:31: warning: cast to pointer from integer of different size
> > >  arch/mips/mips-boards/generic/amon.c: In function 'amon_cpu_start':
> > >  arch/mips/mips-boards/generic/amon.c:56: warning: cast to pointer from integer of different size
> > >  make[4]: *** [arch/mips/mips-boards/malta] Error 2
> > >
> > 
> > Known error. Please see this thread for some suggestions (and be
> > warned that I did not try any of them):
> > http://marc.info/?t=120966332300004&r=1&w=2
> 
> Isn't that a completely different issue?  Anyway, I just tried and I
> still see the problems above (with 64 bit Malta) still after applying
> the traps.c patch from Thomas Bogendoerfer.

I didn't fix the problems above. The change to traps.c only fixes
traps.c for 64bit builds and it's a totally different issue. Looking
at the warning/errors someone needs to fix some data types and use 
CKSEG0ADDR(). I don't have the hardware, so I could only provide
an untested patch, if no one else steps forward...

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessary a
good idea.                                                [ RFC1925, 2.3 ]

Re: Malta build errors with 2.6.26-rc1

[Martin Michlmayr]

* Thomas Bogendoerfer <tsbogend@alpha.franken.de> [2008-05-28 10:50]:
> I didn't fix the problems above. The change to traps.c only fixes
> traps.c for 64bit builds and it's a totally different issue. Looking
> at the warning/errors someone needs to fix some data types and use
> CKSEG0ADDR(). I don't have the hardware, so I could only provide an
> untested patch, if no one else steps forward...

QEMU emulates Malta, so I (or someone else here) should be able to
test the patch.
-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Malta build errors with 2.6.26-rc1

[Dmitri Vorobiev]

> I didn't fix the problems above. The change to traps.c only fixes
> traps.c for 64bit builds and it's a totally different issue. Looking
> at the warning/errors someone needs to fix some data types and use
> CKSEG0ADDR(). I don't have the hardware, so I could only provide
> an untested patch, if no one else steps forward...

Please provide an untested patch. I have hardware here, so I can
perform the test for you.

Thanks,
Dmitri

>
> Thomas.
>
> --
> Crap can work. Given enough thrust pigs will fly, but it's not necessary a
> good idea.                                                [ RFC1925, 2.3 ]
>

Re: Malta build errors with 2.6.26-rc1

[Thomas Bogendoerfer]

On Wed, May 28, 2008 at 05:10:25PM +0200, Martin Michlmayr wrote:
> * Thomas Bogendoerfer <tsbogend@alpha.franken.de> [2008-05-28 10:50]:
> > I didn't fix the problems above. The change to traps.c only fixes
> > traps.c for 64bit builds and it's a totally different issue. Looking
> > at the warning/errors someone needs to fix some data types and use
> > CKSEG0ADDR(). I don't have the hardware, so I could only provide an
> > untested patch, if no one else steps forward...
> 
> QEMU emulates Malta, so I (or someone else here) should be able to
> test the patch.


Fix 64bit Malta by using CKSEG0ADDR and correct casts

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
---

 arch/mips/mips-boards/generic/amon.c |    4 ++--
 include/asm-mips/gic.h               |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/mips/mips-boards/generic/amon.c b/arch/mips/mips-boards/generic/amon.c
index b7633fd..96236bf 100644
--- a/arch/mips/mips-boards/generic/amon.c
+++ b/arch/mips/mips-boards/generic/amon.c
@@ -28,7 +28,7 @@
 
 int amon_cpu_avail(int cpu)
 {
-	struct cpulaunch *launch = (struct cpulaunch *)KSEG0ADDR(CPULAUNCH);
+	struct cpulaunch *launch = (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH);
 
 	if (cpu < 0 || cpu >= NCPULAUNCH) {
 		pr_debug("avail: cpu%d is out of range\n", cpu);
@@ -53,7 +53,7 @@ void amon_cpu_start(int cpu,
 		    unsigned long gp, unsigned long a0)
 {
 	volatile struct cpulaunch *launch =
-		(struct cpulaunch  *)KSEG0ADDR(CPULAUNCH);
+		(struct cpulaunch  *)CKSEG0ADDR(CPULAUNCH);
 
 	if (!amon_cpu_avail(cpu))
 		return;
diff --git a/include/asm-mips/gic.h b/include/asm-mips/gic.h
index 3a492f2..954807d 100644
--- a/include/asm-mips/gic.h
+++ b/include/asm-mips/gic.h
@@ -24,8 +24,8 @@
 
 #define MSK(n) ((1 << (n)) - 1)
 #define REG32(addr)		(*(volatile unsigned int *) (addr))
-#define REG(base, offs)		REG32((unsigned int)(base) + offs##_##OFS)
-#define REGP(base, phys)	REG32((unsigned int)(base) + (phys))
+#define REG(base, offs)		REG32((unsigned long)(base) + offs##_##OFS)
+#define REGP(base, phys)	REG32((unsigned long)(base) + (phys))
 
 /* Accessors */
 #define GIC_REG(segment, offset) \


-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessary a
good idea.                                                [ RFC1925, 2.3 ]

Re: Malta build errors with 2.6.26-rc1

[Dmitri Vorobiev]

> Is there a maintainer for Malta?

Well, I think I can volunteer. At least, I have the hardware and am
pretty much interested in working with this platform. Ralf, what do
you think?

Dmitri

> --
> Martin Michlmayr
> http://www.cyrius.com/
>

Re: Malta build errors with 2.6.26-rc1

[Dmitri Vorobiev]

2008/5/29 Thomas Bogendoerfer <tsbogend@alpha.franken.de>:
> On Wed, May 28, 2008 at 05:10:25PM +0200, Martin Michlmayr wrote:
>> * Thomas Bogendoerfer <tsbogend@alpha.franken.de> [2008-05-28 10:50]:
>> > I didn't fix the problems above. The change to traps.c only fixes
>> > traps.c for 64bit builds and it's a totally different issue. Looking
>> > at the warning/errors someone needs to fix some data types and use
>> > CKSEG0ADDR(). I don't have the hardware, so I could only provide an
>> > untested patch, if no one else steps forward...
>>
>> QEMU emulates Malta, so I (or someone else here) should be able to
>> test the patch.
>
>
> Fix 64bit Malta by using CKSEG0ADDR and correct casts
>
> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> ---
>
>  arch/mips/mips-boards/generic/amon.c |    4 ++--
>  include/asm-mips/gic.h               |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/mips/mips-boards/generic/amon.c b/arch/mips/mips-boards/generic/amon.c
> index b7633fd..96236bf 100644
> --- a/arch/mips/mips-boards/generic/amon.c
> +++ b/arch/mips/mips-boards/generic/amon.c
> @@ -28,7 +28,7 @@
>
>  int amon_cpu_avail(int cpu)
>  {
> -       struct cpulaunch *launch = (struct cpulaunch *)KSEG0ADDR(CPULAUNCH);
> +       struct cpulaunch *launch = (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH);
>
>        if (cpu < 0 || cpu >= NCPULAUNCH) {
>                pr_debug("avail: cpu%d is out of range\n", cpu);
> @@ -53,7 +53,7 @@ void amon_cpu_start(int cpu,
>                    unsigned long gp, unsigned long a0)
>  {
>        volatile struct cpulaunch *launch =
> -               (struct cpulaunch  *)KSEG0ADDR(CPULAUNCH);
> +               (struct cpulaunch  *)CKSEG0ADDR(CPULAUNCH);
>
>        if (!amon_cpu_avail(cpu))
>                return;
> diff --git a/include/asm-mips/gic.h b/include/asm-mips/gic.h
> index 3a492f2..954807d 100644
> --- a/include/asm-mips/gic.h
> +++ b/include/asm-mips/gic.h
> @@ -24,8 +24,8 @@
>
>  #define MSK(n) ((1 << (n)) - 1)
>  #define REG32(addr)            (*(volatile unsigned int *) (addr))
> -#define REG(base, offs)                REG32((unsigned int)(base) + offs##_##OFS)
> -#define REGP(base, phys)       REG32((unsigned int)(base) + (phys))
> +#define REG(base, offs)                REG32((unsigned long)(base) + offs##_##OFS)
> +#define REGP(base, phys)       REG32((unsigned long)(base) + (phys))
>
>  /* Accessors */
>  #define GIC_REG(segment, offset) \

My test was performed using a Malta 4Kc board. I was able to boot the
target up to the shell prompt with this patch applied to the current
Linus tree.

So, you might want to add

Tested-by: Dmitri Vorobiev <dmtiri.vorobiev@movial.fi>

Re: Malta build errors with 2.6.26-rc1

[Dmitri Vorobiev]

>
> So, you might want to add
>
> Tested-by: Dmitri Vorobiev <dmtiri.vorobiev@movial.fi>

Ouch, I made a typo. Corrected version:

Tested-by: Dmitri Vorobiev <dmitri.vorobiev@movial.fi>

P.S. Sorry for a duplicate post, but we're currently having some
problems with email at linux-mips.org...

Dmitri

>

Re: Malta build errors with 2.6.26-rc1

[Ralf Baechle]

On Thu, May 29, 2008 at 10:05:07PM +0200, Thomas Bogendoerfer wrote:

Thanks, applied.

  Ralf