Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20c8c210 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Fixes to get the merged kernel to boot on powermac. 



This merges ppc_ksyms.c, puts back the actual do_execve call in
sys_execve, makes init_MMU call find_end_of_memory rather than
ppc_md.find_end_of_memory (every platform has a device tree
with a /memory node now, right?) and fixes some problems with the
mpic initialization on newworld powermacs.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent a3a9e99e

arch/powerpc/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,5 +14,5 @@ extra-$(CONFIG_PPC_FPU) += fpu.o 
extra-y				+= vmlinux.lds



obj-y				:= semaphore.o traps.o process.o



obj-$(CONFIG_MODULES)		+= ppc_ksyms.o

obj-$(CONFIG_ALTIVEC)		+= vecemu.o vector.o

arch/powerpc/kernel/ppc_ksyms.c

0 → 100644
+338 −0
Original line number Diff line number Diff line 
#include <linux/config.h>

#include <linux/module.h>

#include <linux/threads.h>

#include <linux/smp.h>

#include <linux/sched.h>

#include <linux/elfcore.h>

#include <linux/string.h>

#include <linux/interrupt.h>

#include <linux/tty.h>

#include <linux/vt_kern.h>

#include <linux/nvram.h>

#include <linux/console.h>

#include <linux/irq.h>

#include <linux/pci.h>

#include <linux/delay.h>

#include <linux/ide.h>

#include <linux/pm.h>

#include <linux/bitops.h>



#include <asm/page.h>

#include <asm/semaphore.h>

#include <asm/processor.h>

#include <asm/uaccess.h>

#include <asm/io.h>

#include <asm/ide.h>

#include <asm/atomic.h>

#include <asm/checksum.h>

#include <asm/pgtable.h>

#include <asm/tlbflush.h>

#include <linux/adb.h>

#include <linux/cuda.h>

#include <linux/pmu.h>

#include <asm/prom.h>

#include <asm/system.h>

#include <asm/pci-bridge.h>

#include <asm/irq.h>

#include <asm/pmac_feature.h>

#include <asm/dma.h>

#include <asm/machdep.h>

#include <asm/hw_irq.h>

#include <asm/nvram.h>

#include <asm/mmu_context.h>

#include <asm/backlight.h>

#include <asm/time.h>

#include <asm/cputable.h>

#include <asm/btext.h>

#include <asm/div64.h>

#include <asm/xmon.h>



#ifdef  CONFIG_8xx

#include <asm/commproc.h>

#endif



extern void transfer_to_handler(void);

extern void do_IRQ(struct pt_regs *regs);

extern void MachineCheckException(struct pt_regs *regs);

extern void AlignmentException(struct pt_regs *regs);

extern void ProgramCheckException(struct pt_regs *regs);

extern void SingleStepException(struct pt_regs *regs);

extern int do_signal(sigset_t *, struct pt_regs *);

extern int pmac_newworld;

extern int sys_sigreturn(struct pt_regs *regs);



long long __ashrdi3(long long, int);

long long __ashldi3(long long, int);

long long __lshrdi3(long long, int);



extern unsigned long mm_ptov (unsigned long paddr);



EXPORT_SYMBOL(clear_pages);

EXPORT_SYMBOL(clear_user_page);

EXPORT_SYMBOL(do_signal);

EXPORT_SYMBOL(transfer_to_handler);

EXPORT_SYMBOL(do_IRQ);

EXPORT_SYMBOL(MachineCheckException);

EXPORT_SYMBOL(AlignmentException);

EXPORT_SYMBOL(ProgramCheckException);

EXPORT_SYMBOL(SingleStepException);

EXPORT_SYMBOL(sys_sigreturn);

EXPORT_SYMBOL(ppc_n_lost_interrupts);

EXPORT_SYMBOL(ppc_lost_interrupts);



EXPORT_SYMBOL(ISA_DMA_THRESHOLD);

EXPORT_SYMBOL(DMA_MODE_READ);

EXPORT_SYMBOL(DMA_MODE_WRITE);

#if defined(CONFIG_PPC_PREP)

EXPORT_SYMBOL(_prep_type);

EXPORT_SYMBOL(ucSystemType);

#endif



#if !defined(__INLINE_BITOPS)

EXPORT_SYMBOL(set_bit);

EXPORT_SYMBOL(clear_bit);

EXPORT_SYMBOL(change_bit);

EXPORT_SYMBOL(test_and_set_bit);

EXPORT_SYMBOL(test_and_clear_bit);

