Re: 2.4.21-rc1 doesn't build on ppc (6xx/pmac)

Re: 2.4.21-rc1 doesn't build on ppc (6xx/pmac)

[mikpe]

On Tue, 22 Apr 2003 15:47:39 +0200, Olaf Hering wrote:
>  On Tue, Apr 22, mikpe@csd.uu.se wrote:
> 
> > arch/ppc/kernel/head.o(__ftr_fixup+0x60): undefined reference to `CPU_FTR_HAS_HIGH_BATS'
> > arch/ppc/kernel/head.o(__ftr_fixup+0x64): undefined reference to `CPU_FTR_HAS_HIGH_BATS'
> > arch/ppc/kernel/kernel.o: In function `sys_call_table':
> > arch/ppc/kernel/kernel.o(.data+0x330c): undefined reference to `__setup_cpu_7450'
> > arch/ppc/kernel/kernel.o(.data+0x332c): undefined reference to `__setup_cpu_7450'
> > arch/ppc/kernel/kernel.o(.data+0x334c): undefined reference to `__setup_cpu_7450'
> > arch/ppc/kernel/kernel.o(.data+0x336c): undefined reference to `__setup_cpu_7455'
> > arch/ppc/kernel/kernel.o(.data+0x338c): undefined reference to `__setup_cpu_7455'
> > arch/ppc/kernel/kernel.o(.data+0x33ac): undefined reference to `__setup_cpu_7455'
> > make: *** [vmlinux] Error 1
> 
> 
> diff -purNX /home/olaf/kernel_exclude.txt kaputteslinuxdingens/arch/ppc/kernel/cputable.c linux-2.4.21-pre7-cset-1.1100-to-1.1116/arch/ppc/kernel/cputable.c
> --- kaputteslinuxdingens/arch/ppc/kernel/cputable.c	Mon Apr 21 21:28:04 2003
> +++ linux-2.4.21-pre7-cset-1.1100-to-1.1116/arch/ppc/kernel/cputable.c	Mon Apr 21 20:46:17 2003
> @@ -26,8 +26,7 @@ extern void __setup_cpu_750cx(unsigned l

<patch omitted>

That fixed it. Thanks!

/Mikael

Re: 2.4.21-rc1 doesn't build on ppc (6xx/pmac)

[Olaf Hering]

 On Tue, Apr 22, mikpe@csd.uu.se wrote:

> arch/ppc/kernel/head.o(__ftr_fixup+0x60): undefined reference to `CPU_FTR_HAS_HIGH_BATS'
> arch/ppc/kernel/head.o(__ftr_fixup+0x64): undefined reference to `CPU_FTR_HAS_HIGH_BATS'
> arch/ppc/kernel/kernel.o: In function `sys_call_table':
> arch/ppc/kernel/kernel.o(.data+0x330c): undefined reference to `__setup_cpu_7450'
> arch/ppc/kernel/kernel.o(.data+0x332c): undefined reference to `__setup_cpu_7450'
> arch/ppc/kernel/kernel.o(.data+0x334c): undefined reference to `__setup_cpu_7450'
> arch/ppc/kernel/kernel.o(.data+0x336c): undefined reference to `__setup_cpu_7455'
> arch/ppc/kernel/kernel.o(.data+0x338c): undefined reference to `__setup_cpu_7455'
> arch/ppc/kernel/kernel.o(.data+0x33ac): undefined reference to `__setup_cpu_7455'
> make: *** [vmlinux] Error 1


