* Please pull powerpc.git merge branch
@ 2008-02-14 22:00 Paul Mackerras
0 siblings, 0 replies; 15+ messages in thread
From: Paul Mackerras @ 2008-02-14 22:00 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev, linux-kernel, akpm
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get a collection of bug-fixes and very minor cleanups for powerpc
(plus one commit wiring up the timerfd syscalls).
Thanks,
Paul.
arch/powerpc/Kconfig | 4 ---
arch/powerpc/boot/Makefile | 2 +
arch/powerpc/boot/ps3-hvcall.S | 2 +
arch/powerpc/kernel/Makefile | 2 +
arch/powerpc/kernel/process.c | 2 +
arch/powerpc/kernel/vdso.c | 12 ++++----
arch/powerpc/platforms/512x/Kconfig | 1 -
arch/powerpc/platforms/52xx/Kconfig | 2 -
arch/powerpc/platforms/Kconfig | 2 -
arch/powerpc/platforms/Kconfig.cputype | 4 ---
arch/powerpc/platforms/cell/ras.c | 11 ++++++-
arch/powerpc/platforms/embedded6xx/Kconfig | 4 ---
arch/powerpc/platforms/iseries/vio.c | 2 +
drivers/char/hvc_rtas.c | 2 +
drivers/ps3/ps3-lpm.c | 22 ++++++++------
drivers/ps3/ps3-sys-manager.c | 44 ++++++++++++++++++++--------
include/asm-powerpc/systbl.h | 4 ++-
include/asm-powerpc/unistd.h | 6 +++-
include/asm-ppc/page.h | 2 +
19 files changed, 76 insertions(+), 54 deletions(-)
Adrian Bunk (3):
[POWERPC] vdso_do_func_patch{32,64}() must be __init
[POWERPC] free_property() must not be __init
[POWERPC] hvc_rtas_init() must be __init
Geoff Levand (4):
[POWERPC] PS3: Fix bootwrapper hang bug
[POWERPC] PS3: Use system reboot on restart
[POWERPC] PS3: Sys-manager code cleanup
[POWERPC] PS3: Update sys-manager button events
Grant Likely (1):
[POWERPC] Remove unused CONFIG_WANT_DEVICE_TREE
Hugh Dickins (1):
[POWERPC] Fix DEBUG_PREEMPT warning when warning
Kumar Gala (1):
[POWERPC] Remove generated files on make clean
Michael Ellerman (1):
[POWERPC] Cell RAS: Remove DEBUG, and add license and copyright
Stefan Roese (1):
[POWERPC] Fix arch/ppc compilation - add typedef for pgtable_t
Stephen Rothwell (1):
[POWERPC] Wire up new timerfd syscalls
Takashi Yamamoto (2):
[POWERPC] PS3: Fix setting bookmark in logical performance monitor
[POWERPC] PS3: Fix reading pm interval in logical performance monitor
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull powerpc.git merge branch
@ 2008-02-20 3:46 Paul Mackerras
2008-02-21 12:15 ` Paul Mackerras
0 siblings, 1 reply; 15+ messages in thread
From: Paul Mackerras @ 2008-02-20 3:46 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev, linux-kernel, akpm
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get a few more bug and warning fixes for powerpc. The diffstat is
bloated by the defconfig updates -- the actual code changes are only a
few dozen lines.
Thanks,
Paul.
arch/powerpc/boot/Makefile | 8
arch/powerpc/boot/dts/bamboo.dts | 3
arch/powerpc/boot/dts/ebony.dts | 2
arch/powerpc/boot/dts/katmai.dts | 2
arch/powerpc/boot/dts/kilauea.dts | 3
arch/powerpc/boot/dts/makalu.dts | 3
arch/powerpc/boot/dts/rainier.dts | 4
arch/powerpc/boot/dts/sequoia.dts | 4
arch/powerpc/boot/dts/taishan.dts | 4
arch/powerpc/configs/bamboo_defconfig | 81 ++-
arch/powerpc/configs/ebony_defconfig | 79 ++-
arch/powerpc/configs/ep405_defconfig | 92 ++-
arch/powerpc/configs/kilauea_defconfig | 69 ++
arch/powerpc/configs/makalu_defconfig | 69 ++
arch/powerpc/configs/ppc44x_defconfig | 904 ++++++++++++++++++++++++++++++++
arch/powerpc/configs/rainier_defconfig | 82 ++-
arch/powerpc/configs/sequoia_defconfig | 77 ++-
arch/powerpc/configs/taishan_defconfig | 81 ++-
arch/powerpc/configs/walnut_defconfig | 81 ++-
arch/powerpc/configs/warp_defconfig | 139 +++--
arch/powerpc/kernel/kprobes.c | 9
arch/powerpc/kernel/prom.c | 13
arch/powerpc/platforms/44x/Kconfig | 10
arch/powerpc/platforms/pseries/power.c | 2
arch/ppc/platforms/4xx/ibm440ep.c | 6
drivers/net/ibm_newemac/rgmii.c | 1
26 files changed, 1497 insertions(+), 331 deletions(-)
create mode 100644 arch/powerpc/configs/ppc44x_defconfig
Ananth N Mavinakayanahalli (1):
[POWERPC] Kill sparse warnings in kprobes
Becky Bruce (1):
[POWERPC] Fix dt_mem_next_cell() to read the full address
Josh Boyer (4):
[POWERPC] 4xx: Update defconfigs for 2.6.25
[POWERPC] 44x: Fix Kconfig formatting
[POWERPC] 44x: Add multiplatform defconfig
[POWERPC] Fix bootwrapper builds with older gcc versions
Stefan Roese (2):
[POWERPC] net: NEWEMAC: Remove "rgmii-interface" from rgmii matching table
[POWERPC] 4xx: Remove "i2c" and "xxmii-interface" device_types from dts
Stephen Rothwell (1):
[POWERPC] Fix warning in pseries/power.c
Wolfgang Ocker (1):
[POWERPC] PPC440EP Interrupt Triggering and Level Settings
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Please pull powerpc.git merge branch
2008-02-20 3:46 Paul Mackerras
@ 2008-02-21 12:15 ` Paul Mackerras
0 siblings, 0 replies; 15+ messages in thread
From: Paul Mackerras @ 2008-02-21 12:15 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev, akpm, linux-kernel
Linus,
Since I send the last pull request I have added four more commits to
the powerpc.git merge branch, two from Olof Johansson fixing a bug and
a warning for the pasemi platform, and two spufs bugfixes from Jeremy
Kerr.
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
The diffstat and log below reflect all the outstanding commits, not
just the new four.
Thanks,
Paul.
arch/powerpc/boot/Makefile | 8
arch/powerpc/boot/dts/bamboo.dts | 3
arch/powerpc/boot/dts/ebony.dts | 2
arch/powerpc/boot/dts/katmai.dts | 2
arch/powerpc/boot/dts/kilauea.dts | 3
arch/powerpc/boot/dts/makalu.dts | 3
arch/powerpc/boot/dts/rainier.dts | 4
arch/powerpc/boot/dts/sequoia.dts | 4
arch/powerpc/boot/dts/taishan.dts | 4
arch/powerpc/configs/bamboo_defconfig | 81 ++-
arch/powerpc/configs/ebony_defconfig | 79 ++
arch/powerpc/configs/ep405_defconfig | 92 ++-
arch/powerpc/configs/kilauea_defconfig | 69 +-
arch/powerpc/configs/makalu_defconfig | 69 +-
arch/powerpc/configs/ppc44x_defconfig | 904 ++++++++++++++++++++++++++++
arch/powerpc/configs/rainier_defconfig | 82 ++-
arch/powerpc/configs/sequoia_defconfig | 77 ++
arch/powerpc/configs/taishan_defconfig | 81 ++-
arch/powerpc/configs/walnut_defconfig | 81 ++-
arch/powerpc/configs/warp_defconfig | 139 +++-
arch/powerpc/kernel/kprobes.c | 9
arch/powerpc/kernel/prom.c | 13
arch/powerpc/platforms/44x/Kconfig | 10
arch/powerpc/platforms/cell/spu_base.c | 12
arch/powerpc/platforms/cell/spufs/run.c | 1
arch/powerpc/platforms/cell/spufs/sched.c | 8
arch/powerpc/platforms/cell/spufs/switch.c | 6
arch/powerpc/platforms/pasemi/Makefile | 2
arch/powerpc/platforms/pasemi/misc.c | 97 +++
arch/powerpc/platforms/pseries/power.c | 2
arch/powerpc/sysdev/mpic_pasemi_msi.c | 5
arch/ppc/platforms/4xx/ibm440ep.c | 6
drivers/net/ibm_newemac/rgmii.c | 1
include/asm-powerpc/spu.h | 3
34 files changed, 1605 insertions(+), 357 deletions(-)
create mode 100644 arch/powerpc/configs/ppc44x_defconfig
create mode 100644 arch/powerpc/platforms/pasemi/misc.c
Ananth N Mavinakayanahalli (1):
[POWERPC] Kill sparse warnings in kprobes
Andre Detsch (1):
[POWERPC] cell: fix spurious false return from spu_trap_data_{map,seg}
Becky Bruce (1):
[POWERPC] Fix dt_mem_next_cell() to read the full address
Jeremy Kerr (1):
[POWERPC] spufs: fix scheduler starvation by idle contexts
Josh Boyer (4):
[POWERPC] 4xx: Update defconfigs for 2.6.25
[POWERPC] 44x: Fix Kconfig formatting
[POWERPC] 44x: Add multiplatform defconfig
[POWERPC] Fix bootwrapper builds with older gcc versions
Olof Johansson (2):
[POWERPC] pasemi: Register i2c devices at boot
[POWERPC] pasemi: Remove warning in mpic_pasemi_msi.c
Stefan Roese (2):
[POWERPC] net: NEWEMAC: Remove "rgmii-interface" from rgmii matching table
[POWERPC] 4xx: Remove "i2c" and "xxmii-interface" device_types from dts
Stephen Rothwell (1):
[POWERPC] Fix warning in pseries/power.c
Wolfgang Ocker (1):
[POWERPC] PPC440EP Interrupt Triggering and Level Settings
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull powerpc.git merge branch
@ 2008-03-03 11:41 Paul Mackerras
2008-03-03 15:44 ` Grant Likely
0 siblings, 1 reply; 15+ messages in thread
From: Paul Mackerras @ 2008-03-03 11:41 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev, akpm, linux-kernel
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get a collection of bug-fixes for powerpc, for the Cell, 4xx and
52xx platforms.
Thanks,
Paul.
arch/powerpc/boot/cuboot-bamboo.c | 1
arch/powerpc/boot/cuboot-ebony.c | 1
arch/powerpc/boot/cuboot-katmai.c | 1
arch/powerpc/boot/cuboot-taishan.c | 2
arch/powerpc/boot/cuboot-warp.c | 1
arch/powerpc/boot/dts/haleakala.dts | 2
arch/powerpc/boot/dts/katmai.dts | 58 +++++-----
arch/powerpc/oprofile/op_model_cell.c | 2
arch/powerpc/platforms/52xx/mpc52xx_common.c | 1
arch/powerpc/platforms/cell/iommu.c | 151 +++++++++++++++-----------
arch/powerpc/platforms/cell/setup.c | 7 +
arch/powerpc/platforms/cell/spu_base.c | 16 ++-
arch/powerpc/platforms/cell/spufs/context.c | 7 +
arch/powerpc/platforms/cell/spufs/file.c | 12 ++
arch/powerpc/platforms/cell/spufs/sched.c | 2
arch/powerpc/platforms/cell/spufs/sputrace.c | 7 +
arch/powerpc/platforms/cell/spufs/switch.c | 6 +
arch/powerpc/platforms/celleb/beat.h | 3 -
drivers/char/xilinx_hwicap/buffer_icap.c | 80 +++++++-------
drivers/char/xilinx_hwicap/fifo_icap.c | 60 +++++-----
drivers/char/xilinx_hwicap/xilinx_hwicap.c | 138 +++++++++++-------------
drivers/char/xilinx_hwicap/xilinx_hwicap.h | 24 ++--
include/asm-powerpc/reg.h | 3 +
23 files changed, 318 insertions(+), 267 deletions(-)
Andre Detsch (1):
[POWERPC] spufs: fix use time accounting on SPE-overcommit
Arnd Bergmann (3):
[POWERPC] spufs: synchronize IRQ when disabling
[POWERPC] spufs: invalidate SLB translation before adding a new entry
[POWERPC] spufs: serialize SLB invalidation against SLB loading
Bob Nelson (1):
[POWERPC] OProfile: enable callgraph support for Cell
Eric Dujardin (1):
[POWERPC] Add export for mpc52xx_set_psc_clkdiv
Jens Osterkamp (2):
[POWERPC] move celleb DABRX definitions
[POWERPC] enable hardware watchpoints on cell blades
Jeremy Kerr (3):
[POWERPC] spufs: fix context destruction during psmap fault
[POWERPC] spufs: fix invalid scheduling of forgotten contexts
[POWERPC] spufs: fix order of sputrace thread IDs
Josh Boyer (1):
[POWERPC] 4xx: Use correct board info structure in cuboot wrappers
Michael Ellerman (8):
[POWERPC] Clearup cell IOMMU fixed mapping terminology
[POWERPC] Use it_offset not pte_offset in cell IOMMU code
[POWERPC] Remove unused pte_offset variable
[POWERPC] Move allocation of cell IOMMU pad page
[POWERPC] Split setup of IOMMU stab and ptab, allocate dynamic/fixed ptabs separately
[POWERPC] Cell IOMMU: n_pte_pages is in 4K page units, not IOMMU_PAGE_SIZE
[POWERPC] Allow for different IOMMU page sizes in cell IOMMU code
[POWERPC] Convert the cell IOMMU fixed mapping to 16M IOMMU pages
Stefan Roese (2):
[POWERPC] 4xx: Fix Haleakala PCIe compatibility problem in dts
[POWERPC] 4xx: Fix L1 cache size in katmai DTS
Stephen Neuendorffer (1):
[POWERPC] Xilinx: hwicap cleanup
Valentine Barshak (1):
[POWERPC] 44x: add missing define TARGET_4xx and TARGET_440GX to cuboot-taishan
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Please pull powerpc.git merge branch
2008-03-03 11:41 Paul Mackerras
@ 2008-03-03 15:44 ` Grant Likely
0 siblings, 0 replies; 15+ messages in thread
From: Grant Likely @ 2008-03-03 15:44 UTC (permalink / raw)
To: Paul Mackerras; +Cc: torvalds, linuxppc-dev, akpm, linux-kernel
Paul, can you please pick up this one too?
http://patchwork.ozlabs.org/linuxppc/patch?id=16965
Thanks,
g.
On Mon, Mar 3, 2008 at 4:41 AM, Paul Mackerras <paulus@samba.org> wrote:
> Linus,
>
> Please do:
>
> git pull \
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
>
> to get a collection of bug-fixes for powerpc, for the Cell, 4xx and
> 52xx platforms.
>
> Thanks,
> Paul.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull powerpc.git merge branch
@ 2008-03-12 23:51 Paul Mackerras
0 siblings, 0 replies; 15+ messages in thread
From: Paul Mackerras @ 2008-03-12 23:51 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev, akpm, linux-kernel
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get some more bug-fixes for various powerpc platforms.
Thanks,
Paul.
arch/powerpc/Makefile | 2
arch/powerpc/boot/Makefile | 18 -
arch/powerpc/boot/dts/mpc8377_mds.dts | 70 ++
arch/powerpc/boot/dts/mpc8378_mds.dts | 70 ++
arch/powerpc/boot/dts/mpc8379_mds.dts | 70 ++
arch/powerpc/boot/dts/sbc8548.dts | 16
arch/powerpc/boot/wrapper | 6
arch/powerpc/configs/adder875-uboot_defconfig | 798 -----------------------
arch/powerpc/configs/adder875_defconfig | 61 +-
arch/powerpc/kernel/head_8xx.S | 30 +
arch/powerpc/kernel/misc_32.S | 15
arch/powerpc/kernel/pci-common.c | 8
arch/powerpc/kernel/ppc_ksyms.c | 3
arch/powerpc/mm/hash_utils_64.c | 4
arch/powerpc/platforms/83xx/mpc837x_mds.c | 8
arch/powerpc/platforms/Kconfig | 1
arch/powerpc/platforms/Kconfig.cputype | 7
arch/powerpc/platforms/cell/spufs/context.c | 3
arch/powerpc/platforms/cell/spufs/run.c | 3
arch/powerpc/platforms/cell/spufs/sched.c | 4
arch/powerpc/platforms/cell/spufs/spufs.h | 1
arch/powerpc/platforms/powermac/pic.c | 2
arch/powerpc/sysdev/qe_lib/qe.c | 7
arch/ppc/kernel/head_8xx.S | 30 +
drivers/block/viodasd.c | 3
drivers/macintosh/via-pmu-backlight.c | 5
drivers/macintosh/via-pmu.c | 2
include/asm-powerpc/pgtable-ppc32.h | 8
include/asm-ppc/pgtable.h | 8
include/linux/pmu.h | 9
30 files changed, 389 insertions(+), 883 deletions(-)
delete mode 100644 arch/powerpc/configs/adder875-uboot_defconfig
rename arch/powerpc/configs/{adder875-redboot_defconfig => adder875_defconfig} (95%)
Andy Fleming (1):
[POWERPC] 83xx: Make 83xx perfmon support selectable
Benjamin Herrenschmidt (3):
[POWERPC] Fix bogus test for unassigned PCI resources
[POWERPC] Fix sleep on some powerbooks
[POWERPC] Fix viodasd driver with scatterlist debug
Grant Likely (1):
[POWERPC] Fix zImage-dtb.initrd build error
Guido Guenther (1):
[POWERPC] Fix build of modular drivers/macintosh/apm_emu.c
Ionut Nicu (1):
[POWERPC] QE: Make qe_get_firmware_info reentrant
Jeremy Kerr (2):
[POWERPC] spufs: don't (ab)use SCHED_IDLE
[POWERPC] spufs: fix rescheduling of non-runnable contexts
Jeremy McNicoll (1):
[POWERPC] 85xx: sbc8548 - Fix incorrect PCI-X and PCI interrupt map
Li Yang (2):
[POWERPC] 83xx: Fix wrong USB phy type in mpc837xmds dts
[POWERPC] 83xx: Add local bus device nodes to MPC837xMDS device trees.
Michael Ellerman (1):
[POWERPC] Fix large hash table allocation on Cell blades
Paul Mackerras (1):
[POWERPC] Add __ucmpdi2 for 64-bit comparisons in 32-bit kernels
Scott Wood (1):
[POWERPC] 8xx: Fix wrapper platform for adder875, and combine defconfigs.
Theodore Ts'o (1):
[POWERPC] Export empty_zero_page
Timur Tabi (1):
[POWERPC] QE: Fix QE firmware uploading limit
Tony Breeds (3):
[POWERPC] Fix undefined pmu_sys_suspended compilation error
[POWERPC] Fix drivers/macintosh/mediabay.c when !CONFIG_ADB_PMU
[POWERPC] Fix arch/powerpc/platforms/powermac/pic.c when !CONFIG_ADB_PMU
Vitaly Bordug (1):
[POWERPC] 8xx: fix swap
Yuri Tikhonov (1):
[PPC] 8xx: swap bug-fix
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull powerpc.git merge branch
@ 2008-03-20 0:43 Paul Mackerras
0 siblings, 0 replies; 15+ messages in thread
From: Paul Mackerras @ 2008-03-20 0:43 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev, akpm, linux-kernel
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.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
small.
Thanks,
Paul.
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@samba.org>
Date: Thu Mar 20 11:21:32 2008 +1100
[POWERPC] Update some defconfigs
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit ebf3a6509299e46c531f88ee727372bd95cf542a
Author: Michael Ellerman <michael@ellerman.id.au>
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@ellerman.id.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 3a4295d101d9654ca909b64c786f9da6ca1bf37a
Author: Michael Ellerman <michael@ellerman.id.au>
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@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit a72a6f53ddb95723960bb64c011457e9739941d7
Author: Paul Gortmaker <paul.gortmaker@windriver.com>
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@windriver.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 44387e9ff25267c78a99229aca55ed750e9174c7
Author: Anton Blanchard <anton@samba.org>
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@samba.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit c2372eb9bcafdd149b26987a8c25bbed92fd2775
Author: Roland McGrath <roland@redhat.com>
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@redhat.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull powerpc.git merge branch
@ 2008-03-24 8:05 Paul Mackerras
0 siblings, 0 replies; 15+ messages in thread
From: Paul Mackerras @ 2008-03-24 8:05 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev, akpm, linux-kernel
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get a few more bug-fixes for powerpc that should go in 2.6.25.
Thanks,
Paul.
arch/powerpc/mm/hash_utils_64.c | 11 ++++++++---
arch/powerpc/sysdev/bestcomm/bestcomm.c | 8 ++++++--
arch/powerpc/sysdev/ipic.c | 2 +-
drivers/net/fec_mpc52xx_phy.c | 3 ++-
4 files changed, 17 insertions(+), 7 deletions(-)
commit 7ea6fd7e2df041297298b5feb5b7b78a2b1a5310
Author: Anatolij Gustschin <agust@denx.de>
Date: Sat Mar 22 21:49:05 2008 +1100
[POWERPC] Fix Oops with TQM5200 on TQM5200
The "bestcomm-core" driver defines its of_match table as follows
static struct of_device_id mpc52xx_bcom_of_match[] = {
{ .type = "dma-controller", .compatible = "fsl,mpc5200-bestcomm", },
{ .type = "dma-controller", .compatible = "mpc5200-bestcomm", },
{},
};
so while registering the driver, the driver's probe function won't be
called, because the device tree node doesn't have a device_type
property. Thus the driver's bcom_engine structure won't be allocated.
Referencing this structure later causes observed Oops.
Checking bcom_eng pointer for NULL before referencing data pointed
by it prevents oopsing, but fec driver still doesn't work (because
of the lost bestcomm match and resulted task allocation failure).
Actually the compatible property exists and should match and so
the fec driver should work.
This removes .type = "dma-controller" from the bestcomm driver's
mpc52xx_bcom_of_match table to solve the problem.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 9560aea4e9d17cb75113c6051e800222fd5c71a4
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Sat Mar 22 14:41:05 2008 +1100
[POWERPC] mpc5200: Fix null dereference if bestcomm fails to initialize
If the bestcomm initialization fails, calls to the task allocate
function should fail gracefully instead of oopsing with a NULL deref.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit b8c19eb16a7e6df57d0f6d67e42ce026e5d5930b
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Sat Mar 22 14:20:29 2008 +1100
[POWERPC] mpc5200-fec: Fix possible NULL dereference in mdio driver
If the reg property is missing from the phy node (unlikely, but possible),
then the kernel will oops with a NULL pointer dereference. This fixes
it by checking the pointer first.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 1428a9fa586cb80acf98289f797f58b8bd662598
Author: Olaf Hering <olaf@aepfle.de>
Date: Tue Mar 18 06:53:05 2008 +1100
[POWERPC] Fix crash in init_ipic_sysfs on efika
The global primary_ipic in arch/powerpc/sysdev/ipic.c can remain NULL
if ipic_init() fails, which will happen on machines that don't have an
ipic interrupt controller. init_ipic_sysfs() will crash in that case.
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit cfe666b145cecffe784d98e60ffe201a5dc57ac3
Author: Paul Mackerras <paulus@samba.org>
Date: Mon Mar 24 17:41:22 2008 +1100
[POWERPC] Don't use 64k pages for ioremap on pSeries
On pSeries, the hypervisor doesn't let us map in the eHEA ethernet
adapter using 64k pages, and thus the ehea driver will fail if 64k
pages are configured. This works around the problem by always
using 4k pages for ioremap on pSeries (but not on other platforms).
A better fix would be to check whether the partition could ever
have an eHEA adapter, and only force 4k pages if it could, but this
will do for 2.6.25.
This is based on an earlier patch by Tony Breeds.
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull powerpc.git merge branch
@ 2008-03-25 3:32 Paul Mackerras
0 siblings, 0 replies; 15+ messages in thread
From: Paul Mackerras @ 2008-03-25 3:32 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev, akpm, linux-kernel
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
once more. Kumar sent me a defconfig update for the Freescale
platforms, and there is another 1-line fix from Grant Likely that only
affects MPC5200B machines.
Thanks,
Paul.
arch/powerpc/boot/dts/lite5200b.dts | 2
arch/powerpc/configs/ep8248e_defconfig | 74 +++++++---
arch/powerpc/configs/ep88xc_defconfig | 56 +++++--
arch/powerpc/configs/linkstation_defconfig | 131 +++++++++++------
arch/powerpc/configs/mpc7448_hpc2_defconfig | 119 ++++++++++++----
arch/powerpc/configs/mpc8272_ads_defconfig | 75 ++++++++--
arch/powerpc/configs/mpc8313_rdb_defconfig | 114 ++++++++++-----
arch/powerpc/configs/mpc8315_rdb_defconfig | 110 ++++++++++-----
arch/powerpc/configs/mpc832x_mds_defconfig | 101 +++++++++----
arch/powerpc/configs/mpc832x_rdb_defconfig | 106 +++++++++-----
arch/powerpc/configs/mpc834x_itx_defconfig | 111 +++++++++------
arch/powerpc/configs/mpc834x_itxgp_defconfig | 109 +++++++++-----
arch/powerpc/configs/mpc834x_mds_defconfig | 104 +++++++++-----
arch/powerpc/configs/mpc836x_mds_defconfig | 102 +++++++++----
arch/powerpc/configs/mpc837x_mds_defconfig | 197 ++++++++++++++------------
arch/powerpc/configs/mpc837x_rdb_defconfig | 83 +++++++----
arch/powerpc/configs/mpc83xx_defconfig | 88 ++++++++----
arch/powerpc/configs/mpc8540_ads_defconfig | 121 ++++++++++++----
arch/powerpc/configs/mpc8544_ds_defconfig | 127 ++++++++++++-----
arch/powerpc/configs/mpc8560_ads_defconfig | 126 +++++++++++++----
arch/powerpc/configs/mpc8568mds_defconfig | 106 ++++++++++----
arch/powerpc/configs/mpc8572_ds_defconfig | 127 ++++++++++++-----
arch/powerpc/configs/mpc85xx_cds_defconfig | 131 +++++++++++++----
arch/powerpc/configs/mpc85xx_defconfig | 111 ++++++++++-----
arch/powerpc/configs/mpc8610_hpcd_defconfig | 131 ++++++++++++++---
arch/powerpc/configs/mpc8641_hpcn_defconfig | 115 ++++++++++-----
arch/powerpc/configs/mpc866_ads_defconfig | 112 +++++++++++----
arch/powerpc/configs/mpc885_ads_defconfig | 56 +++++--
arch/powerpc/configs/pq2fads_defconfig | 89 +++++++++---
arch/powerpc/configs/prpmc2800_defconfig | 160 +++++++++++++++------
arch/powerpc/configs/sbc834x_defconfig | 78 +++++++---
arch/powerpc/configs/sbc8548_defconfig | 115 ++++++++++++---
arch/powerpc/configs/sbc8560_defconfig | 124 +++++++++++++---
arch/powerpc/configs/storcenter_defconfig | 102 ++++++++-----
arch/powerpc/configs/stx_gp3_defconfig | 154 +++++++++++++++-----
arch/powerpc/configs/tqm8540_defconfig | 133 +++++++++++++-----
arch/powerpc/configs/tqm8541_defconfig | 133 +++++++++++++-----
arch/powerpc/configs/tqm8555_defconfig | 133 +++++++++++++-----
arch/powerpc/configs/tqm8560_defconfig | 133 +++++++++++++-----
39 files changed, 3032 insertions(+), 1267 deletions(-)
commit 5492a7e4cba8e38419d489f0865de0a67c737e8a
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Sat Mar 22 14:25:15 2008 +1100
[POWERPC] mpc5200: Fix incorrect compatible string for the mdio node
The MDIO node in the lite5200b.dts file needs to also claim compatibility
with the older mpc5200 chip. Otherwise the driver won't find the device.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit eff2f1ec37c114fda63ac1dd15c9ca9ac7e68db4
Author: Kumar Gala <galak@kernel.crashing.org>
Date: Mon Mar 24 08:56:06 2008 -0500
[POWERPC] Update some defconfigs
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull powerpc.git merge branch
@ 2008-03-27 23:08 Paul Mackerras
0 siblings, 0 replies; 15+ messages in thread
From: Paul Mackerras @ 2008-03-27 23:08 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev, akpm, linux-kernel
Linus,
Olof Johansson has a defconfig update for the pasemi platform that he
would like to have in 2.6.25, so please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
Thanks,
Paul.
arch/powerpc/configs/pasemi_defconfig | 142 ++++++++++++++++++++-------------
1 files changed, 88 insertions(+), 54 deletions(-)
commit 5c29934de29ddd7ecd913d83cad28e872f2e8c78
Author: Olof Johansson <olof@lixom.net>
Date: Tue Mar 25 10:28:26 2008 -0500
[POWERPC] update pasemi_defconfig
Disable GEN_RTC since it conflicts with the i2c rtc drivers registering,
besides that keep most of the new defaults.
Signed-off-by: Olof Johansson <olof@lixom.net>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull powerpc.git merge branch
@ 2008-03-28 12:35 Paul Mackerras
2008-03-28 22:06 ` Bartlomiej Sieka
0 siblings, 1 reply; 15+ messages in thread
From: Paul Mackerras @ 2008-03-28 12:35 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev, akpm, linux-kernel
Linus,
I have added another commit to the powerpc.git merge branch, so when
you do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
you'll get a fix for a bug where the hardware data breakpoint would
sometimes fail to trigger on powerpc, if multiple threads put a
breakpoint on the same address. The bug has been around for a while
and Michael Ellerman just found the cause and posted a fix.
Thanks,
Paul.
arch/powerpc/configs/pasemi_defconfig | 142 ++++++++++++++++++++-------------
arch/powerpc/kernel/process.c | 10 +-
2 files changed, 93 insertions(+), 59 deletions(-)
commit a2ceff5e555e664751bc653a4d9b133efa18c742
Author: Michael Ellerman <michael@ellerman.id.au>
Date: Fri Mar 28 19:11:48 2008 +1100
[POWERPC] Fix missed hardware breakpoints across multiple threads
There is a bug in the powerpc DABR (data access breakpoint) handling,
which can result in us missing breakpoints if several threads are trying
to break on the same address.
The circumstances are that do_page_fault() calls do_dabr(), this clears
the DABR (sets it to 0) and sets up the signal which will report to
userspace that the DABR was hit. The do_signal() code will restore the DABR
value on the way out to userspace.
If we reschedule before calling do_signal(), __switch_to() will check the
cached DABR value and compare it to the new thread's value, if they match
we don't set the DABR in hardware.
So if two threads have the same DABR value, and we schedule from one to
the other after taking the interrupt for the first thread hitting the DABR,
the second thread will run without the DABR set in hardware.
The cleanest fix is to move the cache update into set_dabr(), that way we
can't forget to do it.
Reported-by: Jan Kratochvil <jan.kratochvil@redhat.com>
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 5c29934de29ddd7ecd913d83cad28e872f2e8c78
Author: Olof Johansson <olof@lixom.net>
Date: Tue Mar 25 10:28:26 2008 -0500
[POWERPC] update pasemi_defconfig
Disable GEN_RTC since it conflicts with the i2c rtc drivers registering,
besides that keep most of the new defaults.
Signed-off-by: Olof Johansson <olof@lixom.net>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Please pull powerpc.git merge branch
2008-03-28 12:35 Please pull powerpc.git merge branch Paul Mackerras
@ 2008-03-28 22:06 ` Bartlomiej Sieka
2008-04-01 23:12 ` Paul Mackerras
0 siblings, 1 reply; 15+ messages in thread
From: Bartlomiej Sieka @ 2008-03-28 22:06 UTC (permalink / raw)
To: Paul Mackerras; +Cc: torvalds, linuxppc-dev, akpm, linux-kernel, Grant Likely
Paul Mackerras wrote:
> Linus,
>
> I have added another commit to the powerpc.git merge branch, so when
> you do:
>
> git pull \
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
>
> you'll get a fix for a bug where the hardware data breakpoint would
> sometimes fail to trigger on powerpc, if multiple threads put a
> breakpoint on the same address. The bug has been around for a while
> and Michael Ellerman just found the cause and posted a fix.
Hello Paul,
What about http://patchwork.ozlabs.org/linuxppc/patch?id=17525 ? I don't
see it in the merge branch of your repository, and it would be nice to
get it upstream as it fixes boot problems on some MPC5200-based boards.
Regards,
Bartlomiej
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Please pull powerpc.git merge branch
2008-03-28 22:06 ` Bartlomiej Sieka
@ 2008-04-01 23:12 ` Paul Mackerras
2008-04-02 4:27 ` Grant Likely
0 siblings, 1 reply; 15+ messages in thread
From: Paul Mackerras @ 2008-04-01 23:12 UTC (permalink / raw)
To: Bartlomiej Sieka; +Cc: torvalds, linuxppc-dev, akpm, linux-kernel, Grant Likely
Bartlomiej Sieka writes:
> What about http://patchwork.ozlabs.org/linuxppc/patch?id=17525 ? I don't
> see it in the merge branch of your repository, and it would be nice to
> get it upstream as it fixes boot problems on some MPC5200-based boards.
It needs a proper stand-alone commit message and an acked-by from
Grant. The commit message should explain why you are making the
changes you are making rather than just saying "the bulk of this patch
is taken from http://...".
Paul.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Please pull powerpc.git merge branch
2008-04-01 23:12 ` Paul Mackerras
@ 2008-04-02 4:27 ` Grant Likely
0 siblings, 0 replies; 15+ messages in thread
From: Grant Likely @ 2008-04-02 4:27 UTC (permalink / raw)
To: Paul Mackerras
Cc: Bartlomiej Sieka, torvalds, linuxppc-dev, akpm, linux-kernel
On Tue, Apr 1, 2008 at 5:12 PM, Paul Mackerras <paulus@samba.org> wrote:
> Bartlomiej Sieka writes:
>
> > What about http://patchwork.ozlabs.org/linuxppc/patch?id=17525 ? I don't
> > see it in the merge branch of your repository, and it would be nice to
> > get it upstream as it fixes boot problems on some MPC5200-based boards.
>
> It needs a proper stand-alone commit message and an acked-by from
> Grant. The commit message should explain why you are making the
> changes you are making rather than just saying "the bulk of this patch
> is taken from http://...".
Total Ack. I just missed it when it was sent. But Paul is right, it
needs a real commit message. Feel free to add my Acked-by: line when
you resend.
Cheers,
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Please pull powerpc.git merge branch
@ 2008-04-03 11:33 Paul Mackerras
0 siblings, 0 replies; 15+ messages in thread
From: Paul Mackerras @ 2008-04-03 11:33 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev, akpm, linux-kernel
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get some more bug fixes for powerpc, mostly for various embedded
platforms. The bulk of the changes are once again in the defconfigs.
Thanks,
Paul.
arch/powerpc/boot/dts/cm5200.dts | 37 +++++++++++++++-
arch/powerpc/boot/dts/lite5200.dts | 15 ++++++
arch/powerpc/boot/dts/motionpro.dts | 63 +++++++++++++++------------
arch/powerpc/boot/dts/mpc8377_mds.dts | 4 +-
arch/powerpc/boot/dts/mpc8377_rdb.dts | 3 -
arch/powerpc/boot/dts/mpc8378_rdb.dts | 3 -
arch/powerpc/boot/dts/mpc8379_mds.dts | 8 ++-
arch/powerpc/boot/dts/mpc8379_rdb.dts | 3 -
arch/powerpc/boot/dts/tqm5200.dts | 42 ++++++++++++++++++
arch/powerpc/configs/mpc832x_mds_defconfig | 11 +----
arch/powerpc/configs/mpc834x_mds_defconfig | 11 +----
arch/powerpc/configs/mpc836x_mds_defconfig | 11 +----
arch/powerpc/configs/mpc837x_rdb_defconfig | 24 ++++++++++
arch/powerpc/configs/mpc83xx_defconfig | 24 ++++++++++
arch/powerpc/configs/mpc8544_ds_defconfig | 11 +----
arch/powerpc/configs/mpc8568mds_defconfig | 11 +----
arch/powerpc/configs/mpc8572_ds_defconfig | 11 +----
arch/powerpc/configs/mpc85xx_defconfig | 11 +----
arch/powerpc/configs/mpc8641_hpcn_defconfig | 11 +----
arch/powerpc/configs/prpmc2800_defconfig | 11 +----
arch/powerpc/configs/storcenter_defconfig | 11 +----
arch/powerpc/kernel/head_64.S | 13 +++---
arch/powerpc/kernel/irq.c | 1
arch/powerpc/kernel/rtas_flash.c | 2 -
arch/powerpc/mm/hash_low_32.S | 8 +++
arch/powerpc/sysdev/cpm2.c | 1
drivers/ata/sata_fsl.c | 5 --
drivers/dma/fsldma.c | 8 ++-
drivers/net/fec_mpc52xx.c | 1
drivers/net/fec_mpc52xx_phy.c | 1
30 files changed, 234 insertions(+), 142 deletions(-)
commit 8d813941b17626a7610342325be63435282bac02
Author: René Bürgel <r.buergel@unicontrol.de>
Date: Thu Apr 3 19:58:37 2008 +1100
[POWERPC] Fix MPC5200 (not B!) device tree so FEC ethernet works
This gets the FEC ethernet driver working again on the lite5200
platform.
The FEC driver is also compatible with the MPC5200, not only with the
MPC5200B, so this adds a suitable entry to the driver's match list.
Furthermore this adds the settings for the PHY in the dts file for the
Lite5200. Note, that this is not exactly the same as in the
Lite5200B, because the PHY is located at f0003000:01 for the 5200, and
at :00 for the 5200B. This was tested on a Lite5200 and a Lite5200B,
both booted a kernel via tftp and mounted the root via nfs
successfully.
Signed-off-by: René Bürgel <r.buergel@unicontrol.de>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 115e1adca3b75a82f24da8b2cc9386eb5b7e2cff
Author: Bartlomiej Sieka <tur@semihalf.com>
Date: Thu Apr 3 01:26:02 2008 +1100
[POWERPC] mpc5200: Amalgamated DTS fixes and updates
DTS updates that fix booting problems on mpc5200-based boards:
- change to ethernet reg property
- addition of mdio and phy nodes
- removal of pci node (Motion-Pro board)
Other DTS updates:
- update i2c device tree nodes
- add lpb bus node and flash device (without partitions defined)
- add rtc i2c nodes
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 7484839850d826e14b8b024bb048dca8489140ae
Author: Maxim Shchetynin <maxim@de.ibm.com>
Date: Wed Apr 2 00:12:20 2008 +1100
[POWERPC] Fix rtas_flash procfs interface
Handling of the proc_dir_entry->count was changed in 2.6.24-rc5.
After this change, the default value for pde->count is 1 and not 0 as
before. Therefore, if we want to check whether our procfs file is
already opened (already in use), we have to check if pde->count is
greater than 2 rather than 1.
Signed-off-by: Maxim Shchetynin <maxim@de.ibm.com>
Signed-off-by: Jens Osterkamp <jens@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit b991f05f1326fd9e6212851d0f2099875906dd16
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon Mar 31 07:49:27 2008 +1100
[POWERPC] Fix deadlock with mmu_hash_lock in hash_page_sync
hash_page_sync() takes and releases the low level mmu hash
lock in order to sync with other processors disposing of page
tables. Because that lock can be needed to service hash misses
triggered by interrupt handlers, taking it must be done with
interrupts off. However, hash_page_sync() appears to be called
with interrupts enabled, thus causing occasional deadlocks.
We fix it by making sure hash_page_sync() masks interrupts while
holding the lock.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit ff3da2e0938bae36d10d69c22bce0177b067a9e2
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed Apr 2 15:58:40 2008 +1100
[POWERPC] Fix iSeries hard irq enabling regression
A subtle bug sneaked into iSeries recently. On this platform, we must
not normally clear MSR:EE (the hardware external interrupt enable)
except for short periods of time. Taking an interrupt while
soft-disabled doesn't cause us to clear it for example.
The iSeries kernel expects to mostly run with MSR:EE enabled at all
times except in a few exception entry/exit code paths. Thus
local_irq_enable() doesn't check if it needs to hard-enable as it
expects this to be unnecessary on iSeries.
However, hard_irq_disable() _does_ cause MSR:EE to be cleared,
including on iSeries. A call to it was recently added to the
context switch code, thus causing interrupts to become disabled
for a long periods of time, causing the iSeries watchdog to kick
in under some circumstances and other nasty things.
This patch fixes it by making local_irq_enable() properly re-enable
MSR:EE on iSeries. It basically removes a return statement here
to make iSeries use the same code path as everybody else. That does
mean that we might occasionally get spurious decrementer interrupts
but I don't think that matters.
Another option would have been to make hard_irq_disable() a nop
on iSeries but I didn't like it much, in case we have good reasons
to hard-disable.
Part of the patch is fixes to make sure the hard_enabled PACA field
is properly set on iSeries as it used not to be before, since it
was mostly unused.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 025306f30948836a743eb68a7cbaf4ab0bfb5f47
Author: Laurent Pinchart <laurentp@cse-semaphore.com>
Date: Wed Apr 2 16:46:31 2008 +0200
[POWERPC] Fix CPM2 SCC1 clock initialization.
A missing break statement in a switch caused cpm2_clk_setup() to initialize
SCC2 instead of SCC1.
Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
commit 1e85d89fa3954eff332033c0e75f6e2442be44ed
Author: Kumar Gala <galak@kernel.crashing.org>
Date: Mon Mar 31 11:53:46 2008 -0500
[POWERPC] Fix defconfigs so we dont set both GENRTC and RTCLIB
The new rtc subsystem conflicts with genrtc so don't enable GENRTC
if RTCLIB is enabled.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
commit 049c9d45531d9825bf737891163a794fca1421c5
Author: Kumar Gala <galak@kernel.crashing.org>
Date: Mon Mar 31 11:13:21 2008 -0500
[POWERPC] fsldma: Use compatiable binding as spec
Documentation/powerpc/booting-without-of.txt specifies the
compatiables we should bind to for this driver (elo, eloplus).
Use these instead of the extremely specific 'mpc8540' and 'mpc8349'
compatiables.
Acked-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
commit 96ce1b6dc5824cc6027c954b9a2e4717c70e01b5
Author: Kim Phillips <kim.phillips@freescale.com>
Date: Fri Mar 28 10:51:33 2008 -0500
[POWERPC] sata_fsl: reduce compatibility to fsl,pq-sata
as prescribed in Documentation/powerpc/booting-without-of.txt.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Acked-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
commit 58bb7a973b1d3c0a5127477fb049bbfc5ce02fb5
Author: Kim Phillips <kim.phillips@freescale.com>
Date: Fri Mar 28 10:51:29 2008 -0500
[POWERPC] 83xx: enable usb in 837x rdb and 83xx defconfigs
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
commit 8e8ff3a309ebdaad51fd7a64a6fd2a2f88b30d87
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Wed Mar 12 23:02:13 2008 +0300
[POWERPC] 83xx: Fix wrong USB phy type in mpc837xrdb dts
Due to chip constraint MPC837x USB DR module can only use
ULPI and serial PHY interfaces. The patch fixes the wrong
type in dts.
This patch fixes USB malfunctioning on the MPC837xE-RDB boards.
Similar patch has been already applied for the MDS boards:
commit 28b958859206b7010d03129611c2e444898e3ee4
Author: Li Yang <leoli@freescale.com>
Date: Thu Mar 6 18:42:26 2008 +0800
[POWERPC] 83xx: Fix wrong USB phy type in mpc837xmds dts
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2008-04-03 11:52 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-28 12:35 Please pull powerpc.git merge branch Paul Mackerras
2008-03-28 22:06 ` Bartlomiej Sieka
2008-04-01 23:12 ` Paul Mackerras
2008-04-02 4:27 ` Grant Likely
-- strict thread matches above, loose matches on Subject: below --
2008-04-03 11:33 Paul Mackerras
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox