Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

14d1adfc · Linus Torvalds <[email protected]> · 2006-09-22 12:48:03 -07:00

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (114 commits)
  [POWERPC] Fix ohare IDE irq workaround on old powermacs
  [POWERPC] EEH: Power4 systems sometimes need multiple resets.
  [POWERPC] Include <asm/mmu.h> in arch/powerpc/sysdev/fsl_soc.h for phys_addr_t.
  [POWERPC] Demacrofy arch/powerpc/platforms/maple/pci.c
  [POWERPC] Maple U3 HT - reject inappropriate config space access
  [POWERPC] Fix IPIC pending register assignments
  [POWERPC] powerpc: fix building gdb against asm/ptrace.h
  [POWERPC] Remove DISCONTIGMEM cruft from page.h
  [POWERPC] Merge iSeries i/o operations with the rest
  [POWERPC] 40x: Fix debug status register defines
  [POWERPC] Fix compile error in sbc8560
  [POWERPC] EEH: support MMIO enable recovery step
  [POWERPC] EEH: enable MMIO/DMA on frozen slot
  [POWERPC] EEH: code comment cleanup
  [POWERPC] EEH: balance pcidev_get/put calls
  [POWERPC] PPC: Fix xmon stack frame address in backtrace
  [POWERPC] Add AT_PLATFORM value for Xilinx Virtex-4 FX
  [POWERPC] Start arch/powerpc/boot code reorganization
  [POWERPC] Define of_read_ulong helper
  [POWERPC] iseries: eliminate a couple of warnings
  ...

Commit: 14d1adfc59ba66932ef167fdff62983e7c2b0197
Parents: e478bec0 · 69917c26

Merge commit. Changes below are compared with the first parent: e478bec0.

Changes

219 files changed · +4351 −2459