EXPORT_SYMBOL(test_and_change_bit);

#endif /* __INLINE_BITOPS */



EXPORT_SYMBOL(strcpy);

EXPORT_SYMBOL(strncpy);

EXPORT_SYMBOL(strcat);

EXPORT_SYMBOL(strncat);

EXPORT_SYMBOL(strchr);

EXPORT_SYMBOL(strrchr);

EXPORT_SYMBOL(strpbrk);

EXPORT_SYMBOL(strstr);

EXPORT_SYMBOL(strlen);

EXPORT_SYMBOL(strnlen);

EXPORT_SYMBOL(strcmp);

EXPORT_SYMBOL(strncmp);

EXPORT_SYMBOL(strcasecmp);

EXPORT_SYMBOL(__div64_32);



EXPORT_SYMBOL(csum_partial);

EXPORT_SYMBOL(csum_partial_copy_generic);

EXPORT_SYMBOL(ip_fast_csum);

EXPORT_SYMBOL(csum_tcpudp_magic);



EXPORT_SYMBOL(__copy_tofrom_user);

EXPORT_SYMBOL(__clear_user);

EXPORT_SYMBOL(__strncpy_from_user);

EXPORT_SYMBOL(__strnlen_user);



EXPORT_SYMBOL(_insb);

EXPORT_SYMBOL(_outsb);

EXPORT_SYMBOL(_insw);

EXPORT_SYMBOL(_outsw);

EXPORT_SYMBOL(_insl);

EXPORT_SYMBOL(_outsl);

EXPORT_SYMBOL(_insw_ns);

EXPORT_SYMBOL(_outsw_ns);

EXPORT_SYMBOL(_insl_ns);

EXPORT_SYMBOL(_outsl_ns);

EXPORT_SYMBOL(iopa);

EXPORT_SYMBOL(mm_ptov);

EXPORT_SYMBOL(ioremap);

#ifdef CONFIG_44x

EXPORT_SYMBOL(ioremap64);

#endif

EXPORT_SYMBOL(__ioremap);

EXPORT_SYMBOL(iounmap);

EXPORT_SYMBOL(ioremap_bot);	/* aka VMALLOC_END */



#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)

EXPORT_SYMBOL(ppc_ide_md);

#endif



#ifdef CONFIG_PCI

EXPORT_SYMBOL(isa_io_base);

EXPORT_SYMBOL(isa_mem_base);

EXPORT_SYMBOL(pci_dram_offset);

EXPORT_SYMBOL(pci_alloc_consistent);

EXPORT_SYMBOL(pci_free_consistent);

EXPORT_SYMBOL(pci_bus_io_base);

EXPORT_SYMBOL(pci_bus_io_base_phys);

EXPORT_SYMBOL(pci_bus_mem_base_phys);

EXPORT_SYMBOL(pci_bus_to_hose);

EXPORT_SYMBOL(pci_resource_to_bus);

EXPORT_SYMBOL(pci_phys_to_bus);

EXPORT_SYMBOL(pci_bus_to_phys);

#endif /* CONFIG_PCI */



#ifdef CONFIG_NOT_COHERENT_CACHE

EXPORT_SYMBOL(flush_dcache_all);

#endif



EXPORT_SYMBOL(start_thread);

EXPORT_SYMBOL(kernel_thread);



EXPORT_SYMBOL(flush_instruction_cache);

EXPORT_SYMBOL(giveup_fpu);

#ifdef CONFIG_PPC64

EXPORT_SYMBOL(__flush_icache_range);

#else

EXPORT_SYMBOL(flush_icache_range);

#endif

EXPORT_SYMBOL(flush_dcache_range);

EXPORT_SYMBOL(flush_icache_user_range);

EXPORT_SYMBOL(flush_dcache_page);

EXPORT_SYMBOL(flush_tlb_kernel_range);

EXPORT_SYMBOL(flush_tlb_page);

EXPORT_SYMBOL(_tlbie);

#ifdef CONFIG_ALTIVEC

EXPORT_SYMBOL(last_task_used_altivec);

EXPORT_SYMBOL(giveup_altivec);

#endif /* CONFIG_ALTIVEC */

#ifdef CONFIG_SPE

EXPORT_SYMBOL(last_task_used_spe);

EXPORT_SYMBOL(giveup_spe);

#endif /* CONFIG_SPE */

#ifdef CONFIG_SMP

EXPORT_SYMBOL(smp_call_function);

