2003-07-06 22:29:16

by Mikael Pettersson

Subject: [PATCH][2.4.22-pre3] fix PPC32 compile failure due to SPRN_HID2 being undefined

Compiling 2.4.22-pre3 for a 6xx-class PowerPC fails in cpu_setup_6xx.S:

ppc-unknown-linux-gcc -D__ASSEMBLY__ -D__KERNEL__ -I/tmp/linux-2.4.22-pre3/include -I/tmp/linux-2.4.22-pre3/arch/ppc -c -o cpu_setup_6xx.o cpu_setup_6xx.S
cpu_setup_6xx.S: Assembler messages:
cpu_setup_6xx.S:325: Error: unsupported relocation against SPRN_HID2
cpu_setup_6xx.S:416: Error: unsupported relocation against SPRN_HID2
make[1]: *** [cpu_setup_6xx.o] Error 1
make[1]: Leaving directory `/tmp/linux-2.4.22-pre3/arch/ppc/kernel'
make: *** [_dir_arch/ppc/kernel] Error 2

SPRN_HID2 should be a #defined constant, but it isn't. The patch
below from 2.4.21-ben2 (rediffed for 2.4.22-pre3) fixes the problem.

/Mikael

diff -ruN linux-2.4.22-pre3/include/asm-ppc/processor.h linux-2.4.22-pre3.ppc-hid2-fix/include/asm-ppc/processor.h
--- linux-2.4.22-pre3/include/asm-ppc/processor.h 2003-07-06 18:37:48.000000000 +0200
+++ linux-2.4.22-pre3.ppc-hid2-fix/include/asm-ppc/processor.h 2003-07-06 22:24:10.000000000 +0200
@@ -248,6 +248,7 @@
#define HID0_NOPDST (1<<1) /* No-op dst, dstt, etc. instr. */
#define HID0_NOPTI (1<<0) /* No-op dcbt and dcbst instr. */
#define SPRN_HID1 0x3F1 /* Hardware Implementation Register 1 */
+#define SPRN_HID2 0x3F8 /* Hardware Implementation Register 2 */
#define SPRN_IABR 0x3F2 /* Instruction Address Breakpoint Register */
#define SPRN_IAC1 0x3F4 /* Instruction Address Compare 1 */
#define SPRN_IAC2 0x3F5 /* Instruction Address Compare 2 */

2003-07-07 05:37:00

by Benjamin Herrenschmidt

Subject: Re: [PATCH][2.4.22-pre3] fix PPC32 compile failure due to SPRN_HID2 being undefined

On Mon, 2003-07-07 at 00:43, Mikael Pettersson wrote:
> Compiling 2.4.22-pre3 for a 6xx-class PowerPC fails in cpu_setup_6xx.S:
>
> ppc-unknown-linux-gcc -D__ASSEMBLY__ -D__KERNEL__ -I/tmp/linux-2.4.22-pre3/include -I/tmp/linux-2.4.22-pre3/arch/ppc -c -o cpu_setup_6xx.o cpu_setup_6xx.S
> cpu_setup_6xx.S: Assembler messages:
> cpu_setup_6xx.S:325: Error: unsupported relocation against SPRN_HID2
> cpu_setup_6xx.S:416: Error: unsupported relocation against SPRN_HID2
> make[1]: *** [cpu_setup_6xx.o] Error 1
> make[1]: Leaving directory `/tmp/linux-2.4.22-pre3/arch/ppc/kernel'
> make: *** [_dir_arch/ppc/kernel] Error 2
>
> SPRN_HID2 should be a #defined constant, but it isn't. The patch
> below from 2.4.21-ben2 (rediffed for 2.4.22-pre3) fixes the problem.

Yup, Marcelo, please apply.

2003-07-07 06:35:07

by Paul Mackerras

Subject: Re: [PATCH][2.4.22-pre3] fix PPC32 compile failure due to SPRN_HID2 being undefined

Benjamin Herrenschmidt writes:

> > SPRN_HID2 should be a #defined constant, but it isn't. The patch
> > below from 2.4.21-ben2 (rediffed for 2.4.22-pre3) fixes the problem.
>
> Yup, Marcelo, please apply.

Um, I have that in the for-marcelo-ppc tree already, which I hope
Marcelo will pull before pre4.

Paul.

2003-07-07 18:19:00

by Marcelo Tosatti

Subject: Re: [PATCH][2.4.22-pre3] fix PPC32 compile failure due to SPRN_HID2 being undefined

On Mon, 7 Jul 2003, Paul Mackerras wrote:

> Benjamin Herrenschmidt writes:
>
> > > SPRN_HID2 should be a #defined constant, but it isn't. The patch
> > > below from 2.4.21-ben2 (rediffed for 2.4.22-pre3) fixes the problem.
> >
> > Yup, Marcelo, please apply.
>
> Um, I have that in the for-marcelo-ppc tree already, which I hope
> Marcelo will pull before pre4.

Just pushed it and pulled to bkbits.net