File	Status	Add	Del	Content
MAINTAINERS	modified	+7	−0	View file
arch/powerpc/Kconfig	modified	+13	−1	View file
arch/powerpc/Kconfig.debug	modified	+16	−0	View file
arch/powerpc/boot/Makefile	modified	+6	−1	View file
arch/powerpc/boot/dts/mpc8349emds.dts	modified	+8	−8	View file
arch/powerpc/boot/flatdevtree.h	added	+46	−0	View file
arch/powerpc/boot/main.c	modified	+129	−121	View file
arch/powerpc/boot/prom.c → arch/powerpc/boot/of.c	renamed	+131	−13	View file
arch/powerpc/boot/ops.h	added	+100	−0	View file
arch/powerpc/boot/prom.h	deleted	+0	−41	View before deletion
arch/powerpc/boot/stdio.c	modified	+2	−2	View file
arch/powerpc/boot/stdio.h	modified	+8	−0	View file
arch/powerpc/boot/types.h	added	+23	−0	View file
arch/powerpc/configs/maple_defconfig	modified	+1	−1	View file
arch/powerpc/kernel/Makefile	modified	+2	−2	View file
arch/powerpc/kernel/asm-offsets.c	modified	+16	−1	View file
arch/powerpc/kernel/btext.c	modified	+12	−12	View file
arch/powerpc/kernel/cpu_setup_power4.S → arch/powerpc/kernel/cpu_setup_ppc970.S	renamed	+26	−77	View file
arch/powerpc/kernel/cputable.c	modified	+21	−0	View file
arch/powerpc/kernel/crash_dump.c	modified	+1	−1	View file
arch/powerpc/kernel/dma_64.c	modified	+28	−37	View file
arch/powerpc/kernel/entry_64.S	modified	+8	−0	View file
arch/powerpc/kernel/head_64.S	modified	+34	−20	View file
arch/powerpc/kernel/ibmebus.c	modified	+3	−3	View file
arch/powerpc/kernel/io.c	added	+131	−0	View file
arch/powerpc/kernel/irq.c	modified	+5	−0	View file
arch/powerpc/kernel/legacy_serial.c	modified	+18	−17	View file
arch/powerpc/kernel/lparcfg.c	modified	+19	−11	View file
arch/powerpc/kernel/machine_kexec_64.c	modified	+4	−6	View file
arch/powerpc/kernel/misc.S	modified	+0	−159	View file
arch/powerpc/kernel/of_device.c	modified	+0	−24	View file
arch/powerpc/kernel/paca.c	modified	+14	−1	View file
arch/powerpc/kernel/pci_32.c	modified	+21	−18	View file
arch/powerpc/kernel/pci_64.c	modified	+16	−51	View file
arch/powerpc/kernel/pci_dn.c	modified	+7	−6	View file
arch/powerpc/kernel/ppc_ksyms.c	modified	+2	−17	View file
arch/powerpc/kernel/prom.c	modified	+14	−30	View file
arch/powerpc/kernel/prom_init.c	modified	+8	−2	View file
arch/powerpc/kernel/prom_parse.c	modified	+47	−43	View file
arch/powerpc/kernel/rtas-proc.c	modified	+13	−12	View file
arch/powerpc/kernel/rtas.c	modified	+28	−19	View file
arch/powerpc/kernel/rtas_pci.c	modified	+13	−15	View file
arch/powerpc/kernel/setup-common.c	modified	+18	−14	View file
arch/powerpc/kernel/setup_64.c	modified	+11	−12	View file
arch/powerpc/kernel/sysfs.c	modified	+4	−5	View file
arch/powerpc/kernel/time.c	modified	+3	−5	View file
arch/powerpc/kernel/traps.c	modified	+25	−0	View file
arch/powerpc/kernel/vio.c	modified	+8	−8	View file
arch/powerpc/lib/Makefile	modified	+0	−1	View file
arch/powerpc/lib/e2a.c	deleted	+0	−116	View before deletion
arch/powerpc/lib/locks.c	modified	+13	−14	View file
arch/powerpc/mm/numa.c	modified	+14	−17	View file
arch/powerpc/mm/slb.c	modified	+33	−4	View file
arch/powerpc/mm/tlb_64.c	modified	+1	−0	View file
arch/powerpc/platforms/83xx/mpc834x_itx.c	modified	+2	−2	View file
arch/powerpc/platforms/83xx/mpc834x_sys.c	modified	+2	−2	View file
arch/powerpc/platforms/83xx/pci.c	modified	+2	−2	View file
arch/powerpc/platforms/85xx/mpc85xx_ads.c	modified	+2	−2	View file
arch/powerpc/platforms/85xx/mpc85xx_cds.c	modified	+2	−2	View file
arch/powerpc/platforms/85xx/pci.c	modified	+2	−2	View file
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c	modified	+2	−2	View file
arch/powerpc/platforms/86xx/pci.c	modified	+2	−2	View file
arch/powerpc/platforms/Makefile	modified	+1	−0	View file
arch/powerpc/platforms/cell/cbe_regs.c	modified	+3	−5	View file
arch/powerpc/platforms/cell/interrupt.c	modified	+12	−13	View file
arch/powerpc/platforms/cell/iommu.c	modified	+12	−10	View file
arch/powerpc/platforms/cell/setup.c	modified	+0	−4	View file
arch/powerpc/platforms/cell/smp.c	modified	+2	−2	View file
arch/powerpc/platforms/cell/spider-pic.c	modified	+5	−5	View file
arch/powerpc/platforms/cell/spu_base.c	modified	+9	−9	View file
arch/powerpc/platforms/chrp/nvram.c	modified	+3	−2	View file
arch/powerpc/platforms/chrp/pci.c	modified	+43	−10	View file
arch/powerpc/platforms/chrp/setup.c	modified	+35	−13	View file
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c	modified	+4	−4	View file
arch/powerpc/platforms/iseries/Kconfig	modified	+6	−2	View file
arch/powerpc/platforms/iseries/dt.c	modified	+42	−3	View file
arch/powerpc/platforms/iseries/hvlpconfig.c	modified	+13	−0	View file
arch/powerpc/platforms/iseries/iommu.c	modified	+18	−1	View file
include/asm-powerpc/iseries/it_exp_vpd_panel.h → arch/powerpc/platforms/iseries/it_exp_vpd_panel.h	renamed	+3	−3	View file
include/asm-powerpc/iseries/it_lp_naca.h → arch/powerpc/platforms/iseries/it_lp_naca.h	renamed	+3	−3	View file
arch/powerpc/platforms/iseries/lpardata.c	modified	+2	−4	View file
arch/powerpc/platforms/iseries/lpevents.c	modified	+1	−1	View file
arch/powerpc/platforms/iseries/main_store.h	modified	+63	−63	View file
arch/powerpc/platforms/iseries/pci.c	modified	+232	−57	View file
arch/powerpc/platforms/iseries/setup.c	modified	+1	−0	View file
arch/powerpc/platforms/iseries/viopath.c	modified	+18	−10	View file
arch/powerpc/platforms/iseries/vpdinfo.c	modified	+13	−9	View file
arch/powerpc/platforms/maple/pci.c	modified	+42	−28	View file
arch/powerpc/platforms/maple/setup.c	modified	+10	−17	View file
arch/powerpc/platforms/pasemi/Makefile	added	+1	−0	View file
arch/powerpc/platforms/pasemi/pasemi.h	added	+8	−0	View file
arch/powerpc/platforms/pasemi/pci.c	added	+198	−0	View file
arch/powerpc/platforms/pasemi/setup.c	added	+188	−0	View file
arch/powerpc/platforms/pasemi/time.c	added	+29	−0	View file
arch/powerpc/platforms/powermac/backlight.c	modified	+2	−1	View file
arch/powerpc/platforms/powermac/cpufreq_32.c	modified	+12	−11	View file
arch/powerpc/platforms/powermac/cpufreq_64.c	modified	+14	−13	View file
arch/powerpc/platforms/powermac/feature.c	modified	+15	−15	View file
arch/powerpc/platforms/powermac/low_i2c.c	modified	+12	−12	View file
arch/powerpc/platforms/powermac/pci.c	modified	+20	−17	View file
arch/powerpc/platforms/powermac/pfunc_base.c	modified	+1	−1	View file
arch/powerpc/platforms/powermac/pfunc_core.c	modified	+3	−2	View file
arch/powerpc/platforms/powermac/setup.c	modified	+8	−10	View file
arch/powerpc/platforms/powermac/smp.c	modified	+3	−4	View file
arch/powerpc/platforms/powermac/udbg_scc.c	modified	+5	−5	View file
arch/powerpc/platforms/pseries/Makefile	modified	+1	−0	View file
arch/powerpc/platforms/pseries/eeh.c	modified	+73	−23	View file
arch/powerpc/platforms/pseries/eeh_cache.c	modified	+2	−15	View file
arch/powerpc/platforms/pseries/eeh_driver.c	modified	+87	−25	View file
arch/powerpc/platforms/pseries/eeh_event.c	modified	+2	−2	View file
arch/powerpc/platforms/pseries/firmware.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/hvCall.S	modified	+104	−169	View file
arch/powerpc/platforms/pseries/hvCall_inst.c	added	+129	−0	View file
arch/powerpc/platforms/pseries/hvconsole.c	modified	+3	−2	View file
arch/powerpc/platforms/pseries/iommu.c	modified	+6	−7	View file
arch/powerpc/platforms/pseries/lpar.c	modified	+29	−17	View file
arch/powerpc/platforms/pseries/nvram.c	modified	+3	−2	View file
arch/powerpc/platforms/pseries/pci.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/plpar_wrappers.h	modified	+90	−17	View file
arch/powerpc/platforms/pseries/ras.c	modified	+2	−2	View file
arch/powerpc/platforms/pseries/rtasd.c	modified	+2	−2	View file
arch/powerpc/platforms/pseries/setup.c	modified	+28	−14	View file
arch/powerpc/platforms/pseries/smp.c	modified	+6	−6	View file
arch/powerpc/platforms/pseries/xics.c	modified	+12	−32	View file
arch/powerpc/sysdev/fsl_soc.c	modified	+14	−14	View file
arch/powerpc/sysdev/fsl_soc.h	modified	+2	−0	View file
arch/powerpc/sysdev/i8259.c	modified	+1	−1	View file
arch/powerpc/sysdev/ipic.c	modified	+21	−21	View file
arch/powerpc/sysdev/mmio_nvram.c	modified	+2	−2	View file
arch/powerpc/sysdev/tsi108_pci.c	modified	+2	−2	View file
arch/powerpc/xmon/xmon.c	modified	+10	−0	View file
arch/ppc/Kconfig	modified	+3	−3	View file
arch/ppc/kernel/misc.S	modified	+0	−88	View file
arch/ppc/kernel/ppc_ksyms.c	modified	+0	−9	View file
arch/ppc/kernel/setup.c	modified	+12	−5	View file
arch/ppc/platforms/85xx/sbc8560.h	modified	+1	−0	View file
arch/ppc/platforms/85xx/sbc85xx.h	modified	+18	−0	View file
arch/ppc/syslib/m8260_pci_erratum9.c	modified	+0	−16	View file
arch/ppc/xmon/start.c	modified	+18	−10	View file
arch/ppc/xmon/xmon.c	modified	+21	−7	View file
drivers/char/Kconfig	modified	+22	−0	View file
drivers/char/Makefile	modified	+2	−0	View file
drivers/char/agp/uninorth-agp.c	modified	+2	−2	View file
drivers/char/briq_panel.c	added	+268	−0	View file
drivers/char/hvc_console.c	modified	+10	−8	View file
drivers/char/hvc_console.h	modified	+1	−1	View file
drivers/char/hvc_iseries.c	added	+594	−0	View file
drivers/char/hvc_rtas.c	modified	+1	−1	View file
drivers/char/hvc_vio.c	modified	+4	−3	View file
drivers/char/hvsi.c	modified	+3	−4	View file
drivers/char/tpm/tpm_atmel.h	modified	+2	−2	View file
drivers/char/viocons.c	modified	+1	−30	View file
drivers/char/viotape.c	modified	+2	−4	View file
drivers/i2c/busses/i2c-powermac.c	modified	+2	−1	View file
drivers/ide/ppc/pmac.c	modified	+4	−4	View file
drivers/macintosh/macio_asic.c	modified	+6	−4	View file
drivers/macintosh/macio_sysfs.c	modified	+4	−4	View file
drivers/macintosh/smu.c	modified	+9	−10	View file
drivers/macintosh/therm_adt746x.c	modified	+4	−4	View file
drivers/macintosh/therm_pm72.c	modified	+7	−7	View file
drivers/macintosh/therm_windtunnel.c	modified	+2	−2	View file
drivers/macintosh/via-cuda.c	modified	+2	−2	View file
drivers/macintosh/via-pmu-led.c	modified	+1	−1	View file
drivers/macintosh/via-pmu.c	modified	+5	−5	View file
drivers/macintosh/windfarm_pm81.c	modified	+2	−2	View file
drivers/macintosh/windfarm_pm91.c	modified	+1	−1	View file
drivers/macintosh/windfarm_smu_controls.c	modified	+7	−6	View file
drivers/macintosh/windfarm_smu_sat.c	modified	+4	−4	View file
drivers/macintosh/windfarm_smu_sensors.c	modified	+6	−6	View file
drivers/net/bmac.c	modified	+8	−5	View file
drivers/net/ibmveth.c	modified	+2	−1	View file
drivers/net/ibmveth.h	modified	+15	−12	View file
drivers/net/mace.c	modified	+1	−1	View file
drivers/net/spider_net.c	modified	+6	−6	View file
drivers/net/sungem.c	modified	+1	−1	View file
drivers/pci/hotplug/rpaphp_core.c	modified	+16	−16	View file
drivers/scsi/ibmvscsi/rpa_vscsi.c	modified	+4	−7	View file
drivers/scsi/mac53c94.c	modified	+1	−1	View file
drivers/scsi/mesh.c	modified	+3	−2	View file
drivers/scsi/sata_svw.c	modified	+1	−1	View file
drivers/serial/pmac_zilog.c	modified	+5	−4	View file
drivers/video/S3triofb.c	modified	+6	−6	View file
drivers/video/aty/radeon_base.c	modified	+4	−4	View file
drivers/video/aty/radeon_monitor.c	modified	+6	−6	View file
drivers/video/aty/radeon_pm.c	modified	+2	−2	View file
drivers/video/nvidia/nv_of.c	modified	+5	−7	View file
drivers/video/offb.c	modified	+11	−11	View file
drivers/video/riva/fbdev.c	modified	+2	−3	View file
include/asm-powerpc/cputable.h	modified	+18	−9	View file
include/asm-powerpc/hvcall.h	modified	+42	−79	View file
include/asm-powerpc/ibmebus.h	modified	+1	−1	View file
include/asm-powerpc/ide.h	modified	+6	−6	View file
include/asm-powerpc/io.h	modified	+84	−99	View file
include/asm-powerpc/irq.h	modified	+12	−12	View file
include/asm-powerpc/iseries/hv_call_xm.h	modified	+0	−17	View file
include/asm-powerpc/iseries/hv_lp_config.h	modified	+2	−11	View file
include/asm-powerpc/iseries/iseries_io.h	deleted	+0	−60	View before deletion
include/asm-powerpc/iseries/it_lp_queue.h	modified	+0	−2	View file
include/asm-powerpc/iseries/vio.h	modified	+28	−0	View file
include/asm-powerpc/lppaca.h	modified	+21	−2	View file
include/asm-powerpc/paca.h	modified	+3	−0	View file
include/asm-powerpc/page.h	modified	+0	−6	View file
include/asm-powerpc/ppc-pci.h	modified	+11	−0	View file
include/asm-powerpc/processor.h	modified	+1	−0	View file
include/asm-powerpc/prom.h	modified	+25	−15	View file
include/asm-powerpc/ptrace.h	modified	+0	−4	View file
include/asm-powerpc/reg.h	modified	+1	−0	View file
include/asm-powerpc/rtas.h	modified	+16	−0	View file
include/asm-powerpc/smu.h	modified	+1	−1	View file
include/asm-powerpc/spu.h	modified	+1	−1	View file
include/asm-powerpc/system.h	modified	+0	−5	View file
include/asm-powerpc/vio.h	modified	+2	−2	View file
include/asm-ppc/io.h	modified	+6	−20	View file
include/asm-ppc/mpc8260_pci9.h	modified	+0	−4	View file
include/asm-ppc/reg_booke.h	modified	+8	−8	View file
scripts/checkstack.pl	modified	+2	−0	View file
sound/aoa/core/snd-aoa-gpio-feature.c	modified	+1	−1	View file
sound/oss/dmasound/dmasound_awacs.c	modified	+6	−5	View file
sound/ppc/tumbler.c	modified	+8	−7	View file

