please pull powerpc-merge.git tree

Paul Mackerras paulus at samba.org
Thu Nov 10 16:33:49 EST 2005


Linus,

Please do a pull from

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git

to get another powerpc update.  This contains more merging, some fixes
from Ben H for various bugs (notably some problems with 64k pages), a
set of fixes for the PCI error handling stuff from Linas Vepstas, some
memory add fixes from Mike Kravetz, some ppc patches, and various
other cleanups and fixes.

With the ppc32/64 merge, I think we are at the point of being able to
make ppc64 machines default to ARCH=powerpc.  Also, there is not much
left in arch/ppc64, and it would be nice to move the remaining stuff
to arch/powerpc and get rid of arch/ppc64 entirely.  That would take a
couple more days, though - could we have a small extension on the
merge window to do that?

Thanks,
Paul.

 arch/powerpc/Kconfig                       |    4 
 arch/powerpc/kernel/Makefile               |   13 -
 arch/powerpc/kernel/asm-offsets.c          |    1 
 arch/powerpc/kernel/cpu_setup_power4.S     |    8 
 arch/powerpc/kernel/cputable.c             |   19 -
 arch/powerpc/kernel/firmware.c             |    2 
 arch/powerpc/kernel/fpu.S                  |   24 +
 arch/powerpc/kernel/head_64.S              |   89 ----
 arch/powerpc/kernel/ioctl32.c              |    4 
 arch/powerpc/kernel/irq.c                  |  265 +++++------
 arch/powerpc/kernel/lparcfg.c              |   13 -
 arch/powerpc/kernel/misc_32.S              |   23 -
 arch/powerpc/kernel/misc_64.S              |    8 
 arch/powerpc/kernel/paca.c                 |    7 
 arch/powerpc/kernel/ppc_ksyms.c            |    5 
 arch/powerpc/kernel/proc_ppc64.c           |   12 -
 arch/powerpc/kernel/prom.c                 |   35 +
 arch/powerpc/kernel/prom_init.c            |  187 ++++++--
 arch/powerpc/kernel/rtas-proc.c            |    2 
 arch/powerpc/kernel/rtas.c                 |    5 
 arch/powerpc/kernel/rtas_pci.c             |   47 +-
 arch/powerpc/kernel/setup-common.c         |   37 +-
 arch/powerpc/kernel/setup.h                |    6 
 arch/powerpc/kernel/setup_32.c             |   18 -
 arch/powerpc/kernel/setup_64.c             |   93 ++--
 arch/powerpc/kernel/signal_32.c            |    1 
 arch/powerpc/kernel/smp.c                  |    9 
 arch/powerpc/kernel/sys_ppc32.c            |    1 
 arch/powerpc/kernel/sysfs.c                |    2 
 arch/powerpc/kernel/time.c                 |   31 +
 arch/powerpc/kernel/traps.c                |    2 
 arch/powerpc/lib/bitops.c                  |    2 
 arch/powerpc/mm/hash_utils_64.c            |   38 +-
 arch/powerpc/mm/init_32.c                  |    3 
 arch/powerpc/mm/init_64.c                  |   20 +
 arch/powerpc/mm/mem.c                      |    4 
 arch/powerpc/mm/pgtable_64.c               |    7 
 arch/powerpc/mm/stab.c                     |   21 +
 arch/powerpc/oprofile/op_model_power4.c    |    3 
 arch/powerpc/platforms/chrp/setup.c        |    4 
 arch/powerpc/platforms/iseries/irq.c       |   24 +
 arch/powerpc/platforms/iseries/misc.S      |    1 
 arch/powerpc/platforms/iseries/setup.c     |   27 +
 arch/powerpc/platforms/maple/pci.c         |    3 
 arch/powerpc/platforms/powermac/pci.c      |    3 
 arch/powerpc/platforms/powermac/pic.c      |    3 
 arch/powerpc/platforms/powermac/smp.c      |   51 +-
 arch/powerpc/platforms/pseries/Makefile    |    2 
 arch/powerpc/platforms/pseries/eeh.c       |  659 ++++++++++++++++++++--------
 arch/powerpc/platforms/pseries/eeh_event.c |  155 +++++++
 arch/powerpc/platforms/pseries/iommu.c     |    3 
 arch/powerpc/platforms/pseries/pci.c       |    3 
 arch/powerpc/platforms/pseries/reconfig.c  |    2 
 arch/powerpc/platforms/pseries/rtasd.c     |    8 
 arch/powerpc/platforms/pseries/scanlog.c   |    0 
 arch/powerpc/platforms/pseries/setup.c     |    8 
 arch/powerpc/platforms/pseries/smp.c       |    5 
 arch/powerpc/platforms/pseries/xics.c      |    7 
 arch/powerpc/sysdev/u3_iommu.c             |    2 
 arch/powerpc/xmon/Makefile                 |    2 
 arch/powerpc/xmon/nonstdio.c               |  134 ++++++
 arch/powerpc/xmon/nonstdio.h               |   28 -
 arch/powerpc/xmon/setjmp.S                 |  176 ++++---
 arch/powerpc/xmon/start_32.c               |  235 +---------
 arch/powerpc/xmon/start_64.c               |  167 -------
 arch/powerpc/xmon/start_8xx.c              |  255 -----------
 arch/powerpc/xmon/subr_prf.c               |   54 --
 arch/powerpc/xmon/xmon.c                   |   50 +-
 arch/ppc/boot/include/of1275.h             |    3 
 arch/ppc/boot/of1275/Makefile              |    2 
 arch/ppc/boot/of1275/call_prom.c           |   74 +++
 arch/ppc/boot/of1275/claim.c               |   99 +++-
 arch/ppc/boot/of1275/finddevice.c          |   19 -
 arch/ppc/boot/openfirmware/Makefile        |    3 
 arch/ppc/kernel/Makefile                   |    5 
 arch/ppc/kernel/head_booke.h               |    2 
 arch/ppc/kernel/irq.c                      |  165 -------
 arch/ppc/kernel/misc.S                     |    4 
 arch/ppc/kernel/ppc_ksyms.c                |    7 
 arch/ppc/kernel/setup.c                    |    1 
 arch/ppc/platforms/pmac_pic.c              |    3 
 arch/ppc/platforms/prep_setup.c            |    9 
 arch/ppc64/Kconfig                         |    4 
 arch/ppc64/boot/addRamDisk.c               |  207 +++++----
 arch/ppc64/kernel/Makefile                 |   16 -
 arch/ppc64/kernel/asm-offsets.c            |    1 
 arch/ppc64/kernel/head.S                   |   82 ---
 arch/ppc64/kernel/idle.c                   |    1 
 arch/ppc64/kernel/misc.S                   |    8 
 arch/ppc64/kernel/nvram.c                  |    5 
 arch/ppc64/kernel/pci.c                    |   10 
 arch/ppc64/kernel/pci_dn.c                 |   21 +
 arch/ppc64/kernel/prom.c                   |    9 
 arch/ppc64/kernel/prom_init.c              |    3 
 arch/ppc64/kernel/vdso.c                   |    5 
 drivers/net/fs_enet/fs_enet-main.c         |    1 
 drivers/net/fs_enet/mac-fcc.c              |    1 
 drivers/net/fs_enet/mac-fec.c              |    1 
 drivers/net/fs_enet/mac-scc.c              |    1 
 drivers/pci/hotplug/rpadlpar_core.c        |    2 
 include/asm-powerpc/abs_addr.h             |    6 
 include/asm-powerpc/asm-compat.h           |   55 ++
 include/asm-powerpc/atomic.h               |  188 ++++++++
 include/asm-powerpc/bitops.h               |   41 +-
 include/asm-powerpc/bug.h                  |   19 -
 include/asm-powerpc/cache.h                |   40 ++
 include/asm-powerpc/cacheflush.h           |   68 +++
 include/asm-powerpc/compat.h               |    8 
 include/asm-powerpc/cputable.h             |    6 
 include/asm-powerpc/current.h              |   27 +
 include/asm-powerpc/eeh_event.h            |   52 ++
 include/asm-powerpc/firmware.h             |    6 
 include/asm-powerpc/futex.h                |    5 
 include/asm-powerpc/hvcall.h               |   14 -
 include/asm-powerpc/hw_irq.h               |    1 
 include/asm-powerpc/irq.h                  |    5 
 include/asm-powerpc/lppaca.h               |    9 
 include/asm-powerpc/paca.h                 |   15 -
 include/asm-powerpc/ppc-pci.h              |   52 ++
 include/asm-powerpc/ppc_asm.h              |   39 --
 include/asm-powerpc/processor.h            |   70 ++-
 include/asm-powerpc/reg.h                  |    7 
 include/asm-powerpc/reg_8xx.h              |   42 ++
 include/asm-powerpc/signal.h               |   41 +-
 include/asm-powerpc/sparsemem.h            |    4 
 include/asm-powerpc/system.h               |    2 
 include/asm-powerpc/systemcfg.h            |    6 
 include/asm-powerpc/tce.h                  |    6 
 include/asm-powerpc/uaccess.h              |   40 +-
 include/asm-powerpc/xmon.h                 |    1 
 include/asm-ppc/cache.h                    |   84 ----
 include/asm-ppc/cacheflush.h               |   49 --
 include/asm-ppc/current.h                  |   11 
 include/asm-ppc64/cache.h                  |   36 --
 include/asm-ppc64/cacheflush.h             |   48 --
 include/asm-ppc64/current.h                |   16 -
 include/asm-ppc64/eeh.h                    |   46 +-
 include/asm-ppc64/mmu.h                    |    6 
 include/asm-ppc64/mmzone.h                 |    8 
 include/asm-ppc64/page.h                   |    2 
 include/asm-ppc64/pci-bridge.h             |    1 
 include/asm-ppc64/pgalloc.h                |    4 
 include/asm-ppc64/prom.h                   |    2 
 include/asm-ppc64/signal.h                 |  132 ------
 include/asm-ppc64/system.h                 |    2 
 145 files changed, 2618 insertions(+), 2620 deletions(-)
 rename arch/{ppc64/kernel/cpu_setup_power4.S => powerpc/kernel/cpu_setup_power4.S} (99%)
 rename arch/{ppc64/kernel/firmware.c => powerpc/kernel/firmware.c} (96%)
 rename arch/{ppc64/kernel/ioctl32.c => powerpc/kernel/ioctl32.c} (96%)
 rename arch/{ppc64/kernel/irq.c => powerpc/kernel/irq.c} (52%)
 rename arch/{ppc64/kernel/lparcfg.c => powerpc/kernel/lparcfg.c} (99%)
 rename arch/{ppc64/kernel/pacaData.c => powerpc/kernel/paca.c} (98%)
 rename arch/{ppc64/kernel/proc_ppc64.c => powerpc/kernel/proc_ppc64.c} (92%)
 rename arch/{ppc64/kernel/rtas_pci.c => powerpc/kernel/rtas_pci.c} (93%)
 create mode 100644 arch/powerpc/kernel/setup.h
 rename arch/{ppc64/kernel/sysfs.c => powerpc/kernel/sysfs.c} (100%)
 rename arch/{ppc64/kernel/eeh.c => powerpc/platforms/pseries/eeh.c} (52%)
 create mode 100644 arch/powerpc/platforms/pseries/eeh_event.c
 rename arch/{ppc64/kernel/scanlog.c => powerpc/platforms/pseries/scanlog.c} (100%)
 create mode 100644 arch/powerpc/xmon/nonstdio.c
 delete mode 100644 arch/powerpc/xmon/subr_prf.c
 create mode 100644 arch/ppc/boot/of1275/call_prom.c
 delete mode 100644 arch/ppc/kernel/irq.c
 rename include/{asm-ppc64/abs_addr.h => asm-powerpc/abs_addr.h} (93%)
 create mode 100644 include/asm-powerpc/asm-compat.h
 create mode 100644 include/asm-powerpc/cache.h
 create mode 100644 include/asm-powerpc/cacheflush.h
 rename include/{asm-ppc64/compat.h => asm-powerpc/compat.h} (97%)
 create mode 100644 include/asm-powerpc/current.h
 create mode 100644 include/asm-powerpc/eeh_event.h
 rename include/{asm-ppc64/hvcall.h => asm-powerpc/hvcall.h} (98%)
 rename include/{asm-ppc64/lppaca.h => asm-powerpc/lppaca.h} (98%)
 rename include/{asm-ppc64/paca.h => asm-powerpc/paca.h} (94%)
 create mode 100644 include/asm-powerpc/reg_8xx.h
 rename include/{asm-ppc/signal.h => asm-powerpc/signal.h} (77%)
 rename include/{asm-ppc64/systemcfg.h => asm-powerpc/systemcfg.h} (95%)
 rename include/{asm-ppc64/tce.h => asm-powerpc/tce.h} (96%)
 delete mode 100644 include/asm-ppc/cache.h
 delete mode 100644 include/asm-ppc/cacheflush.h
 delete mode 100644 include/asm-ppc/current.h
 delete mode 100644 include/asm-ppc64/cache.h
 delete mode 100644 include/asm-ppc64/cacheflush.h
 delete mode 100644 include/asm-ppc64/current.h
 delete mode 100644 include/asm-ppc64/signal.h

