Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

489de302 · Linus Torvalds <[email protected]> · 2007-07-16 17:58:08 -07:00

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (209 commits)
  [POWERPC] Create add_rtc() function to enable the RTC CMOS driver
  [POWERPC] Add H_ILLAN_ATTRIBUTES hcall number
  [POWERPC] xilinxfb: Parameterize xilinxfb platform device registration
  [POWERPC] Oprofile support for Power 5++
  [POWERPC] Enable arbitary speed tty ioctls and split input/output speed
  [POWERPC] Make drivers/char/hvc_console.c:khvcd() static
  [POWERPC] Remove dead code for preventing pread() and pwrite() calls
  [POWERPC] Remove unnecessary #undef printk from prom.c
  [POWERPC] Fix typo in Ebony default DTS
  [POWERPC] Check for NULL ppc_md.init_IRQ() before calling
  [POWERPC] Remove extra return statement
  [POWERPC] pasemi: Don't auto-select CONFIG_EMBEDDED
  [POWERPC] pasemi: Rename platform
  [POWERPC] arch/powerpc/kernel/sysfs.c: Move NUMA exports
  [POWERPC] Add __read_mostly support for powerpc
  [POWERPC] Modify sched_clock() to make CONFIG_PRINTK_TIME more sane
  [POWERPC] Create a dummy zImage if no valid platform has been selected
  [POWERPC] PS3: Bootwrapper support.
  [POWERPC] powermac i2c: Use mutex
  [POWERPC] Schedule removal of arch/ppc
  ...

Fixed up conflicts manually in:

	Documentation/feature-removal-schedule.txt
	arch/powerpc/kernel/pci_32.c
	arch/powerpc/kernel/pci_64.c
	include/asm-powerpc/pci.h

and asked the powerpc people to double-check the result..

Commit: 489de30259e667d7bc47da9da44a0270b050cd97
Parents: 1f1c2881 · bf22f6fe

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

Changes

279 files changed · +10844 −6854