Only the first 600 diff lines are shown. Download the complete patch.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index a34c53c..11b59d2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1783,6 +1783,13 @@ W:     http://www.penguinppc.org/
 L:     [email protected]
 S:     Maintained
 
+LINUX FOR POWERPC PA SEMI PWRFICIENT
+P:	Olof Johansson
+M:	[email protected]
+W:	http://www.pasemi.com/
+L:	[email protected]
+S:	Supported
+
 LLC (802.2)
 P:	Arnaldo Carvalho de Melo
 M:	[email protected]

arch/powerpc/Kconfig

View file

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 694b0c6..de1ef2f 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -417,6 +417,17 @@ config PPC_MAPLE
           This option enables support for the Maple 970FX Evaluation Board.
 	  For more informations, refer to <http://www.970eval.com>
 
+config PPC_PASEMI
+	depends on PPC_MULTIPLATFORM && PPC64
+	bool "PA Semi SoC-based platforms"
+	default n
+	select MPIC
+	select PPC_UDBG_16550
+	select GENERIC_TBSYNC
+	help
+	  This option enables support for PA Semi's PWRficient line
+	  of SoC processors, including PA6T-1682M
+
 config PPC_CELL
 	bool
 	default n
@@ -436,7 +447,8 @@ config PPC_IBM_CELL_BLADE
 	select UDBG_RTAS_CONSOLE
 
 config UDBG_RTAS_CONSOLE