EXPORT_SYMBOL(smp_hw_index);

#endif



EXPORT_SYMBOL(ppc_md);



#ifdef CONFIG_ADB

EXPORT_SYMBOL(adb_request);

EXPORT_SYMBOL(adb_register);

EXPORT_SYMBOL(adb_unregister);

EXPORT_SYMBOL(adb_poll);

EXPORT_SYMBOL(adb_try_handler_change);

#endif /* CONFIG_ADB */

#ifdef CONFIG_ADB_CUDA

EXPORT_SYMBOL(cuda_request);

EXPORT_SYMBOL(cuda_poll);

#endif /* CONFIG_ADB_CUDA */

#ifdef CONFIG_PPC_MULTIPLATFORM

EXPORT_SYMBOL(_machine);

#endif

#ifdef CONFIG_PPC_PMAC

EXPORT_SYMBOL(sys_ctrler);

EXPORT_SYMBOL(pmac_newworld);

#endif

#ifdef CONFIG_PPC_OF

EXPORT_SYMBOL(find_devices);

EXPORT_SYMBOL(find_type_devices);

EXPORT_SYMBOL(find_compatible_devices);

EXPORT_SYMBOL(find_path_device);

EXPORT_SYMBOL(device_is_compatible);

EXPORT_SYMBOL(machine_is_compatible);

EXPORT_SYMBOL(find_all_nodes);

EXPORT_SYMBOL(get_property);

EXPORT_SYMBOL(request_OF_resource);

EXPORT_SYMBOL(release_OF_resource);

EXPORT_SYMBOL(pci_busdev_to_OF_node);

EXPORT_SYMBOL(pci_device_to_OF_node);

EXPORT_SYMBOL(pci_device_from_OF_node);

EXPORT_SYMBOL(of_find_node_by_name);

EXPORT_SYMBOL(of_find_node_by_type);

EXPORT_SYMBOL(of_find_compatible_node);

EXPORT_SYMBOL(of_find_node_by_path);

EXPORT_SYMBOL(of_find_all_nodes);

EXPORT_SYMBOL(of_get_parent);

EXPORT_SYMBOL(of_get_next_child);

EXPORT_SYMBOL(of_node_get);

EXPORT_SYMBOL(of_node_put);

#endif /* CONFIG_PPC_OF */

#if defined(CONFIG_BOOTX_TEXT)

EXPORT_SYMBOL(btext_update_display);

#endif

#if defined(CONFIG_SCSI) && defined(CONFIG_PPC_PMAC)

EXPORT_SYMBOL(note_scsi_host);

#endif

#ifdef CONFIG_VT

EXPORT_SYMBOL(kd_mksound);

#endif

EXPORT_SYMBOL(to_tm);



EXPORT_SYMBOL(pm_power_off);



EXPORT_SYMBOL(__ashrdi3);

EXPORT_SYMBOL(__ashldi3);

EXPORT_SYMBOL(__lshrdi3);

EXPORT_SYMBOL(memcpy);

EXPORT_SYMBOL(cacheable_memcpy);

EXPORT_SYMBOL(memset);

EXPORT_SYMBOL(memmove);

EXPORT_SYMBOL(memscan);

EXPORT_SYMBOL(memcmp);

EXPORT_SYMBOL(memchr);



#if defined(CONFIG_FB_VGA16_MODULE)

EXPORT_SYMBOL(screen_info);

#endif



EXPORT_SYMBOL(__delay);

EXPORT_SYMBOL(timer_interrupt);

EXPORT_SYMBOL(irq_desc);

EXPORT_SYMBOL(tb_ticks_per_jiffy);

EXPORT_SYMBOL(get_wchan);

EXPORT_SYMBOL(console_drivers);



#ifdef CONFIG_PPC_ISERIES

EXPORT_SYMBOL(local_irq_disable);

EXPORT_SYMBOL(local_irq_enable);

EXPORT_SYMBOL(local_get_flags);

#endif



#ifdef CONFIG_XMON

EXPORT_SYMBOL(xmon);

EXPORT_SYMBOL(xmon_printf);

#endif

EXPORT_SYMBOL(__up);

EXPORT_SYMBOL(__down);

EXPORT_SYMBOL(__down_interruptible);



#if defined(CONFIG_KGDB) || defined(CONFIG_XMON)

extern void (*debugger)(struct pt_regs *regs);

extern int (*debugger_bpt)(struct pt_regs *regs);

extern int (*debugger_sstep)(struct pt_regs *regs);