File	Status	Add	Del	Content
Documentation/cachetlb.txt	modified	+1	−1	View file
Documentation/feature-removal-schedule.txt	modified	+13	−0	View file
Documentation/powerpc/booting-without-of.txt	modified	+38	−2	View file
arch/powerpc/Kconfig	modified	+4	−263	View file
arch/powerpc/Makefile	modified	+1	−1	View file
arch/powerpc/boot/44x.c	modified	+45	−0	View file
arch/powerpc/boot/44x.h	modified	+3	−0	View file
arch/powerpc/boot/Makefile	modified	+35	−46	View file
arch/powerpc/boot/cuboot-83xx.c	modified	+2	−11	View file
arch/powerpc/boot/cuboot-85xx.c	modified	+2	−11	View file
arch/powerpc/boot/cuboot-ebony.c	modified	+2	−14	View file
arch/powerpc/boot/cuboot.c	added	+35	−0	View file
arch/powerpc/boot/cuboot.h	added	+14	−0	View file
arch/powerpc/boot/dcr.h	modified	+37	−0	View file
arch/powerpc/boot/dts/ebony.dts	modified	+5	−7	View file
arch/powerpc/boot/dts/holly.dts	modified	+27	−25	View file
arch/powerpc/boot/dts/mpc7448hpc2.dts	modified	+16	−17	View file
arch/powerpc/boot/dts/mpc8272ads.dts	modified	+15	−27	View file
arch/powerpc/boot/dts/mpc832x_mds.dts	modified	+14	−2	View file
arch/powerpc/boot/dts/mpc832x_rdb.dts	modified	+14	−2	View file
arch/powerpc/boot/dts/mpc8349emitx.dts	modified	+10	−0	View file
arch/powerpc/boot/dts/mpc834x_mds.dts	modified	+10	−0	View file
arch/powerpc/boot/dts/mpc836x_mds.dts	modified	+14	−2	View file
arch/powerpc/boot/dts/mpc8540ads.dts	modified	+81	−66	View file
arch/powerpc/boot/dts/mpc8541cds.dts	modified	+45	−45	View file
arch/powerpc/boot/dts/mpc8544ds.dts	modified	+9	−9	View file
arch/powerpc/boot/dts/mpc8548cds.dts	modified	+57	−51	View file
arch/powerpc/boot/dts/mpc8555cds.dts	modified	+45	−45	View file
arch/powerpc/boot/dts/mpc8560ads.dts	modified	+86	−62	View file
arch/powerpc/boot/dts/mpc8568mds.dts	modified	+45	−21	View file
arch/powerpc/boot/dts/mpc8641_hpcn.dts	modified	+121	−26	View file
arch/powerpc/boot/dts/mpc866ads.dts	modified	+11	−20	View file
arch/powerpc/boot/dts/mpc885ads.dts	modified	+27	−27	View file
arch/powerpc/boot/dts/prpmc2800.dts	modified	+1	−1	View file
arch/powerpc/boot/dts/ps3.dts	added	+68	−0	View file
arch/powerpc/boot/ebony.c	modified	+2	−17	View file
arch/powerpc/boot/main.c	modified	+0	−2	View file
arch/powerpc/boot/of.c	modified	+4	−208	View file
arch/powerpc/boot/of.h	added	+21	−0	View file
arch/powerpc/boot/ofconsole.c	added	+45	−0	View file
arch/powerpc/boot/oflib.c	added	+202	−0	View file
arch/powerpc/boot/ops.h	modified	+3	−1	View file
arch/powerpc/boot/ps3-head.S	added	+80	−0	View file
arch/powerpc/boot/ps3-hvcall.S	added	+184	−0	View file
arch/powerpc/boot/ps3.c	added	+161	−0	View file
arch/powerpc/boot/serial.c	modified	+1	−1	View file
arch/powerpc/boot/stdio.c	modified	+9	−1	View file
arch/powerpc/boot/types.h	modified	+4	−0	View file
arch/powerpc/boot/wrapper	modified	+55	−0	View file
arch/powerpc/boot/zImage.ps3.lds.S	added	+50	−0	View file
arch/powerpc/configs/holly_defconfig	modified	+4	−2	View file
arch/powerpc/configs/ps3_defconfig	modified	+35	−17	View file
arch/powerpc/kernel/Makefile	modified	+4	−3	View file
arch/powerpc/kernel/cputable.c	modified	+30	−5	View file
arch/powerpc/kernel/head_32.S	modified	+3	−119	View file
arch/powerpc/kernel/head_64.S	modified	+2	−2	View file
arch/powerpc/kernel/io.c	modified	+6	−6	View file
arch/powerpc/kernel/irq.c	modified	+47	−13	View file
arch/powerpc/kernel/isa-bridge.c	added	+271	−0	View file
arch/powerpc/kernel/misc_32.S	modified	+5	−5	View file
arch/powerpc/kernel/misc_64.S	modified	+13	−13	View file
arch/powerpc/kernel/of_platform.c	modified	+0	−8	View file
arch/powerpc/kernel/pci-common.c	added	+454	−0	View file
arch/powerpc/kernel/pci_32.c	modified	+15	−495	View file
arch/powerpc/kernel/pci_64.c	modified	+126	−624	View file
arch/powerpc/kernel/ppc_ksyms.c	modified	+0	−5	View file
arch/powerpc/kernel/process.c	modified	+7	−7	View file
arch/powerpc/kernel/prom.c	modified	+19	−10	View file
arch/powerpc/kernel/prom_init.c	modified	+3	−1	View file
arch/powerpc/kernel/ptrace-common.h	deleted	+0	−161	View before deletion
arch/powerpc/kernel/ptrace.c	modified	+218	−107	View file
arch/powerpc/kernel/ptrace32.c	modified	+104	−135	View file
arch/powerpc/kernel/rtas_pci.c	modified	+2	−5	View file
arch/powerpc/kernel/setup-common.c	modified	+21	−0	View file
arch/powerpc/kernel/setup_32.c	modified	+5	−7	View file
arch/powerpc/kernel/setup_64.c	modified	+8	−4	View file
arch/powerpc/kernel/signal.c	added	+180	−0	View file
arch/powerpc/kernel/signal.h	added	+55	−0	View file
arch/powerpc/kernel/signal_32.c	modified	+28	−163	View file
arch/powerpc/kernel/signal_64.c	modified	+5	−177	View file
arch/powerpc/kernel/sysfs.c	modified	+2	−3	View file
arch/powerpc/kernel/time.c	modified	+41	−24	View file
arch/powerpc/kernel/vdso.c	modified	+1	−1	View file
arch/powerpc/kernel/vmlinux.lds.S	modified	+6	−0	View file
arch/powerpc/mm/44x_mmu.c	modified	+0	−1	View file
arch/powerpc/mm/4xx_mmu.c	modified	+0	−1	View file
arch/powerpc/mm/Makefile	modified	+1	−2	View file
arch/powerpc/mm/fault.c	modified	+1	−1	View file
arch/powerpc/mm/fsl_booke_mmu.c	modified	+0	−1	View file
arch/powerpc/mm/hash_native_64.c	modified	+13	−14	View file
arch/powerpc/mm/hash_utils_64.c	modified	+1	−1	View file
arch/powerpc/mm/imalloc.c	deleted	+0	−313	View before deletion
arch/powerpc/mm/init_32.c	modified	+0	−1	View file
arch/powerpc/mm/init_64.c	modified	+0	−1	View file
arch/powerpc/mm/mem.c	modified	+0	−3	View file
arch/powerpc/mm/mmu_context_32.c	modified	+0	−1	View file
arch/powerpc/mm/mmu_decl.h	modified	+2	−15	View file
arch/powerpc/mm/pgtable_32.c	modified	+0	−123	View file
arch/powerpc/mm/pgtable_64.c	modified	+49	−157	View file
arch/powerpc/mm/ppc_mmu_32.c	modified	+3	−4	View file
arch/powerpc/mm/stab.c	modified	+2	−2	View file
arch/powerpc/mm/tlb_32.c	modified	+0	−1	View file
arch/powerpc/mm/tlb_64.c	modified	+56	−1	View file
arch/powerpc/oprofile/op_model_power4.c	modified	+14	−0	View file
arch/powerpc/platforms/52xx/efika.c	modified	+7	−6	View file
arch/powerpc/platforms/52xx/lite5200.c	modified	+1	−1	View file
arch/powerpc/platforms/52xx/mpc52xx_pci.c	modified	+7	−11	View file
arch/powerpc/platforms/52xx/mpc52xx_pm.c	modified	+4	−4	View file
arch/powerpc/platforms/82xx/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/82xx/mpc82xx_ads.c	modified	+6	−11	View file
arch/powerpc/platforms/83xx/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/83xx/Makefile	modified	+1	−1	View file
arch/powerpc/platforms/83xx/mpc8313_rdb.c	modified	+2	−6	View file
arch/powerpc/platforms/83xx/mpc832x_mds.c	modified	+1	−6	View file
arch/powerpc/platforms/83xx/mpc832x_rdb.c	modified	+1	−6	View file
arch/powerpc/platforms/83xx/mpc834x_itx.c	modified	+3	−6	View file
arch/powerpc/platforms/83xx/mpc834x_mds.c	modified	+6	−50	View file
arch/powerpc/platforms/83xx/mpc836x_mds.c	modified	+1	−6	View file
arch/powerpc/platforms/83xx/mpc83xx.h	modified	+29	−5	View file
arch/powerpc/platforms/83xx/pci.c	modified	+5	−13	View file
arch/powerpc/platforms/83xx/usb.c	added	+181	−0	View file
arch/powerpc/platforms/85xx/misc.c	modified	+32	−0	View file
arch/powerpc/platforms/85xx/mpc8544_ds.c	modified	+1	−14	View file
arch/powerpc/platforms/85xx/mpc85xx.h	modified	+1	−1	View file
arch/powerpc/platforms/85xx/mpc85xx_ads.c	modified	+4	−28	View file
arch/powerpc/platforms/85xx/mpc85xx_cds.c	modified	+39	−77	View file
arch/powerpc/platforms/85xx/mpc85xx_mds.c	modified	+2	−26	View file
arch/powerpc/platforms/85xx/pci.c	modified	+3	−8	View file
arch/powerpc/platforms/86xx/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/86xx/mpc86xx.h	modified	+3	−8	View file
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c	modified	+3	−24	View file
arch/powerpc/platforms/86xx/pci.c	modified	+50	−17	View file
arch/powerpc/platforms/8xx/m8xx_setup.c	modified	+5	−0	View file
arch/powerpc/platforms/8xx/mpc885ads_setup.c	modified	+71	−0	View file
arch/powerpc/platforms/Kconfig	modified	+22	−7	View file
arch/powerpc/platforms/Kconfig.cputype	added	+221	−0	View file
arch/powerpc/platforms/apus/Kconfig	deleted	+0	−130	View before deletion
arch/powerpc/platforms/cell/io-workarounds.c	modified	+1	−1	View file
arch/powerpc/platforms/cell/spu_base.c	modified	+57	−2	View file
arch/powerpc/platforms/cell/spufs/backing_ops.c	modified	+6	−0	View file
arch/powerpc/platforms/cell/spufs/context.c	modified	+11	−4	View file
arch/powerpc/platforms/cell/spufs/fault.c	modified	+26	−3	View file
arch/powerpc/platforms/cell/spufs/file.c	modified	+139	−10	View file
arch/powerpc/platforms/cell/spufs/inode.c	modified	+3	−7	View file
arch/powerpc/platforms/cell/spufs/run.c	modified	+35	−10	View file
arch/powerpc/platforms/cell/spufs/sched.c	modified	+384	−92	View file
arch/powerpc/platforms/cell/spufs/spu_restore.c	modified	+1	−1	View file
arch/powerpc/platforms/cell/spufs/spu_save.c	modified	+1	−1	View file
arch/powerpc/platforms/cell/spufs/spufs.h	modified	+74	−10	View file
arch/powerpc/platforms/cell/spufs/switch.c	modified	+16	−2	View file
arch/powerpc/platforms/chrp/Kconfig	modified	+1	−0	View file
arch/powerpc/platforms/chrp/Makefile	modified	+1	−2	View file
arch/powerpc/platforms/chrp/pci.c	modified	+3	−4	View file
arch/powerpc/platforms/embedded6xx/Kconfig	modified	+2	−0	View file
arch/powerpc/platforms/embedded6xx/holly.c	modified	+1	−1	View file
arch/powerpc/platforms/embedded6xx/linkstation.c	modified	+5	−5	View file
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c	modified	+2	−7	View file
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h	modified	+0	−5	View file
arch/powerpc/platforms/iseries/call_hpt.h	modified	+5	−4	View file
arch/powerpc/platforms/iseries/htab.c	modified	+4	−4	View file
arch/powerpc/platforms/iseries/pci.c	modified	+6	−1	View file
arch/powerpc/platforms/iseries/setup.c	modified	+2	−4	View file
arch/powerpc/platforms/maple/pci.c	modified	+3	−38	View file
arch/powerpc/platforms/pasemi/Kconfig	modified	+9	−0	View file
arch/powerpc/platforms/pasemi/Makefile	modified	+1	−0	View file
arch/powerpc/platforms/pasemi/electra_ide.c	added	+96	−0	View file
arch/powerpc/platforms/pasemi/pci.c	modified	+2	−22	View file
arch/powerpc/platforms/pasemi/setup.c	modified	+1	−1	View file
arch/powerpc/platforms/powermac/Kconfig	modified	+1	−0	View file
arch/powerpc/platforms/powermac/low_i2c.c	modified	+12	−11	View file
arch/powerpc/platforms/powermac/pci.c	modified	+3	−43	View file
arch/powerpc/platforms/ps3/Kconfig	modified	+13	−13	View file
arch/powerpc/platforms/ps3/Makefile	modified	+1	−0	View file
arch/powerpc/platforms/ps3/device-init.c	added	+785	−0	View file
arch/powerpc/platforms/ps3/htab.c	modified	+19	−12	View file
arch/powerpc/platforms/ps3/interrupt.c	modified	+158	−114	View file
arch/powerpc/platforms/ps3/mm.c	modified	+518	−114	View file
arch/powerpc/platforms/ps3/os-area.c	modified	+2	−2	View file
arch/powerpc/platforms/ps3/platform.h	modified	+32	−11	View file
arch/powerpc/platforms/ps3/repository.c	modified	+317	−269	View file
arch/powerpc/platforms/ps3/setup.c	modified	+62	−43	View file
arch/powerpc/platforms/ps3/smp.c	modified	+9	−9	View file
arch/powerpc/platforms/ps3/spu.c	modified	+9	−4	View file
arch/powerpc/platforms/ps3/system-bus.c	modified	+482	−80	View file
arch/powerpc/platforms/ps3/time.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/Makefile	modified	+1	−1	View file
arch/powerpc/platforms/pseries/eeh.c	modified	+14	−5	View file
arch/powerpc/platforms/pseries/eeh_cache.c	modified	+4	−1	View file
arch/powerpc/platforms/pseries/eeh_driver.c	modified	+3	−3	View file
arch/powerpc/platforms/pseries/eeh_sysfs.c	added	+87	−0	View file
arch/powerpc/platforms/pseries/lpar.c	modified	+14	−3	View file
arch/powerpc/platforms/pseries/pci_dlpar.c	modified	+5	−4	View file
arch/powerpc/platforms/pseries/plpar_wrappers.h	modified	+15	−0	View file
arch/powerpc/platforms/pseries/pseries.h	modified	+2	−0	View file
arch/powerpc/platforms/pseries/reconfig.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/setup.c	modified	+2	−0	View file
arch/powerpc/platforms/pseries/xics.c	modified	+29	−24	View file
arch/powerpc/sysdev/Makefile	modified	+4	−2	View file
arch/powerpc/sysdev/fsl_soc.c	modified	+13	−0	View file
arch/powerpc/sysdev/indirect_pci.c	modified	+34	−10	View file
arch/powerpc/sysdev/mpc8xx_pic.h	modified	+9	−2	View file
arch/powerpc/sysdev/mv64x60_dev.c	modified	+28	−0	View file
arch/powerpc/sysdev/mv64x60_pci.c	modified	+2	−5	View file
arch/powerpc/sysdev/qe_lib/ucc.c	modified	+2	−0	View file
arch/powerpc/sysdev/qe_lib/ucc_fast.c	modified	+8	−0	View file
arch/powerpc/sysdev/rtc_cmos_setup.c	added	+49	−0	View file
arch/powerpc/sysdev/timer.c	modified	+12	−2	View file
arch/powerpc/sysdev/tsi108_dev.c	modified	+22	−11	View file
arch/powerpc/sysdev/tsi108_pci.c	modified	+5	−5	View file
arch/powerpc/xmon/xmon.c	modified	+1	−1	View file
arch/ppc/kernel/misc.S	modified	+4	−4	View file
arch/ppc/kernel/ppc_ksyms.c	modified	+0	−1	View file
arch/ppc/kernel/setup.c	modified	+1	−1	View file
arch/ppc/mm/tlb.c	modified	+1	−0	View file
arch/ppc/platforms/prep_setup.c	modified	+0	−3	View file
arch/ppc/syslib/Makefile	modified	+1	−0	View file
arch/powerpc/sysdev/fsl_pcie.c → arch/ppc/syslib/indirect_pci.c	renamed	+37	−74	View file
arch/ppc/syslib/virtex_devices.c	modified	+25	−13	View file
drivers/block/viodasd.c	modified	+2	−2	View file
drivers/char/briq_panel.c	modified	+0	−10	View file
drivers/char/hvc_console.c	modified	+1	−1	View file
drivers/char/viotape.c	modified	+6	−6	View file
drivers/pci/hotplug/rpadlpar_core.c	modified	+3	−3	View file
drivers/pcmcia/Kconfig	modified	+9	−8	View file
drivers/pcmcia/m8xx_pcmcia.c	modified	+167	−184	View file
drivers/ps3/Makefile	modified	+4	−1	View file
drivers/ps3/ps3av.c	modified	+198	−174	View file
drivers/ps3/ps3av_cmd.c	modified	+18	−33	View file
drivers/ps3/ps3stor_lib.c	added	+302	−0	View file
drivers/ps3/sys-manager-core.c	added	+68	−0	View file
drivers/ps3/sys-manager.c	modified	+191	−99	View file
drivers/ps3/vuart.c	modified	+489	−328	View file
drivers/ps3/vuart.h	modified	+23	−48	View file
drivers/rtc/Kconfig	modified	+1	−1	View file
drivers/serial/cpm_uart/cpm_uart_core.c	modified	+1	−1	View file
drivers/serial/of_serial.c	modified	+26	−7	View file
drivers/video/Kconfig	modified	+2	−2	View file
drivers/video/ps3fb.c	modified	+127	−163	View file
include/asm-powerpc/cache.h	modified	+4	−0	View file
include/asm-powerpc/cputable.h	modified	+48	−63	View file
include/asm-powerpc/floppy.h	modified	+3	−3	View file
include/asm-powerpc/hvcall.h	modified	+1	−0	View file
include/asm-powerpc/io.h	modified	+8	−18	View file
include/asm-powerpc/irq.h	modified	+9	−0	View file
include/asm-powerpc/lppaca.h	modified	+1	−1	View file
include/asm-powerpc/lv1call.h	modified	+3	−0	View file
include/asm-powerpc/machdep.h	modified	+1	−1	View file
include/asm-powerpc/mmu-8xx.h	added	+147	−0	View file
include/asm-powerpc/mmu-fsl-booke.h	added	+88	−0	View file
include/asm-powerpc/mmu-hash32.h	added	+91	−0	View file
include/asm-powerpc/mmu-hash64.h	modified	+6	−3	View file
include/asm-powerpc/mmu.h	modified	+9	−4	View file
include/asm-powerpc/mmu_context.h	modified	+198	−4	View file
include/asm-powerpc/mpc86xx.h	modified	+0	−6	View file
include/asm-powerpc/mpc8xx.h	modified	+4	−0	View file
include/asm-powerpc/pci-bridge.h	modified	+121	−27	View file
include/asm-powerpc/pci.h	modified	+2	−9	View file
include/asm-powerpc/pgtable-ppc32.h	modified	+0	−50	View file
include/asm-powerpc/pgtable-ppc64.h	modified	+15	−35	View file
include/asm-powerpc/pgtable.h	modified	+28	−0	View file
include/asm-powerpc/ppc-pci.h	modified	+6	−3	View file
include/asm-powerpc/processor.h	modified	+0	−8	View file
include/asm-powerpc/prom.h	modified	+15	−3	View file
include/asm-powerpc/ps3.h	modified	+109	−73	View file
include/asm-powerpc/ps3av.h	modified	+27	−21	View file
include/asm-powerpc/ps3fb.h	modified	+0	−12	View file
include/asm-powerpc/ps3stor.h	added	+71	−0	View file
include/asm-powerpc/ptrace.h	modified	+18	−4	View file
include/asm-powerpc/reg.h	modified	+2	−0	View file
include/asm-powerpc/spu.h	modified	+24	−0	View file
include/asm-powerpc/syscalls.h	modified	+0	−7	View file
include/asm-powerpc/system.h	modified	+3	−1	View file
include/asm-powerpc/termbits.h	modified	+4	−0	View file
include/asm-powerpc/thread_info.h	modified	+8	−4	View file
include/asm-powerpc/time.h	modified	+3	−1	View file
include/asm-powerpc/tlbflush.h	modified	+5	−0	View file
include/linux/fsl_devices.h	modified	+5	−0	View file
include/linux/vmalloc.h	modified	+2	−1	View file
mm/vmalloc.c	modified	+9	−4	View file

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