-	bool
+	bool "RTAS based debug console"
+	depends on PPC_RTAS
 	default n
 
 config XICS

arch/powerpc/Kconfig.debug

View file

diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index e29ef77..5ad149b 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -18,6 +18,20 @@ config DEBUG_STACK_USAGE
 
 	  This option will slow down process creation somewhat.
 
+config HCALL_STATS
+	bool "Hypervisor call instrumentation"
+	depends on PPC_PSERIES && DEBUG_FS
+	help
+	  Adds code to keep track of the number of hypervisor calls made and
+	  the amount of time spent in hypervisor callsr.  Wall time spent in
+	  each call is always calculated, and if available CPU cycles spent
+	  are also calculated.  A directory named hcall_inst is added at the
+	  root of the debugfs filesystem.  Within the hcall_inst directory
+	  are files that contain CPU specific call statistics.
+
+	  This option will add a small amount of overhead to all hypervisor
+	  calls.
+
 config DEBUGGER
 	bool "Enable debugger hooks"
 	depends on DEBUG_KERNEL
@@ -74,6 +88,8 @@ config XMON
 	  very early during boot. 'xmon=on' will just enable the xmon
 	  debugger hooks.  'xmon=off' will disable the debugger hooks
 	  if CONFIG_XMON_DEFAULT is set.