diff -purNX /home/olaf/kernel_exclude.txt kaputteslinuxdingens/arch/ppc/kernel/cputable.c linux-2.4.21-pre7-cset-1.1100-to-1.1116/arch/ppc/kernel/cputable.c
--- kaputteslinuxdingens/arch/ppc/kernel/cputable.c	Mon Apr 21 21:28:04 2003
+++ linux-2.4.21-pre7-cset-1.1100-to-1.1116/arch/ppc/kernel/cputable.c	Mon Apr 21 20:46:17 2003
@@ -26,8 +26,7 @@ extern void __setup_cpu_750cx(unsigned l
 extern void __setup_cpu_750fx(unsigned long offset, int cpu_nr, struct cpu_spec* spec);
 extern void __setup_cpu_7400(unsigned long offset, int cpu_nr, struct cpu_spec* spec);
 extern void __setup_cpu_7410(unsigned long offset, int cpu_nr, struct cpu_spec* spec);
-extern void __setup_cpu_7450(unsigned long offset, int cpu_nr, struct cpu_spec* spec);
-extern void __setup_cpu_7455(unsigned long offset, int cpu_nr, struct cpu_spec* spec);
+extern void __setup_cpu_745x(unsigned long offset, int cpu_nr, struct cpu_spec* spec);
 extern void __setup_cpu_power3(unsigned long offset, int cpu_nr, struct cpu_spec* spec);
 extern void __setup_cpu_power4(unsigned long offset, int cpu_nr, struct cpu_spec* spec);
 extern void __setup_cpu_8xx(unsigned long offset, int cpu_nr, struct cpu_spec* spec);
@@ -154,7 +153,7 @@ struct cpu_spec	cpu_specs[] = {
     	0xffff0000, 0x70000000, "750FX",
     	CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_CAN_DOZE | CPU_FTR_USE_TB |
 	CPU_FTR_L2CR | CPU_FTR_TAU | CPU_FTR_HPTE_TABLE | CPU_FTR_CAN_NAP |
-	CPU_FTR_DUAL_PLL_750FX,
+	CPU_FTR_DUAL_PLL_750FX | CPU_FTR_HAS_HIGH_BATS,
 	COMMON_PPC,
 	32, 32,
 	__setup_cpu_750fx
@@ -201,7 +200,7 @@ struct cpu_spec	cpu_specs[] = {
 	CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450,
 	COMMON_PPC | PPC_FEATURE_HAS_ALTIVEC,
 	32, 32,
-	__setup_cpu_7450
+	__setup_cpu_745x
     },
     {	/* 7450 2.1 */
     	0xffffffff, 0x80000201, "7450",
@@ -211,7 +210,7 @@ struct cpu_spec	cpu_specs[] = {
 	CPU_FTR_L3_DISABLE_NAP,
 	COMMON_PPC | PPC_FEATURE_HAS_ALTIVEC,
 	32, 32,
-	__setup_cpu_7450
+	__setup_cpu_745x
     },
     {	/* 7450 2.3 and newer */
     	0xffff0000, 0x80000000, "7450",
@@ -220,35 +219,46 @@ struct cpu_spec	cpu_specs[] = {
 	CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR,
 	COMMON_PPC | PPC_FEATURE_HAS_ALTIVEC,
 	32, 32,
-	__setup_cpu_7450
+	__setup_cpu_745x
     },
     {	/* 7455 rev 1.x */
     	0xffffff00, 0x80010100, "7455",
     	CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB |
 	CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | CPU_FTR_L3CR |
-	CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450,
+	CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_HAS_HIGH_BATS,
 	COMMON_PPC | PPC_FEATURE_HAS_ALTIVEC,
 	32, 32,
-	__setup_cpu_7455
+	__setup_cpu_745x
     },
     {	/* 7455 rev 2.0 */
     	0xffffffff, 0x80010200, "7455",
     	CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_CAN_NAP |
 	CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | CPU_FTR_L3CR |
 	CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR |
-	CPU_FTR_L3_DISABLE_NAP,
+	CPU_FTR_L3_DISABLE_NAP | CPU_FTR_HAS_HIGH_BATS,
 	COMMON_PPC | PPC_FEATURE_HAS_ALTIVEC,
 	32, 32,
-	__setup_cpu_7455
+	__setup_cpu_745x
     },
     {	/* 7455 others */
     	0xffff0000, 0x80010000, "7455",
     	CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_CAN_NAP |
 	CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | CPU_FTR_L3CR |
-	CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR,
+	CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR |
+	CPU_FTR_HAS_HIGH_BATS,
+	COMMON_PPC | PPC_FEATURE_HAS_ALTIVEC,
+	32, 32,
+	__setup_cpu_745x
+    },
+    {	/* 7457 */
+    	0xffff0000, 0x80020000, "7457",
+    	CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_CAN_NAP |
+	CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | CPU_FTR_L3CR |
+	CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR |
+	CPU_FTR_HAS_HIGH_BATS,
 	COMMON_PPC | PPC_FEATURE_HAS_ALTIVEC,
 	32, 32,
-	__setup_cpu_7455
+	__setup_cpu_745x
     },
     {	/* 82xx (8240, 8245, 8260 are all 603e cores) */
 	0x7fff0000, 0x00810000, "82xx",
diff -purNX /home/olaf/kernel_exclude.txt kaputteslinuxdingens/arch/ppc/kernel/i8259.c linux-2.4.21-pre7-cset-1.1100-to-1.1116/arch/ppc/kernel/i8259.c
--- kaputteslinuxdingens/arch/ppc/kernel/i8259.c	Mon Apr 21 21:28:04 2003
+++ linux-2.4.21-pre7-cset-1.1100-to-1.1116/arch/ppc/kernel/i8259.c	Mon Apr 21 21:24:33 2003
@@ -141,6 +141,7 @@ struct hw_interrupt_type i8259_pic = {
 	NULL
 };
 
+#if 0 /* Do not request these before the host bridge resource have been setup */
 static struct resource pic1_iores = {
 	"8259 (master)", 0x20, 0x21, IORESOURCE_BUSY
 };
@@ -152,6 +153,7 @@ static struct resource pic2_iores = {
 static struct resource pic_edgectrl_iores = {
 	"8259 edge control", 0x4d0, 0x4d1, IORESOURCE_BUSY
 };
+#endif
 
 void __init i8259_init(unsigned long intack_addr)
 {
diff -purNX /home/olaf/kernel_exclude.txt kaputteslinuxdingens/include/asm-ppc/cputable.h linux-2.4.21-pre7-cset-1.1100-to-1.1116/include/asm-ppc/cputable.h
--- kaputteslinuxdingens/include/asm-ppc/cputable.h	Mon Apr 21 21:28:09 2003
+++ linux-2.4.21-pre7-cset-1.1100-to-1.1116/include/asm-ppc/cputable.h	Mon Apr 21 21:09:57 2003
@@ -74,6 +74,7 @@ extern struct cpu_spec		*cur_cpu_spec[];
 #define CPU_FTR_NAP_DISABLE_L2_PR	0x00002000
 #define CPU_FTR_DUAL_PLL_750FX		0x00004000
 #define CPU_FTR_NO_DPM			0x00008000
+#define CPU_FTR_HAS_HIGH_BATS		0x00010000
 
 #ifdef __ASSEMBLY__
 
@@ -94,6 +95,6 @@ extern struct cpu_spec		*cur_cpu_spec[];
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __ASM_PPC_CPUTABLE_H */
 #endif /* __KERNEL__ */
+#endif /* __ASM_PPC_CPUTABLE_H */
 

-- 
USB is for mice, FireWire is for men!

Re: 2.4.21-rc1 doesn't build on ppc (6xx/pmac)

[Benjamin Herrenschmidt]

On Tue, 2003-04-22 at 15:33, mikpe@csd.uu.se wrote:
> 2.4.21-pre7 built and ran Ok on my PowerMac 4400 with
> CONFIG_6xx=y and CONFIG_ALL_PPC=y.
> 2.4.21-rc1 fails at the end of the build with:

Known problem, a patch is pending for Marcelo, in the meantime,
use the linuxppc trees

Ben.

2.4.21-rc1 doesn't build on ppc (6xx/pmac)

[mikpe]

2.4.21-pre7 built and ran Ok on my PowerMac 4400 with
CONFIG_6xx=y and CONFIG_ALL_PPC=y.
2.4.21-rc1 fails at the end of the build with:

ld -T arch/ppc/vmlinux.lds -Ttext 0xc0000000 -Bstatic arch/ppc/kernel/head.o arch/ppc/kernel/idle_6xx.o init/main.o init/version.o init/do_mounts.o \
	--start-group \
	arch/ppc/kernel/kernel.o arch/ppc/platforms/platform.o arch/ppc/mm/mm.o arch/ppc/lib/lib.o kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o \
	 drivers/char/char.o drivers/block/block.o drivers/misc/misc.o drivers/net/net.o drivers/ide/idedriver.o drivers/cdrom/driver.o drivers/pci/driver.o drivers/macintosh/macintosh.o drivers/video/video.o drivers/usb/usbdrv.o drivers/media/media.o drivers/input/inputdrv.o \
	net/network.o \
	/tmp/linux-2.4.21-rc1/lib/lib.a \
	--end-group \
	-o vmlinux
arch/ppc/kernel/head.o(__ftr_fixup+0x60): undefined reference to `CPU_FTR_HAS_HIGH_BATS'
arch/ppc/kernel/head.o(__ftr_fixup+0x64): undefined reference to `CPU_FTR_HAS_HIGH_BATS'
arch/ppc/kernel/kernel.o: In function `sys_call_table':
arch/ppc/kernel/kernel.o(.data+0x330c): undefined reference to `__setup_cpu_7450'
arch/ppc/kernel/kernel.o(.data+0x332c): undefined reference to `__setup_cpu_7450'
arch/ppc/kernel/kernel.o(.data+0x334c): undefined reference to `__setup_cpu_7450'
arch/ppc/kernel/kernel.o(.data+0x336c): undefined reference to `__setup_cpu_7455'
arch/ppc/kernel/kernel.o(.data+0x338c): undefined reference to `__setup_cpu_7455'
arch/ppc/kernel/kernel.o(.data+0x33ac): undefined reference to `__setup_cpu_7455'
make: *** [vmlinux] Error 1

/Mikael