Documentation/cachetlb.txt

View file

diff --git a/Documentation/cachetlb.txt b/Documentation/cachetlb.txt
index debf681..866b761 100644
--- a/Documentation/cachetlb.txt
+++ b/Documentation/cachetlb.txt
@@ -253,7 +253,7 @@ Here are the routines, one by one:
 
 	The first of these two routines is invoked after map_vm_area()
 	has installed the page table entries.  The second is invoked
-	before unmap_vm_area() deletes the page table entries.
+	before unmap_kernel_range() deletes the page table entries.
 
 There exists another whole class of cpu cache issues which currently
 require a whole different set of interfaces to handle properly.

Documentation/feature-removal-schedule.txt

View file

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 18bd2dd..d05e624 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -297,3 +297,16 @@ Why:	Obsolete for multiple years now, NAT core provides the same behaviour.
 Who:	Patrick McHardy <[email protected]>
 
 ---------------------------
+
+What: The arch/ppc and include/asm-ppc directories
+When: Jun 2008
+Why:  The arch/powerpc tree is the merged architecture for ppc32 and ppc64
+      platforms.  Currently there are efforts underway to port the remaining
+      arch/ppc platforms to the merged tree.  New submissions to the arch/ppc
+      tree have been frozen with the 2.6.22 kernel release and that tree will
+      remain in bug-fix only mode until its scheduled removal.  Platforms
+      that are not ported by June 2008 will be removed due to the lack of an
+      interested maintainer.
+Who:  [email protected]
+
+---------------------------