+	  xmon will print a backtrace on the very first invocation.
+	  'xmon=nobt' will disable this autobacktrace.
 
 config XMON_DEFAULT
 	bool "Enable xmon by default"

arch/powerpc/boot/Makefile

View file

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index d961bfe..e737741 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -36,11 +36,16 @@ zliblinuxheader := zlib.h zconf.h zutil.h
 $(addprefix $(obj)/,$(zlib) main.o): $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
 #$(addprefix $(obj)/,main.o): $(addprefix $(obj)/,zlib.h)
 
-src-boot := crt0.S string.S prom.c stdio.c main.c div64.S
+src-boot-$(CONFIG_PPC_MULTIPLATFORM) := of.c
+src-boot := crt0.S string.S stdio.c main.c div64.S $(src-boot-y)
 src-boot += $(zlib)
 src-boot := $(addprefix $(obj)/, $(src-boot))
 obj-boot := $(addsuffix .o, $(basename $(src-boot)))
 
+ifeq ($(call cc-option-yn, -fstack-protector),y)
+BOOTCFLAGS	+= -fno-stack-protector
+endif
+
 BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(obj)
 
 quiet_cmd_copy_zlib = COPY    $@

arch/powerpc/boot/dts/mpc8349emds.dts

View file

diff --git a/arch/powerpc/boot/dts/mpc8349emds.dts b/arch/powerpc/boot/dts/mpc8349emds.dts
index 12f5dbf..efceb34 100644
--- a/arch/powerpc/boot/dts/mpc8349emds.dts
+++ b/arch/powerpc/boot/dts/mpc8349emds.dts
@@ -214,10 +214,10 @@
 					 b800 0 0 4 700 15 8
 
 					/* IDSEL 0x18 */
-					 b000 0 0 1 700 15 8
-					 b000 0 0 2 700 16 8
-					 b000 0 0 3 700 17 8
-					 b000 0 0 4 700 14 8>;
+					 c000 0 0 1 700 15 8
+					 c000 0 0 2 700 16 8
+					 c000 0 0 3 700 17 8
+					 c000 0 0 4 700 14 8>;
 			interrupt-parent = <700>;
 			interrupts = <42 8>;
 			bus-range = <0 0>;
@@ -274,10 +274,10 @@
 					 b800 0 0 4 700 15 8
 
 					/* IDSEL 0x18 */
-					 b000 0 0 1 700 15 8
-					 b000 0 0 2 700 16 8
-					 b000 0 0 3 700 17 8
-					 b000 0 0 4 700 14 8>;
+					 c000 0 0 1 700 15 8
+					 c000 0 0 2 700 16 8
+					 c000 0 0 3 700 17 8
+					 c000 0 0 4 700 14 8>;
 			interrupt-parent = <700>;
 			interrupts = <42 8>;
 			bus-range = <0 0>;

arch/powerpc/boot/flatdevtree.h

View file

diff --git a/arch/powerpc/boot/flatdevtree.h b/arch/powerpc/boot/flatdevtree.h
new file mode 100644
index 0000000..761c8dc
--- /dev/null
+++ b/arch/powerpc/boot/flatdevtree.h
@@ -0,0 +1,46 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef FLATDEVTREE_H
+#define FLATDEVTREE_H
+
+#include "types.h"
+
+/* Definitions used by the flattened device tree */
+#define OF_DT_HEADER            0xd00dfeed      /* marker */
+#define OF_DT_BEGIN_NODE        0x1     /* Start of node, full name */
+#define OF_DT_END_NODE          0x2     /* End node */
+#define OF_DT_PROP              0x3     /* Property: name off, size, content */
+#define OF_DT_NOP               0x4     /* nop */
+#define OF_DT_END               0x9
+
+#define OF_DT_VERSION           0x10
+
+struct boot_param_header {
+	u32 magic;              /* magic word OF_DT_HEADER */
+	u32 totalsize;          /* total size of DT block */
+	u32 off_dt_struct;      /* offset to structure */
+	u32 off_dt_strings;     /* offset to strings */
+	u32 off_mem_rsvmap;     /* offset to memory reserve map */
+	u32 version;            /* format version */
+	u32 last_comp_version;  /* last compatible version */
+	/* version 2 fields below */
+	u32 boot_cpuid_phys;    /* Physical CPU id we're booting on */
+	/* version 3 fields below */
+	u32 dt_strings_size;    /* size of the DT strings block */
+};
+
+#endif /* FLATDEVTREE_H */