extern int (*debugger_iabr_match)(struct pt_regs *regs);

extern int (*debugger_dabr_match)(struct pt_regs *regs);

extern void (*debugger_fault_handler)(struct pt_regs *regs);



EXPORT_SYMBOL(debugger);

EXPORT_SYMBOL(debugger_bpt);

EXPORT_SYMBOL(debugger_sstep);

EXPORT_SYMBOL(debugger_iabr_match);

EXPORT_SYMBOL(debugger_dabr_match);

EXPORT_SYMBOL(debugger_fault_handler);

#endif



#ifdef  CONFIG_8xx

EXPORT_SYMBOL(cpm_install_handler);

EXPORT_SYMBOL(cpm_free_handler);

#endif /* CONFIG_8xx */

#if defined(CONFIG_8xx) || defined(CONFIG_40x) || defined(CONFIG_85xx) ||\

	defined(CONFIG_83xx)

EXPORT_SYMBOL(__res);

#endif



EXPORT_SYMBOL(next_mmu_context);

EXPORT_SYMBOL(set_context);

EXPORT_SYMBOL_GPL(__handle_mm_fault); /* For MOL */

EXPORT_SYMBOL(disarm_decr);

#ifdef CONFIG_PPC_STD_MMU

extern long mol_trampoline;

EXPORT_SYMBOL(mol_trampoline); /* For MOL */

EXPORT_SYMBOL(flush_hash_pages); /* For MOL */

#ifdef CONFIG_SMP

extern int mmu_hash_lock;

EXPORT_SYMBOL(mmu_hash_lock); /* For MOL */

#endif /* CONFIG_SMP */

extern long *intercept_table;

EXPORT_SYMBOL(intercept_table);

#endif /* CONFIG_PPC_STD_MMU */

EXPORT_SYMBOL(cur_cpu_spec);

#ifdef CONFIG_PPC_PMAC

extern unsigned long agp_special_page;

EXPORT_SYMBOL(agp_special_page);

#endif

#if defined(CONFIG_40x) || defined(CONFIG_BOOKE)

EXPORT_SYMBOL(__mtdcr);

EXPORT_SYMBOL(__mfdcr);

#endif

arch/powerpc/kernel/process.c

+2 −0
Original line number Diff line number Diff line
@@ -601,6 +601,8 @@ int sys_execve(unsigned long a0, unsigned long a1, unsigned long a2, 
	flush_fp_to_thread(current);

	flush_altivec_to_thread(current);

	flush_spe_to_thread(current);

	error = do_execve(filename, (char __user * __user *) a1,

			  (char __user * __user *) a2, regs);

	if (error == 0) {

		task_lock(current);

		current->ptrace &= ~PT_DTRACE;

arch/powerpc/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ void __init MMU_init(void) 
	if (boot_mem_size)

		total_memory = boot_mem_size;

	else

		total_memory = ppc_md.find_end_of_memory();

		total_memory = find_end_of_memory();



	if (__max_memory && total_memory > __max_memory)

		total_memory = __max_memory;

arch/powerpc/platforms/powermac/pmac_pic.c

+17 −0
Original line number Diff line number Diff line
@@ -424,6 +424,8 @@ void __init pmac_pic_init(void) 


		printk(KERN_INFO "PowerMac using OpenPIC irq controller at 0x%08x\n",

		       (unsigned int)irqctrler->addrs[0].address);

		ppc_md.get_irq = mpic_get_irq;

		pmac_call_feature(PMAC_FTR_ENABLE_MPIC, irqctrler, 0, 0);



		prom_get_irq_senses(senses, 0, 128);

		mpic1 = mpic_alloc(irqctrler->addrs[0].address,
@@ -452,7 +454,22 @@ void __init pmac_pic_init(void) 
			mpic_setup_cascade(irqctrler2->intrs[0].line,

					   pmac_u3_cascade, mpic2);

		}

#ifdef CONFIG_XMON

		{

			struct device_node* pswitch;

			int nmi_irq;



			pswitch = find_devices("programmer-switch");

			if (pswitch && pswitch->n_intrs) {

				nmi_irq = pswitch->intrs[0].line;

				openpic_init_nmi_irq(nmi_irq);

				setup_irq(nmi_irq, &xmon_action);

			}

		}

#endif	/* CONFIG_XMON */

		return;

	}

	irqctrler = NULL;



	/* Get the level/edge settings, assume if it's not

	 * a Grand Central nor an OHare, then it's an Heathrow