Documentation/powerpc/booting-without-of.txt

View file

diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index d42d981..0c24348 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -42,15 +42,16 @@ Table of Contents
     1) Defining child nodes of an SOC
     2) Representing devices without a current OF specification
       a) MDIO IO device
-      c) PHY nodes
       b) Gianfar-compatible ethernet nodes
+      c) PHY nodes
       d) Interrupt controllers
       e) I2C
       f) Freescale SOC USB controllers
       g) Freescale SOC SEC Security Engines
       h) Board Control and Status (BCSR)
       i) Freescale QUICC Engine module (QE)
-      g) Flash chip nodes
+      j) Flash chip nodes
+      k) Global Utilities Block
 
   VII - Specifying interrupt information for devices
     1) interrupts property
@@ -626,6 +627,14 @@ So the node content can be summarized as a start token, a full path,
 a list of properties, a list of child nodes, and an end token. Every
 child node is a full node structure itself as defined above.
 
+NOTE: The above definition requires that all property definitions for
+a particular node MUST precede any subnode definitions for that node.
+Although the structure would not be ambiguous if properties and
+subnodes were intermingled, the kernel parser requires that the
+properties come first (up until at least 2.6.22).  Any tools
+manipulating a flattened tree must take care to preserve this
+constraint.
+
 4) Device tree "strings" block
 
 In order to save space, property names, which are generally redundant,