arch/powerpc/boot/main.c

View file

diff --git a/arch/powerpc/boot/main.c b/arch/powerpc/boot/main.c
index b66634c..d719bb9 100644
--- a/arch/powerpc/boot/main.c
+++ b/arch/powerpc/boot/main.c
@@ -14,17 +14,12 @@
 #include "page.h"
 #include "string.h"
 #include "stdio.h"
-#include "prom.h"
 #include "zlib.h"
+#include "ops.h"
+#include "flatdevtree.h"
 
 extern void flush_cache(void *, unsigned long);
 
-
-/* Value picked to match that used by yaboot */
-#define PROG_START	0x01400000	/* only used on 64-bit systems */
-#define RAM_END		(512<<20)	/* Fixme: use OF */
-#define	ONE_MB		0x100000
-
 extern char _start[];
 extern char __bss_start[];
 extern char _end[];
@@ -33,14 +28,6 @@ extern char _vmlinux_end[];
 extern char _initrd_start[];
 extern char _initrd_end[];
 
-/* A buffer that may be edited by tools operating on a zImage binary so as to
- * edit the command line passed to vmlinux (by setting /chosen/bootargs).
- * The buffer is put in it's own section so that tools may locate it easier.
- */
-static char builtin_cmdline[512]
-	__attribute__((section("__builtin_cmdline")));
-
-
 struct addr_range {
 	unsigned long addr;
 	unsigned long size;
@@ -51,21 +38,16 @@ static struct addr_range vmlinuz;
 static struct addr_range initrd;
 
 static unsigned long elfoffset;
+static int is_64bit;
 
-static char scratch[46912];	/* scratch space for gunzip, from zlib_inflate_workspacesize() */
+/* scratch space for gunzip; 46912 is from zlib_inflate_workspacesize() */
+static char scratch[46912];
 static char elfheader[256];
 
-
-typedef void (*kernel_entry_t)( unsigned long,
-                                unsigned long,
-                                void *,
-				void *);
-
+typedef void (*kernel_entry_t)(unsigned long, unsigned long, void *);
 
 #undef DEBUG
 
-static unsigned long claim_base;
-
 #define HEAD_CRC	2
 #define EXTRA_FIELD	4
 #define ORIG_NAME	8
@@ -123,24 +105,6 @@ static void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp)
 	zlib_inflateEnd(&s);
 }
 
-static unsigned long try_claim(unsigned long size)
-{
-	unsigned long addr = 0;
-
-	for(; claim_base < RAM_END; claim_base += ONE_MB) {
-#ifdef DEBUG
-		printf("    trying: 0x%08lx\n\r", claim_base);
-#endif
-		addr = (unsigned long)claim(claim_base, size, 0);
-		if ((void *)addr != (void *)-1)
-			break;
-	}
-	if (addr == 0)
-		return 0;
-	claim_base = PAGE_ALIGN(claim_base + size);
-	return addr;
-}
-
 static int is_elf64(void *hdr)
 {
 	Elf64_Ehdr *elf64 = hdr;
@@ -169,16 +133,7 @@ static int is_elf64(void *hdr)
 	vmlinux.size = (unsigned long)elf64ph->p_filesz + elfoffset;
 	vmlinux.memsize = (unsigned long)elf64ph->p_memsz + elfoffset;
 
-#if defined(PROG_START)
-	/*
-	 * Maintain a "magic" minimum address. This keeps some older
-	 * firmware platforms running.
-	 */
-
-	if (claim_base < PROG_START)
-		claim_base = PROG_START;
-#endif
-
+	is_64bit = 1;
 	return 1;
 }
 
@@ -212,47 +167,9 @@ static int is_elf32(void *hdr)
 	return 1;
 }
 
-void export_cmdline(void* chosen_handle)
-{
-        int len;
-        char cmdline[2] = { 0, 0 };
-
-	if (builtin_cmdline[0] == 0)
-		return;
-
-        len = getprop(chosen_handle, "bootargs", cmdline, sizeof(cmdline));
-        if (len > 0 && cmdline[0] != 0)
-		return;
-
-	setprop(chosen_handle, "bootargs", builtin_cmdline,
-		strlen(builtin_cmdline) + 1);
-}
-
-
-void start(unsigned long a1, unsigned long a2, void *promptr, void *sp)
+static void prep_kernel(unsigned long *a1, unsigned long *a2)
 {
 	int len;
-	kernel_entry_t kernel_entry;
-
-	memset(__bss_start, 0, _end - __bss_start);
-
-	prom = (int (*)(void *)) promptr;
-	chosen_handle = finddevice("/chosen");
-	if (chosen_handle == (void *) -1)
-		exit();
-	if (getprop(chosen_handle, "stdout", &stdout, sizeof(stdout)) != 4)
-		exit();
-
-	printf("\n\rzImage starting: loaded at 0x%p (sp: 0x%p)\n\r", _start, sp);
-
-	/*
-	 * The first available claim_base must be above the end of the
-	 * the loaded kernel wrapper file (_start to _end includes the
-	 * initrd image if it is present) and rounded up to a nice
-	 * 1 MB boundary for good measure.
-	 */
-
-	claim_base = _ALIGN_UP((unsigned long)_end, ONE_MB);
 
 	vmlinuz.addr = (unsigned long)_vmlinux_start;
 	vmlinuz.size = (unsigned long)(_vmlinux_end - _vmlinux_start);
@@ -263,43 +180,51 @@ void start(unsigned long a1, unsigned long a2, void *promptr, void *sp)
 		gunzip(elfheader, sizeof(elfheader),
 				(unsigned char *)vmlinuz.addr, &len);
 	} else