Benjamin Herrenschmidt:
      ppc64: Don't panic when early __ioremap fails
      powerpc: 64k pages pmd alloc fix
      powerpc: 64k pages vs. U3 iommu
      ppc64: fix PCI IO mapping

David Gibson:
      powerpc: Merge signal.h
      powerpc: Merge current.h
      powerpc: Move various ppc64 files with no ppc32 equivalent to powerpc
      powerpc: Merge cacheflush.h and cache.h
      powerpc: Move scanlog.c to platforms/pseries
      powerpc: Consolidate asm compatibility macros
      powerpc: Move more ppc64 files with no ppc32 equivalent to powerpc

linas:
      ppc64: uniform usage of bus unit id interfaces

Linas Vepstas:
      ppc64: misc minor cleanup
      ppc64: PCI address cache minor fixes
      ppc64: PCI error rate statistics
      ppc64: RTAS error reporting restructuring
      ppc64: avoid PCI error reporting for empty slots
      ppc64: serialize reports of PCI errors
      ppc64: escape hatch for spinning interrupt deadlocks
      ppc64: bugfix: crash on PCI hotplug
      ppc64: bugfix: don't silently ignore PCI errors
      ppc64: move eeh.c to powerpc directory from ppc64
      ppc64: PCI error event dispatcher
      ppc64: PCI reset support routines
      ppc64: Save & restore of PCI device BARS
      ppc64: mark failed devices
      ppc64: bugfix: crash on PHB add

Marcelo Tosatti:
      fs_enet build fix

Matt Porter:
      ppc32: fix ppc44x fpu build

Mike Kravetz:
      revised Memory Add Fixes for ppc64
      Memory Add Fixes for ppc64
      Memory Add Fixes for ppc64
      Memory Add Fixes for ppc64

Olaf Hering:
      ppc64 boot: remove local initializers
      ppc64 boot: remove argv usage
      ppc64 boot: remove sysmap from required filenames
      ppc64 boot: fix compile warnings

Paul Mackerras:
      powerpc: Fix crash in early boot on some powermacs
      powerpc: Simplify and clean up the xmon terminal I/O
      ppc/powerpc: workarounds for old Open Firmware versions
      powerpc: Fix find_next_bit on 32-bit
      powerpc: merge code values for identifying platforms
      powerpc: Fix typo introduced in merging platform codes
      powerpc: Fix compile error in EEH code with gcc4
      powerpc: Fixes for 32-bit powermac SMP
      powerpc: Fix SMP time initialization problem
      powerpc: Add user CPU features for POWER4, POWER5, POWER5+ and Cell.
      powerpc: 32-bit fixes for xmon
      powerpc: Move some extern declarations from C code into headers
      ppc64: Add declarations to ppc64 headers as well as powerpc headers

Stephen Rothwell:
      powerpc: create kernel/setup.h
      ppc64: move stack switching up in interrupt processing
      ppc64: allow iSeries to use IRQSTACKS again
      ppc64: remove ppc_irq_dispatch_handler
      powerpc: merge irq.c
      powerpc: remove some warnings when building iSeries
      powerpc: implement atomic64_t on ppc64
      powerpc: fix iSeries build




More information about the Linuxppc64-dev mailing list