@@ -1782,6 +1791,33 @@ platforms are moved over to use the flattened-device-tree model.
  		partition-names = "fs\0firmware";
  	};
 
+   k) Global Utilities Block
+
+   The global utilities block controls power management, I/O device
+   enabling, power-on-reset configuration monitoring, general-purpose
+   I/O signal configuration, alternate function selection for multiplexed
+   signals, and clock control.
+
+   Required properties:
+
+    - compatible : Should define the compatible device type for
+      global-utilities.
+    - reg : Offset and length of the register set for the device.
+
+  Recommended properties:
+
+    - fsl,has-rstcr : Indicates that the global utilities register set
+      contains a functioning "reset control register" (i.e. the board
+      is wired to reset upon setting the HRESET_REQ bit in this register).
+
+    Example:
+
+	global-utilities@e0000 {	/* global utilities block */
+		compatible = "fsl,mpc8548-guts";
+		reg = <e0000 1000>;
+		fsl,has-rstcr;
+	};
+
    More devices will be defined as this spec matures.
 
 VII - Specifying interrupt information for devices

arch/powerpc/Kconfig

View file

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 6b8b83e..e641bb6 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -4,17 +4,7 @@
 
 mainmenu "Linux/PowerPC Kernel Configuration"
 
-config PPC64
-	bool "64-bit kernel"
-	default n
-	help
-	  This option selects whether a 32-bit or a 64-bit kernel
-	  will be built.
-
-config PPC_PM_NEEDS_RTC_LIB
-	bool
-	select RTC_LIB
-	default y if PM
+source "arch/powerpc/platforms/Kconfig.cputype"
 
 config PPC32
 	bool
@@ -135,123 +125,6 @@ config PPC64_SWSUSP
 	depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL))
 	default y
 
