Attachment #8335 for bug #15672

Lines 17-23 Link Here

(-)linux-2.4.20.orig/Makefile (-1 / +1 lines)
17	FINDHPATH = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu	17	FINDHPATH = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu
18		18
19	HOSTCC = gcc	19	HOSTCC = gcc
20	HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer	20	HOSTCFLAGS = -Wall -Wstrict-prototypes -O3 -fomit-frame-pointer -pipe
21		21
22	CROSS_COMPILE =	22	CROSS_COMPILE =
23		23




CFLAGS := $(CFLAGS) -Wa,-m405
endif

ifdef CONFIG_6xx31
CFLAGS := $(CFLAGS) -O3
endif

ifdef CONFIG_7xx31
CFLAGS := $(CFLAGS) -mcpu=750 -O3
endif

ifdef CONFIG_74xx31
CFLAGS := $(CFLAGS) -mcpu=7400 -O3
endif

ifdef CONFIG_745031
CFLAGS := $(CFLAGS) -mcpu=7450 -O3
endif

ifdef CONFIG_8xx
CFLAGS := $(CFLAGS) -mcpu=860
endif

    ifdef CONFIG_6xx
	HEAD += arch/ppc/kernel/idle_6xx.o
    endif
    ifdef CONFIG_6xx31
	HEAD += arch/ppc/kernel/idle_6xx.o
    endif
    ifdef CONFIG_7xx31
	HEAD += arch/ppc/kernel/idle_6xx.o
    endif
    ifdef CONFIG_74xx31
	HEAD += arch/ppc/kernel/idle_6xx.o
    endif
    ifdef CONFIG_745031
	HEAD += arch/ppc/kernel/idle_6xx.o
    endif
  endif
endif


Lines 70-76 Link Here

(-)linux-2.4.20.orig/arch/ppc/boot/simple/head.S (-1 / +1 lines)
70		70
71	/* The following functions we call must not modify r3 or r4.....	71	/* The following functions we call must not modify r3 or r4.....
72	*/	72	*/
73	#ifdef CONFIG_6xx	73	#if defined(CONFIG_6xx) \|\| defined(CONFIG_6xx31) \|\| defined(CONFIG_7xx31) \|\| defined(CONFIG_74xx31) \|\| defined(CONFIG_745031)
74	bl disable_6xx_mmu	74	bl disable_6xx_mmu
75	bl disable_6xx_l1cache	75	bl disable_6xx_l1cache
76	#if defined(CONFIG_FORCE) \|\| defined(CONFIG_K2) \|\| defined(CONFIG_EV64260)	76	#if defined(CONFIG_FORCE) \|\| defined(CONFIG_K2) \|\| defined(CONFIG_EV64260)

Lines 30-41 Link Here

(-)linux-2.4.20.orig/arch/ppc/config.in (-4 / +16 lines)
30	define_bool CONFIG_PPC32 y	30	define_bool CONFIG_PPC32 y
31	choice 'Processor Type' \	31	choice 'Processor Type' \
32	"6xx/7xx/74xx/8260 CONFIG_6xx \	32	"6xx/7xx/74xx/8260 CONFIG_6xx \
		33	6xx(GCC>3.1) CONFIG_6xx31 \
		34	7xx(GCC>3.1) CONFIG_7xx31 \
		35	74xx(GCC>3.1) CONFIG_74xx31 \
		36	7450(GCC>3.1) CONFIG_745031 \
33	4xx CONFIG_4xx \	37	4xx CONFIG_4xx \
34	POWER3 CONFIG_POWER3 \	38	POWER3 CONFIG_POWER3 \
35	POWER4 CONFIG_POWER4 \	39	POWER4 CONFIG_POWER4 \
36	8xx CONFIG_8xx" 6xx	40	8xx CONFIG_8xx" 6xx
37		41
38	if [ "$CONFIG_6xx" = "y" ]; then	42	if [ "$CONFIG_6xx" = "y" -o "$CONFIG_6xx31" = "y" -o \
		43	"$CONFIG_7xx31" = "y" -o "$CONFIG_74xx31" = "y" -o \
		44	"$CONFIG_745031" = "y" ]; then
