linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Paul Mackerras <paulus@samba.org>
To: torvalds@linux-foundation.org
Cc: linuxppc-dev@ozlabs.org
Subject: Please pull powerpc.git merge branch
Date: Fri, 10 Aug 2007 22:20:17 +1000	[thread overview]
Message-ID: <18108.22529.340205.626742@cargo.ozlabs.ibm.com> (raw)

Linus,

Please do

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

to get another batch of bug-fixes for powerpc.  I have included the
full log messages this time.  The changes for spu_base.c and
spu_manage.c are mostly code movement that was needed so that a
PS3-only config would build, so the real change isn't as large as the
diffstat might seem to indicate.

Thanks,
Paul.

 arch/powerpc/configs/ps3_defconfig        |  200 +++++++++--------------------
 arch/powerpc/kernel/head_64.S             |   16 +-
 arch/powerpc/kernel/pci_64.c              |    1 
 arch/powerpc/mm/slb.c                     |   45 ++-----
 arch/powerpc/mm/slice.c                   |    2 
 arch/powerpc/platforms/83xx/mpc832x_mds.c |    1 
 arch/powerpc/platforms/83xx/mpc832x_rdb.c |    1 
 arch/powerpc/platforms/83xx/mpc836x_mds.c |    1 
 arch/powerpc/platforms/85xx/mpc85xx_mds.c |    1 
 arch/powerpc/platforms/cell/spu_base.c    |  141 --------------------
 arch/powerpc/platforms/cell/spu_manage.c  |  163 ++++++++++++++++++++++++
 arch/powerpc/platforms/ps3/Kconfig        |   10 +
 arch/powerpc/platforms/ps3/device-init.c  |   37 +++--
 arch/powerpc/platforms/ps3/spu.c          |    6 +
 include/asm-powerpc/dma-mapping.h         |    2 
 include/asm-powerpc/spu_priv1.h           |    7 +
 16 files changed, 295 insertions(+), 339 deletions(-)

commit d1f5a77f2c9db5b8a565eabdf8b534b02e32cc44
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Wed Aug 8 15:44:15 2007 +1000

    [POWERPC] Fix size check for hugetlbfs
    
    My "slices" address space management code that was added in the 2.6.22
    implementation of get_unmapped_area() doesn't properly check that the
    size is a multiple of the requested page size.  This allows userland to
    create VMAs that aren't a multiple of the huge page size with hugetlbfs
    (since hugetlbfs entirely relies on get_unmapped_area() to do that
    checking) which leads to a kernel BUG() when such areas are torn down.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 8f2ea1fd3f97ab7a809e939b5b9005a16f862439
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Tue Aug 7 08:05:10 2007 +1000

    [POWERPC] Fix initialization and usage of dma_mask
    
    powerpc has a couple of bugs in the usage of dma_masks that tend to
    break when drivers explicitly try to set a 32-bit mask for example.
    
    First, the code that generates the pci devices from the OF device-tree
    doesn't initialize the mask properly, then our implementation of
    set_dma_mask() was trying to validate the -previous- mask value, not the
    one passed in as an argument.
    
    This fixes these problems.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 939e60f6808a9ffd3a4e5f145057379c138c89aa
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Tue Jul 31 16:44:13 2007 +1000

    [POWERPC] Fix more section mismatches in head_64.S
    
    WARNING: vmlinux.o(.text+0x8174): Section mismatch: reference to .init.text:.prom_init (between '.__boot_from_prom' and '.__after_prom_start')
    WARNING: vmlinux.o(.text+0x8498): Section mismatch: reference to .init.text:.early_setup (between '.start_here_multiplatform' and '.start_here_common')
    WARNING: vmlinux.o(.text+0x8514): Section mismatch: reference to .init.text:.setup_system (between '.start_here_common' and 'system_call_common')
    WARNING: vmlinux.o(.text+0x8530): Section mismatch: reference to .init.text:.start_kernel (between '.start_here_common' and 'system_call_common')
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Acked-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 3c5ede8cc6c75c3d85e46a5c20f106bcec933347
Author: Kim Phillips <kim.phillips@freescale.com>
Date:   Thu Jul 26 17:25:12 2007 -0500

    [POWERPC] Revert "[POWERPC] Add 'mdio' to bus scan id list for platforms with QE UEC"
    
    This reverts commit 3baee955953957be5496cd28e9c544d9db214262.
    
    That commit was a mistake from the start; I added mdio type to the
    bus scan list early on in my ucc_geth migrate to phylib development,
    which is just pure wrong (the ucc_geth_mii driver creates the mii
    bus and the PHY layer handles PHY enumeration without translation).
    
    This follows on from commit 77926826f301fbd8ed96d3cd9ff17a5b59560dfb:
    
     Revert "[POWERPC] Don't complain if size-cells == 0 in prom_parse()"
    
    which was basically trying to hide a symptom of the original mistake
    this revert fixes.
    
    Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit bd948b0377e7ab93559a80f68d38749bcc2e9a77