-menu "Processor support"
-choice
-	prompt "Processor Type"
-	depends on PPC32
-	default 6xx
-
-config CLASSIC32
-	bool "52xx/6xx/7xx/74xx"
-	select PPC_FPU
-	select 6xx
-	help
-	  There are four families of PowerPC chips supported.  The more common
-	  types (601, 603, 604, 740, 750, 7400), the Motorola embedded
-	  versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the AMCC
-	  embedded versions (403 and 405) and the high end 64 bit Power
-	  processors (POWER 3, POWER4, and IBM PPC970 also known as G5).
-
-	  This option is the catch-all for 6xx types, including some of the
-	  embedded versions.  Unless there is see an option for the specific
-	  chip family you are using, you want this option.
-	  
-	  You do not want this if you are building a kernel for a 64 bit
-	  IBM RS/6000 or an Apple G5, choose 6xx.
-	  
-	  If unsure, select this option
-	  
-	  Note that the kernel runs in 32-bit mode even on 64-bit chips.
-
-config PPC_82xx
-	bool "Freescale 82xx"
-	select 6xx
-	select PPC_FPU
-
-config PPC_83xx
-	bool "Freescale 83xx"
-	select 6xx
-	select FSL_SOC
-	select 83xx
-	select PPC_FPU
-	select WANT_DEVICE_TREE
-
-config PPC_85xx
-	bool "Freescale 85xx"
-	select E500
-	select FSL_SOC
-	select 85xx
-	select WANT_DEVICE_TREE
-
-config PPC_86xx
-	bool "Freescale 86xx"
-	select 6xx
-	select FSL_SOC
-	select FSL_PCIE
-	select PPC_FPU
-	select ALTIVEC
-	help
-	  The Freescale E600 SoCs have 74xx cores.
-
-config PPC_8xx
-	bool "Freescale 8xx"
-	select FSL_SOC
-	select 8xx
-
-config 40x
-	bool "AMCC 40x"
-	select PPC_DCR_NATIVE
-
-config 44x
-	bool "AMCC 44x"
-	select PPC_DCR_NATIVE
-	select WANT_DEVICE_TREE
-
-config E200
-	bool "Freescale e200"
-
-endchoice
-
-config POWER4_ONLY
-	bool "Optimize for POWER4"
-	depends on PPC64
-	default n
-	---help---
-	  Cause the compiler to optimize for POWER4/POWER5/PPC970 processors.
-	  The resulting binary will not work on POWER3 or RS64 processors
-	  when compiled with binutils 2.15 or later.
-
-config POWER3
-	bool
-	depends on PPC64
-	default y if !POWER4_ONLY
-
-config POWER4
-	depends on PPC64
-	def_bool y
-
-config 6xx
-	bool
-
-# this is temp to handle compat with arch=ppc
-config 8xx
-	bool
-
-# this is temp to handle compat with arch=ppc
-config 83xx
-	bool
-
-# this is temp to handle compat with arch=ppc
-config 85xx
-	bool
-
-config E500
-	bool
-
-config PPC_FPU
-	bool
-	default y if PPC64
-
 config PPC_DCR_NATIVE
 	bool
 	default n
@@ -270,134 +143,6 @@ config PPC_OF_PLATFORM_PCI
 	depends on PPC64 # not supported on 32 bits yet
 	default n
 
-config 4xx
-	bool
-	depends on 40x || 44x
-	default y
-
-config BOOKE
-	bool
-	depends on E200 || E500 || 44x
-	default y
-
-config FSL_BOOKE
-	bool
-	depends on E200 || E500
-	default y
-
-config PTE_64BIT
-	bool
-	depends on 44x || E500
-	default y if 44x
-	default y if E500 && PHYS_64BIT
-
-config PHYS_64BIT
-	bool 'Large physical address support' if E500
-	depends on 44x || E500
-	select RESOURCES_64BIT
-	default y if 44x
-	---help---
-	  This option enables kernel support for larger than 32-bit physical
-	  addresses.  This features is not be available on all e500 cores.
-
-	  If in doubt, say N here.
-
-config ALTIVEC
-	bool "AltiVec Support"
-	depends on CLASSIC32 || POWER4
-	---help---
-	  This option enables kernel support for the Altivec extensions to the
-	  PowerPC processor. The kernel currently supports saving and restoring
-	  altivec registers, and turning on the 'altivec enable' bit so user
-	  processes can execute altivec instructions.
-
-	  This option is only usefully if you have a processor that supports
-	  altivec (G4, otherwise known as 74xx series), but does not have
-	  any affect on a non-altivec cpu (it does, however add code to the
-	  kernel).
-
-	  If in doubt, say Y here.
-
-config SPE
-	bool "SPE Support"
-	depends on E200 || E500
-	default y
-	---help---
-	  This option enables kernel support for the Signal Processing
-	  Extensions (SPE) to the PowerPC processor. The kernel currently
-	  supports saving and restoring SPE registers, and turning on the
-	  'spe enable' bit so user processes can execute SPE instructions.
-
-	  This option is only useful if you have a processor that supports
-	  SPE (e500, otherwise known as 85xx series), but does not have any
-	  effect on a non-spe cpu (it does, however add code to the kernel).
-
-	  If in doubt, say Y here.
-
-config PPC_STD_MMU
-	bool
-	depends on 6xx || POWER3 || POWER4 || PPC64
-	default y
-
-config PPC_STD_MMU_32
-	def_bool y
-	depends on PPC_STD_MMU && PPC32
-
-config PPC_MM_SLICES
-	bool
-	default y if HUGETLB_PAGE
-	default n
-
-config VIRT_CPU_ACCOUNTING
-	bool "Deterministic task and CPU time accounting"
-	depends on PPC64
-	default y
-	help
-	  Select this option to enable more accurate task and CPU time
-	  accounting.  This is done by reading a CPU counter on each
-	  kernel entry and exit and on transitions within the kernel
-	  between system, softirq and hardirq state, so there is a
-	  small performance impact.  This also enables accounting of
-	  stolen time on logically-partitioned systems running on
-	  IBM POWER5-based machines.
-
-	  If in doubt, say Y here.
-
-config SMP
-	depends on PPC_STD_MMU
-	bool "Symmetric multi-processing support"
-	---help---
-	  This enables support for systems with more than one CPU. If you have
-	  a system with only one CPU, say N. If you have a system with more
-	  than one CPU, say Y.  Note that the kernel does not currently
-	  support SMP machines with 603/603e/603ev or PPC750 ("G3") processors
-	  since they have inadequate hardware support for multiprocessor
-	  operation.
-
-	  If you say N here, the kernel will run on single and multiprocessor
-	  machines, but will use only one CPU of a multiprocessor machine. If
-	  you say Y here, the kernel will run on single-processor machines.
-	  On a single-processor machine, the kernel will run faster if you say
-	  N here.
-
-	  If you don't know what to do here, say N.
-
-config NR_CPUS
-	int "Maximum number of CPUs (2-128)"
-	range 2 128
-	depends on SMP
-	default "32" if PPC64
-	default "4"
-
-config NOT_COHERENT_CACHE
-	bool
-	depends on 4xx || 8xx || E200
-	default y
-
-config CONFIG_CHECK_CACHE_COHERENCY
-	bool
-endmenu
-
 source "init/Kconfig"
 
 source "arch/powerpc/platforms/Kconfig"