39	bool 'MPC8260 CPM Support' CONFIG_8260	45	bool 'MPC8260 CPM Support' CONFIG_8260
40	fi	46	fi
41		47
Lines 45-51 Link Here
45	define_bool CONFIG_PPC_ISATIMER y	51	define_bool CONFIG_PPC_ISATIMER y
46	fi	52	fi
47		53
48	if [ "$CONFIG_6xx" = "y" -o "$CONFIG_POWER3" = "y" -o \	54	if [ "$CONFIG_6xx" = "y" -o "$CONFIG_6xx31" = "y" -o \
		55	"$CONFIG_7xx31" = "y" -o "$CONFIG_74xx31" = "y" -o \
		56	"$CONFIG_745031" = "y" -o "$CONFIG_POWER3" = "y" -o \
49	"$CONFIG_POWER4" = "y" ]; then	57	"$CONFIG_POWER4" = "y" ]; then
50	define_bool CONFIG_PPC_STD_MMU y	58	define_bool CONFIG_PPC_STD_MMU y
51	else	59	else
Lines 94-100 Link Here
94	fi	102	fi
95	fi	103	fi
96		104
97	if [ "$CONFIG_6xx" = "y" -a "$CONFIG_8260" = "n" ]; then	105	if [ "$CONFIG_8260" = "n" -a "$CONFIG_6xx" = "y" -o \
		106	"$CONFIG_6xx31" = "y" -o "$CONFIG_7xx31" = "y" -o \
		107	"$CONFIG_74xx31" = "y" -o "$CONFIG_745031" = "y" ]; then
98	choice 'Machine Type' \	108	choice 'Machine Type' \
99	"CHRP/PowerMac/PReP CONFIG_ALL_PPC \	109	"CHRP/PowerMac/PReP CONFIG_ALL_PPC \
100	Amiga-APUS CONFIG_APUS \	110	Amiga-APUS CONFIG_APUS \
Lines 112-118 Link Here
112	bool ' Distribute interrupts on all CPUs by default' CONFIG_IRQ_ALL_CPUS	122	bool ' Distribute interrupts on all CPUs by default' CONFIG_IRQ_ALL_CPUS
113	fi	123	fi
114		124
115	if [ "$CONFIG_6xx" = "y" -a "$CONFIG_8260" = "n" ];then	125	if [ "$CONFIG_8260" = "n" -a "$CONFIG_6xx" = "y" -o \
		126	"$CONFIG_6xx31" = "y" -o "$CONFIG_7xx31" = "y" -o \
		127	"$CONFIG_74xx31" = "y" -o "$CONFIG_745031" = "y" ]; then
116	bool 'AltiVec Support' CONFIG_ALTIVEC	128	bool 'AltiVec Support' CONFIG_ALTIVEC
117	bool 'Thermal Management Support' CONFIG_TAU	129	bool 'Thermal Management Support' CONFIG_TAU
118	if [ "$CONFIG_TAU" = "y" ]; then	130	if [ "$CONFIG_TAU" = "y" ]; then

Lines 25-30 Link Here

(-)linux-2.4.20.orig/arch/ppc/kernel/Makefile (+8 lines)
25	# Start off with 'head.o', change as needed.	25	# Start off with 'head.o', change as needed.
26	HEAD-y := head.o	26	HEAD-y := head.o
27	HEAD-$(CONFIG_6xx) += idle_6xx.o	27	HEAD-$(CONFIG_6xx) += idle_6xx.o
		28	HEAD-$(CONFIG_6xx31) += idle_6xx.o
		29	HEAD-$(CONFIG_7xx31) += idle_6xx.o
		30	HEAD-$(CONFIG_74xx31) += idle_6xx.o
		31	HEAD-$(CONFIG_745031) += idle_6xx.o
