Please pull powerpc.git merge branch

Paul Mackerras paulus at
Thu Mar 20 11:43:45 EST 2008


Please do:

git pull \
git:// merge

to get some more bug-fixes and a defconfig update for various powerpc
platforms.  The defconfig update only updates 9 of the defconfigs but
still dominates the diffstat, since the bug-fixes are all fairly


 arch/powerpc/boot/Makefile             |    4 -
 arch/powerpc/boot/wrapper              |    4 -
 arch/powerpc/configs/cell_defconfig    |  141 ++++++++++++++---------
 arch/powerpc/configs/celleb_defconfig  |  117 ++++++++++++-------
 arch/powerpc/configs/chrp32_defconfig  |  165 +++++++++++----------------
 arch/powerpc/configs/g5_defconfig      |  137 ++++++++++++++--------
 arch/powerpc/configs/iseries_defconfig |   99 +++++++++++-----
 arch/powerpc/configs/pmac32_defconfig  |  195 ++++++++++++++++++++------------
 arch/powerpc/configs/ppc64_defconfig   |  169 +++++++++++++++++-----------
 arch/powerpc/configs/ps3_defconfig     |  103 ++++++++++-------
 arch/powerpc/configs/pseries_defconfig |  136 +++++++++++++---------
 arch/powerpc/kernel/process.c          |    6 +
 arch/powerpc/kernel/ptrace.c           |   10 +-
 arch/powerpc/mm/slb.c                  |    6 +
 arch/powerpc/platforms/cell/iommu.c    |   41 ++++---
 arch/powerpc/platforms/cell/setup.c    |   36 ++++++
 16 files changed, 835 insertions(+), 534 deletions(-)

commit 93ce4e2d2d7404e80d5612fb1cc13d4aad5e42fc
Author: Paul Mackerras <paulus at>
Date:   Thu Mar 20 11:21:32 2008 +1100

    [POWERPC] Update some defconfigs
    Signed-off-by: Paul Mackerras <paulus at>

commit ebf3a6509299e46c531f88ee727372bd95cf542a
Author: Michael Ellerman <michael at>
Date:   Wed Mar 19 17:10:55 2008 +1100

    [POWERPC] Hide resources on Axon PCIE root complex nodes
    The PCI bridge representing the PCIE root complex on Axon, contains
    device BARs for a memory range and ROM that define inbound accesses.
    This confuses the kernel resource management code -- the resources
    need to be hidden when Axon is a host bridge.
    Signed-off-by: Michael Ellerman <michael at>
    Acked-by: Benjamin Herrenschmidt <benh at>
    Signed-off-by: Paul Mackerras <paulus at>

commit 3a4295d101d9654ca909b64c786f9da6ca1bf37a
Author: Michael Ellerman <michael at>
Date:   Fri Mar 14 16:47:39 2008 +1100

    [POWERPC] Fix cell IOMMU code to cope with empty dma-ranges and non-PCI devices
    The cell IOMMU code to parse the dma-ranges properties, used for the fixed
    mapping, was broken in two ways for some devices.
    Firstly it didn't cope with empty dma-ranges properties. An empty property
    implies no translation so can be safely skipped.
    The code also wrongly assumed it would be looking at PCI devices, and hard
    coded the number of address and size cells.
    Signed-off-by: Michael Ellerman <michael at>
    Signed-off-by: Paul Mackerras <paulus at>

commit a72a6f53ddb95723960bb64c011457e9739941d7
Author: Paul Gortmaker <paul.gortmaker at>
Date:   Tue Mar 18 16:13:10 2008 +1100

    [POWERPC] Fix build failure for tqm8540 and sbc85xx defconfigs
    The wrapper script didn't have entries for the TQM8540 board and the
    SBC8548 or SBC8560 boards.  I've assumed that the TQM8540 console is
    8250 based and not CPM based by looking at its defconfig.  There was
    also a trailing * on the TQM8555 entry that I removed too.
    Signed-off-by: Paul Gortmaker <paul.gortmaker at>
    Signed-off-by: Grant Likely <grant.likely at>
    Signed-off-by: Paul Mackerras <paulus at>

commit 44387e9ff25267c78a99229aca55ed750e9174c7
Author: Anton Blanchard <anton at>
Date:   Mon Mar 17 15:27:09 2008 +1100

    [POWERPC] Fix PMU + soft interrupt disable bug
    Since the PMU is an NMI now, it can come at any time we are only soft
    disabled.  We must hard disable around the two places we allow the kernel
    stack SLB and r1 to go out of sync.  Otherwise the PMU exception can
    force a kernel stack SLB into another slot, which can lead to it
    getting evicted, which can lead to a nasty unrecoverable SLB miss
    in the exception entry code.
    Signed-off-by: Anton Blanchard <anton at>
    Acked-by: Benjamin Herrenschmidt <benh at>
    Acked-by: Olof Johansson <olof at>
    Signed-off-by: Paul Mackerras <paulus at>

commit c2372eb9bcafdd149b26987a8c25bbed92fd2775
Author: Roland McGrath <roland at>
Date:   Thu Mar 13 19:25:35 2008 +1100

    [POWERPC] user_regset PTRACE_SETREGS regression fix
    The PTRACE_SETREGS request was only recently added on powerpc,
    and gdb does not use it.  So it slipped through without getting
    all the testing it should have had.
    The user_regset changes had a simple bug in storing to all of
    the 32-bit general registers block on 64-bit kernels.  This bug
    only comes up with PTRACE_SETREGS, not PPC_PTRACE_SETREGS.
    It causes a BUG_ON to hit, so this fix needs to go in ASAP.
    Signed-off-by: Roland McGrath <roland at>
    Signed-off-by: Paul Mackerras <paulus at>

More information about the Linuxppc-dev mailing list