Author: geoffrey.levand@am.sony.com <geoffrey.levand@am.sony.com>
Date:   Tue Aug 7 20:31:22 2007 -0700

    [POWERPC] PS3: Update ps3_defconfig
    
    Update ps3_defconfig.
    
    Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 332a7b3e93c6521219be0a72ebfe2eee795a8345
Author: Geoff Levand <geoffrey.levand@am.sony.com>
Date:   Wed Aug 8 09:39:02 2007 -0700

    [POWERPC] PS3: Remove text saying PS3 support is incomplete
    
    Remove the Kconfig message that indicates the PS3 platform support is
    incomplete.
    
    Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit edd2a9d185799354db255de62c3ed1f2b1c6b0f4
Author: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date:   Wed Aug 8 11:01:21 2007 -0700

    [POWERPC] PS3: Fix storage probe logic
    
    Fix the PS3 storage probe logic to properly find device regions on cold
    startup.
    
     o Change the storage probe event mask from notify_device_ready
       to notify_region_update.
     o Improve the storage probe error handling.
     o Change ps3_storage_wait_for_device() to use a temporary variable to hold
       the buffer address.
    
    Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
    Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit f5996449e3244524cab0ba709a4bd87047a8175f
Author: Andre Detsch <adetsch@br.ibm.com>
Date:   Fri Aug 3 18:53:46 2007 -0700

    [POWERPC] cell: Move SPU affinity init to spu_management_of_ops
    
    This patch moves affinity initialization code from spu_base.c to a
    new spu_management_of_ops function (init_affinity), which is empty
    in the case of PS3. This fixes a linking problem that was happening
    when compiling for PS3.
    Also, some small code style changes were made.
    
    Signed-off-by: Andre Detsch <adetsch@br.ibm.com>
    Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
    Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit edd0622bd2e8f755c960827e15aa6908c3c5aa94
Author: Paul Mackerras <paulus@samba.org>
Date:   Fri Aug 10 21:04:07 2007 +1000

    [POWERPC] Fix potential duplicate entry in SLB shadow buffer
    
    We were getting a duplicate entry in the SLB shadow buffer in
    slb_flush_and_rebolt() if the kernel stack was in the same segment
    as PAGE_OFFSET, which on POWER6 causes the hypervisor to terminate
    the partition with an error.  This fixes it.
    
    Also we were not creating an SLB entry (or an SLB shadow buffer
    entry) for the kernel stack on secondary CPUs when starting the
    CPU.  This isn't a major problem, since an appropriate entry will
    be created on demand, but this fixes that also for consistency.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>

             reply	other threads:[~2007-08-10 12:20 UTC|newest]