-		memcpy(elfheader, (const void *)vmlinuz.addr, sizeof(elfheader));
+		memcpy(elfheader, (const void *)vmlinuz.addr,
+		       sizeof(elfheader));
 
 	if (!is_elf64(elfheader) && !is_elf32(elfheader)) {
 		printf("Error: not a valid PPC32 or PPC64 ELF file!\n\r");
 		exit();
 	}
+	if (platform_ops.image_hdr)
+		platform_ops.image_hdr(elfheader);
 
-	/* We need to claim the memsize plus the file offset since gzip
+	/* We need to alloc the memsize plus the file offset since gzip
 	 * will expand the header (file offset), then the kernel, then
 	 * possible rubbish we don't care about. But the kernel bss must
 	 * be claimed (it will be zero'd by the kernel itself)
 	 */
 	printf("Allocating 0x%lx bytes for kernel ...\n\r", vmlinux.memsize);
-	vmlinux.addr = try_claim(vmlinux.memsize);
+	vmlinux.addr = (unsigned long)malloc(vmlinux.memsize);
 	if (vmlinux.addr == 0) {
 		printf("Can't allocate memory for kernel image !\n\r");
 		exit();
 	}
 
 	/*
-	 * Now we try to claim memory for the initrd (and copy it there)
+	 * Now we try to alloc memory for the initrd (and copy it there)
 	 */
 	initrd.size = (unsigned long)(_initrd_end - _initrd_start);
 	initrd.memsize = initrd.size;
 	if ( initrd.size > 0 ) {
-		printf("Allocating 0x%lx bytes for initrd ...\n\r", initrd.size);
-		initrd.addr = try_claim(initrd.size);
+		printf("Allocating 0x%lx bytes for initrd ...\n\r",
+		       initrd.size);
+		initrd.addr = (unsigned long)malloc((u32)initrd.size);
 		if (initrd.addr == 0) {
-			printf("Can't allocate memory for initial ramdisk !\n\r");
+			printf("Can't allocate memory for initial "
+					"ramdisk !\n\r");
 			exit();
 		}
-		a1 = initrd.addr;
-		a2 = initrd.size;
-		printf("initial ramdisk moving 0x%lx <- 0x%lx (0x%lx bytes)\n\r",
-		       initrd.addr, (unsigned long)_initrd_start, initrd.size);
-		memmove((void *)initrd.addr, (void *)_initrd_start, initrd.size);
-		printf("initrd head: 0x%lx\n\r", *((unsigned long *)initrd.addr));
+		*a1 = initrd.addr;
+		*a2 = initrd.size;
+		printf("initial ramdisk moving 0x%lx <- 0x%lx "
+			"(0x%lx bytes)\n\r", initrd.addr,
+			(unsigned long)_initrd_start, initrd.size);
+		memmove((void *)initrd.addr, (void *)_initrd_start,
+			initrd.size);
+		printf("initrd head: 0x%lx\n\r",
+				*((unsigned long *)initrd.addr));
 	}
 
 	/* Eventually gunzip the kernel */
@@ -311,11 +236,10 @@ void start(unsigned long a1, unsigned long a2, void *promptr, void *sp)
 			(unsigned char *)vmlinuz.addr, &len);
 		printf("done 0x%lx bytes\n\r", len);
 	} else {
-		memmove((void *)vmlinux.addr,(void *)vmlinuz.addr,vmlinuz.size);
+		memmove((void *)vmlinux.addr,(void *)vmlinuz.addr,
+			vmlinuz.size);
 	}
 
-	export_cmdline(chosen_handle);
-
 	/* Skip over the ELF header */
 #ifdef DEBUG
 	printf("... skipping 0x%lx bytes of ELF header\n\r",
@@ -324,23 +248,107 @@ void start(unsigned long a1, unsigned long a2, void *promptr, void *sp)
 	vmlinux.addr += elfoffset;
 
 	flush_cache((void *)vmlinux.addr, vmlinux.size);
+}
 
-	kernel_entry = (kernel_entry_t)vmlinux.addr;
-#ifdef DEBUG
-	printf( "kernel:\n\r"
-		"        entry addr = 0x%lx\n\r"
-		"        a1         = 0x%lx,\n\r"
-		"        a2         = 0x%lx,\n\r"
-		"        prom       = 0x%lx,\n\r"
-		"        bi_recs    = 0x%lx,\n\r",
-		(unsigned long)kernel_entry, a1, a2,
-		(unsigned long)prom, NULL);
-#endif
+void __attribute__ ((weak)) ft_init(void *dt_blob)
+{
+}
 
-	kernel_entry(a1, a2, prom, NULL);
+/* A buffer that may be edited by tools operating on a zImage binary so as to
+ * edit the command line passed to vmlinux (by setting /chosen/bootargs).
+ * The buffer is put in it's own section so that tools may locate it easier.
+ */
+static char builtin_cmdline[COMMAND_LINE_SIZE]
+	__attribute__((__section__("__builtin_cmdline")));
 