@@ -677,10 +422,6 @@ config SBUS
 config FSL_SOC
 	bool
 
-config FSL_PCIE
-	bool
-	depends on PPC_86xx
-
 # Yes MCA RS/6000s exist but Linux-PPC does not currently support any
 config MCA
 	bool
@@ -688,10 +429,10 @@ config MCA
 config PCI
 	bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
 		|| PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \
-		|| MPC7448HPC2 || PPC_PS3 || PPC_HOLLY
-	default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx \
+		|| PPC_PS3
+	default y if !40x && !CPM2 && !8xx && !PPC_83xx \
 		&& !PPC_85xx && !PPC_86xx
-	default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS
+	default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
 	default PCI_QSPAN if !4xx && !CPM2 && 8xx
 	select ARCH_SUPPORTS_MSI
 	help

arch/powerpc/Makefile

View file

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index fbafd96..187a39a 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -148,7 +148,7 @@ all: $(KBUILD_IMAGE)
 
 CPPFLAGS_vmlinux.lds	:= -Upowerpc
 
-BOOT_TARGETS = zImage zImage.initrd zImage.dts zImage.dts_initrd uImage
+BOOT_TARGETS = zImage zImage.initrd uImage
 
 PHONY += $(BOOT_TARGETS)
 

arch/powerpc/boot/44x.c

View file

diff --git a/arch/powerpc/boot/44x.c b/arch/powerpc/boot/44x.c
index d51377d..9f64e84 100644
--- a/arch/powerpc/boot/44x.c
+++ b/arch/powerpc/boot/44x.c
@@ -38,3 +38,48 @@ void ibm44x_fixup_memsize(void)
 
 	dt_fixup_memory(0, memsize);
 }
+
+#define SPRN_DBCR0		0x134
+#define   DBCR0_RST_SYSTEM	0x30000000
+
+void ibm44x_dbcr_reset(void)
+{
+	unsigned long tmp;
+
+	asm volatile (
+		"mfspr	%0,%1\n"
+		"oris	%0,%0,%2@h\n"
+		"mtspr	%1,%0"
+		: "=&r"(tmp) : "i"(SPRN_DBCR0), "i"(DBCR0_RST_SYSTEM)
+		);
+
+}
+
+/* Read 4xx EBC bus bridge registers to get mappings of the peripheral
+ * banks into the OPB address space */
+void ibm4xx_fixup_ebc_ranges(const char *ebc)
+{
+	void *devp;
+	u32 bxcr;
+	u32 ranges[EBC_NUM_BANKS*4];
+	u32 *p = ranges;
+	int i;
+
+	for (i = 0; i < EBC_NUM_BANKS; i++) {
+		mtdcr(DCRN_EBC0_CFGADDR, EBC_BXCR(i));
+		bxcr = mfdcr(DCRN_EBC0_CFGDATA);
+
+		if ((bxcr & EBC_BXCR_BU) != EBC_BXCR_BU_OFF) {
+			*p++ = i;
+			*p++ = 0;
+			*p++ = bxcr & EBC_BXCR_BAS;
+			*p++ = EBC_BXCR_BANK_SIZE(bxcr);
+		}
+	}
+
+	devp = finddevice(ebc);
+	if (! devp)
+		fatal("Couldn't locate EBC node %s\n\r", ebc);
+
+	setprop(devp, "ranges", ranges, (p - ranges) * sizeof(u32));
+}

arch/powerpc/boot/44x.h

View file

diff --git a/arch/powerpc/boot/44x.h b/arch/powerpc/boot/44x.h
index 7b129ad..577982c 100644
--- a/arch/powerpc/boot/44x.h
+++ b/arch/powerpc/boot/44x.h
@@ -11,6 +11,9 @@
 #define _PPC_BOOT_44X_H_
 
 void ibm44x_fixup_memsize(void);
+void ibm4xx_fixup_ebc_ranges(const char *ebc);
+
+void ibm44x_dbcr_reset(void);
 void ebony_init(void *mac0, void *mac1);
 
 #endif /* _PPC_BOOT_44X_H_ */

arch/powerpc/boot/Makefile

View file

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index ff27019..61a6f34 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -43,10 +43,11 @@ $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \
 
 src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \
 		ns16550.c serial.c simple_alloc.c div64.S util.S \