28	HEAD-$(CONFIG_4xx) := head_4xx.o	32	HEAD-$(CONFIG_4xx) := head_4xx.o
29	HEAD-$(CONFIG_8xx) := head_8xx.o	33	HEAD-$(CONFIG_8xx) := head_8xx.o
30		34
Lines 39-44 Link Here
39	semaphore.o syscalls.o setup.o \	43	semaphore.o syscalls.o setup.o \
40	cputable.o ppc_htab.o	44	cputable.o ppc_htab.o
41	obj-$(CONFIG_6xx) += l2cr.o	45	obj-$(CONFIG_6xx) += l2cr.o
		46	obj-$(CONFIG_6xx31) += l2cr.o
		47	obj-$(CONFIG_7xx31) += l2cr.o
		48	obj-$(CONFIG_74xx31) += l2cr.o
		49	obj-$(CONFIG_745031) += l2cr.o
42	obj-$(CONFIG_MODULES) += ppc_ksyms.o	50	obj-$(CONFIG_MODULES) += ppc_ksyms.o
43	obj-$(CONFIG_PCI) += pci.o	51	obj-$(CONFIG_PCI) += pci.o
44	obj-$(CONFIG_PCI) += pci-dma.o	52	obj-$(CONFIG_PCI) += pci-dma.o




	bl	reloc_offset
	li	r24,0			/* cpu# */
	bl	call_setup_cpu		/* Call setup_cpu for this CPU */
#if defined(CONFIG_6xx) || defined(CONFIG_6xx31) || defined(CONFIG_7xx31) || defined(CONFIG_74xx31) || defined(CONFIG_745031)
	bl	reloc_offset
	bl	init_idle_6xx
#endif /* CONFIG_6xx */

	/* Out of line case when returning to kernel,
	 * check return from power_save_6xx
	 */
#if defined(CONFIG_6xx) || defined(CONFIG_6xx31) || defined(CONFIG_7xx31) || defined(CONFIG_74xx31) || defined(CONFIG_745031)
	
	mfspr	r24,SPRN_HID0
	mtcr	r24
BEGIN_FTR_SECTION

	mr	r4,r24
	bl	identify_cpu
	bl	call_setup_cpu		/* Call setup_cpu for this CPU */
#if defined(CONFIG_6xx) || defined(CONFIG_6xx31) || defined(CONFIG_7xx31) || defined(CONFIG_74xx31) || defined(CONFIG_745031)
	lis	r3,-KERNELBASE@h
	bl	init_idle_6xx
#endif /* CONFIG_6xx */

Lines 37-43 Link Here

(-)linux-2.4.20.orig/arch/ppc/kernel/idle.c (-2 / +2 lines)
37	unsigned long powersave_nap;	37	unsigned long powersave_nap;
38	unsigned long powersave_lowspeed;	38	unsigned long powersave_lowspeed;
39		39
40	#ifdef CONFIG_6xx	40	#if defined(CONFIG_6xx) \|\| defined(CONFIG_6xx31) \|\| defined(CONFIG_7xx31) \|\| defined(CONFIG_74xx31) \|\| defined(CONFIG_745031)
41	extern void power_save_6xx(void);	41	extern void power_save_6xx(void);
42	#endif	42	#endif
43		43
Lines 69-75 Link Here
69	}	69	}
70	}	70	}
71	#endif	71	#endif
72	#ifdef CONFIG_6xx	72	#if defined(CONFIG_6xx) \|\| defined(CONFIG_6xx31) \|\| defined(CONFIG_7xx31) \|\| defined(CONFIG_74xx31) \|\| defined(CONFIG_745031)
73	if (do_power_save && !current->need_resched)	73	if (do_power_save && !current->need_resched)
74	power_save_6xx();	74	power_save_6xx();
75	#endif /* CONFIG_6xx */	75	#endif /* CONFIG_6xx */