-	printf("Error: Linux kernel returned to zImage bootloader!\n\r");
+static void get_cmdline(char *buf, int size)
+{
+	void *devp;
+	int len = strlen(builtin_cmdline);
 
-	exit();
+	buf[0] = '\0';
+
+	if (len > 0) { /* builtin_cmdline overrides dt's /chosen/bootargs */
+		len = min(len, size-1);
+		strncpy(buf, builtin_cmdline, len);
+		buf[len] = '\0';
+	}
+	else if ((devp = finddevice("/chosen")))
+		getprop(devp, "bootargs", buf, size);
+}
+
+static void set_cmdline(char *buf)
+{
+	void *devp;
+
+	if ((devp = finddevice("/chosen")))
+		setprop(devp, "bootargs", buf, strlen(buf) + 1);
 }
 
+/* Section where ft can be tacked on after zImage is built */
+union blobspace {
+	struct boot_param_header hdr;
+	char space[8*1024];
+} dt_blob __attribute__((__section__("__builtin_ft")));
+
+struct platform_ops platform_ops;
+struct dt_ops dt_ops;
+struct console_ops console_ops;
+
+void start(unsigned long a1, unsigned long a2, void *promptr, void *sp)
+{
+	int have_dt = 0;
+	kernel_entry_t kentry;
+	char cmdline[COMMAND_LINE_SIZE];
+
+	memset(__bss_start, 0, _end - __bss_start);
+	memset(&platform_ops, 0, sizeof(platform_ops));
+	memset(&dt_ops, 0, sizeof(dt_ops));
+	memset(&console_ops, 0, sizeof(console_ops));
+
+	/* Override the dt_ops and device tree if there was an flat dev
+	 * tree attached to the zImage.
+	 */
+	if (dt_blob.hdr.magic == OF_DT_HEADER) {
+		have_dt = 1;
+		ft_init(&dt_blob);
+	}
+
+	if (platform_init(promptr))
+		exit();
+	if (console_ops.open && (console_ops.open() < 0))
+		exit();
+	if (platform_ops.fixups)
+		platform_ops.fixups();
+
+	printf("\n\rzImage starting: loaded at 0x%p (sp: 0x%p)\n\r",
+	       _start, sp);
+
+	prep_kernel(&a1, &a2);
+
+	/* If cmdline came from zimage wrapper or if we can edit the one
+	 * in the dt, print it out and edit it, if possible.
+	 */
+	if ((strlen(builtin_cmdline) > 0) || console_ops.edit_cmdline) {
+		get_cmdline(cmdline, COMMAND_LINE_SIZE);
+		printf("\n\rLinux/PowerPC load: %s", cmdline);
+		if (console_ops.edit_cmdline)
+			console_ops.edit_cmdline(cmdline, COMMAND_LINE_SIZE);
+		printf("\n\r");
+		set_cmdline(cmdline);
+	}
+
+	if (console_ops.close)
+		console_ops.close();
+
+	kentry = (kernel_entry_t) vmlinux.addr;
+	if (have_dt)
+		kentry(dt_ops.ft_addr(), 0, NULL);
+	else
+		/* XXX initrd addr/size should be passed in properties */
+		kentry(a1, a2, promptr);
+
+	/* console closed so printf below may not work */
+	printf("Error: Linux kernel returned to zImage boot wrapper!\n\r");
+	exit();
+}

arch/powerpc/boot/of.c

View file

diff --git a/arch/powerpc/boot/prom.c b/arch/powerpc/boot/of.c
similarity index 63%
rename from arch/powerpc/boot/prom.c
rename to arch/powerpc/boot/of.c
index fa00577..fd99f78 100644
--- a/arch/powerpc/boot/prom.c
+++ b/arch/powerpc/boot/of.c
@@ -8,15 +8,29 @@
  */
 #include <stdarg.h>
 #include <stddef.h>
+#include "types.h"
+#include "elf.h"
 #include "string.h"
 #include "stdio.h"
-#include "prom.h"
+#include "page.h"
+#include "ops.h"
 
-int (*prom)(void *);
-phandle chosen_handle;
-ihandle stdout;
+typedef void *ihandle;
+typedef void *phandle;
 
-int call_prom(const char *service, int nargs, int nret, ...)
+extern char _end[];
+
+/* Value picked to match that used by yaboot */
+#define PROG_START	0x01400000	/* only used on 64-bit systems */
+#define RAM_END		(512<<20)	/* Fixme: use OF */
+#define	ONE_MB		0x100000
+
+int (*prom) (void *);
+
+
+static unsigned long claim_base;
+
+static int call_prom(const char *service, int nargs, int nret, ...)
 {
 	int i;
 	struct prom_args {
@@ -45,7 +59,7 @@ int call_prom(const char *service, int nargs, int nret, ...)
 	return (nret > 0)? args.args[nargs]: 0;
 }
 
-int call_prom_ret(const char *service, int nargs, int nret,
+static int call_prom_ret(const char *service, int nargs, int nret,
 		  unsigned int *rets, ...)
 {