-		gunzip_util.c elf_util.c $(zlib) devtree.c \
-		44x.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c
+		gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
+		44x.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c
 src-plat := of.c cuboot-83xx.c cuboot-85xx.c holly.c \
-		cuboot-ebony.c treeboot-ebony.c prpmc2800.c
+		cuboot-ebony.c treeboot-ebony.c prpmc2800.c \
+		ps3-head.S ps3-hvcall.S ps3.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -75,11 +76,11 @@ $(addprefix $(obj)/,$(zliblinuxheader)): $(obj)/%: $(srctree)/include/linux/%
 $(obj)/empty.c:
 	@touch $@
 
-$(obj)/zImage.lds $(obj)/zImage.coff.lds: $(obj)/%: $(srctree)/$(src)/%.S
+$(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds: $(obj)/%: $(srctree)/$(src)/%.S
 	@cp $< $@
 
 clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \
-		empty.c zImage.coff.lds zImage.lds
+		empty.c zImage zImage.coff.lds zImage.ps3.lds zImage.lds
 
 quiet_cmd_bootcc = BOOTCC  $@
       cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<
@@ -102,7 +103,7 @@ hostprogs-y	:= addnote addRamDisk hack-coff mktree
 
 targets		+= $(patsubst $(obj)/%,%,$(obj-boot) wrapper.a)
 extra-y		:= $(obj)/wrapper.a $(obj-plat) $(obj)/empty.o \
-		   $(obj)/zImage.lds $(obj)/zImage.coff.lds
+		   $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds
 
 wrapper		:=$(srctree)/$(src)/wrapper
 wrapperbits	:= $(extra-y) $(addprefix $(obj)/,addnote hack-coff mktree) \
@@ -132,7 +133,7 @@ image-$(CONFIG_PPC_CELLEB)		+= zImage.pseries
 image-$(CONFIG_PPC_CHRP)		+= zImage.chrp
 image-$(CONFIG_PPC_EFIKA)		+= zImage.chrp
 image-$(CONFIG_PPC_PMAC)		+= zImage.pmac
-image-$(CONFIG_PPC_HOLLY)		+= zImage.holly-elf
+image-$(CONFIG_PPC_HOLLY)		+= zImage.holly
 image-$(CONFIG_PPC_PRPMC2800)		+= zImage.prpmc2800
 image-$(CONFIG_PPC_ISERIES)		+= zImage.iseries
 image-$(CONFIG_DEFAULT_UIMAGE)		+= uImage
@@ -157,55 +158,43 @@ targets	+= $(image-y) $(initrd-y)
 
 $(addprefix $(obj)/, $(initrd-y)): $(obj)/ramdisk.image.gz
 
-dts-  := $(patsubst zImage%, zImage.dts%, $(image-n) $(image-))
-dts-y := $(patsubst zImage%, zImage.dts%, $(image-y))
-dts-y := $(filter-out $(image-y), $(dts-y))
-targets	+= $(image-y) $(dts-y)
-
-dts_initrd-  := $(patsubst zImage%, zImage.dts_initrd%, $(image-n) $(image-))
-dts_initrd-y := $(patsubst zImage%, zImage.dts_initrd%, $(image-y))
-dts_initrd-y := $(filter-out $(image-y), $(dts_initrd-y))
-targets	+= $(image-y) $(dts_initrd-y)
-
-$(addprefix $(obj)/, $(dts_initrd-y)): $(obj)/ramdisk.image.gz
+# If CONFIG_WANT_DEVICE_TREE is set and CONFIG_DEVICE_TREE isn't an
+# empty string, define 'dts' to be path to the dts
+# CONFIG_DEVICE_TREE will have "" around it, make sure to strip them
+ifeq ($(CONFIG_WANT_DEVICE_TREE),y)
+ifneq ($(CONFIG_DEVICE_TREE),"")
+dts = $(if $(shell echo $(CONFIG_DEVICE_TREE) | grep '^/'),\
+	,$(srctree)/$(src)/dts/)$(CONFIG_DEVICE_TREE:"%"=%)
+endif
+endif
 
 # Don't put the ramdisk on the pattern rule; when its missing make will try
 # the pattern rule with less dependencies that also matches (even with the
 # hard dependency listed).
-$(obj)/zImage.dts_initrd.%: vmlinux $(wrapperbits) $(dts) $(obj)/ramdisk.image.gz
+$(obj)/zImage.initrd.%: vmlinux $(wrapperbits) $(dts)
 	$(call if_changed,wrap,$*,$(dts),,$(obj)/ramdisk.image.gz)
 
-$(obj)/zImage.dts.%: vmlinux $(wrapperbits) $(dts)
+$(obj)/zImage.%: vmlinux $(wrapperbits) $(dts)
 	$(call if_changed,wrap,$*,$(dts))
 
-$(obj)/zImage.initrd.%: vmlinux $(wrapperbits)
-	$(call if_changed,wrap,$*,,,$(obj)/ramdisk.image.gz)
-
-$(obj)/zImage.%: vmlinux $(wrapperbits)
-	$(call if_changed,wrap,$*)
-
-$(obj)/zImage.iseries: vmlinux
+# This cannot be in the root of $(src) as the zImage rule always adds a $(obj)
+# prefix
+$(obj)/vmlinux.strip: vmlinux
 	$(STRIP) -s -R .comment $< -o $@
 
-$(obj)/zImage.ps3: vmlinux
+$(obj)/zImage.iseries: vmlinux
 	$(STRIP) -s -R .comment $< -o $@
 
-$(obj)/zImage.initrd.ps3: vmlinux
-	@echo "  WARNING zImage.initrd.ps3 not supported (yet)"
-
-$(obj)/zImage.holly-elf: vmlinux $(wrapperbits)