Lines 116-122 Link Here

(-)linux-2.4.20.orig/arch/ppc/mm/fault.c (-1 / +1 lines)
116		116
117	good_area:	117	good_area:
118	code = SEGV_ACCERR;	118	code = SEGV_ACCERR;
119	#if defined(CONFIG_6xx)	119	#if defined(CONFIG_6xx) \|\| defined(CONFIG_6xx31) \|\| defined(CONFIG_7xx31) \|\| defined(CONFIG_74xx31) \|\| defined(CONFIG_745031)
120	if (error_code & 0x95700000)	120	if (error_code & 0x95700000)
121	/* an error such as lwarx to I/O controller space,	121	/* an error such as lwarx to I/O controller space,
122	address matching DABR, eciwx, etc. */	122	address matching DABR, eciwx, etc. */

Lines 50-56 Link Here

(-)linux-2.4.20.orig/arch/ppc/mm/pgtable.c (-1 / +1 lines)
50	struct pgtable_cache_struct quicklists;	50	struct pgtable_cache_struct quicklists;
51	#endif	51	#endif
52		52
53	#if defined(CONFIG_6xx) \|\| defined(CONFIG_POWER3)	53	#if defined(CONFIG_6xx) \|\| defined(CONFIG_6xx31) \|\| defined(CONFIG_7xx31) \|\| defined(CONFIG_74xx31) \|\| defined(CONFIG_745031) \|\| defined(CONFIG_POWER3)
54	#define HAVE_BATS 1	54	#define HAVE_BATS 1
55	#endif	55	#endif
56		56

Lines 55-61 Link Here

(-)linux-2.4.20.orig/include/asm-ppc/system.h (-1 / +1 lines)
55	extern void flush_instruction_cache(void);	55	extern void flush_instruction_cache(void);
56	extern void hard_reset_now(void);	56	extern void hard_reset_now(void);
57	extern void poweroff_now(void);	57	extern void poweroff_now(void);
58	#ifdef CONFIG_6xx	58	#if defined(CONFIG_6xx) \|\| defined(CONFIG_6xx31) \|\| defined(CONFIG_7xx31) \|\| defined(CONFIG_74xx31) \|\| defined(CONFIG_745031)
59	extern long _get_L2CR(void);	59	extern long _get_L2CR(void);
60	extern void _set_L2CR(unsigned long);	60	extern void _set_L2CR(unsigned long);
61	extern long _get_L3CR(void);	61	extern long _get_L3CR(void);

Lines 59-65 Link Here

(-)linux-2.4.20.orig/include/asm-ppc/time.h (-1 / +1 lines)
59		59
60	/* Accessor functions for the timebase (RTC on 601) registers. */	60	/* Accessor functions for the timebase (RTC on 601) registers. */
61	/* If one day CONFIG_POWER is added just define __USE_RTC as 1 */	61	/* If one day CONFIG_POWER is added just define __USE_RTC as 1 */
62	#ifdef CONFIG_6xx	62	#if defined(CONFIG_6xx) \|\| defined(CONFIG_6xx31) \|\| defined(CONFIG_7xx31) \|\| defined(CONFIG_74xx31) \|\| defined(CONFIG_745031)
63	extern __inline__ int const __USE_RTC(void) {	63	extern __inline__ int const __USE_RTC(void) {
64	return (mfspr(SPRN_PVR)>>16) == 1;	64	return (mfspr(SPRN_PVR)>>16) == 1;
65	}	65	}

Return to bug 15672

Lines 192-198 Link Here

(-)linux-2.4.20.orig/arch/ppc/kernel/head.S (-4 / +3 lines)
192	bl reloc_offset	192	bl reloc_offset
193	li r24,0 /* cpu# */	193	li r24,0 /* cpu# */
194	bl call_setup_cpu /* Call setup_cpu for this CPU */	194	bl call_setup_cpu /* Call setup_cpu for this CPU */
195	#ifdef CONFIG_6xx	195	#if defined(CONFIG_6xx) \|\| defined(CONFIG_6xx31) \|\| defined(CONFIG_7xx31) \|\| defined(CONFIG_74xx31) \|\| defined(CONFIG_745031)
196	bl reloc_offset	196	bl reloc_offset
197	bl init_idle_6xx	197	bl init_idle_6xx
198	#endif /* CONFIG_6xx */	198	#endif /* CONFIG_6xx */
Lines 820-827 Link Here
820	/* Out of line case when returning to kernel,	820	/* Out of line case when returning to kernel,
821	* check return from power_save_6xx	821	* check return from power_save_6xx
822	*/	822	*/
823	#ifdef CONFIG_6xx	823	#if defined(CONFIG_6xx) \|\| defined(CONFIG_6xx31) \|\| defined(CONFIG_7xx31) \|\| defined(CONFIG_74xx31) \|\| defined(CONFIG_745031)
824
825	mfspr r24,SPRN_HID0	824	mfspr r24,SPRN_HID0
826	mtcr r24	825	mtcr r24
827	BEGIN_FTR_SECTION	826	BEGIN_FTR_SECTION
Lines 1273-1279 Link Here
1273	mr r4,r24	1272	mr r4,r24
1274	bl identify_cpu	1273	bl identify_cpu
1275	bl call_setup_cpu /* Call setup_cpu for this CPU */	1274	bl call_setup_cpu /* Call setup_cpu for this CPU */
1276	#ifdef CONFIG_6xx	1275	#if defined(CONFIG_6xx) \|\| defined(CONFIG_6xx31) \|\| defined(CONFIG_7xx31) \|\| defined(CONFIG_74xx31) \|\| defined(CONFIG_745031)
1277	lis r3,-KERNELBASE@h	1276	lis r3,-KERNELBASE@h
1278	bl init_idle_6xx	1277	bl init_idle_6xx
1279	#endif /* CONFIG_6xx */	1278	#endif /* CONFIG_6xx */

Lines 34-39 Link Here

(-)linux-2.4.20.orig/arch/ppc/Makefile (+28 lines)
34	CFLAGS := $(CFLAGS) -Wa,-m405	34	CFLAGS := $(CFLAGS) -Wa,-m405
35	endif	35	endif
36		36
		37	ifdef CONFIG_6xx31
		38	CFLAGS := $(CFLAGS) -O3
		39	endif
		40
		41	ifdef CONFIG_7xx31
		42	CFLAGS := $(CFLAGS) -mcpu=750 -O3
		43	endif
		44
		45	ifdef CONFIG_74xx31
		46	CFLAGS := $(CFLAGS) -mcpu=7400 -O3
		47	endif
		48
		49	ifdef CONFIG_745031
		50	CFLAGS := $(CFLAGS) -mcpu=7450 -O3
		51	endif
		52
37	ifdef CONFIG_8xx	53	ifdef CONFIG_8xx
38	CFLAGS := $(CFLAGS) -mcpu=860	54	CFLAGS := $(CFLAGS) -mcpu=860
39	endif	55	endif
Lines 57-62 Link Here
57	ifdef CONFIG_6xx	73	ifdef CONFIG_6xx
58	HEAD += arch/ppc/kernel/idle_6xx.o	74	HEAD += arch/ppc/kernel/idle_6xx.o
59	endif	75	endif
		76	ifdef CONFIG_6xx31
		77	HEAD += arch/ppc/kernel/idle_6xx.o
		78	endif
		79	ifdef CONFIG_7xx31
		80	HEAD += arch/ppc/kernel/idle_6xx.o
		81	endif
		82	ifdef CONFIG_74xx31
		83	HEAD += arch/ppc/kernel/idle_6xx.o
		84	endif
		85	ifdef CONFIG_745031
		86	HEAD += arch/ppc/kernel/idle_6xx.o
		87	endif
60	endif	88	endif
61	endif	89	endif
62		90