Thread overview: 146+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-10 12:20 Paul Mackerras [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-04-03 11:33 Please pull powerpc.git merge branch Paul Mackerras
2008-03-28 12:35 Paul Mackerras
2008-03-28 22:06 ` Bartlomiej Sieka
2008-04-01 23:12   ` Paul Mackerras
2008-04-02  4:27     ` Grant Likely
2008-04-02 14:32     ` Bartlomiej Sieka
2008-03-27 23:08 Paul Mackerras
2008-03-25  3:32 Paul Mackerras
2008-03-24  8:05 Paul Mackerras
2008-03-20  0:43 Paul Mackerras
2008-03-12 23:51 Paul Mackerras
2008-03-03 11:41 Paul Mackerras
2008-03-03 15:44 ` Grant Likely
2008-02-20  3:46 Paul Mackerras
2008-02-21 12:15 ` Paul Mackerras
2008-02-14 22:00 Paul Mackerras
2008-02-15 22:43 ` Josh Boyer
2008-01-15 10:19 Paul Mackerras
2008-01-12  0:09 Paul Mackerras
2008-01-02  5:21 Paul Mackerras
2007-12-28  9:28 Paul Mackerras
2007-12-28 21:53 ` Geoff Levand
2007-12-31  1:40   ` Paul Mackerras
2007-12-31 16:12     ` Arnd Bergmann
2008-01-02  4:39       ` Jeremy Kerr
2007-12-17  6:00 Paul Mackerras
2007-12-07  1:04 Paul Mackerras
2007-12-06 12:01 Paul Mackerras
2007-12-02 23:12 Paul Mackerras
2007-12-03  0:25 ` Josh Boyer
2007-11-26 22:09 Paul Mackerras
2007-11-20  8:38 Paul Mackerras
2007-11-13 11:11 Paul Mackerras
2007-11-08  9:54 Paul Mackerras
2007-10-23  4:21 Paul Mackerras
2007-10-17 12:49 Paul Mackerras
2007-10-17 13:31 ` Josh Boyer
2007-10-02  3:15 Paul Mackerras
2007-09-25 11:40 Paul Mackerras
2007-09-25 12:43 ` Kumar Gala
2007-09-25 12:52   ` Paul Mackerras
2007-09-26 11:33 ` Paul Mackerras
2007-09-19 12:38 Paul Mackerras
2007-09-10 19:13 Paul Mackerras
2007-08-30 11:49 Paul Mackerras
2007-08-30 14:32 ` Kumar Gala
2007-08-26 23:57 Paul Mackerras
2007-08-17  0:51 Paul Mackerras
2007-08-15 11:41 Paul Mackerras
2007-08-03 10:32 Paul Mackerras
2007-08-06  5:57 ` Zhang Wei-r63237
2007-08-06 13:57   ` Kumar Gala
2007-08-07  1:06     ` Michael Ellerman
2007-08-07  2:57       ` Zang Roy-r61911
2007-08-07  3:18         ` Michael Ellerman
2007-08-07  3:31           ` Zhang Wei-r63237
2007-07-26 12:10 Paul Mackerras
2007-07-22 12:56 Paul Mackerras
2007-07-11  4:46 Paul Mackerras
2007-07-05  1:45 Paul Mackerras
2007-07-02  4:25 Paul Mackerras
2007-07-02  6:04 ` Paul Mackerras
2007-06-26 10:08 Paul Mackerras
2007-06-20 12:46 Paul Mackerras
2007-06-19  5:39 Paul Mackerras
2007-06-15  5:00 Paul Mackerras
2007-04-11 22:29 Paul Mackerras
2007-03-28 23:51 Paul Mackerras
2007-03-22  4:31 Paul Mackerras
2007-03-13  0:47 Paul Mackerras
2007-03-08  4:01 Paul Mackerras
2007-03-09 21:08 ` Paul Mackerras
2007-03-09 23:31   ` Arnd Bergmann
2007-01-27 23:08 Please pull powerpc.git 'merge' branch Paul Mackerras
2007-01-27 23:15 ` Paul Mackerras
2007-01-22 11:50 Paul Mackerras
2007-01-09  9:45 Paul Mackerras
2006-12-20 10:23 Paul Mackerras
2006-12-20 10:52 ` Benjamin Herrenschmidt
2006-12-20 11:15   ` Arnd Bergmann
2006-12-20 11:18     ` Benjamin Herrenschmidt
2006-11-22  2:35 Paul Mackerras
2006-11-22  2:47 ` Linus Torvalds
2006-11-22 21:40   ` Paul Mackerras
2006-11-22 21:53     ` Linus Torvalds
2006-11-16  2:19 Paul Mackerras
2006-11-11 11:32 Paul Mackerras
2006-11-01  7:30 Paul Mackerras
2006-10-25  6:26 Paul Mackerras
2006-10-25 14:09 ` Kumar Gala
2006-10-25 21:37   ` Paul Mackerras
2006-10-25 22:02     ` Kumar Gala
2006-10-25 14:22 ` Olof Johansson
2006-10-25 21:34   ` Paul Mackerras
2006-10-25 22:32     ` Olof Johansson
2006-10-17  4:02 Paul Mackerras
2006-10-10  5:31 Paul Mackerras
2006-10-07 12:33 Paul Mackerras
2006-09-13 12:47 Paul Mackerras
2006-09-14 19:14 ` Linus Torvalds
2006-09-14 22:55   ` Paul Mackerras
2006-09-14 23:36     ` Linus Torvalds
2006-09-15 19:59       ` Linus Torvalds
2006-08-31  4:34 Paul Mackerras
2006-08-31  4:49 ` Linus Torvalds
2006-09-03 19:16 ` Linus Torvalds
2006-09-03 19:23   ` Sergei Shtylyov
2006-09-03 19:29     ` Linus Torvalds
2006-09-03 20:41       ` Segher Boessenkool
2006-09-03 21:15   ` Benjamin Herrenschmidt
2006-09-03 21:33     ` Linus Torvalds
2006-09-03 21:54       ` Benjamin Herrenschmidt
2006-08-24  0:44 Paul Mackerras
     [not found] ` <20060824010508.GA17848@suse.de>
2006-08-24  4:02   ` Paul Mackerras
2006-08-24  4:10     ` Greg KH
2006-08-24 13:22       ` Jon Loeliger
2006-08-24 13:33         ` Kumar Gala
2006-08-18  2:10 Paul Mackerras
2006-08-18 14:15 ` Matt Porter
2006-08-18 16:20 ` Greg KH
2006-07-31  5:37 please " Paul Mackerras
2006-07-31 20:41 ` Linus Torvalds
2006-06-21  8:21 Paul Mackerras
2006-06-21 12:45 ` Kumar Gala
2006-06-21 13:04   ` Jon Loeliger
2006-06-21 13:08     ` Kumar Gala
2006-06-21 13:27       ` Jon Loeliger
2006-06-21 21:16   ` Paul Mackerras
2006-05-27 13:17 Paul Mackerras
2006-05-16 12:35 Paul Mackerras
2006-05-09  9:13 Paul Mackerras
2006-05-03 22:29 Paul Mackerras
2006-04-29  6:15 Paul Mackerras
2006-04-29 15:19 ` Olof Johansson
2006-04-29 23:47   ` Paul Mackerras
2006-04-30  3:12     ` Segher Boessenkool
2006-04-30  4:20       ` Olof Johansson
2006-04-30 11:42         ` Arnd Bergmann
2006-04-30 11:57           ` Arnd Bergmann
2006-04-30 15:07             ` Olof Johansson
2006-04-30 13:04           ` Segher Boessenkool
2006-04-30 16:14             ` Arnd Bergmann
2006-04-30 15:03           ` Olof Johansson
2006-04-30 15:07             ` Olof Johansson
2006-04-30  3:50     ` Olof Johansson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=18108.22529.340205.626742@cargo.ozlabs.ibm.com \
    --to=paulus@samba.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).