* Please pull powerpc.git 'merge' branch
@ 2007-01-27 23:08 Paul Mackerras
2007-01-27 23:15 ` Paul Mackerras
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2007-01-27 23:08 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
or, if the mirroring hasn't caught up:
git pull \
master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git merge
There are 3 small bugfixes (one- or two-liners, including Ben's fix
for sys_pciconfig_iobase in case you didn't pick it up directly), plus
a change to arch/powerpc/Kconfig to make it clear that the PS3 support
is still incomplete.
Thanks,
Paul.
arch/powerpc/Kconfig | 5 ++++-
arch/powerpc/kernel/pci_64.c | 2 +-
arch/powerpc/platforms/ps3/Makefile | 3 ++-
arch/powerpc/platforms/ps3/interrupt.c | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
commit 545da94f924d52f80e2bbea99a8652f454889a2b
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sun Jan 28 07:45:53 2007 +1100
[POWERPC] Fix sys_pciconfig_iobase bus matching
A stupid bug has been plaguing the sys_pciconfig_iobase on ppc64. It wasn't
noticed until recently as it seems to not affect G5s but it's been causing
problems running X servers on some other machines recently. The bus number
matching was bogus.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 05916eec9f4d4370ef9a6cbb699f637302f6e157
Author: Geoff Levand <geoffrey.levand@am.sony.com>
Date: Thu Jan 25 18:07:14 2007 -0800
[POWERPC] PS3: add not complete comment to kconfig
Add a comment to the PS3 config option to inform users that the current
implementation is not yet complete.
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit ded84bcb246780137ecaa3f6d137ac1b0f06fd08
Author: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date: Thu Dec 21 13:57:16 2006 +0100
[POWERPC] ps3_free_io_irq: Fix inverted error check
ps3_free_io_irq: Fix inverted error check after calling
lv1_destruct_io_irq_outlet().
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 63ea9c1710f05a7309c272750bbf40134c628f36
Author: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date: Wed Dec 20 16:11:57 2006 +0100
[POWERPC] PS3: Fix uniprocessor kernel build
Allow to build a uniprocessor kernel for PS3.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git 'merge' branch
2007-01-27 23:08 Please pull powerpc.git 'merge' branch Paul Mackerras
@ 2007-01-27 23:15 ` Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-01-27 23:15 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
I meant to add, in the pull request I just sent, that we are looking
into the known unfixed regression listed by Adrian Bunk with the
subject "powerpc64: performance monitor exception". The problem is
that I am not convinced the proposed patch is safe, and in fact I
think it introduces a potential deadlock on Cell at least, but we
haven't worked out an alternative solution yet. I hope to have a good
solution within the next couple of days.
Paul.
^ permalink raw reply [flat|nested] 146+ messages in thread
* Please pull powerpc.git merge branch
@ 2008-04-03 11:33 Paul Mackerras
0 siblings, 0 replies; 146+ 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=5Fmds.dts | 4 +-
arch/powerpc/boot/dts/mpc8377=5Frdb.dts | 3 -
arch/powerpc/boot/dts/mpc8378=5Frdb.dts | 3 -
arch/powerpc/boot/dts/mpc8379=5Fmds.dts | 8 ++-
arch/powerpc/boot/dts/mpc8379=5Frdb.dts | 3 -
arch/powerpc/boot/dts/tqm5200.dts | 42 ++++++++++++++++++
arch/powerpc/configs/mpc832x=5Fmds=5Fdefconfig | 11 +----
arch/powerpc/configs/mpc834x=5Fmds=5Fdefconfig | 11 +----
arch/powerpc/configs/mpc836x=5Fmds=5Fdefconfig | 11 +----
arch/powerpc/configs/mpc837x=5Frdb=5Fdefconfig | 24 ++++++++++
arch/powerpc/configs/mpc83xx=5Fdefconfig | 24 ++++++++++
arch/powerpc/configs/mpc8544=5Fds=5Fdefconfig | 11 +----
arch/powerpc/configs/mpc8568mds=5Fdefconfig | 11 +----
arch/powerpc/configs/mpc8572=5Fds=5Fdefconfig | 11 +----
arch/powerpc/configs/mpc85xx=5Fdefconfig | 11 +----
arch/powerpc/configs/mpc8641=5Fhpcn=5Fdefconfig | 11 +----
arch/powerpc/configs/prpmc2800=5Fdefconfig | 11 +----
arch/powerpc/configs/storcenter=5Fdefconfig | 11 +----
arch/powerpc/kernel/head=5F64.S | 13 +++---
arch/powerpc/kernel/irq.c | 1=20
arch/powerpc/kernel/rtas=5Fflash.c | 2 -
arch/powerpc/mm/hash=5Flow=5F32.S | 8 +++
arch/powerpc/sysdev/cpm2.c | 1=20
drivers/ata/sata=5Ffsl.c | 5 --
drivers/dma/fsldma.c | 8 ++-
drivers/net/fec=5Fmpc52xx.c | 1=20
drivers/net/fec=5Fmpc52xx=5Fphy.c | 1=20
30 files changed, 234 insertions(+), 142 deletions(-)
commit 8d813941b17626a7610342325be63435282bac02
Author: Ren=E9 B=FCrgel <r.buergel@unicontrol.de>
Date: Thu Apr 3 19:58:37 2008 +1100
[POWERPC] Fix MPC5200 (not B!) device tree so FEC ethernet works
=20
This gets the FEC ethernet driver working again on the lite5200
platform.
=20
The FEC driver is also compatible with the MPC5200, not only with t=
he
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 Lite5200=
B,
both booted a kernel via tftp and mounted the root via nfs
successfully.
=20
Signed-off-by: Ren=E9 B=FCrgel <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
=20
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)
=20
Other DTS updates:
- update i2c device tree nodes
- add lpb bus node and flash device (without partitions defined)
- add rtc i2c nodes
=20
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=5Fflash procfs interface
=20
Handling of the proc=5Fdir=5Fentry->count was changed in 2.6.24-rc5=
=2E
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.
=20
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=5Fhash=5Flock in hash=5Fpage=5Fsync=
=20
hash=5Fpage=5Fsync() 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=5Fpage=5Fsync() appears to be called=
with interrupts enabled, thus causing occasional deadlocks.
=20
We fix it by making sure hash=5Fpage=5Fsync() masks interrupts whil=
e
holding the lock.
=20
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
=20
A subtle bug sneaked into iSeries recently. On this platform, we m=
ust
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.
=20
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=5Firq=5Fenable() doesn't check if it needs to hard-enable as =
it
expects this to be unnecessary on iSeries.
=20
However, hard=5Firq=5Fdisable() =5Fdoes=5F cause MSR:EE to be clear=
ed,
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.
=20
This patch fixes it by making local=5Firq=5Fenable() properly re-en=
able
MSR:EE on iSeries. It basically removes a return statement here
to make iSeries use the same code path as everybody else. That doe=
s
mean that we might occasionally get spurious decrementer interrupts=
but I don't think that matters.
=20
Another option would have been to make hard=5Firq=5Fdisable() a nop=
on iSeries but I didn't like it much, in case we have good reasons
to hard-disable.
=20
Part of the patch is fixes to make sure the hard=5Fenabled PACA fie=
ld
is properly set on iSeries as it used not to be before, since it
was mostly unused.
=20
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.
=20
A missing break statement in a switch caused cpm2=5Fclk=5Fsetup() t=
o initialize
SCC2 instead of SCC1.
=20
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
=20
The new rtc subsystem conflicts with genrtc so don't enable GENRTC
if RTCLIB is enabled.
=20
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
=20
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.
=20
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=5Ffsl: reduce compatibility to fsl,pq-sata
=20
as prescribed in Documentation/powerpc/booting-without-of.txt.
=20
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
=20
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
=20
Due to chip constraint MPC837x USB DR module can only use
ULPI and serial PHY interfaces. The patch fixes the wrong
type in dts.
=20
This patch fixes USB malfunctioning on the MPC837xE-RDB boards.
=20
Similar patch has been already applied for the MDS boards:
=20
commit 28b958859206b7010d03129611c2e444898e3ee4
Author: Li Yang <leoli@freescale.com>
Date: Thu Mar 6 18:42:26 2008 +0800
=20
[POWERPC] 83xx: Fix wrong USB phy type in mpc837xmds dts
=20
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] 146+ 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; 146+ 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] 146+ messages in thread* Re: Please pull powerpc.git merge branch
2008-03-28 12:35 Paul Mackerras
@ 2008-03-28 22:06 ` Bartlomiej Sieka
2008-04-01 23:12 ` Paul Mackerras
0 siblings, 1 reply; 146+ messages in thread
From: Bartlomiej Sieka @ 2008-03-28 22:06 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, akpm, torvalds, linux-kernel
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] 146+ 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
2008-04-02 14:32 ` Bartlomiej Sieka
0 siblings, 2 replies; 146+ messages in thread
From: Paul Mackerras @ 2008-04-01 23:12 UTC (permalink / raw)
To: Bartlomiej Sieka; +Cc: linuxppc-dev, akpm, torvalds, linux-kernel
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] 146+ messages in thread
* Re: Please pull powerpc.git merge branch
2008-04-01 23:12 ` Paul Mackerras
@ 2008-04-02 4:27 ` Grant Likely
2008-04-02 14:32 ` Bartlomiej Sieka
1 sibling, 0 replies; 146+ messages in thread
From: Grant Likely @ 2008-04-02 4:27 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, akpm, torvalds, 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] 146+ messages in thread
* Re: Please pull powerpc.git merge branch
2008-04-01 23:12 ` Paul Mackerras
2008-04-02 4:27 ` Grant Likely
@ 2008-04-02 14:32 ` Bartlomiej Sieka
1 sibling, 0 replies; 146+ messages in thread
From: Bartlomiej Sieka @ 2008-04-02 14:32 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
Paul Mackerras 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://...".
Paul,
Just re-sent the patch, please see
http://patchwork.ozlabs.org/linuxppc/patch?id=17678; hopefully
everything is OK now.
(Note that I've dropped torvalds@linux-foundation.org,
akpm@linux-foundation.org and linux-kernel@vger.kernel.org from the CC:)
Regards,
Bartlomiej
^ permalink raw reply [flat|nested] 146+ messages in thread
* Please pull powerpc.git merge branch
@ 2008-03-27 23:08 Paul Mackerras
0 siblings, 0 replies; 146+ 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] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2008-03-25 3:32 Paul Mackerras
0 siblings, 0 replies; 146+ 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] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2008-03-24 8:05 Paul Mackerras
0 siblings, 0 replies; 146+ 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] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2008-03-20 0:43 Paul Mackerras
0 siblings, 0 replies; 146+ 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] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2008-03-12 23:51 Paul Mackerras
0 siblings, 0 replies; 146+ 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] 146+ 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; 146+ 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] 146+ 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; 146+ messages in thread
From: Grant Likely @ 2008-03-03 15:44 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, akpm, torvalds, 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] 146+ 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; 146+ messages in thread
From: Paul Mackerras @ 2008-02-20 3:46 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 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] 146+ 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; 146+ 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] 146+ messages in thread
* Please pull powerpc.git merge branch
@ 2008-02-14 22:00 Paul Mackerras
2008-02-15 22:43 ` Josh Boyer
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2008-02-14 22:00 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 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] 146+ messages in thread* Re: Please pull powerpc.git merge branch
2008-02-14 22:00 Paul Mackerras
@ 2008-02-15 22:43 ` Josh Boyer
0 siblings, 0 replies; 146+ messages in thread
From: Josh Boyer @ 2008-02-15 22:43 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
On Fri, 15 Feb 2008 09:00:28 +1100
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 and very minor cleanups for powerpc
> (plus one commit wiring up the timerfd syscalls).
Could you please pull this into your master? Help the peons!
josh
^ permalink raw reply [flat|nested] 146+ messages in thread
* Please pull powerpc.git merge branch
@ 2008-01-15 10:19 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2008-01-15 10:19 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get two more bug fixes for powerpc. One is a fix for a recently
introduced regression which means that the kernel doesn't boot on
POWER6 machines. The other is a fix for something that got broken
back in the 2.6.19 timeframe.
Thanks,
Paul.
arch/powerpc/kernel/iommu.c | 17 ++++++++++++++---
arch/powerpc/mm/slb.c | 10 ++--------
arch/powerpc/platforms/pseries/lpar.c | 1 -
include/asm-powerpc/mmu-hash64.h | 1 -
4 files changed, 16 insertions(+), 13 deletions(-)
commit dfbe0d3b6be52596b5694b1bb75b19562e769021
Author: Paul Mackerras <paulus@samba.org>
Date: Tue Jan 15 17:29:33 2008 +1100
[POWERPC] Fix boot failure on POWER6
Commit 473980a99316c0e788bca50996375a2815124ce1 added a call to clear
the SLB shadow buffer before registering it. Unfortunately this means
that we clear out the entries that slb_initialize has previously set in
there. On POWER6, the hypervisor uses the SLB shadow buffer when doing
partition switches, and that means that after the next partition switch,
each non-boot CPU has no SLB entries to map the kernel text and data,
which causes it to crash.
This fixes it by reverting most of 473980a9 and instead clearing the
3rd entry explicitly in slb_initialize. This fixes the problem that
473980a9 was trying to solve, but without breaking POWER6.
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit d262c32a4bcc3e5fda0325a64e53c25fe1e999d7
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue Jan 8 10:34:22 2008 +1100
[POWERPC] Workaround for iommu page alignment
Commit 5d2efba64b231a1733c4048d1708d77e07f26426 changed our iommu code
so that it always uses an iommu page size of 4kB. That means with our
current code, drivers may do a dma_map_sg() of a 64kB page and obtain
a dma_addr_t that is only 4k aligned.
This works fine in most cases except for some infiniband HW it seems,
where they tell the HW about the page size and it ignores the low bits
of the DMA address.
This works around it by making our IOMMU code enforce a PAGE_SIZE alignment
for mappings of objects that are page aligned in the first place and whose
size is larger or equal to a page.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2008-01-12 0:09 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2008-01-12 0:09 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get two more bug fixes for powerpc, as listed below.
Thanks,
Paul.
arch/powerpc/kernel/prom_init.c | 39 ++++++++++++++++++++++++++
arch/powerpc/mm/slb.c | 8 +++++
arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +
arch/powerpc/platforms/pseries/lpar.c | 1 +
include/asm-powerpc/mmu-hash64.h | 1 +
5 files changed, 51 insertions(+), 0 deletions(-)
commit 473980a99316c0e788bca50996375a2815124ce1
Author: Michael Neuling <mikey@neuling.org>
Date: Fri Jan 11 14:02:47 2008 +1100
[POWERPC] Fix CPU hotplug when using the SLB shadow buffer
Before we register the SLB shadow buffer, we need to invalidate the
entries in the buffer, otherwise we can end up stale entries from when
we previously offlined the CPU.
This does this invalidate as well as unregistering the buffer with
PHYP before we offline the cpu. Tested and fixes crashes seen on
970MP (thanks to tonyb) and POWER5.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 6f4347c969674ed45de7d08d4b26d6326a95b959
Author: Olaf Hering <olaf@aepfle.de>
Date: Thu Jan 10 01:06:08 2008 +1100
[POWERPC] efika: add phy-handle property for fec_mpc52xx
The new network driver fec_mpc52xx will not work on efika because the
firmware does not provide all required properties.
http://www.powerdeveloper.org/asset/by-id/46 has a Forth script to
create more properties. But only the phy stuff is required to get a
working network.
This should go into the kernel because its appearently
impossible to boot the script via tftp and then load the real boot
binary (yaboot or zimage).
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2008-01-02 5:21 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2008-01-02 5:21 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get a fix for a bug introduced in one of the two commits I asked
you to pull last time.
Thanks,
Paul.
arch/powerpc/platforms/cell/spufs/sched.c | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
commit a5a971129cc6155e26315fd28a450505ccc35fd8
Author: Paul Mackerras <paulus@samba.org>
Date: Wed Jan 2 15:56:30 2008 +1100
[POWERPC] Fix build failure on Cell when CONFIG_SPU_FS=y
Commit aed3a8c9bb1a8623a618232087c5ff62718e3b9a introduced a
definition of notify_spus_active in .../cell/spu_syscalls.c, and
another definition under #ifndef MODULE in .../cell/spufs/sched.c.
The latter is not necessary and causes the build to fail when
CONFIG_SPU_FS=y, so this removes it. It also removes the export
of do_notify_spus_active, which is unnecessary.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Jeremy Kerr <jk@ozlabs.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-12-28 9:28 Paul Mackerras
2007-12-28 21:53 ` Geoff Levand
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2007-12-28 9:28 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get two more bug-fixes that the Cell guys would like to see in
2.6.24 (and which only affect Cell). The changes are less than the
diffstat might indicate since a couple of functions got moved from one
file to another by the second commit listed below.
Thanks,
Paul.
arch/powerpc/platforms/cell/Kconfig | 5 ++
arch/powerpc/platforms/cell/Makefile | 1
arch/powerpc/platforms/cell/spu_notify.c | 67 ++++++++++++++++++++++++++
arch/powerpc/platforms/cell/spu_syscalls.c | 14 +++++
arch/powerpc/platforms/cell/spufs/context.c | 16 ------
arch/powerpc/platforms/cell/spufs/sched.c | 29 +++--------
arch/powerpc/platforms/cell/spufs/syscalls.c | 1
arch/powerpc/platforms/ps3/os-area.c | 40 ++++++++++++----
include/asm-powerpc/spu.h | 4 ++
9 files changed, 129 insertions(+), 48 deletions(-)
create mode 100644 arch/powerpc/platforms/cell/spu_notify.c
commit ec5d2dfe72cf4808ae4ecee03454a4d91dfcbe0c
Author: Geoff Levand <geoffrey.levand@am.sony.com>
Date: Mon Dec 24 04:41:01 2007 +1100
[POWERPC] PS3: Fix printing of os-area magic numbers
Fix a bug in the printing of the os-area magic numbers which assumed
that magic numbers were zero terminated strings. The magic numbers
are represented in memory as integers. If the os-area sections are
not initialized correctly they could contained random data that would
be printed to the display. Also unify the handling of header and db
magic numbers and make both of type array of u8.
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit aed3a8c9bb1a8623a618232087c5ff62718e3b9a
Author: Bob Nelson <rrnelson@linux.vnet.ibm.com>
Date: Sat Dec 15 01:27:30 2007 +1100
[POWERPC] Oprofile: Remove dependency on spufs module
This removes an OProfile dependency on the spufs module. This
dependency was causing a problem for multiplatform systems that are
built with support for Oprofile on Cell but try to load the oprofile
module on a non-Cell system.
Signed-off-by: Bob Nelson <rrnelson@us.ibm.com>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Acked-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git merge branch
2007-12-28 9:28 Paul Mackerras
@ 2007-12-28 21:53 ` Geoff Levand
2007-12-31 1:40 ` Paul Mackerras
0 siblings, 1 reply; 146+ messages in thread
From: Geoff Levand @ 2007-12-28 21:53 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev, rrnelson, Paul Mackerras
Paul Mackerras wrote:
> Linus,
>
> Please do
>
> git pull \
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
This broke Cell builds.
arch/powerpc/platforms/cell/spufs/sched.c:200: multiple definition of `.notify_spus_active'
arch/powerpc/platforms/cell/spu_syscalls.c:149: first defined here
commit aed3a8c9bb1a8623a618232087c5ff62718e3b9a
Author: Bob Nelson <rrnelson@linux.vnet.ibm.com>
Date: Sat Dec 15 01:27:30 2007 +1100
[POWERPC] Oprofile: Remove dependency on spufs module
Looking at the code, it seems just when CONFIG_SPU_FS=y, not when =m.
I'll try to make a fix.
-Geoff
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git merge branch
2007-12-28 21:53 ` Geoff Levand
@ 2007-12-31 1:40 ` Paul Mackerras
2007-12-31 16:12 ` Arnd Bergmann
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2007-12-31 1:40 UTC (permalink / raw)
To: Geoff Levand; +Cc: linuxppc-dev, rrnelson, jk, arnd
Geoff Levand writes:
> This broke Cell builds.
>
> arch/powerpc/platforms/cell/spufs/sched.c:200: multiple definition of `.notify_spus_active'
> arch/powerpc/platforms/cell/spu_syscalls.c:149: first defined here
>
>
> commit aed3a8c9bb1a8623a618232087c5ff62718e3b9a
> Author: Bob Nelson <rrnelson@linux.vnet.ibm.com>
> Date: Sat Dec 15 01:27:30 2007 +1100
>
> [POWERPC] Oprofile: Remove dependency on spufs module
>
>
> Looking at the code, it seems just when CONFIG_SPU_FS=y, not when =m.
Indeed. Clearly, several people have failed to review this patch
properly. :(
It looks to me that the definition of notify_spus_active under #ifndef
MODULE in spufs/sched.c is bogus and should just be removed
completely. Also, I don't see any need for do_notify_spus_active to
be exported.
I propose the patch below. Arnd, Jeremy, Bob, any opinions?
Paul.
---
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 6e2a45e..9ad53e6 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -192,15 +192,6 @@ void do_notify_spus_active(void)
mutex_unlock(&cbe_spu_info[node].list_mutex);
}
}
-EXPORT_SYMBOL_GPL(do_notify_spus_active);
-
-#ifndef MODULE
-void notify_spus_active(void)
-{
- do_notify_spus_active();
-}
-EXPORT_SYMBOL_GPL(notify_spus_active);
-#endif
/**
* spu_bind_context - bind spu context to physical spu
^ permalink raw reply related [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git merge branch
2007-12-31 1:40 ` Paul Mackerras
@ 2007-12-31 16:12 ` Arnd Bergmann
2008-01-02 4:39 ` Jeremy Kerr
0 siblings, 1 reply; 146+ messages in thread
From: Arnd Bergmann @ 2007-12-31 16:12 UTC (permalink / raw)
To: linuxppc-dev; +Cc: rrnelson, Paul Mackerras, jk
On Monday 31 December 2007, Paul Mackerras wrote:
> Geoff Levand writes:
> >=20
> > Looking at the code, it seems just when CONFIG_SPU_FS=3Dy, not when =3D=
m.
Right, thanks for reporting this.
> It looks to me that the definition of notify_spus_active under #ifndef
> MODULE in spufs/sched.c is bogus and should just be removed
> completely. =A0Also, I don't see any need for do_notify_spus_active to
> be exported.
>=20
> I propose the patch below. =A0Arnd, Jeremy, Bob, any opinions?
I'm still out of office and can't do a proper test on this in the
way I should have done on the original patch, but your assessment and
patch looks entirely correct.
Acked-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply [flat|nested] 146+ messages in thread
* Please pull powerpc.git merge branch
@ 2007-12-17 6:00 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-12-17 6:00 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get some bugfixes and defconfig updates for powerpc.
Thanks,
Paul.
arch/powerpc/configs/mpc8272_ads_defconfig | 6 +++---
arch/powerpc/configs/pq2fads_defconfig | 6 +++---
arch/powerpc/configs/ps3_defconfig | 2 +-
arch/powerpc/kernel/ppc_ksyms.c | 12 ------------
arch/powerpc/math-emu/op-2.h | 3 ++-
arch/powerpc/platforms/iseries/lpevents.c | 17 +++++++++++++++--
arch/powerpc/platforms/ps3/Kconfig | 2 +-
arch/powerpc/sysdev/cpm2_common.c | 3 +--
drivers/net/fs_enet/mac-scc.c | 2 +-
include/asm-powerpc/commproc.h | 3 ---
10 files changed, 27 insertions(+), 29 deletions(-)
Jochen Friedrich (2):
[POWERPC] Fix typo #ifdef -> #ifndef
[POWERPC] Kill non-existent symbols from ksyms and commproc.h
Liu Yu (1):
[POWERPC] Fix rounding bug in emulation for double float operating
Michael Ellerman (1):
[POWERPC] Make PS3_SYS_MANAGER default y, not m
Scott Wood (2):
[POWRPC] CPM2: Eliminate section mismatch warning in cpm2_reset().
[POWERPC] 82xx: mpc8272ads, pq2fads: Update defconfig with CONFIG_FS_ENET_MDIO_FCC
Stephen Rothwell (1):
[POWERPC] iSeries: don't printk with HV spinlock held
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-12-07 1:04 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-12-07 1:04 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
I have added another commit to my powerpc.git tree merge branch, so
please do:
git pull \
master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git merge
(the mirroring seems to be slow today).
The diffstat and log below reflect the new commit plus the 4 in my
last pull request.
Thanks,
Paul.
arch/powerpc/configs/bamboo_defconfig | 22 +-
arch/powerpc/configs/cell_defconfig | 176 ++++++++++--------
arch/powerpc/configs/celleb_defconfig | 170 +++++++++--------
arch/powerpc/configs/chrp32_defconfig | 163 +++++++++--------
arch/powerpc/configs/ebony_defconfig | 25 +--
arch/powerpc/configs/ep88xc_defconfig | 92 +++++----
arch/powerpc/configs/g5_defconfig | 150 ++++++++-------
arch/powerpc/configs/holly_defconfig | 136 +++++++-------
arch/powerpc/configs/iseries_defconfig | 123 ++++++------
arch/powerpc/configs/kilauea_defconfig | 79 +++-----
arch/powerpc/configs/linkstation_defconfig | 152 ++++++++-------
arch/powerpc/configs/lite5200_defconfig | 119 ++++++------
arch/powerpc/configs/maple_defconfig | 126 ++++++-------
arch/powerpc/configs/mpc7448_hpc2_defconfig | 137 +++++++-------
arch/powerpc/configs/mpc8272_ads_defconfig | 106 ++++++-----
arch/powerpc/configs/mpc8313_rdb_defconfig | 173 +++++++++---------
arch/powerpc/configs/mpc832x_mds_defconfig | 155 ++++++++--------
arch/powerpc/configs/mpc832x_rdb_defconfig | 167 ++++++++---------
arch/powerpc/configs/mpc834x_itx_defconfig | 156 ++++++++--------
arch/powerpc/configs/mpc834x_itxgp_defconfig | 161 +++++++++-------
arch/powerpc/configs/mpc834x_mds_defconfig | 149 +++++++--------
arch/powerpc/configs/mpc836x_mds_defconfig | 155 ++++++++--------
arch/powerpc/configs/mpc8540_ads_defconfig | 101 +++++-----
arch/powerpc/configs/mpc8544_ds_defconfig | 130 +++++++------
arch/powerpc/configs/mpc8560_ads_defconfig | 104 +++++------
arch/powerpc/configs/mpc8568mds_defconfig | 161 ++++++++--------
arch/powerpc/configs/mpc8572_ds_defconfig | 130 +++++++------
arch/powerpc/configs/mpc85xx_cds_defconfig | 126 ++++++-------
arch/powerpc/configs/mpc8610_hpcd_defconfig | 114 +++++-------
arch/powerpc/configs/mpc8641_hpcn_defconfig | 131 +++++++------
arch/powerpc/configs/mpc866_ads_defconfig | 107 +++++------
arch/powerpc/configs/mpc885_ads_defconfig | 98 +++++-----
arch/powerpc/configs/pasemi_defconfig | 8 +
arch/powerpc/configs/pmac32_defconfig | 217 ++++++++++++++--------
arch/powerpc/configs/ppc64_defconfig | 9 +
arch/powerpc/configs/pq2fads_defconfig | 148 +++++++++------
arch/powerpc/configs/prpmc2800_defconfig | 150 ++++++++-------
arch/powerpc/configs/ps3_defconfig | 177 +++++++++---------
arch/powerpc/configs/pseries_defconfig | 156 +++++++++-------
arch/powerpc/configs/sequoia_defconfig | 111 ++++++-----
arch/powerpc/configs/walnut_defconfig | 22 +-
arch/powerpc/kernel/process.c | 2
arch/ppc/platforms/4xx/xparameters/xparameters.h | 8 +
arch/ppc/syslib/virtex_devices.c | 8 -
include/asm-powerpc/time.h | 8 -
45 files changed, 2662 insertions(+), 2456 deletions(-)
Geoff Levand (1):
[POWERPC] PS3: Update ps3_defconfig
Grant Likely (1):
[POWERPC] virtex bug fix: Use canonical value for AC97 interrupt xparams
Paul Mackerras (1):
[POWERPC] Update defconfigs
Stephen Rothwell (1):
[POWERPC] Update iseries_defconfig
Tony Breeds (1):
[POWERPC] Fix hardware IRQ time accounting problem.
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-12-06 12:01 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-12-06 12:01 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
There is one commit there that fixes a bug where some machines were
incorrectly reporting over 50% hard irq time even when idle, and three
commits that update defconfigs.
Thanks,
Paul.
arch/powerpc/configs/bamboo_defconfig | 22 +--
arch/powerpc/configs/cell_defconfig | 176 ++++++++++++---------
arch/powerpc/configs/celleb_defconfig | 170 +++++++++++---------
arch/powerpc/configs/chrp32_defconfig | 163 +++++++++++---------
arch/powerpc/configs/ebony_defconfig | 25 +--
arch/powerpc/configs/ep88xc_defconfig | 92 +++++------
arch/powerpc/configs/g5_defconfig | 150 ++++++++++--------
arch/powerpc/configs/holly_defconfig | 136 +++++++++-------
arch/powerpc/configs/iseries_defconfig | 123 ++++++++-------
arch/powerpc/configs/kilauea_defconfig | 79 ++++-----
arch/powerpc/configs/linkstation_defconfig | 152 ++++++++++--------
arch/powerpc/configs/lite5200_defconfig | 119 +++++++-------
arch/powerpc/configs/maple_defconfig | 126 ++++++++-------
arch/powerpc/configs/mpc7448_hpc2_defconfig | 137 +++++++++-------
arch/powerpc/configs/mpc8272_ads_defconfig | 106 +++++++------
arch/powerpc/configs/mpc8313_rdb_defconfig | 173 ++++++++++-----------
arch/powerpc/configs/mpc832x_mds_defconfig | 155 +++++++++----------
arch/powerpc/configs/mpc832x_rdb_defconfig | 167 ++++++++++----------
arch/powerpc/configs/mpc834x_itx_defconfig | 156 +++++++++----------
arch/powerpc/configs/mpc834x_itxgp_defconfig | 161 ++++++++++---------
arch/powerpc/configs/mpc834x_mds_defconfig | 149 +++++++++---------
arch/powerpc/configs/mpc836x_mds_defconfig | 155 +++++++++----------
arch/powerpc/configs/mpc8540_ads_defconfig | 101 ++++++------
arch/powerpc/configs/mpc8544_ds_defconfig | 130 ++++++++--------
arch/powerpc/configs/mpc8560_ads_defconfig | 104 ++++++------
arch/powerpc/configs/mpc8568mds_defconfig | 161 ++++++++++---------
arch/powerpc/configs/mpc8572_ds_defconfig | 130 ++++++++--------
arch/powerpc/configs/mpc85xx_cds_defconfig | 126 ++++++++-------
arch/powerpc/configs/mpc8610_hpcd_defconfig | 114 ++++++--------
arch/powerpc/configs/mpc8641_hpcn_defconfig | 131 ++++++++--------
arch/powerpc/configs/mpc866_ads_defconfig | 107 ++++++-------
arch/powerpc/configs/mpc885_ads_defconfig | 98 ++++++------
arch/powerpc/configs/pasemi_defconfig | 8 +
arch/powerpc/configs/pmac32_defconfig | 217 ++++++++++++++++----------
arch/powerpc/configs/ppc64_defconfig | 9 +
arch/powerpc/configs/pq2fads_defconfig | 148 +++++++++++-------
arch/powerpc/configs/prpmc2800_defconfig | 150 +++++++++---------
arch/powerpc/configs/ps3_defconfig | 177 +++++++++++----------
arch/powerpc/configs/pseries_defconfig | 156 ++++++++++---------
arch/powerpc/configs/sequoia_defconfig | 111 +++++++------
arch/powerpc/configs/walnut_defconfig | 22 +--
arch/powerpc/kernel/process.c | 2
include/asm-powerpc/time.h | 8 -
43 files changed, 2650 insertions(+), 2452 deletions(-)
Geoff Levand (1):
[POWERPC] PS3: Update ps3_defconfig
Paul Mackerras (1):
[POWERPC] Update defconfigs
Stephen Rothwell (1):
[POWERPC] Update iseries_defconfig
Tony Breeds (1):
[POWERPC] Fix hardware IRQ time accounting problem.
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-12-02 23:12 Paul Mackerras
2007-12-03 0:25 ` Josh Boyer
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2007-12-02 23:12 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
There are two commits there; one reverts a patch which was causing
some machines to fail to come back up when rebooting, and the other
only touches a couple of defconfigs.
Thanks,
Paul.
arch/powerpc/kernel/rtas.c | 12 ++++++------
arch/powerpc/platforms/pseries/setup.c | 3 +--
arch/ppc/configs/ml300_defconfig | 2 +-
arch/ppc/configs/ml403_defconfig | 2 +-
include/asm-powerpc/rtas.h | 3 +--
5 files changed, 10 insertions(+), 12 deletions(-)
Grant Likely (1):
[POWERPC] Remove xmon from ml300 and ml403 defconfig in arch/ppc
Paul Mackerras (1):
Revert "[POWERPC] Fix RTAS os-term usage on kernel panic"
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git merge branch
2007-12-02 23:12 Paul Mackerras
@ 2007-12-03 0:25 ` Josh Boyer
0 siblings, 0 replies; 146+ messages in thread
From: Josh Boyer @ 2007-12-03 0:25 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
On Mon, 3 Dec 2007 10:12:49 +1100
Paul Mackerras <paulus@samba.org> wrote:
> Linus,
>
> Please do
>
> git pull \
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
>
> There are two commits there; one reverts a patch which was causing
> some machines to fail to come back up when rebooting, and the other
> only touches a couple of defconfigs.
>
> Thanks,
> Paul.
>
> arch/powerpc/kernel/rtas.c | 12 ++++++------
> arch/powerpc/platforms/pseries/setup.c | 3 +--
> arch/ppc/configs/ml300_defconfig | 2 +-
> arch/ppc/configs/ml403_defconfig | 2 +-
> include/asm-powerpc/rtas.h | 3 +--
> 5 files changed, 10 insertions(+), 12 deletions(-)
>
> Grant Likely (1):
> [POWERPC] Remove xmon from ml300 and ml403 defconfig in arch/ppc
Thanks Paul. I had this one queued for you to pull, but you beat me to
it.
josh
^ permalink raw reply [flat|nested] 146+ messages in thread
* Please pull powerpc.git merge branch
@ 2007-11-26 22:09 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-11-26 22:09 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get another batch of fixes for powerpc, as listed below. Since the
pull request I sent last week while you were away, I have added four
more commits from Kumar.
Thanks,
Paul.
Documentation/powerpc/booting-without-of.txt | 5 +
arch/powerpc/boot/dts/mpc832x_mds.dts | 16 ++-
arch/powerpc/boot/dts/mpc834x_mds.dts | 9 ++
arch/powerpc/boot/dts/mpc836x_mds.dts | 9 ++
arch/powerpc/boot/dts/mpc8544ds.dts | 20 ++--
arch/powerpc/boot/dts/mpc8572ds.dts | 108 ++++++++++++++++++---
arch/powerpc/boot/dts/mpc8641_hpcn.dts | 126 ++++++++++++++++++++----
arch/powerpc/configs/mpc832x_mds_defconfig | 48 +++++++++
arch/powerpc/configs/mpc832x_rdb_defconfig | 41 +++++++-
arch/powerpc/configs/mpc834x_itx_defconfig | 2
arch/powerpc/configs/mpc834x_itxgp_defconfig | 88 +++++++++++++++++
arch/powerpc/configs/mpc834x_mds_defconfig | 48 +++++++++
arch/powerpc/configs/mpc836x_mds_defconfig | 48 +++++++++
arch/powerpc/configs/mpc8568mds_defconfig | 48 +++++++++
arch/powerpc/kernel/asm-offsets.c | 4 +
arch/powerpc/kernel/rtas.c | 111 ++++++++++++---------
arch/powerpc/kernel/time.c | 5 +
arch/powerpc/kernel/vdso.c | 11 ++
arch/powerpc/kernel/vdso32/cacheflush.S | 41 ++++++--
arch/powerpc/kernel/vdso64/cacheflush.S | 41 ++++++--
arch/powerpc/mm/mem.c | 2
arch/powerpc/mm/mmu_decl.h | 2
arch/powerpc/mm/stab.c | 1
arch/powerpc/platforms/40x/walnut.c | 3 -
arch/powerpc/platforms/44x/bamboo.c | 3 -
arch/powerpc/platforms/44x/ebony.c | 3 -
arch/powerpc/platforms/44x/sequoia.c | 3 -
arch/powerpc/platforms/83xx/mpc832x_mds.c | 31 +-----
arch/powerpc/platforms/83xx/mpc832x_rdb.c | 14 ++-
arch/powerpc/platforms/83xx/mpc834x_mds.c | 24 -----
arch/powerpc/platforms/83xx/mpc836x_mds.c | 55 +++++-----
arch/powerpc/platforms/83xx/usb.c | 8 +-
arch/powerpc/platforms/cell/spufs/inode.c | 1
arch/powerpc/platforms/embedded6xx/prpmc2800.c | 1
arch/powerpc/platforms/pasemi/setup.c | 2
arch/powerpc/platforms/pseries/Kconfig | 2
arch/powerpc/platforms/pseries/setup.c | 3 -
arch/powerpc/sysdev/uic.c | 18 +++
arch/ppc/kernel/setup.c | 7 +
arch/ppc/mm/init.c | 2
arch/ppc/mm/mmu_decl.h | 2
arch/ppc/platforms/4xx/yucca.c | 1
arch/ppc/syslib/virtex_devices.c | 31 ++++++
include/asm-powerpc/page_32.h | 4 +
include/asm-powerpc/pci-bridge.h | 5 +
include/asm-powerpc/rtas.h | 3 -
include/asm-powerpc/vdso_datapage.h | 8 ++
47 files changed, 832 insertions(+), 236 deletions(-)
Anton Vorontsov (2):
[POWERPC] 83xx: MPC832x RDB - remove spidev stub, use mmc_spi
[POWERPC] 83xx: Update mpc832x_rdb_defconfig to enable MMC-over-SPI
Benjamin Herrenschmidt (3):
[POWERPC] Fix declaration of pcibios_free_controller
[POWERPC] Fix kmalloc alignment on non-coherent DMA platforms
[POWERPC] Fix 8xx build breakage due to _tlbie changes
Cyrill Gorcunov (1):
[POWERPC] Fix potential NULL dereference
Grant Likely (1):
[POWERPC] 83xx: Update mpc8349emitx(gp) defconfig for USB
Jeremy Kerr (1):
[POWERPC] spufs: Fix context destroy vs /spu readdir race
Joachim Foerster (1):
[POWERPC] Xilinx: Register AC97 Controller Reference with the platform bus
Jon Loeliger (1):
[POWERPC] 4xx: Replace #includes of asm/of_platform.h with linux/of_platform.h.
Josh Boyer (1):
[POWERPC] 4xx: Use virtual PVR value to init FPU on arch/ppc 440EP
Kamalesh Babulal (1):
[POWERPC] Fix build failure on legacy iSeries
Kim Phillips (5):
[POWERPC] 83xx: mpc832x mds: Fix board PHY reset code
[POWERPC] 83xx: Fix 2nd UCC entry in mpc832x_mds.dts
[POWERPC] Document rgmii-rxid and rgmii-txid phy-connection-types
[POWERPC] 83xx: Handle mpc8360 rev. 2.1 RGMII timing erratum
[POWERPC] 8xxx: MDS board RTC fixes
Kumar Gala (1):
[POWERPC] Fix device tree interrupt map for Freescale ULI1575 boards
Linas Vepstas (1):
[POWERPC] Fix RTAS os-term usage on kernel panic
Mark A. Greer (1):
[POWERPC] prpmc2800: Enable L2 cache
Michael Neuling (1):
[POWERPC] Fix possible division by zero in scaled time accounting
Nathan Lynch (1):
[POWERPC] Fix multiple bugs in rtas_ibm_suspend_me code
Olof Johansson (2):
[POWERPC] pasemi: Don't reset mpic at boot
[POWERPC] vdso: Fixes for cache block sizes
Roel Kluin (1):
[POWERPC] 4xx: balance ioremap/ioumap calls for Yucca
Stephen Rothwell (1):
[POWERPC] pSeries: make pseries_defconfig minus PCI build again
Valentine Barshak (1):
[POWERPC] 4xx: UIC add mask_ack callback
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-11-20 8:38 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-11-20 8:38 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get another batch of fixes for powerpc, as listed below.
Thanks,
Paul.
Documentation/powerpc/booting-without-of.txt | 5 +
arch/powerpc/boot/dts/mpc832x_mds.dts | 9 +-
arch/powerpc/boot/dts/mpc8544ds.dts | 20 ++--
arch/powerpc/boot/dts/mpc8572ds.dts | 108 ++++++++++++++++++---
arch/powerpc/boot/dts/mpc8641_hpcn.dts | 126 ++++++++++++++++++++----
arch/powerpc/kernel/asm-offsets.c | 4 +
arch/powerpc/kernel/rtas.c | 111 ++++++++++++---------
arch/powerpc/kernel/time.c | 5 +
arch/powerpc/kernel/vdso.c | 11 ++
arch/powerpc/kernel/vdso32/cacheflush.S | 41 ++++++--
arch/powerpc/kernel/vdso64/cacheflush.S | 41 ++++++--
arch/powerpc/mm/mem.c | 2
arch/powerpc/mm/mmu_decl.h | 2
arch/powerpc/mm/stab.c | 1
arch/powerpc/platforms/40x/walnut.c | 3 -
arch/powerpc/platforms/44x/bamboo.c | 3 -
arch/powerpc/platforms/44x/ebony.c | 3 -
arch/powerpc/platforms/44x/sequoia.c | 3 -
arch/powerpc/platforms/83xx/mpc832x_mds.c | 7 +
arch/powerpc/platforms/83xx/mpc836x_mds.c | 31 +++++-
arch/powerpc/platforms/83xx/usb.c | 8 +-
arch/powerpc/platforms/cell/spufs/inode.c | 1
arch/powerpc/platforms/embedded6xx/prpmc2800.c | 1
arch/powerpc/platforms/pasemi/setup.c | 2
arch/powerpc/platforms/pseries/Kconfig | 2
arch/powerpc/platforms/pseries/setup.c | 3 -
arch/powerpc/sysdev/uic.c | 18 +++
arch/ppc/kernel/setup.c | 7 +
arch/ppc/mm/init.c | 2
arch/ppc/mm/mmu_decl.h | 2
arch/ppc/platforms/4xx/yucca.c | 1
arch/ppc/syslib/virtex_devices.c | 31 ++++++
include/asm-powerpc/page_32.h | 4 +
include/asm-powerpc/pci-bridge.h | 5 +
include/asm-powerpc/rtas.h | 3 -
include/asm-powerpc/vdso_datapage.h | 8 ++
36 files changed, 486 insertions(+), 148 deletions(-)
Benjamin Herrenschmidt (3):
[POWERPC] Fix declaration of pcibios_free_controller
[POWERPC] Fix kmalloc alignment on non-coherent DMA platforms
[POWERPC] Fix 8xx build breakage due to _tlbie changes
Cyrill Gorcunov (1):
[POWERPC] Fix potential NULL dereference
Jeremy Kerr (1):
[POWERPC] spufs: Fix context destroy vs /spu readdir race
Joachim Foerster (1):
[POWERPC] Xilinx: Register AC97 Controller Reference with the platform bus
Jon Loeliger (1):
[POWERPC] 4xx: Replace #includes of asm/of_platform.h with linux/of_platform.h.
Josh Boyer (1):
[POWERPC] 4xx: Use virtual PVR value to init FPU on arch/ppc 440EP
Kamalesh Babulal (1):
[POWERPC] Fix build failure on legacy iSeries
Kim Phillips (4):
[POWERPC] 83xx: mpc832x mds: Fix board PHY reset code
[POWERPC] 83xx: Fix 2nd UCC entry in mpc832x_mds.dts
[POWERPC] Document rgmii-rxid and rgmii-txid phy-connection-types
[POWERPC] 83xx: Handle mpc8360 rev. 2.1 RGMII timing erratum
Kumar Gala (1):
[POWERPC] Fix device tree interrupt map for Freescale ULI1575 boards
Linas Vepstas (1):
[POWERPC] Fix RTAS os-term usage on kernel panic
Mark A. Greer (1):
[POWERPC] prpmc2800: Enable L2 cache
Michael Neuling (1):
[POWERPC] Fix possible division by zero in scaled time accounting
Nathan Lynch (1):
[POWERPC] Fix multiple bugs in rtas_ibm_suspend_me code
Olof Johansson (2):
[POWERPC] pasemi: Don't reset mpic at boot
[POWERPC] vdso: Fixes for cache block sizes
Roel Kluin (1):
[POWERPC] 4xx: balance ioremap/ioumap calls for Yucca
Stephen Rothwell (1):
[POWERPC] pSeries: make pseries_defconfig minus PCI build again
Valentine Barshak (1):
[POWERPC] 4xx: UIC add mask_ack callback
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-11-13 11:11 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-11-13 11:11 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
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. (OK, two of the commits are
cosmetic printk changes and one is a workaround for a hardware
erratum, but they are all reasonable 2.6.24 material.)
Thanks,
Paul.
arch/powerpc/Makefile | 3 +++
arch/powerpc/kernel/btext.c | 4 +++-
arch/powerpc/kernel/entry_32.S | 6 ++++++
arch/powerpc/kernel/time.c | 2 +-
arch/powerpc/mm/init_64.c | 16 ++++------------
arch/powerpc/mm/tlb_64.c | 2 --
arch/powerpc/sysdev/cpm_common.c | 4 +---
arch/ppc/kernel/entry.S | 6 ++++++
include/asm-powerpc/cputable.h | 22 ++++++++++++----------
include/asm-powerpc/tlbflush.h | 4 ++--
10 files changed, 38 insertions(+), 31 deletions(-)
Becky Bruce (1):
[POWERPC] Avoid unpaired stwcx. on some processors
Benjamin Herrenschmidt (1):
[POWERPC] Fix early btext debug on PowerMac
Kumar Gala (2):
[POWERPC] Add -mno-spe for ARCH=powerpc builds
[POWERPC] Fix oops related to 4xx flush_tlb_page modification
Olof Johansson (1):
[POWERPC] Fix CONFIG_SMP=n build error on ppc64
Scott Wood (1):
[POWERPC] cpm: Fix a couple minor issues in cpm_common.c.
Stephen Rothwell (1):
[POWERPC] Silence an annoying boot message
Tony Breeds (1):
[POWERPC] Demote clockevent printk to KERN_DEBUG
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-11-08 9:54 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-11-08 9:54 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get a bunch of bug-fixes, documentation updates and defconfig
updates for powerpc.
Thanks,
Paul.
Documentation/powerpc/booting-without-of.txt | 275 +++++++++++++++++++++++
arch/powerpc/boot/dts/walnut.dts | 4
arch/powerpc/boot/wrapper | 43 ++--
arch/powerpc/configs/pasemi_defconfig | 308 ++++++++++++++++----------
arch/powerpc/configs/ppc64_defconfig | 247 +++++++++++++++------
arch/powerpc/kernel/cputable.c | 36 ++-
arch/powerpc/kernel/entry_32.S | 23 ++
arch/powerpc/kernel/head_64.S | 2
arch/powerpc/kernel/idle.c | 2
arch/powerpc/kernel/misc_32.S | 32 ++-
arch/powerpc/kernel/prom.c | 12 +
arch/powerpc/kernel/prom_init.c | 2
arch/powerpc/kernel/setup_64.c | 19 +-
arch/powerpc/kernel/swsusp_32.S | 2
arch/powerpc/kernel/time.c | 10 -
arch/powerpc/kernel/vmlinux.lds.S | 3
arch/powerpc/mm/40x_mmu.c | 17 +
arch/powerpc/mm/44x_mmu.c | 1
arch/powerpc/mm/fault.c | 2
arch/powerpc/mm/hash_low_64.S | 5
arch/powerpc/mm/hash_utils_64.c | 7 -
arch/powerpc/mm/mmu_decl.h | 4
arch/powerpc/mm/slb.c | 35 +++
arch/powerpc/platforms/cell/interrupt.c | 24 +-
arch/powerpc/platforms/cell/smp.c | 1
arch/powerpc/platforms/celleb/setup.c | 1
arch/powerpc/platforms/iseries/irq.h | 4
arch/powerpc/platforms/iseries/setup.c | 4
arch/powerpc/platforms/iseries/vio.c | 10 +
arch/powerpc/platforms/pseries/eeh.c | 13 +
arch/powerpc/platforms/pseries/eeh_driver.c | 18 +-
arch/powerpc/platforms/pseries/firmware.c | 1
arch/powerpc/platforms/pseries/msi.c | 6 +
arch/powerpc/sysdev/i8259.c | 1
arch/powerpc/sysdev/mv64x60_pci.c | 10 +
arch/ppc/kernel/entry.S | 23 ++
arch/ppc/kernel/misc.S | 31 ++-
arch/ppc/mm/44x_mmu.c | 1
arch/ppc/mm/4xx_mmu.c | 17 +
arch/ppc/mm/fault.c | 2
arch/ppc/mm/mmu_decl.h | 4
arch/ppc/platforms/4xx/ebony.c | 2
arch/ppc/platforms/4xx/luan.c | 7 +
arch/ppc/platforms/4xx/ocotea.c | 2
arch/ppc/platforms/4xx/taishan.c | 2
arch/ppc/syslib/i8259.c | 1
arch/ppc/syslib/m8260_setup.c | 13 +
drivers/macintosh/windfarm_core.c | 10 -
drivers/serial/uartlite.c | 10 +
include/asm-powerpc/pgtable-ppc32.h | 13 +
include/asm-powerpc/systbl.h | 2
include/asm-powerpc/time.h | 20 +-
include/asm-powerpc/tlbflush.h | 12 +
53 files changed, 996 insertions(+), 360 deletions(-)
Alexey Dobriyan (1):
[POWERPC] Fix sysctl table check failure on PowerMac
Aurelien Jarno (1):
[POWERPC] i8259: Add disable method
Benjamin Herrenschmidt (5):
[POWERPC] powerpc: Fix demotion of segments to 4K pages
[POWERPC] 4xx: Fix 4xx flush_tlb_page()
[POWERPC] 4xx: Deal with 44x virtually tagged icache
[POWERPC] Fix cache line vs. block size confusion
[POWERPC] Fix si_addr value on low level hash failures
Dale Farnsworth (1):
[POWERPC] Fix mv643xx_pci sysfs .read and .write functions
Grant Likely (5):
[POWERPC] bootwrapper: Allow wrapper script to execute verbosely
[POWERPC] bootwrapper: Bail from script if any command fails
[POWERPC] Device tree bindings for Xilinx devices
[POWERPC] Uartlite: speed up console output
[POWERPC] ppc405 Fix arithmatic rollover bug when memory size under 16M
Johannes Berg (2):
[POWERPC] windfarm: Fix windfarm thread freezer interaction
[POWERPC] Make altivec code in swsusp_32.S depend on CONFIG_ALTIVEC
Li Zefan (1):
[POWERPC] ] Fix memset size error
Linas Vepstas (4):
[POWERPC] EEH: Clean up comments
[POWERPC] EEH: Drivers that need reset trump others
[POWERPC] EEH: Avoid crash on null device
[POWERPC] EEH: Make sure warning message is printed
Michael Ellerman (1):
[POWERPC] Read back MSI message in rtas_setup_msi_irqs() so restore works
Olof Johansson (4):
[POWERPC] Fix build break in arch/ppc/syslib/m8260_setup.c
[POWERPC] Fix CONFIG_SMP=n build break
[POWERPC] pasemi: Update defconfig
[POWERPC] Refresh ppc64_defconfig and enable pasemi-related options
Patrick Mansfield (1):
[POWERPC] Change fallocate to match unistd.h on powerpc
Paul Mackerras (1):
[POWERPC] Fix off-by-one error in setting decrementer on Book E/4xx (v2)
Roel Kluin (1):
[POWERPC] allocation fix in ppc/platforms/4xx/luan.c
Scott Wood (1):
[POWERPC] bootwrapper: Revert ps3 binary flag usage, and remove .bin suffix
Stephen Rothwell (3):
[POWERPC] iSeries_init_IRQ non-PCI tidy
[POWERPC] Fix link errors for allyesconfig
[POWERPC] iSeries: Fix ref counting in vio setup
Steven A. Falco (1):
[POWERPC] 4xx: Fix Walnut DTS interrupt property
Tony Breeds (1):
[POWERPC] Fix build failure when CONFIG_VIRT_CPU_ACCOUNTING is not defined
Valentine Barshak (1):
[POWERPC] 4xx: Workaround for the 440EP(x)/GR(x) processors identical PVR issue.
will schmidt (2):
[POWERPC] Include udbg.h when using udbg_printf
[POWERPC] Fix switch_slb handling of 1T ESID values
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-10-23 4:21 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-10-23 4:21 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get a commit that adds Vitaly Bordug as a maintainer for the
powerpc embedded 8xx processors. This is something that Marcelo asked
me to push ages ago, but it kept falling through the cracks.
Thanks,
Paul.
MAINTAINERS | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Marcelo Tosatti (1):
[POWERPC] Add Vitaly Bordug as PPC8xx maintainer
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-10-17 12:49 Paul Mackerras
2007-10-17 13:31 ` Josh Boyer
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2007-10-17 12:49 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get some a collection of fixes for powerpc, plus a set of commits
that add some new driver code for the "bestcomm" hardware on some
Freescale embedded PowerPC chips.
Thanks,
Paul.
arch/powerpc/Kconfig | 4
arch/powerpc/boot/dts/lite5200b.dts | 18 +
arch/powerpc/configs/bamboo_defconfig | 7
arch/powerpc/configs/celleb_defconfig | 7
arch/powerpc/configs/chrp32_defconfig | 7
arch/powerpc/configs/ebony_defconfig | 7
arch/powerpc/configs/g5_defconfig | 7
arch/powerpc/configs/holly_defconfig | 7
arch/powerpc/configs/iseries_defconfig | 7
arch/powerpc/configs/kilauea_defconfig | 7
arch/powerpc/configs/linkstation_defconfig | 7
arch/powerpc/configs/lite5200_defconfig | 7
arch/powerpc/configs/maple_defconfig | 8
arch/powerpc/configs/mpc7448_hpc2_defconfig | 5
arch/powerpc/configs/mpc8272_ads_defconfig | 7
arch/powerpc/configs/mpc8313_rdb_defconfig | 7
arch/powerpc/configs/mpc832x_mds_defconfig | 5
arch/powerpc/configs/mpc832x_rdb_defconfig | 5
arch/powerpc/configs/mpc834x_itx_defconfig | 5
arch/powerpc/configs/mpc834x_itxgp_defconfig | 5
arch/powerpc/configs/mpc834x_mds_defconfig | 5
arch/powerpc/configs/mpc836x_mds_defconfig | 5
arch/powerpc/configs/mpc8540_ads_defconfig | 7
arch/powerpc/configs/mpc8544_ds_defconfig | 7
arch/powerpc/configs/mpc8560_ads_defconfig | 7
arch/powerpc/configs/mpc8568mds_defconfig | 7
arch/powerpc/configs/mpc8572_ds_defconfig | 7
arch/powerpc/configs/mpc85xx_cds_defconfig | 7
arch/powerpc/configs/mpc8610_hpcd_defconfig | 7
arch/powerpc/configs/mpc8641_hpcn_defconfig | 7
arch/powerpc/configs/mpc866_ads_defconfig | 5
arch/powerpc/configs/pasemi_defconfig | 7
arch/powerpc/configs/pmac32_defconfig | 7
arch/powerpc/configs/ppc64_defconfig | 11
arch/powerpc/configs/pq2fads_defconfig | 7
arch/powerpc/configs/prpmc2800_defconfig | 5
arch/powerpc/configs/ps3_defconfig | 7
arch/powerpc/configs/pseries_defconfig | 11
arch/powerpc/configs/sequoia_defconfig | 7
arch/powerpc/configs/walnut_defconfig | 7
arch/powerpc/kernel/entry_64.S | 6
arch/powerpc/kernel/ibmebus.c | 263 +++-------
arch/powerpc/kernel/of_device.c | 80 +++
arch/powerpc/kernel/of_platform.c | 70 ---
arch/powerpc/kernel/setup_64.c | 13
arch/powerpc/kernel/time.c | 2
arch/powerpc/kernel/vdso64/sigtramp.S | 11
arch/powerpc/lib/Makefile | 5
arch/powerpc/lib/rheap.c | 15 +
arch/powerpc/math-emu/math.c | 13
arch/powerpc/mm/hash_utils_64.c | 3
arch/powerpc/mm/init_64.c | 2
arch/powerpc/mm/slb.c | 3
arch/powerpc/platforms/Kconfig | 4
arch/powerpc/platforms/Kconfig.cputype | 1
arch/powerpc/platforms/iseries/htab.c | 4
arch/powerpc/platforms/iseries/vio.c | 2
arch/powerpc/sysdev/Makefile | 1
arch/powerpc/sysdev/bestcomm/Kconfig | 39 +
arch/powerpc/sysdev/bestcomm/Makefile | 14 +
arch/powerpc/sysdev/bestcomm/ata.c | 154 ++++++
arch/powerpc/sysdev/bestcomm/ata.h | 37 +
arch/powerpc/sysdev/bestcomm/bcom_ata_task.c | 67 +++
arch/powerpc/sysdev/bestcomm/bcom_fec_rx_task.c | 78 +++
arch/powerpc/sysdev/bestcomm/bcom_fec_tx_task.c | 91 +++
arch/powerpc/sysdev/bestcomm/bcom_gen_bd_rx_task.c | 63 ++
arch/powerpc/sysdev/bestcomm/bcom_gen_bd_tx_task.c | 69 +++
arch/powerpc/sysdev/bestcomm/bestcomm.c | 528 ++++++++++++++++++++
arch/powerpc/sysdev/bestcomm/bestcomm.h | 190 +++++++
arch/powerpc/sysdev/bestcomm/bestcomm_priv.h | 334 +++++++++++++
arch/powerpc/sysdev/bestcomm/fec.c | 270 ++++++++++
arch/powerpc/sysdev/bestcomm/fec.h | 61 ++
arch/powerpc/sysdev/bestcomm/gen_bd.c | 260 ++++++++++
arch/powerpc/sysdev/bestcomm/gen_bd.h | 48 ++
arch/powerpc/sysdev/bestcomm/sram.c | 177 +++++++
arch/powerpc/sysdev/bestcomm/sram.h | 54 ++
arch/powerpc/sysdev/fsl_pci.c | 2
arch/ppc/Kconfig | 6
drivers/infiniband/hw/ehca/ehca_classes.h | 2
drivers/infiniband/hw/ehca/ehca_eq.c | 6
drivers/infiniband/hw/ehca/ehca_main.c | 32 +
drivers/net/ehea/ehea.h | 2
drivers/net/ehea/ehea_main.c | 72 +--
include/asm-powerpc/cputable.h | 3
include/asm-powerpc/ibmebus.h | 38 -
include/asm-powerpc/of_device.h | 4
include/asm-ppc/mpc52xx_psc.h | 10
include/linux/of_device.h | 5
88 files changed, 3010 insertions(+), 483 deletions(-)
create mode 100644 arch/powerpc/sysdev/bestcomm/Kconfig
create mode 100644 arch/powerpc/sysdev/bestcomm/Makefile
create mode 100644 arch/powerpc/sysdev/bestcomm/ata.c
create mode 100644 arch/powerpc/sysdev/bestcomm/ata.h
create mode 100644 arch/powerpc/sysdev/bestcomm/bcom_ata_task.c
create mode 100644 arch/powerpc/sysdev/bestcomm/bcom_fec_rx_task.c
create mode 100644 arch/powerpc/sysdev/bestcomm/bcom_fec_tx_task.c
create mode 100644 arch/powerpc/sysdev/bestcomm/bcom_gen_bd_rx_task.c
create mode 100644 arch/powerpc/sysdev/bestcomm/bcom_gen_bd_tx_task.c
create mode 100644 arch/powerpc/sysdev/bestcomm/bestcomm.c
create mode 100644 arch/powerpc/sysdev/bestcomm/bestcomm.h
create mode 100644 arch/powerpc/sysdev/bestcomm/bestcomm_priv.h
create mode 100644 arch/powerpc/sysdev/bestcomm/fec.c
create mode 100644 arch/powerpc/sysdev/bestcomm/fec.h
create mode 100644 arch/powerpc/sysdev/bestcomm/gen_bd.c
create mode 100644 arch/powerpc/sysdev/bestcomm/gen_bd.h
create mode 100644 arch/powerpc/sysdev/bestcomm/sram.c
create mode 100644 arch/powerpc/sysdev/bestcomm/sram.h
Anton Blanchard (4):
[POWERPC] Enable SLUB in *_defconfig
[POWERPC] Quieten clockevent printk
[POWERPC] Quieten cache information at boot
[POWERPC] Enable NO_HZ and high res timers for pseries and ppc64 configs
Benjamin Herrenschmidt (1):
[POWERPC] Fix 64 bits vDSO DWARF info for CR register
Domen Puncer (1):
[POWERPC] mpc52xx: device tree changes for FEC and MDIO
Joachim Fenkes (4):
[POWERPC] Move of_device allocation into of_device.[ch]
[POWERPC] ibmebus: Remove bus match/probe/remove functions
[POWERPC] ibmebus: Add device creation and bus probing based on of_device
[POWERPC] ibmebus: Move to of_device and of_platform_driver, match eHCA and eHEA drivers
Kumar Gala (1):
[POWERPC] Fix handling of stfiwx math emulation
Olof Johansson (2):
[POWERPC] Fix 1TB segment detection
[POWERPC] Add 1TB workaround for PA6T
Stephen Rothwell (2):
[POWERPC] Fix copyright symbol
[POWERPC] Fix iSeries_hpte_insert prototype
Sylvain Munaut (7):
[POWERPC] exports rheap symbol to modules
[POWERPC] rheap: Changes config mechanism
[POWERPC] mpc52xx: Update mpc52xx_psc structure with B revision changes
[POWERPC] bestcomm: core bestcomm support for Freescale MPC5200
[POWERPC] bestcomm: ATA task support
[POWERPC] bestcomm: FEC task support
[POWERPC] bestcomm: GenBD task support
Tony Breeds (1):
[POWERPC] Fix vmemmap warning in init_64.c
Tony Li (1):
[POWERPC] Add missing semicolon for fsl_pci.c
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-10-02 3:15 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-10-02 3:15 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get a bug-fix from Anton Blanchard for 2.6.23.
Thanks,
Paul.
arch/powerpc/platforms/pseries/xics.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit e48395f1753cab0fde6c03f1db833cece9ef2ba0
Author: Anton Blanchard <anton@samba.org>
Date: Mon Oct 1 07:45:55 2007 +1000
[POWERPC] Fix xics set_affinity code
On a POWER6 machine running 2.6.23-rc8 I sometimes see the following error:
xics_set_affinity: No online cpus in the mask 00000000,00000000,00000000,00000001 for irq 20
In a desperate attempt to get a changelog entry in 2.6.23, I took a look
into it.
It turns out we are passing a real and not a virtual irq into
get_irq_server. This works for the case where hwirq < NR_IRQS and we
set virq = hwirq. In my case however hwirq = 590082 and we try and
access irq_desc[590082], slightly past the end at 512 entries.
Lucky we ship lots of memory with our machines.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-09-25 11:40 Paul Mackerras
2007-09-25 12:43 ` Kumar Gala
2007-09-26 11:33 ` Paul Mackerras
0 siblings, 2 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-09-25 11:40 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev, roland
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get a patch from Roland McGrath that fixes a user-triggerable oops
on 64-bit powerpc.
Thanks,
Paul.
arch/powerpc/kernel/process.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
commit 474f81967217f3bec2389ae913da72641f2c40e3
Author: Roland McGrath <roland@redhat.com>
Date: Mon Sep 24 16:52:44 2007 -0700
[POWERPC] Ensure FULL_REGS on exec
When PTRACE_O_TRACEEXEC is used, a ptrace call to fetch the registers at
the PTRACE_EVENT_EXEC stop (PTRACE_PEEKUSR) will oops in CHECK_FULL_REGS.
With recent versions, "gdb --args /bin/sh -c 'exec /bin/true'" and "run" at
the (gdb) prompt is sufficient to produce this. I also have written an
isolated test case, see https://bugzilla.redhat.com/show_bug.cgi?id=301791#c15.
This change fixes the problem by clearing the low bit of pt_regs.trap in
start_thread so that FULL_REGS is true again. This is correct since all of
the GPRs that "full" refers to are cleared in start_thread.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git merge branch
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
1 sibling, 1 reply; 146+ messages in thread
From: Kumar Gala @ 2007-09-25 12:43 UTC (permalink / raw)
To: Paul Mackerras; +Cc: PowerPC dev list, Greg KH, Linus Torvalds, Roland McGrath
On Sep 25, 2007, at 6:40 AM, Paul Mackerras wrote:
> Linus,
>
> Please do
>
> git pull \
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
>
> to get a patch from Roland McGrath that fixes a user-triggerable oops
> on 64-bit powerpc.
>
> Thanks,
> Paul.
Should this also go to -stable?
- k
>
> arch/powerpc/kernel/process.c | 7 +++++++
> 1 files changed, 7 insertions(+), 0 deletions(-)
>
> commit 474f81967217f3bec2389ae913da72641f2c40e3
> Author: Roland McGrath <roland@redhat.com>
> Date: Mon Sep 24 16:52:44 2007 -0700
>
> [POWERPC] Ensure FULL_REGS on exec
>
> When PTRACE_O_TRACEEXEC is used, a ptrace call to fetch the
> registers at
> the PTRACE_EVENT_EXEC stop (PTRACE_PEEKUSR) will oops in
> CHECK_FULL_REGS.
> With recent versions, "gdb --args /bin/sh -c 'exec /bin/true'"
> and "run" at
> the (gdb) prompt is sufficient to produce this. I also have
> written an
> isolated test case, see https://bugzilla.redhat.com/
> show_bug.cgi?id=301791#c15.
>
> This change fixes the problem by clearing the low bit of
> pt_regs.trap in
> start_thread so that FULL_REGS is true again. This is correct
> since all of
> the GPRs that "full" refers to are cleared in start_thread.
>
> Signed-off-by: Roland McGrath <roland@redhat.com>
> Signed-off-by: Paul Mackerras <paulus@samba.org>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git merge branch
2007-09-25 12:43 ` Kumar Gala
@ 2007-09-25 12:52 ` Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-09-25 12:52 UTC (permalink / raw)
To: Kumar Gala; +Cc: PowerPC dev list, Greg KH, Linus Torvalds, Roland McGrath
Kumar Gala writes:
> Should this also go to -stable?
It turns out that it's not triggerable (as an oops) from userspace in
2.6.22 and earlier. Commit 1b6610d6 of Ben H's took out #ifdef
CONFIG_PPC32 around a couple of CHECK_FULL_REGS calls, which is what
made it triggerable on ppc64. We have an interesting difference
between ppc32 and ppc64 in our CHECK_FULL_REGS implementation - it's a
BUG_ON on 64-bit but just a printk on 32-bit. So on 32-bit someone
could use it to spam the logs but not to actually crash the system.
So yes, I guess it should go to -stable once Linus takes it, but it's
a much less serious vulnerability in 2.6.22 and earlier than I first
thought (since it's only 32-bit, and just a user-triggerable printk).
And yes we should consolidate the CHECK_FULL_REGS implementations as a
WARN_ON with a counter to limit how many we do.
Paul.
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git merge branch
2007-09-25 11:40 Paul Mackerras
2007-09-25 12:43 ` Kumar Gala
@ 2007-09-26 11:33 ` Paul Mackerras
1 sibling, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-09-26 11:33 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev, jk
I wrote:
> Linus,
>
> Please do
>
> git pull \
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
>
> to get a patch from Roland McGrath that fixes a user-triggerable oops
> on 64-bit powerpc.
I have added another commit from Jeremy Kerr fixing a mismerge that
caused a user visible ABI regression from 2.6.22. The diffstat and
log below include both the patch from Roland and this new patch.
Thanks,
Paul.
arch/powerpc/kernel/process.c | 7 +++++++
arch/powerpc/platforms/cell/spufs/file.c | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
commit 603c461250b223ac42c10b8d1df653af1a361d44
Author: Jeremy Kerr <jk@ozlabs.org>
Date: Wed Sep 26 10:53:45 2007 +1000
[POWERPC] spufs: fix mismerge, making context signal{1,2} files readable again
The commit 8b6f50ef1d5cc86b278eb42bc91630fad455fb10 seems to have
been affected by a mismerge of a duplicate patch
(d054b36ffd302ec65aabec16a0c60ddd9e6b5a62) - both the
spufs_dir_contents and spufs_dir_nosched_contents have been given
write-only signal notification files.
This change reverts the spufs_dir_contents array to use the
readable signal notification file implementation.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 474f81967217f3bec2389ae913da72641f2c40e3
Author: Roland McGrath <roland@redhat.com>
Date: Mon Sep 24 16:52:44 2007 -0700
[POWERPC] Ensure FULL_REGS on exec
When PTRACE_O_TRACEEXEC is used, a ptrace call to fetch the registers at
the PTRACE_EVENT_EXEC stop (PTRACE_PEEKUSR) will oops in CHECK_FULL_REGS.
With recent versions, "gdb --args /bin/sh -c 'exec /bin/true'" and "run" at
the (gdb) prompt is sufficient to produce this. I also have written an
isolated test case, see https://bugzilla.redhat.com/show_bug.cgi?id=301791#c15.
This change fixes the problem by clearing the low bit of pt_regs.trap in
start_thread so that FULL_REGS is true again. This is correct since all of
the GPRs that "full" refers to are cleared in start_thread.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread
* Please pull powerpc.git merge branch
@ 2007-09-19 12:38 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-09-19 12:38 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get three more bug-fixes for powerpc, as listed below.
Thanks,
Paul.
arch/powerpc/kernel/time.c | 8 +++++---
arch/powerpc/kernel/vdso.c | 12 ++++++++++++
arch/powerpc/platforms/cell/spufs/sched.c | 4 ++--
include/asm-powerpc/time.h | 5 +++++
4 files changed, 24 insertions(+), 5 deletions(-)
commit c27da339698145a9383e052c1070a950d30da478
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed Sep 19 14:21:56 2007 +1000
[POWERPC] Fix timekeeping on PowerPC 601
Recent changes to the timekeeping code broke support for the PowerPC 601
processor which doesn't have the usual timebase facility but a slightly
different thing called (yuck) the RTC.
This fixes it, boot tested on an old 601 based PowerMac 7200.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 7b5acbaac3f94ab810a977c0ec4e5fcabbf51bed
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed Sep 19 14:21:56 2007 +1000
[POWERPC] Don't expose clock vDSO functions when CPU has no timebase
We forgot to remove the clock_gettime, clock_getres and get_tbfreq vDSO
calls on CPUs that have no timebase such as 601 or 403 (old CPUs that have
different mechanisms and for which the vDSO code will not work properly).
This fixes it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit c0e7b4aa1c09ea992808ea8c079141bc8dd0f5bc
Author: Christoph Hellwig <hch@lst.de>
Date: Wed Sep 19 14:38:12 2007 +1000
[POWERPC] spusched: Fix null pointer dereference in find_victim
find_victim can dereference a NULL pointer when iterating over the list
of victim spus because list_mutex only guarantees spu->ct to be stable,
but of course not to be non-NULL.
Also fix find_victim to not call spu_unbind_context without list_mutex
because that violates the above guarantee.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-09-10 19:13 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-09-10 19:13 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
There are four bug-fixes there. Three of them are to fix problems on
PS3 and the fourth is to fix a problem on POWER6 machines.
Thanks,
Paul.
arch/powerpc/kernel/ibmebus.c | 30 +++++++++---------------------
arch/powerpc/platforms/cell/spu_base.c | 24 +++++++++++++++---------
arch/powerpc/platforms/ps3/platform.h | 1 +
arch/powerpc/platforms/ps3/repository.c | 29 +++++++++++++++++++++++++++++
arch/powerpc/platforms/ps3/spu.c | 2 ++
include/asm-powerpc/spu.h | 2 +-
6 files changed, 57 insertions(+), 31 deletions(-)
commit d8612417b2f78767b96ca434b50d23e5cdfcde07
Author: Joachim Fenkes <fenkes@de.ibm.com>
Date: Wed Aug 29 18:15:17 2007 +0200
[POWERPC] ibmebus: Prevent bus_id collisions
Previously, ibmebus derived a device's bus_id from its location code.
The location code is not guaranteed to be unique, so we might get bus_id
collisions if two devices share the same location code. The OFDT
full_name, however, is unique, so we use that instead (truncating it
on the left if it is too long).
Signed-off-by: Joachim Fenkes <fenkes@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit d51dd3de87026cb0ea1ea5f873f08e930053bfc5
Author: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date: Thu Sep 6 18:14:57 2007 +0200
[POWERPC] cell/PS3: Ignore storage devices that are still being probed
On PS3, A storage device may show up in the repository before the hypervisor
has finished probing:
- If its type is not yet known, it shows up as PS3_DEV_TYPE_STOR_DUMMY,
- If its regions are being probed, it shows up as having zero regions.
If any of these happen, consider the device not yet present. The storage
probe thread will retry later.
This fixes the timing-dependent problem where a kernel booted from FLASH ROM
sometimes cannot find the hard disk.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Acked-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit ef8034d01a080e81488e9cf74052acf1e2a37bd0
Author: Jeremy Kerr <jk@ozlabs.org>
Date: Fri Sep 7 18:28:27 2007 +1000
[POWERPC] cell/PS3: Always set master run control bit in mfc_sr1_set
At present, running any SPE program on the ps3 will trigger a BUG_ON
when spufs_run_spu tries to clear the master run control bit, as lv1
does not make the master run control available to Linux.
This change makes SPE apps work again by disabling changes to the
master run control on PS3. Although we don't have the facility to
disable a SPE with supervisor-level privileges, it's better than
hitting the BUG_ON unconditionally.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Acked-by: Masato Noguchi <Masato.Noguchi@jp.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit b7f90a406ff72d6698b619210c205e3375dd099a
Author: Masato Noguchi <Masato.Noguchi@jp.sony.com>
Date: Fri Sep 7 18:28:27 2007 +1000
[POWERPC] cell/PS3: Fix a bug that causes the PS3 to hang on the SPU Class 0 interrupt.
The Cell BE Architecture spec states that the SPU MFC Class 0 interrupt
is edge-triggered. The current spu interrupt handler assumes this
behavior and does not clear the interrupt status.
The PS3 hypervisor visualizes all SPU interrupts as level, and on return
from the interrupt handler the hypervisor will deliver a new virtual
interrupt for any unmasked interrupts which for which the status has not
been cleared. This fix clears the interrupt status in the interrupt
handler.
Signed-off-by: Masato Noguchi <Masato.Noguchi@jp.sony.com>
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-08-30 11:49 Paul Mackerras
2007-08-30 14:32 ` Kumar Gala
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2007-08-30 11:49 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
There are a couple more bug fixes for Cell plus one from Kumar, and
defconfig updates.
Paul.
arch/powerpc/configs/celleb_defconfig | 196 +----
arch/powerpc/configs/chrp32_defconfig | 220 ++----
arch/powerpc/configs/ebony_defconfig | 190 +----
arch/powerpc/configs/g5_defconfig | 208 ++---
arch/powerpc/configs/holly_defconfig | 203 ++---
arch/powerpc/configs/iseries_defconfig | 210 +----
arch/powerpc/configs/linkstation_defconfig | 219 ++----
arch/powerpc/configs/lite5200_defconfig | 191 +----
arch/powerpc/configs/maple_defconfig | 189 +----
arch/powerpc/configs/mpc7448_hpc2_defconfig | 202 +----
arch/powerpc/configs/mpc8272_ads_defconfig | 193 ++---
arch/powerpc/configs/mpc8313_rdb_defconfig | 224 ++----
arch/powerpc/configs/mpc832x_mds_defconfig | 209 ++---
arch/powerpc/configs/mpc832x_rdb_defconfig | 211 ++----
arch/powerpc/configs/mpc834x_itx_defconfig | 206 ++---
arch/powerpc/configs/mpc834x_itxgp_defconfig | 203 ++---
arch/powerpc/configs/mpc834x_mds_defconfig | 205 ++---
arch/powerpc/configs/mpc836x_mds_defconfig | 209 ++---
arch/powerpc/configs/mpc8540_ads_defconfig | 183 +----
arch/powerpc/configs/mpc8544_ds_defconfig | 459 +++++++++++-
arch/powerpc/configs/mpc8560_ads_defconfig | 196 +----
arch/powerpc/configs/mpc8568mds_defconfig | 43 -
arch/powerpc/configs/mpc85xx_cds_defconfig | 198 ++---
arch/powerpc/configs/mpc8641_hpcn_defconfig | 880 ++++++++++++++++++-----
arch/powerpc/configs/mpc866_ads_defconfig | 174 +----
arch/powerpc/configs/mpc885_ads_defconfig | 174 +----
arch/powerpc/configs/pasemi_defconfig | 225 ++----
arch/powerpc/configs/pmac32_defconfig | 237 ++----
arch/powerpc/configs/ppc64_defconfig | 220 ++----
arch/powerpc/configs/prpmc2800_defconfig | 213 ++----
arch/powerpc/configs/pseries_defconfig | 205 ++---
arch/powerpc/kernel/process.c | 6
arch/powerpc/platforms/cell/spu_manage.c | 8
arch/powerpc/platforms/cell/spufs/backing_ops.c | 3
arch/powerpc/platforms/cell/spufs/run.c | 6
arch/powerpc/platforms/ps3/setup.c | 3
36 files changed, 2846 insertions(+), 4275 deletions(-)
commit fc43dca9e75b87d24a16d5be7b497e83837d9d31
Author: Masakazu Mokuno <mokuno@sm.sony.co.jp>
Date: Wed Aug 29 20:30:25 2007 +0900
[POWERPC] PS3: Fix bug where the major version part is not compared
Fix the bug that the major version part of the firmware version number
is ignored in the comparison done by ps3_compare_firmware_version
because the difference of two 64-bit quantities is returned as an int.
Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
Acked-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 13a6976afdb10d54ac5ad344aa0c588bc0bd8b0a
Author: Paul Mackerras <paulus@samba.org>
Date: Thu Aug 30 16:51:51 2007 +1000
[POWERPC] Update defconfigs
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit ada83daab31c3ec35845785482124373a62f430c
Author: Andre Detsch <adetsch@br.ibm.com>
Date: Tue Aug 21 10:06:22 2007 +0800
[POWERPC] spufs: Don't call spu_run_init from spu_reacquire_runnable
This fixes a major bug which was happening when a SPU thread advances
its execution right after being restored to a SPU. A potentially
outdated NPC value was being (re)written to the SPU.
So, spu_run_init, in this case, was either not doing anything relevant,
or breaking the execution of the SPU thread.
This fixes a common problem of losing a mailbox write when it was done
to a saved context.
Signed-off-by: Andre Detsch <adetsch@br.ibm.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 62ee68e3bcb0d056aae5b36dea0388ca25572cdf
Author: Arnd Bergmann <arnd@arndb.de>
Date: Tue Aug 21 10:06:22 2007 +0800
[POWERPC] spufs: Fix update of mailbox status register during backed wbox write
When a process writes into the inbound spu mailbox (wbox) while the
context is saved, we accidentally break the contents of the mb_stat_R
register by clearing other entries of the mailbox status register. This
can cause the user side to hang.
This change fixes the problem by only altering the appropriate bits
of the mailbox status register during a backing-store write.
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit aac2e68481681a362ab6f44fc515034e2a4c7f2c
Author: Christian Krafft <krafft@de.ibm.com>
Date: Thu Aug 30 01:33:53 2007 +0200
[POWERPC] spu_manage: fix spu_unit_number for celleb device tree
This fixes a regression introduced with 2.6.23-rc4 after on some
confusion about the device tree interfaces.
IBM QS21 device trees provide "physical-id", so we changed the code to
run on that and remain compatible with all IBM machines.
However, the Toshiba Celleb device tree provides the "unit-id" property,
which was in the Linux code, but never used in this way on IBM hardware.
Legacy device tree used the reg property for the physical id of an spe.
This patch fixes find_spu_unit_number to look for the spu id in that order.
The length is checked to avoid misinterpretation in case the attributes
unit-id or reg do not contain the id.
Signed-off-by: Christian Krafft <krafft@de.ibm.com>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Cc: Jeremy Kerr <jk@ozlabs.org>
commit 5cc44e086d7a4e20035997ec612678ca91f426e7
Author: Kumar Gala <galak@kernel.crashing.org>
Date: Tue Aug 28 21:46:53 2007 -0500
[POWERPC] Update defconfigs
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
commit 0ee6c15e7ba7b36a217cdadb292eeaf32a057a59
Author: Kumar Gala <galak@kernel.crashing.org>
Date: Tue Aug 28 21:15:53 2007 -0500
[POWERPC] Flush registers to proper task context
When we flush register state for FP, Altivec, or SPE in flush_*_to_thread
we need to respect the task_struct that the caller has passed to us.
Most cases we are called with current, however sometimes (ptrace) we may
be passed a different task_struct.
This showed up when using gdbserver debugging a simple program that used
floating point. When gdb tried to show the FP regs they all showed up as
0, because the child's FP registers were never properly flushed to memory.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git merge branch
2007-08-30 11:49 Paul Mackerras
@ 2007-08-30 14:32 ` Kumar Gala
0 siblings, 0 replies; 146+ messages in thread
From: Kumar Gala @ 2007-08-30 14:32 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, torvalds
On Aug 30, 2007, at 6:49 AM, Paul Mackerras wrote:
> Linus,
>
> Please do
>
> git pull \
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
>
> There are a couple more bug fixes for Cell plus one from Kumar, and
> defconfig updates.
>
> Paul.
any reason you didn't pull this into your master branch as well, or
will just wait to do that after linus pulls?
- k
^ permalink raw reply [flat|nested] 146+ messages in thread
* Please pull powerpc.git merge branch
@ 2007-08-26 23:57 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-08-26 23:57 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
There are 4 bug fixes for Cell and a cell_defconfig update from Arnd,
and a bug fix each from Olof Johansson, Olaf Hering and myself.
Thanks,
Paul.
arch/powerpc/configs/cell_defconfig | 220 ++++++++++-------------------
arch/powerpc/mm/slb.c | 36 ++++-
arch/powerpc/platforms/cell/cbe_regs.h | 8 +
arch/powerpc/platforms/cell/cbe_thermal.c | 6 -
arch/powerpc/platforms/cell/pervasive.c | 26 +++
arch/powerpc/platforms/cell/spu_manage.c | 2
arch/powerpc/platforms/pasemi/iommu.c | 6 -
arch/powerpc/sysdev/axonram.c | 46 +-----
drivers/macintosh/adb.c | 4 -
drivers/macintosh/via-pmu.c | 34 ++--
include/linux/pmu.h | 2
11 files changed, 172 insertions(+), 218 deletions(-)
commit 175587cca7447daf5a13e4a53d32360ed8cba804
Author: Paul Mackerras <paulus@samba.org>
Date: Sat Aug 25 13:14:28 2007 +1000
[POWERPC] Fix SLB initialization at boot time
This partially reverts edd0622bd2e8f755c960827e15aa6908c3c5aa94.
It turns out that the part of that commit that aimed to ensure that we
created an SLB entry for the kernel stack on secondary CPUs when
starting the CPU didn't achieve its aim, and in fact caused a
regression, because get_paca()->kstack is not initialized at the point
where slb_initialize is called.
This therefore just reverts that part of that commit, while keeping
the change to slb_flush_and_rebolt, which is correct and necessary.
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit e120e8d03a263cf75f2abc0f8b3a03a65cfd3b88
Author: Olaf Hering <olaf@aepfle.de>
Date: Sat Aug 25 05:42:01 2007 +1000
[POWERPC] Fix undefined reference to device_power_up/resume
Current Linus tree fails to link on pmac32:
drivers/built-in.o: In function `pmac_wakeup_devices':
via-pmu.c:(.text+0x5bab4): undefined reference to `device_power_up'
via-pmu.c:(.text+0x5bb08): undefined reference to `device_resume'
drivers/built-in.o: In function `pmac_suspend_devices':
via-pmu.c:(.text+0x5c260): undefined reference to `device_power_down'
via-pmu.c:(.text+0x5c27c): undefined reference to `device_resume'
make[1]: *** [.tmp_vmlinux1] Error 1
changing CONFIG_PM > CONFIG_PM_SLEEP leads to:
drivers/built-in.o: In function `pmu_led_set':
via-pmu-led.c:(.text+0x5cdca): undefined reference to `pmu_sys_suspended'
via-pmu-led.c:(.text+0x5cdce): undefined reference to `pmu_sys_suspended'
drivers/built-in.o: In function `pmu_req_done':
via-pmu-led.c:(.text+0x5ce3e): undefined reference to `pmu_sys_suspended'
via-pmu-led.c:(.text+0x5ce42): undefined reference to `pmu_sys_suspended'
drivers/built-in.o: In function `adb_init':
(.init.text+0x4c5c): undefined reference to `pmu_register_sleep_notifier'
make[1]: *** [.tmp_vmlinux1] Error 1
So change even more places from PM to PM_SLEEP to allow linking.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit b22ddc703c5daa603d8d53881b530da3cab94cd4
Author: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Date: Thu Aug 23 03:09:17 2007 +1000
[POWERPC] cell: Update cell_defconfig for 2.6.23
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit b0e81ebb1062eba20fbcbe459662c0a6ec6075f7
Author: Maxim Shchetynin <maxim@de.ibm.com>
Date: Thu Aug 23 03:01:28 2007 +1000
[POWERPC] axonram: Do not delete gendisks queue in error path
On exit do not delete gendisk's queue because this is already done by
del_gendisk(). Doing it twice may cause memory damage.
Signed-off-by: Maximilian <maxim@de.ibm.com>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit fedcd2c53d838e7a69df699ce2a14e45d34d7f7f
Author: Maxim Shchetynin <maxim@de.ibm.com>
Date: Thu Aug 23 03:01:27 2007 +1000
[POWERPC] axonram: Module modification for latest firmware API changes
Firmware would not deliver two interrupt numbers in device-tree any more
but only one, for correctable ECC, because uncorrectable ECC from now
is handled by firmware itself.
Changes in the axonram module are necessary because in the old version, if
it is not allowed to fetch the second interrupt number from device-tree,
it interpretes this as an error case and exits.
Signed-off-by: Maximilian <maxim@de.ibm.com>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 3addf55c9415f9da039947b33d064332137e49fe
Author: Arnd Bergmann <arnd@arndb.de>
Date: Thu Aug 23 03:01:26 2007 +1000
[POWERPC] cell: Support pinhole-reset on IBM cell blades
The Cell Broadband Engine has a method of injecting a
system-reset-exception from an external source into the
operating system, which should trigger the regular behaviour
of entering xmon or kdump.
Unfortunately, the exception handler cannot distinguish it from
other interrupt causes by the SRR1 register, which gets used
for this on Power 6 and others.
IBM Blade servers that want to support triggering the
system reset exception using a pinhole button in the front
panel therefore use an extra register to determine the
reset cause.
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
--
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit fa7f374bbf6d8e5fc7dd281a62498041066aaf43
Author: Christian Krafft <krafft@de.ibm.com>
Date: Thu Aug 23 03:01:25 2007 +1000
[POWERPC] spu_manage: Use newer physical-id attribute
Legacy device tree used the reg property for the physical id of an
spe. On newer device tree layouts the reg property contains the
"correct" value in the reg attribute. So there has been intoduced the
"physical-id" on newer devicetree layouts. The id is stored by
spu_manage into the spu struct as spe_id. cbe_thermal has been
changed to use the spu->spe_id. There's no need for the thermal code
to check devicetree attributes for itself.
Signed-off-by: Christian Krafft <krafft@de.ibm.com>
Cc: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit dfa70f81a05fa857fb1428ac2a88da84ecd50dd9
Author: Olof Johansson <olof@lixom.net>
Date: Fri Aug 17 13:57:39 2007 +1000
[POWERPC] pasemi: Another IOMMU bugfix for 64K PAGE_SIZE
More fallout from the switch from PAGE_SIZE based IOMMU to the native page
size for the driver. By pure luck it happened to work most of the time, since
we end up invalidating the wrong entries in the TLB.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-08-17 0:51 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-08-17 0:51 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
I have added one more patch from Ilpo J=E4rvinen since the last pull
request, removing an incorrect semicolon.
Paul.
arch/powerpc/boot/flatdevtree.c | 18 ------------------
arch/powerpc/kernel/Makefile | 1 +
arch/powerpc/kernel/misc=5F32.S | 12 +++++++++++-
arch/powerpc/mm/hash=5Futils=5F64.c | 2 +-
arch/powerpc/platforms/cell/spu=5Fsyscalls.c | 1 +
arch/powerpc/platforms/ps3/device-init.c | 2 +-
arch/ppc/kernel/misc.S | 12 +++++++++++-
7 files changed, 26 insertions(+), 22 deletions(-)
commit 2b02d13996fe28478e45605de9bd8bdca25718de
Author: Ilpo J=C3=A4rvinen <ilpo.jarvinen@helsinki.fi>
Date: Thu Aug 16 08:03:35 2007 +1000
[POWERPC] Fix invalid semicolon after if statement
=20
A similar fix to netfilter from Eric Dumazet inspired me to
look around a bit by using some grep/sed stuff as looking for
this kind of bugs seemed easy to automate. This is one of them
I found where it looks like this semicolon is not valid.
=20
Signed-off-by: Ilpo J=C3=A4rvinen <ilpo.jarvinen@helsinki.fi>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 2de69124e86682c3427adb4136e097854841e467
Author: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date: Wed Aug 15 02:30:13 2007 +1000
[POWERPC] ps3: Fix no storage devices found
=20
Fix probing of PS3 storage devices: in the success case, we should =
set
`error' to zero, not `result'.
=20
Without this patch no storage devices are found.
=20
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 55a910a81d0c3014abc20b9efa73c595b3e68339
Author: Roland McGrath <roland@redhat.com>
Date: Sat Aug 11 09:03:11 2007 +1000
[POWERPC] Fix for assembler -g
=20
ppc64 does the unusual thing of using #include on a compiler-genera=
ted
assembly file (lparmap.s) from an assembly source file (head=5F64.S=
).
This runs afoul of my recent patch to pass -gdwarf2 to the assemble=
r
under CONFIG=5FDEBUG=5FINFO. This patch avoids the problem by disa=
bling
DWARF generation (-g0) when producing lparmap.s.
=20
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit aa1cf632bd6f998cb4567ccf1a9d2e5daaa9fb44
Author: David Gibson <david@gibson.dropbear.id.au>
Date: Tue Aug 7 14:20:50 2007 +1000
[POWERPC] Fix small race in 44x tlbie function
=20
The 440 family of processors don't have a tlbie instruction. So, w=
e
implement TLB invalidates by explicitly searching the TLB with tlbs=
x.,
then clobbering the relevant entry, if any. Unfortunately the PID =
for
the search needs to be stored in the MMUCR register, which is also
used by the TLB miss handler. Interrupts were enabled in =5Ftlbie(=
), so
an interrupt between loading the MMUCR and the tlbsx could cause
incorrect search results, and thus a failure to invalide TLB entrie=
s
which needed to be invalidated.
=20
This fixes the problem in both arch/ppc and arch/powerpc by inhibit=
ing
interrupts (even critical and debug interrupts) across the relevant=
instructions.
=20
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit fa6b769a8e981afea869285982640168f76774df
Author: Becky Bruce <becky.bruce@freescale.com>
Date: Sat May 12 03:49:39 2007 +1000
[POWERPC] Remove unused code causing a compile warning
=20
AFAICT, nobody is using ft=5Fordered(), and it causes a build warni=
ng
to be generated. This patch cleans that up by removing the functio=
n
and the commented-out code that calls it.
=20
Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit ad941fe4b6b83999863f49dfba7b3d2cebc4ced5
Author: Jeremy Kerr <jk@ozlabs.org>
Date: Mon Aug 13 13:22:44 2007 +1000
[POWERPC] cell: Fix errno for modular spufs=5Fcreate with invalid n=
eighbour
=20
At present, spu=5Fcreate with an invalid neighbo(u)r will return -E=
NOSYS,
not -EBADF, but only when spufs.o is built as a module.
=20
This change adds the appropriate errno, making the behaviour the sa=
me
as the built-in case.
=20
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-08-15 11:41 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-08-15 11:41 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
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.
Thanks,
Paul.
arch/powerpc/boot/flatdevtree.c | 18 ------------------
arch/powerpc/kernel/Makefile | 1 +
arch/powerpc/kernel/misc_32.S | 12 +++++++++++-
arch/powerpc/platforms/cell/spu_syscalls.c | 1 +
arch/powerpc/platforms/ps3/device-init.c | 2 +-
arch/ppc/kernel/misc.S | 12 +++++++++++-
6 files changed, 25 insertions(+), 21 deletions(-)
commit 2de69124e86682c3427adb4136e097854841e467
Author: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date: Wed Aug 15 02:30:13 2007 +1000
[POWERPC] ps3: Fix no storage devices found
Fix probing of PS3 storage devices: in the success case, we should set
`error' to zero, not `result'.
Without this patch no storage devices are found.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 55a910a81d0c3014abc20b9efa73c595b3e68339
Author: Roland McGrath <roland@redhat.com>
Date: Sat Aug 11 09:03:11 2007 +1000
[POWERPC] Fix for assembler -g
ppc64 does the unusual thing of using #include on a compiler-generated
assembly file (lparmap.s) from an assembly source file (head_64.S).
This runs afoul of my recent patch to pass -gdwarf2 to the assembler
under CONFIG_DEBUG_INFO. This patch avoids the problem by disabling
DWARF generation (-g0) when producing lparmap.s.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit aa1cf632bd6f998cb4567ccf1a9d2e5daaa9fb44
Author: David Gibson <david@gibson.dropbear.id.au>
Date: Tue Aug 7 14:20:50 2007 +1000
[POWERPC] Fix small race in 44x tlbie function
The 440 family of processors don't have a tlbie instruction. So, we
implement TLB invalidates by explicitly searching the TLB with tlbsx.,
then clobbering the relevant entry, if any. Unfortunately the PID for
the search needs to be stored in the MMUCR register, which is also
used by the TLB miss handler. Interrupts were enabled in _tlbie(), so
an interrupt between loading the MMUCR and the tlbsx could cause
incorrect search results, and thus a failure to invalide TLB entries
which needed to be invalidated.
This fixes the problem in both arch/ppc and arch/powerpc by inhibiting
interrupts (even critical and debug interrupts) across the relevant
instructions.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit fa6b769a8e981afea869285982640168f76774df
Author: Becky Bruce <becky.bruce@freescale.com>
Date: Sat May 12 03:49:39 2007 +1000
[POWERPC] Remove unused code causing a compile warning
AFAICT, nobody is using ft_ordered(), and it causes a build warning
to be generated. This patch cleans that up by removing the function
and the commented-out code that calls it.
Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit ad941fe4b6b83999863f49dfba7b3d2cebc4ced5
Author: Jeremy Kerr <jk@ozlabs.org>
Date: Mon Aug 13 13:22:44 2007 +1000
[POWERPC] cell: Fix errno for modular spufs_create with invalid neighbour
At present, spu_create with an invalid neighbo(u)r will return -ENOSYS,
not -EBADF, but only when spufs.o is built as a module.
This change adds the appropriate errno, making the behaviour the same
as the built-in case.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-08-10 12:20 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-08-10 12:20 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
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>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-08-03 10:32 Paul Mackerras
2007-08-06 5:57 ` Zhang Wei-r63237
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2007-08-03 10:32 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
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.
Thanks,
Paul.
arch/powerpc/kernel/entry_64.S | 3 +++
arch/powerpc/kernel/pci_32.c | 5 ++++-
arch/powerpc/kernel/smp.c | 9 +++------
arch/powerpc/mm/hash_low_64.S | 6 ++++--
arch/powerpc/mm/hash_utils_64.c | 2 +-
arch/powerpc/mm/numa.c | 4 ++--
arch/powerpc/mm/slb.c | 28 ++++++++++++++++++----------
arch/powerpc/platforms/cell/spufs/sched.c | 3 ++-
arch/powerpc/platforms/powermac/feature.c | 6 ++++--
arch/powerpc/platforms/ps3/setup.c | 2 +-
include/asm-powerpc/mmu-hash64.h | 1 +
include/asm-powerpc/pgtable-64k.h | 8 +++-----
12 files changed, 46 insertions(+), 31 deletions(-)
Andre Detsch (1):
[POWERPC] spufs: Fix affinity after introduction of node_allowed() calls
Kevin Corry (1):
[POWERPC] Fix num_cpus calculation in smp_call_function_map()
Michael Ellerman (1):
[POWERPC] Fix parse_drconf_memory() for 64-bit start addresses
Michael Neuling (1):
[POWERPC] Fixes for the SLB shadow buffer code
Paul Mackerras (2):
[POWERPC] Expand RPN field to 34 bits when using 64k pages
[POWERPC] Fix special PTE code for secondary hash bucket
Segher Boessenkool (2):
[POWERPC] Fix a compile warning in pci_32.c
[POWERPC] Fix a compile warning in powermac/feature.c
Stephen Rothwell (1):
[POWERPC] ps3: Fix section mismatch in ps3/setup.c
^ permalink raw reply [flat|nested] 146+ messages in thread* RE: Please pull powerpc.git merge branch
2007-08-03 10:32 Paul Mackerras
@ 2007-08-06 5:57 ` Zhang Wei-r63237
2007-08-06 13:57 ` Kumar Gala
0 siblings, 1 reply; 146+ messages in thread
From: Zhang Wei-r63237 @ 2007-08-06 5:57 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
Hi, Paul,
How about following patches?
[PATCH 1/2] Add sysdev/pci_quirks.c file into PowerPC architecture with
ULI chip quirk functions.
URL: http://ozlabs.org/pipermail/linuxppc-dev/2007-August/040363.html
[PATCH 2/2] Remove ULI chip quirks functions from MPC8641HPCN and
MPC8544DS boards.
URL: http://ozlabs.org/pipermail/linuxppc-dev/2007-August/040364.html
[PATCH 1/3] Add a new member name to structure irq_host =20
URL: http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039896.html
[PATCH 2/3] Add irq host name for all powerpc interrupt controllors.=20
URL: http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039897.html
[PATCH 3/3] Add irq debugfs and virq_mapping for getting the virq=20
URL: http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039895.html
Thanks!
Best Regards,
Zhang Wei
> -----Original Message-----
> From: linuxppc-dev-bounces+wei.zhang=3Dfreescale.com@ozlabs.org=20
> [mailto:linuxppc-dev-bounces+wei.zhang=3Dfreescale.com@ozlabs.or
> g] On Behalf Of Paul Mackerras
> Sent: Friday, August 03, 2007 6:33 PM
> To: torvalds@linux-foundation.org
> Cc: linuxppc-dev@ozlabs.org
> Subject: Please pull powerpc.git merge branch
>=20
> Linus,
>=20
> Please do
>=20
> git pull \
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
>=20
> to get another batch of bug-fixes for powerpc.
>=20
> Thanks,
> Paul.
>=20
> arch/powerpc/kernel/entry_64.S | 3 +++
> arch/powerpc/kernel/pci_32.c | 5 ++++-
> arch/powerpc/kernel/smp.c | 9 +++------
> arch/powerpc/mm/hash_low_64.S | 6 ++++--
> arch/powerpc/mm/hash_utils_64.c | 2 +-
> arch/powerpc/mm/numa.c | 4 ++--
> arch/powerpc/mm/slb.c | 28=20
> ++++++++++++++++++----------
> arch/powerpc/platforms/cell/spufs/sched.c | 3 ++-
> arch/powerpc/platforms/powermac/feature.c | 6 ++++--
> arch/powerpc/platforms/ps3/setup.c | 2 +-
> include/asm-powerpc/mmu-hash64.h | 1 +
> include/asm-powerpc/pgtable-64k.h | 8 +++-----
> 12 files changed, 46 insertions(+), 31 deletions(-)
>=20
> Andre Detsch (1):
> [POWERPC] spufs: Fix affinity after introduction of=20
> node_allowed() calls
>=20
> Kevin Corry (1):
> [POWERPC] Fix num_cpus calculation in smp_call_function_map()
>=20
> Michael Ellerman (1):
> [POWERPC] Fix parse_drconf_memory() for 64-bit start addresses
>=20
> Michael Neuling (1):
> [POWERPC] Fixes for the SLB shadow buffer code
>=20
> Paul Mackerras (2):
> [POWERPC] Expand RPN field to 34 bits when using 64k pages
> [POWERPC] Fix special PTE code for secondary hash bucket
>=20
> Segher Boessenkool (2):
> [POWERPC] Fix a compile warning in pci_32.c
> [POWERPC] Fix a compile warning in powermac/feature.c
>=20
> Stephen Rothwell (1):
> [POWERPC] ps3: Fix section mismatch in ps3/setup.c
>=20
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev
>=20
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git merge branch
2007-08-06 5:57 ` Zhang Wei-r63237
@ 2007-08-06 13:57 ` Kumar Gala
2007-08-07 1:06 ` Michael Ellerman
0 siblings, 1 reply; 146+ messages in thread
From: Kumar Gala @ 2007-08-06 13:57 UTC (permalink / raw)
To: Zhang Wei-r63237; +Cc: linuxppc-dev, Paul Mackerras
On Aug 6, 2007, at 12:57 AM, Zhang Wei-r63237 wrote:
> Hi, Paul,
>
> How about following patches?
>
> [PATCH 1/2] Add sysdev/pci_quirks.c file into PowerPC architecture
> with
> ULI chip quirk functions.
> URL: http://ozlabs.org/pipermail/linuxppc-dev/2007-August/040363.html
> [PATCH 2/2] Remove ULI chip quirks functions from MPC8641HPCN and
> MPC8544DS boards.
> URL: http://ozlabs.org/pipermail/linuxppc-dev/2007-August/040364.html
>
> [PATCH 1/3] Add a new member name to structure irq_host
> URL: http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039896.html
> [PATCH 2/3] Add irq host name for all powerpc interrupt controllors.
> URL: http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039897.html
> [PATCH 3/3] Add irq debugfs and virq_mapping for getting the virq
> URL: http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039895.html
These patches aren't fixing any bugs and would be for 2.6.24 at this
point.
- k
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git merge branch
2007-08-06 13:57 ` Kumar Gala
@ 2007-08-07 1:06 ` Michael Ellerman
2007-08-07 2:57 ` Zang Roy-r61911
0 siblings, 1 reply; 146+ messages in thread
From: Michael Ellerman @ 2007-08-07 1:06 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev, Paul Mackerras, Zhang Wei-r63237
On Mon, 2007-08-06 at 08:57 -0500, Kumar Gala wrote:
> On Aug 6, 2007, at 12:57 AM, Zhang Wei-r63237 wrote:
>
> > Hi, Paul,
> >
> > How about following patches?
> >
> > [PATCH 1/2] Add sysdev/pci_quirks.c file into PowerPC architecture
> > with
> > ULI chip quirk functions.
> > URL: http://ozlabs.org/pipermail/linuxppc-dev/2007-August/040363.html
> > [PATCH 2/2] Remove ULI chip quirks functions from MPC8641HPCN and
> > MPC8544DS boards.
> > URL: http://ozlabs.org/pipermail/linuxppc-dev/2007-August/040364.html
> >
> > [PATCH 1/3] Add a new member name to structure irq_host
> > URL: http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039896.html
> > [PATCH 2/3] Add irq host name for all powerpc interrupt controllors.
> > URL: http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039897.html
> > [PATCH 3/3] Add irq debugfs and virq_mapping for getting the virq
> > URL: http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039895.html
>
> These patches aren't fixing any bugs and would be for 2.6.24 at this
> point.
And I reworked them and posted new versions.
cheers
--
Michael Ellerman
OzLabs, IBM Australia Development Lab
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)
We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://ozlabs.org/pipermail/linuxppc-dev/attachments/20070807/bfb21f14/attachment.pgp
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git merge branch
2007-08-07 1:06 ` Michael Ellerman
@ 2007-08-07 2:57 ` Zang Roy-r61911
2007-08-07 3:18 ` Michael Ellerman
0 siblings, 1 reply; 146+ messages in thread
From: Zang Roy-r61911 @ 2007-08-07 2:57 UTC (permalink / raw)
To: michael; +Cc: linuxppc-dev list, Paul Mackerras, Zhang Wei-r63237
On Tue, 2007-08-07 at 09:06, Michael Ellerman wrote:
> On Mon, 2007-08-06 at 08:57 -0500, Kumar Gala wrote:
> > On Aug 6, 2007, at 12:57 AM, Zhang Wei-r63237 wrote:
> >
> > > Hi, Paul,
> > >
> > > How about following patches?
> > >
> > > [PATCH 1/2] Add sysdev/pci_quirks.c file into PowerPC
> architecture
> > > with
> > > ULI chip quirk functions.
> > > URL:
> http://ozlabs.org/pipermail/linuxppc-dev/2007-August/040363.html
> > > [PATCH 2/2] Remove ULI chip quirks functions from MPC8641HPCN and
> > > MPC8544DS boards.
> > > URL:
> http://ozlabs.org/pipermail/linuxppc-dev/2007-August/040364.html
> > >
> > > [PATCH 1/3] Add a new member name to structure irq_host
> > > URL:
> http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039896.html
> > > [PATCH 2/3] Add irq host name for all powerpc interrupt
> controllors.
> > > URL:
> http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039897.html
> > > [PATCH 3/3] Add irq debugfs and virq_mapping for getting the virq
> > > URL:
> http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039895.html
> >
> > These patches aren't fixing any bugs and would be for 2.6.24 at
> this
> > point.
>
> And I reworked them and posted new versions.
Where are the new versions?
I missed them?
Roy
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git merge branch
2007-08-07 2:57 ` Zang Roy-r61911
@ 2007-08-07 3:18 ` Michael Ellerman
2007-08-07 3:31 ` Zhang Wei-r63237
0 siblings, 1 reply; 146+ messages in thread
From: Michael Ellerman @ 2007-08-07 3:18 UTC (permalink / raw)
To: Zang Roy-r61911; +Cc: linuxppc-dev list, Paul Mackerras, Zhang Wei-r63237
[-- Attachment #1: Type: text/plain, Size: 2050 bytes --]
On Tue, 2007-08-07 at 10:57 +0800, Zang Roy-r61911 wrote:
> On Tue, 2007-08-07 at 09:06, Michael Ellerman wrote:
> > On Mon, 2007-08-06 at 08:57 -0500, Kumar Gala wrote:
> > > On Aug 6, 2007, at 12:57 AM, Zhang Wei-r63237 wrote:
> > >
> > > > Hi, Paul,
> > > >
> > > > How about following patches?
> > > >
> > > > [PATCH 1/2] Add sysdev/pci_quirks.c file into PowerPC
> > architecture
> > > > with
> > > > ULI chip quirk functions.
> > > > URL:
> > http://ozlabs.org/pipermail/linuxppc-dev/2007-August/040363.html
> > > > [PATCH 2/2] Remove ULI chip quirks functions from MPC8641HPCN and
> > > > MPC8544DS boards.
> > > > URL:
> > http://ozlabs.org/pipermail/linuxppc-dev/2007-August/040364.html
> > > >
> > > > [PATCH 1/3] Add a new member name to structure irq_host
> > > > URL:
> > http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039896.html
> > > > [PATCH 2/3] Add irq host name for all powerpc interrupt
> > controllors.
> > > > URL:
> > http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039897.html
> > > > [PATCH 3/3] Add irq debugfs and virq_mapping for getting the virq
> > > > URL:
> > http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039895.html
> > >
> > > These patches aren't fixing any bugs and would be for 2.6.24 at
> > this
> > > point.
> >
> > And I reworked them and posted new versions.
> Where are the new versions?
> I missed them?
On the list, I though I cc'ed you but I guess I forgot :)
http://patchwork.ozlabs.org/linuxppc/patch?q=ellerman&id=12612
http://patchwork.ozlabs.org/linuxppc/patch?q=ellerman&id=12613
http://patchwork.ozlabs.org/linuxppc/patch?q=ellerman&id=12614
http://patchwork.ozlabs.org/linuxppc/patch?q=ellerman&id=12615
http://patchwork.ozlabs.org/linuxppc/patch?q=ellerman&id=12616
cheers
--
Michael Ellerman
OzLabs, IBM Australia Development Lab
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)
We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 146+ messages in thread
* RE: Please pull powerpc.git merge branch
2007-08-07 3:18 ` Michael Ellerman
@ 2007-08-07 3:31 ` Zhang Wei-r63237
0 siblings, 0 replies; 146+ messages in thread
From: Zhang Wei-r63237 @ 2007-08-07 3:31 UTC (permalink / raw)
To: michael, Zang Roy-r61911; +Cc: linuxppc-dev list, Paul Mackerras
Hi, Michael,
I get them. Thanks for your work! :)
Best Regards,
Zhang Wei
> -----Original Message-----
> From: Michael Ellerman [mailto:michael@ellerman.id.au]=20
> Sent: Tuesday, August 07, 2007 11:19 AM
> To: Zang Roy-r61911
> Cc: Kumar Gala; linuxppc-dev list; Paul Mackerras; Zhang Wei-r63237
> Subject: Re: Please pull powerpc.git merge branch
>=20
> On Tue, 2007-08-07 at 10:57 +0800, Zang Roy-r61911 wrote:
> > On Tue, 2007-08-07 at 09:06, Michael Ellerman wrote:
> > > On Mon, 2007-08-06 at 08:57 -0500, Kumar Gala wrote:
> > > > On Aug 6, 2007, at 12:57 AM, Zhang Wei-r63237 wrote:
> > > >=20
> > > > > Hi, Paul,
> > > > >
> > > > > How about following patches?
> > > > >
> > > > > [PATCH 1/2] Add sysdev/pci_quirks.c file into PowerPC
> > > architecture =20
> > > > > with
> > > > > ULI chip quirk functions.
> > > > > URL:
> > > http://ozlabs.org/pipermail/linuxppc-dev/2007-August/040363.html
> > > > > [PATCH 2/2] Remove ULI chip quirks functions from=20
> MPC8641HPCN and
> > > > > MPC8544DS boards.
> > > > > URL:
> > > http://ozlabs.org/pipermail/linuxppc-dev/2007-August/040364.html
> > > > >
> > > > > [PATCH 1/3] Add a new member name to structure irq_host
> > > > > URL:
> > > http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039896.html
> > > > > [PATCH 2/3] Add irq host name for all powerpc interrupt
> > > controllors.
> > > > > URL:
> > > http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039897.html
> > > > > [PATCH 3/3] Add irq debugfs and virq_mapping for=20
> getting the virq
> > > > > URL:
> > > http://ozlabs.org/pipermail/linuxppc-dev/2007-July/039895.html
> > > >=20
> > > > These patches aren't fixing any bugs and would be for 2.6.24 at
> > > this =20
> > > > point.
> > >=20
> > > And I reworked them and posted new versions.
> > Where are the new versions?
> > I missed them?
>=20
> On the list, I though I cc'ed you but I guess I forgot :)
>=20
> http://patchwork.ozlabs.org/linuxppc/patch?q=3Dellerman&id=3D12612
> http://patchwork.ozlabs.org/linuxppc/patch?q=3Dellerman&id=3D12613
> http://patchwork.ozlabs.org/linuxppc/patch?q=3Dellerman&id=3D12614
> http://patchwork.ozlabs.org/linuxppc/patch?q=3Dellerman&id=3D12615
> http://patchwork.ozlabs.org/linuxppc/patch?q=3Dellerman&id=3D12616
>=20
> cheers
>=20
> --=20
> Michael Ellerman
> OzLabs, IBM Australia Development Lab
>=20
> wwweb: http://michael.ellerman.id.au
> phone: +61 2 6212 1183 (tie line 70 21183)
>=20
> We do not inherit the earth from our ancestors,
> we borrow it from our children. - S.M.A.R.T Person
>=20
^ permalink raw reply [flat|nested] 146+ messages in thread
* Please pull powerpc.git merge branch
@ 2007-07-26 12:10 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-07-26 12:10 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get some bug-fixes for powerpc, as listed below.
Thanks,
Paul.
arch/powerpc/Kconfig.debug | 2 -
arch/powerpc/boot/dts/kuroboxHD.dts | 18 +++++---
arch/powerpc/boot/dts/kuroboxHG.dts | 19 +++++---
arch/powerpc/boot/dts/mpc7448hpc2.dts | 2 -
arch/powerpc/boot/dts/mpc8544ds.dts | 8 ++++
arch/powerpc/boot/dts/mpc8568mds.dts | 6 +++
arch/powerpc/kernel/head_64.S | 7 ++-
arch/powerpc/kernel/iomap.c | 8 +++-
arch/powerpc/kernel/irq.c | 8 ++--
arch/powerpc/kernel/pci-common.c | 25 +++++++++++
arch/powerpc/kernel/pci_32.c | 20 ++++++++-
arch/powerpc/kernel/process.c | 4 ++
arch/powerpc/kernel/prom_parse.c | 2 -
arch/powerpc/kernel/setup-common.c | 4 ++
arch/powerpc/kernel/udbg.c | 2 -
arch/powerpc/mm/lmb.c | 4 +-
arch/powerpc/platforms/cell/spufs/context.c | 3 +
arch/powerpc/platforms/cell/spufs/run.c | 4 ++
arch/powerpc/platforms/cell/spufs/sched.c | 4 --
arch/powerpc/platforms/iseries/lpevents.c | 2 -
arch/powerpc/platforms/maple/pci.c | 3 +
arch/powerpc/sysdev/fsl_pci.c | 4 +-
arch/powerpc/sysdev/fsl_soc.c | 61 +++++++++++++++++++++++++++
arch/powerpc/sysdev/indirect_pci.c | 1
include/asm-powerpc/pci-bridge.h | 20 +++++++++
include/asm-powerpc/ppc_asm.h | 12 +++++
include/asm-powerpc/vio.h | 5 ++
27 files changed, 221 insertions(+), 37 deletions(-)
Alan Curry (1):
[POWERPC] Fix Pegasos keyboard detection
Benjamin Herrenschmidt (3):
[POWERPC] Add function to check if address is an IO port
[POWERPC] Make pci_iounmap actually unmap things
[POWERPC] Fix Maple platform ISA bus
Christoph Hellwig (1):
[POWERPC] spusched: Fix initial timeslice calculation
Guennadi Liakhovetski (2):
[POWERPC] Add of_register_i2c_devices()
[POWERPC] Fix RTC and device tree on linkstation machines
Kumar Gala (6):
[POWERPC] Fix PCI indirect for big-endian cfg_addr
[POWERPC] Don't try to allocate resources for a Freescale POWERPC PHB
[POWERPC] Fix ethernet PHY support on MPC8544 DS
[POWREPC] Fixup a number of modpost warnings on ppc32
[POWERPC] Only allow building of BootX text support on PPC_MULTIPLATFORM
[POWERPC] Fix register labels on show_regs() message for 4xx/Book-E
Manish Ahuja (1):
[POWERPC] Fix loop with unsigned long counter variable
Masato Noguchi (1):
[POWERPC] spufs: Fix incorrect initialization of cbe_spu_info.spus
Paul Mackerras (1):
Revert "[POWERPC] Don't complain if size-cells == 0 in prom_parse()"
Roy Zang (2):
[POWERPC] Fix mpc7448hpc2 tsi108 device_type bug
[POWERPC] Fix the ability to reset on MPC8544 DS and MPC8568 MDS boards
Stephen Rothwell (3):
[POWERPC] iSeries: We need vio_enable_interrupts
[POWERPC] iSeries: Fix section mismatch warnings
[POWERPC] iSeries: Fix section mismatch warning in lpevents
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-07-22 12:56 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-07-22 12:56 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get a further powerpc update for 2.6.23.
Thanks,
Paul.
arch/powerpc/configs/prpmc2800_defconfig | 2 +-
arch/powerpc/kernel/pci-common.c | 2 +-
arch/powerpc/kernel/prom.c | 2 +-
arch/powerpc/kernel/smp.c | 7 +++++-
arch/powerpc/mm/fault.c | 8 ++++++-
arch/powerpc/mm/hash_utils_64.c | 4 ++--
arch/powerpc/platforms/Kconfig.cputype | 2 +-
arch/powerpc/platforms/embedded6xx/Kconfig | 2 +-
arch/powerpc/platforms/pseries/firmware.c | 19 +++--------------
arch/powerpc/platforms/pseries/pseries.h | 2 +-
arch/powerpc/platforms/pseries/setup.c | 17 ++++++++++-----
arch/powerpc/sysdev/mpic.c | 32 ++++++++++++++++++++++++++++
arch/powerpc/xmon/nonstdio.c | 5 ++++
arch/powerpc/xmon/nonstdio.h | 3 ++-
arch/powerpc/xmon/start.c | 2 +-
arch/powerpc/xmon/xmon.c | 2 +-
arch/ppc/syslib/mv64x60.c | 15 +++++++------
drivers/char/hvc_iseries.c | 8 ++++---
drivers/char/hvc_rtas.c | 2 +-
drivers/char/hvcs.c | 8 ++++---
drivers/macintosh/rack-meter.c | 1 -
drivers/pcmcia/m8xx_pcmcia.c | 2 +-
include/asm-powerpc/mpic.h | 3 +++
include/asm-powerpc/prom.h | 2 +-
include/asm-ppc/system.h | 1 +
include/linux/of_platform.h | 4 ++--
26 files changed, 101 insertions(+), 56 deletions(-)
Avi Kivity (1):
[POWERPC] Allow smp_call_function_single() to current cpu
Benjamin Herrenschmidt (1):
[POWERPC] MPIC protected sources
Christoph Hellwig (1):
[POWERPC] mv64x60: Use mutex instead of semaphore
Geert Uytterhoeven (1):
[POWERPC] cell: CONFIG_SPE_BASE is a typo
Ishizaki Kou (2):
[POWERPC] Make xmon_write accept a const buffer
[POWERPC] fix showing xmon help
Jesper Juhl (1):
[POWERPC] Clean up duplicate includes in drivers/macintosh/
Josh Boyer (1):
[POWERPC] Fix ARCH=ppc builds
Michael Neuling (1):
[POWERPC] Fix future firmware feature fixups function failure
Paul Mackerras (1):
[POWERPC] Allow exec faults on readable areas on classic 32-bit PowerPC
Robert P. J. Day (1):
[POWERPC] Fix misspelled "CONFIG_CHECK_CACHE_COHERENCY" Kconfig option.
Segher Boessenkool (1):
[POWERPC] of_detach_node()'s device node argument cannot be const
Stephen Rothwell (6):
[POWERPC] Constify of_platform_driver name
[POWERPC] hvcs: Make some things static and const
[POWERPC] Constify of_platform_driver match_table
[POWERPC] Quiet section mismatch in hvc_rtas.c
[POWERPC] init and exit markings for hvc_iseries
[POWERPC] Quiet section mismatch warning on pcibios_setup
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-07-11 4:46 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-07-11 4:46 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get a powerpc update for 2.6.23.
Note the changes to Documentation/cachetlb.txt, mm/vmalloc.c and
include/linux/vmalloc.h - that is Ben H's change of unmap_vm_area to
unmap_kernel_range, which was OK'd by Andrew Morton.
Thanks,
Paul.
Documentation/cachetlb.txt | 2
Documentation/feature-removal-schedule.txt | 12
Documentation/powerpc/booting-without-of.txt | 40 +
arch/powerpc/Kconfig | 267 -------
arch/powerpc/Makefile | 2
arch/powerpc/boot/44x.c | 45 +
arch/powerpc/boot/44x.h | 3
arch/powerpc/boot/Makefile | 81 +-
arch/powerpc/boot/cuboot-83xx.c | 13
arch/powerpc/boot/cuboot-85xx.c | 13
arch/powerpc/boot/cuboot-ebony.c | 16
arch/powerpc/boot/cuboot.c | 35 +
arch/powerpc/boot/cuboot.h | 14
arch/powerpc/boot/dcr.h | 37 +
arch/powerpc/boot/dts/ebony.dts | 12
arch/powerpc/boot/dts/holly.dts | 52 +
arch/powerpc/boot/dts/mpc7448hpc2.dts | 33 -
arch/powerpc/boot/dts/mpc8272ads.dts | 42 -
arch/powerpc/boot/dts/mpc832x_mds.dts | 16
arch/powerpc/boot/dts/mpc832x_rdb.dts | 16
arch/powerpc/boot/dts/mpc8349emitx.dts | 10
arch/powerpc/boot/dts/mpc834x_mds.dts | 10
arch/powerpc/boot/dts/mpc836x_mds.dts | 16
arch/powerpc/boot/dts/mpc8540ads.dts | 147 ++--
arch/powerpc/boot/dts/mpc8541cds.dts | 90 +-
arch/powerpc/boot/dts/mpc8544ds.dts | 18
arch/powerpc/boot/dts/mpc8548cds.dts | 108 +--
arch/powerpc/boot/dts/mpc8555cds.dts | 90 +-
arch/powerpc/boot/dts/mpc8560ads.dts | 148 ++--
arch/powerpc/boot/dts/mpc8568mds.dts | 66 +-
arch/powerpc/boot/dts/mpc8641_hpcn.dts | 147 +++-
arch/powerpc/boot/dts/mpc866ads.dts | 31 -
arch/powerpc/boot/dts/mpc885ads.dts | 54 +
arch/powerpc/boot/dts/prpmc2800.dts | 2
arch/powerpc/boot/dts/ps3.dts | 68 ++
arch/powerpc/boot/ebony.c | 19
arch/powerpc/boot/main.c | 2
arch/powerpc/boot/of.c | 212 -----
arch/powerpc/boot/of.h | 21 +
arch/powerpc/boot/ofconsole.c | 45 +
arch/powerpc/boot/oflib.c | 202 +++++
arch/powerpc/boot/ops.h | 4
arch/powerpc/boot/ps3-head.S | 80 ++
arch/powerpc/boot/ps3-hvcall.S | 184 +++++
arch/powerpc/boot/ps3.c | 161 ++++
arch/powerpc/boot/serial.c | 2
arch/powerpc/boot/stdio.c | 10
arch/powerpc/boot/types.h | 4
arch/powerpc/boot/wrapper | 55 +
arch/powerpc/boot/zImage.ps3.lds.S | 50 +
arch/powerpc/configs/holly_defconfig | 6
arch/powerpc/configs/ps3_defconfig | 52 +
arch/powerpc/kernel/Makefile | 7
arch/powerpc/kernel/cputable.c | 35 +
arch/powerpc/kernel/head_32.S | 122 ---
arch/powerpc/kernel/head_64.S | 4
arch/powerpc/kernel/io.c | 12
arch/powerpc/kernel/irq.c | 60 +-
arch/powerpc/kernel/isa-bridge.c | 271 +++++++
arch/powerpc/kernel/misc_32.S | 10
arch/powerpc/kernel/misc_64.S | 26 -
arch/powerpc/kernel/of_platform.c | 8
arch/powerpc/kernel/pci-common.c | 454 ++++++++++++
arch/powerpc/kernel/pci_32.c | 510 -------------
arch/powerpc/kernel/pci_64.c | 750 +++----------------
arch/powerpc/kernel/ppc_ksyms.c | 5
arch/powerpc/kernel/process.c | 14
arch/powerpc/kernel/prom.c | 29 -
arch/powerpc/kernel/prom_init.c | 4
arch/powerpc/kernel/ptrace-common.h | 161 ----
arch/powerpc/kernel/ptrace.c | 325 ++++++--
arch/powerpc/kernel/ptrace32.c | 239 +++---
arch/powerpc/kernel/rtas_pci.c | 7
arch/powerpc/kernel/setup-common.c | 21 +
arch/powerpc/kernel/setup_32.c | 12
arch/powerpc/kernel/setup_64.c | 12
arch/powerpc/kernel/signal.c | 180 +++++
arch/powerpc/kernel/signal.h | 55 +
arch/powerpc/kernel/signal_32.c | 191 +----
arch/powerpc/kernel/signal_64.c | 182 -----
arch/powerpc/kernel/sysfs.c | 5
arch/powerpc/kernel/time.c | 65 +-
arch/powerpc/kernel/vdso.c | 2
arch/powerpc/kernel/vmlinux.lds.S | 6
arch/powerpc/mm/44x_mmu.c | 1
arch/powerpc/mm/4xx_mmu.c | 1
arch/powerpc/mm/Makefile | 3
arch/powerpc/mm/fault.c | 2
arch/powerpc/mm/fsl_booke_mmu.c | 1
arch/powerpc/mm/hash_native_64.c | 27 -
arch/powerpc/mm/hash_utils_64.c | 2
arch/powerpc/mm/imalloc.c | 313 --------
arch/powerpc/mm/init_32.c | 1
arch/powerpc/mm/init_64.c | 1
arch/powerpc/mm/mem.c | 3
arch/powerpc/mm/mmu_context_32.c | 1
arch/powerpc/mm/mmu_decl.h | 17
arch/powerpc/mm/pgtable_32.c | 123 ---
arch/powerpc/mm/pgtable_64.c | 206 +----
arch/powerpc/mm/ppc_mmu_32.c | 7
arch/powerpc/mm/stab.c | 4
arch/powerpc/mm/tlb_32.c | 1
arch/powerpc/mm/tlb_64.c | 57 +
arch/powerpc/oprofile/op_model_power4.c | 14
arch/powerpc/platforms/52xx/efika.c | 13
arch/powerpc/platforms/52xx/lite5200.c | 2
arch/powerpc/platforms/52xx/mpc52xx_pci.c | 18
arch/powerpc/platforms/52xx/mpc52xx_pm.c | 8
arch/powerpc/platforms/82xx/Kconfig | 2
arch/powerpc/platforms/82xx/mpc82xx_ads.c | 17
arch/powerpc/platforms/83xx/Kconfig | 2
arch/powerpc/platforms/83xx/Makefile | 2
arch/powerpc/platforms/83xx/mpc8313_rdb.c | 8
arch/powerpc/platforms/83xx/mpc832x_mds.c | 7
arch/powerpc/platforms/83xx/mpc832x_rdb.c | 7
arch/powerpc/platforms/83xx/mpc834x_itx.c | 9
arch/powerpc/platforms/83xx/mpc834x_mds.c | 56 -
arch/powerpc/platforms/83xx/mpc836x_mds.c | 7
arch/powerpc/platforms/83xx/mpc83xx.h | 34 +
arch/powerpc/platforms/83xx/pci.c | 18
arch/powerpc/platforms/83xx/usb.c | 181 +++++
arch/powerpc/platforms/85xx/misc.c | 32 +
arch/powerpc/platforms/85xx/mpc8544_ds.c | 15
arch/powerpc/platforms/85xx/mpc85xx.h | 2
arch/powerpc/platforms/85xx/mpc85xx_ads.c | 32 -
arch/powerpc/platforms/85xx/mpc85xx_cds.c | 116 +--
arch/powerpc/platforms/85xx/mpc85xx_mds.c | 28 -
arch/powerpc/platforms/85xx/pci.c | 11
arch/powerpc/platforms/86xx/Kconfig | 2
arch/powerpc/platforms/86xx/mpc86xx.h | 11
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 27 -
arch/powerpc/platforms/86xx/pci.c | 67 +-
arch/powerpc/platforms/8xx/m8xx_setup.c | 5
arch/powerpc/platforms/8xx/mpc885ads_setup.c | 71 ++
arch/powerpc/platforms/Kconfig | 29 +
arch/powerpc/platforms/Kconfig.cputype | 221 ++++++
arch/powerpc/platforms/apus/Kconfig | 130 ---
arch/powerpc/platforms/cell/io-workarounds.c | 2
arch/powerpc/platforms/cell/spu_base.c | 59 +-
arch/powerpc/platforms/cell/spufs/backing_ops.c | 6
arch/powerpc/platforms/cell/spufs/context.c | 15
arch/powerpc/platforms/cell/spufs/fault.c | 29 +
arch/powerpc/platforms/cell/spufs/file.c | 149 ++++
arch/powerpc/platforms/cell/spufs/inode.c | 10
arch/powerpc/platforms/cell/spufs/run.c | 45 +
arch/powerpc/platforms/cell/spufs/sched.c | 476 ++++++++++--
arch/powerpc/platforms/cell/spufs/spu_restore.c | 2
arch/powerpc/platforms/cell/spufs/spu_save.c | 2
arch/powerpc/platforms/cell/spufs/spufs.h | 84 ++
arch/powerpc/platforms/cell/spufs/switch.c | 18
arch/powerpc/platforms/chrp/Kconfig | 1
arch/powerpc/platforms/chrp/Makefile | 3
arch/powerpc/platforms/chrp/pci.c | 7
arch/powerpc/platforms/embedded6xx/Kconfig | 2
arch/powerpc/platforms/embedded6xx/holly.c | 2
arch/powerpc/platforms/embedded6xx/linkstation.c | 10
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 9
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h | 5
arch/powerpc/platforms/iseries/call_hpt.h | 9
arch/powerpc/platforms/iseries/htab.c | 8
arch/powerpc/platforms/iseries/pci.c | 7
arch/powerpc/platforms/iseries/setup.c | 6
arch/powerpc/platforms/maple/pci.c | 41 -
arch/powerpc/platforms/pasemi/Kconfig | 9
arch/powerpc/platforms/pasemi/Makefile | 1
arch/powerpc/platforms/pasemi/electra_ide.c | 96 ++
arch/powerpc/platforms/pasemi/pci.c | 24 -
arch/powerpc/platforms/pasemi/setup.c | 2
arch/powerpc/platforms/powermac/Kconfig | 1
arch/powerpc/platforms/powermac/low_i2c.c | 23 -
arch/powerpc/platforms/powermac/pci.c | 46 -
arch/powerpc/platforms/ps3/Kconfig | 26 -
arch/powerpc/platforms/ps3/Makefile | 1
arch/powerpc/platforms/ps3/device-init.c | 785 ++++++++++++++++++++
arch/powerpc/platforms/ps3/htab.c | 31 -
arch/powerpc/platforms/ps3/interrupt.c | 272 ++++---
arch/powerpc/platforms/ps3/mm.c | 632 +++++++++++++---
arch/powerpc/platforms/ps3/os-area.c | 4
arch/powerpc/platforms/ps3/platform.h | 43 +
arch/powerpc/platforms/ps3/repository.c | 586 ++++++++-------
arch/powerpc/platforms/ps3/setup.c | 105 ++-
arch/powerpc/platforms/ps3/smp.c | 18
arch/powerpc/platforms/ps3/spu.c | 13
arch/powerpc/platforms/ps3/system-bus.c | 562 ++++++++++++--
arch/powerpc/platforms/ps3/time.c | 2
arch/powerpc/platforms/pseries/Makefile | 2
arch/powerpc/platforms/pseries/eeh.c | 19
arch/powerpc/platforms/pseries/eeh_cache.c | 5
arch/powerpc/platforms/pseries/eeh_driver.c | 6
arch/powerpc/platforms/pseries/eeh_sysfs.c | 87 ++
arch/powerpc/platforms/pseries/lpar.c | 17
arch/powerpc/platforms/pseries/pci_dlpar.c | 9
arch/powerpc/platforms/pseries/plpar_wrappers.h | 15
arch/powerpc/platforms/pseries/pseries.h | 2
arch/powerpc/platforms/pseries/reconfig.c | 2
arch/powerpc/platforms/pseries/setup.c | 2
arch/powerpc/platforms/pseries/xics.c | 53 +
arch/powerpc/sysdev/Makefile | 6
arch/powerpc/sysdev/fsl_pcie.c | 171 ----
arch/powerpc/sysdev/fsl_soc.c | 13
arch/powerpc/sysdev/indirect_pci.c | 44 +
arch/powerpc/sysdev/mpc8xx_pic.h | 11
arch/powerpc/sysdev/mv64x60_dev.c | 28 +
arch/powerpc/sysdev/mv64x60_pci.c | 7
arch/powerpc/sysdev/qe_lib/ucc.c | 2
arch/powerpc/sysdev/qe_lib/ucc_fast.c | 8
arch/powerpc/sysdev/rtc_cmos_setup.c | 49 +
arch/powerpc/sysdev/timer.c | 14
arch/powerpc/sysdev/tsi108_dev.c | 33 +
arch/powerpc/sysdev/tsi108_pci.c | 10
arch/powerpc/xmon/xmon.c | 2
arch/ppc/kernel/misc.S | 8
arch/ppc/kernel/ppc_ksyms.c | 1
arch/ppc/kernel/setup.c | 2
arch/ppc/mm/tlb.c | 1
arch/ppc/platforms/prep_setup.c | 3
arch/ppc/syslib/Makefile | 1
arch/ppc/syslib/indirect_pci.c | 134 +++
arch/ppc/syslib/virtex_devices.c | 38 +
drivers/block/viodasd.c | 4
drivers/char/briq_panel.c | 10
drivers/char/hvc_console.c | 2
drivers/char/viotape.c | 12
drivers/pci/hotplug/rpadlpar_core.c | 6
drivers/pcmcia/Kconfig | 17
drivers/pcmcia/m8xx_pcmcia.c | 351 ++++-----
drivers/ps3/Makefile | 5
drivers/ps3/ps3av.c | 372 +++++-----
drivers/ps3/ps3av_cmd.c | 51 -
drivers/ps3/ps3stor_lib.c | 302 ++++++++
drivers/ps3/sys-manager-core.c | 68 ++
drivers/ps3/sys-manager.c | 290 +++++--
drivers/ps3/vuart.c | 817 +++++++++++++--------
drivers/ps3/vuart.h | 71 +-
drivers/rtc/Kconfig | 2
drivers/serial/cpm_uart/cpm_uart_core.c | 2
drivers/serial/of_serial.c | 33 +
drivers/video/Kconfig | 4
drivers/video/ps3fb.c | 290 +++----
include/asm-powerpc/cache.h | 4
include/asm-powerpc/cputable.h | 111 +--
include/asm-powerpc/floppy.h | 6
include/asm-powerpc/hvcall.h | 1
include/asm-powerpc/io.h | 26 -
include/asm-powerpc/irq.h | 9
include/asm-powerpc/lppaca.h | 2
include/asm-powerpc/lv1call.h | 3
include/asm-powerpc/machdep.h | 2
include/asm-powerpc/mmu-8xx.h | 147 ++++
include/asm-powerpc/mmu-fsl-booke.h | 88 ++
include/asm-powerpc/mmu-hash32.h | 91 ++
include/asm-powerpc/mmu-hash64.h | 9
include/asm-powerpc/mmu.h | 13
include/asm-powerpc/mmu_context.h | 202 +++++
include/asm-powerpc/mpc86xx.h | 6
include/asm-powerpc/mpc8xx.h | 4
include/asm-powerpc/pci-bridge.h | 148 +++-
include/asm-powerpc/pci.h | 11
include/asm-powerpc/pgtable-ppc32.h | 50 -
include/asm-powerpc/pgtable-ppc64.h | 50 -
include/asm-powerpc/pgtable.h | 28 +
include/asm-powerpc/ppc-pci.h | 9
include/asm-powerpc/processor.h | 8
include/asm-powerpc/prom.h | 18
include/asm-powerpc/ps3.h | 182 +++--
include/asm-powerpc/ps3av.h | 48 +
include/asm-powerpc/ps3fb.h | 12
include/asm-powerpc/ps3stor.h | 71 ++
include/asm-powerpc/ptrace.h | 22 -
include/asm-powerpc/reg.h | 2
include/asm-powerpc/spu.h | 24 +
include/asm-powerpc/syscalls.h | 7
include/asm-powerpc/system.h | 4
include/asm-powerpc/termbits.h | 4
include/asm-powerpc/thread_info.h | 12
include/asm-powerpc/time.h | 4
include/asm-powerpc/tlbflush.h | 5
include/linux/fsl_devices.h | 5
include/linux/vmalloc.h | 3
mm/vmalloc.c | 13
280 files changed, 10940 insertions(+), 6951 deletions(-)
create mode 100644 arch/powerpc/boot/cuboot.c
create mode 100644 arch/powerpc/boot/cuboot.h
create mode 100644 arch/powerpc/boot/dts/ps3.dts
create mode 100644 arch/powerpc/boot/of.h
create mode 100644 arch/powerpc/boot/ofconsole.c
create mode 100644 arch/powerpc/boot/oflib.c
create mode 100644 arch/powerpc/boot/ps3-head.S
create mode 100644 arch/powerpc/boot/ps3-hvcall.S
create mode 100644 arch/powerpc/boot/ps3.c
create mode 100644 arch/powerpc/boot/zImage.ps3.lds.S
create mode 100644 arch/powerpc/kernel/isa-bridge.c
create mode 100644 arch/powerpc/kernel/pci-common.c
delete mode 100644 arch/powerpc/kernel/ptrace-common.h
create mode 100644 arch/powerpc/kernel/signal.c
create mode 100644 arch/powerpc/kernel/signal.h
delete mode 100644 arch/powerpc/mm/imalloc.c
create mode 100644 arch/powerpc/platforms/83xx/usb.c
create mode 100644 arch/powerpc/platforms/Kconfig.cputype
delete mode 100644 arch/powerpc/platforms/apus/Kconfig
create mode 100644 arch/powerpc/platforms/pasemi/electra_ide.c
create mode 100644 arch/powerpc/platforms/ps3/device-init.c
create mode 100644 arch/powerpc/platforms/pseries/eeh_sysfs.c
delete mode 100644 arch/powerpc/sysdev/fsl_pcie.c
create mode 100644 arch/powerpc/sysdev/rtc_cmos_setup.c
create mode 100644 arch/ppc/syslib/indirect_pci.c
create mode 100644 drivers/ps3/ps3stor_lib.c
create mode 100644 drivers/ps3/sys-manager-core.c
create mode 100644 include/asm-powerpc/mmu-8xx.h
create mode 100644 include/asm-powerpc/mmu-fsl-booke.h
create mode 100644 include/asm-powerpc/mmu-hash32.h
create mode 100644 include/asm-powerpc/ps3stor.h
Adrian Bunk (1):
[POWERPC] Make drivers/char/hvc_console.c:khvcd() static
Anton Blanchard (1):
[POWERPC] Reserve threadinfo flags for perfmon2
Arnd Bergmann (7):
[POWERPC] Split out CPU specific options into a new Kconfig file
[POWERPC] move 82xx/83xx/86xx Kconfig options to platform selection
[POWERPC] rename add_bridge to avoid namespace clashes
[POWERPC] mpc82xx_ads build fix
[POWERPC] kill isa_{io,mem}_base definitions for !PCI
[POWERPC] fix building without PCI
[POWERPC] disallow building powermac and tsi108 without PCI
Benjamin Herrenschmidt (18):
[POWERPC] unmap_vm_area becomes unmap_kernel_range for the public
[POWERPC] Rewrite IO allocation & mapping on powerpc64
[POWERPC] spufs: Add support for SPU single stepping
[POWERPC] spufs: Add a "capabilities" file to spu contexts
[POWERPC] Disable broken PPC_PTRACE_GETFPREGS on 32 bits
[POWERPC] ptrace cleanups
[POWERPC] ptrace updates & new, better requests
[POWERPC] Uninline common ptrace bits
[POWERPC] Remove some useless ifdef's in ptrace
[POWERPC] Allow ptrace write to pt_regs trap and orig_r3
[POWERPC] ptrace shouldn't touch FP exec mode
[POWERPC] powerpc: ptrace can set DABR on both 32 and 64 bits
[POWERPC] Always apply DABR changes on context switches
[POWERPC] Make syscall restart code more common
[POWERPC] Remove obsolete freezer bits
[POWERPC] Merge creation of signal frame
[POWERPC] Remove #ifdef around set_dabr in signal code
[POWERPC] Less ifdef's in signal.c/signal.h
Brian King (1):
[POWERPC] Add H_ILLAN_ATTRIBUTES hcall number
Christoph Hellwig (16):
[POWERPC] Consolidate sys_sigaltstack
[POWERPC] Consolidate restore_sigmask
[POWERPC] Consolidate do_signal
[POWERPC] spusched: Switch from workqueues to kthread + timer tick
[POWERPC] spusched: Dynamic timeslicing for SCHED_OTHER
[POWERPC] spusched: Update scheduling paramters on every spu_run
[POWERPC] spusched: fix cpu/node binding
[POWERPC] spusched: Catch nosched contexts in spu_deactivate
[POWERPC] spusched: No preemption for nosched contexts
[POWERPC] spufs: Add tid file
[POWERPC] spufs: Implement /proc/spu_loadavg
[POWERPC] spufs: Add stat file to spufs
[POWERPC] spusched: Disable tick when not needed
[POWERPC] spusched: Fix runqueue corruption
[POWERPC] spufs: Add spu stats in sysfs
[POWERPC] Remove unused do_signal export
David Gibson (18):
[POWERPC] Split low-level OF-related bootloader code into separate files
[POWERPC] Split out asm-ppc/mmu.h portions for the "classic" hash-based MMU
[POWERPC] Abolish iopa(), mm_ptov(), io_block_mapping() from arch/powerpc
[POWERPC] Remove the dregs of APUS support from arch/powerpc
[POWERPC] Remove a couple of unused definitions from pgtable_32.c
[POWERPC] Start factoring pgtable-ppc32.h and pgtable-ppc64.h
[POWERPC] Kill typedef-ed structs for hash PTEs and BATs
[POWERPC] Merge CPU features pertaining to icache coherency
[POWERPC] Factor zImage's 44x reset code out of ebony.c
[POWERPC] Derive ebc ranges property from EBC registers
[POWERPC] Consolidate cuboot initialization code
[POWERPC] Don't store a command line in the Holly device tree
[POWERPC] Fix problems with device tree representation of TSI-1xx bridges
[POWERPC] Make more OF-related bootwrapper functions available to non-OF platforms
[POWERPC] Abolish unused ucBoardRev variables
[POWERPC] In booting-without-of.txt, clarify that properties must precede subnodes
[POWERPC] Split out asm-ppc/mmu.h portions for Freescale Book-E
[POWERPC] Split out asm-ppc/mmu.h portions for PowerPC 8xx
David Woodhouse (3):
[POWERPC] PS3: System-bus uevent
[POWERPC] PS3: System-bus modinfo attribute
[POWERPC] Enable arbitary speed tty ioctls and split input/output speed
Domen Puncer (1):
[POWERPC] 52xx: sparse fixes
Geert Uytterhoeven (7):
[POWERPC] PS3: Fix sparse warnings
[POWERPC] PS3: Simplify definition of DBG
[POWERPC] PS3: Frame buffer system-bus rework
[POWERPC] PS3: Fix more sparse warnings
[POWERPC] PS3: Preallocate bootmem memory for the PS3 FLASH ROM storage driver
[POWERPC] PS3: Storage Driver Core
[POWERPC] PS3: Storage device registration routines
Geoff Levand (24):
[POWERPC] cell: Add spu shutdown method
[POWERPC] PS3: Rename IPI symbols
[POWERPC] PS3: Use __maybe_unused
[POWERPC] PS3: Map SPU regions as non-guarded
[POWERPC] PS3: Move chip mask defs up
[POWERPC] PS3: Kexec support
[POWERPC] PS3: System-bus rework
[POWERPC] PS3: Repository probe cleanups
[POWERPC] PS3: Vuart rework
[POWERPC] PS3: System manager re-work
[POWERPC] PS3: Rework AV settings driver
[POWERPC] PS3: Device registration routines.
[POWERPC] PS3: Rename processor id symbols
[POWERPC] PS3: Use clear_bit
[POWERPC] Output params value in early_init_devtree
[POWERPC] Correct __secondary_hold comment
[POWERPC] Add signed types to bootwrapper
[POWERPC] Add u64 printf to bootwrapper
[POWERPC] Fix constantness of bootwrapper arg
[POWERPC] Make kernel_entry_t have global scope in bootwrapper
[POWERPC] PS3: Device tree source
[POWERPC] PS3: Select MEMORY_HOTPLUG
[POWERPC] PS3: Update ps3_defconfig
[POWERPC] PS3: Bootwrapper support.
Grant Likely (2):
[POWERPC] 83xx: Add USB support to mpc8349-mitx board port
[POWERPC] xilinxfb: Parameterize xilinxfb platform device registration
Guennadi Liakhovetski (1):
[POWERPC] Don't link timer.o for powerpc systems using generic rtc
Ishizaki Kou (2):
[POWERPC] of_serial: Ignore unknown serial port
[POWERPC] of_serial: add port type checking
Jake Moilanen (1):
[POWERPC] Donate idle CPU cycles on dedicated partitions
Jeremy Kerr (5):
[POWERPC] spusched: Fix timeslice calculations
[POWERPC] spusched: Print out scheduling tunables with DEBUG
[POWERPC] spufs: Remove spufs_dir_inode_operations
[POWERPC] spufs: Trivial whitespace fixes
[POWERPC] spufs: Fix libassist accounting
Johannes Berg (3):
[POWERPC] Use mktime in timer sysdev
[POWERPC] powermac i2c: Use mutex
[POWERPC] arch/powerpc/kernel/sysfs.c: Move NUMA exports
Jon Loeliger (1):
[POWERPC] Replace use of GET_64BIT(prop, i) with of_read_number().
Jon Tollefson (1):
[POWERPC] Move common code out of if/else
Josh Boyer (2):
[POWERPC] Consolidate PowerPC 750 cputable features
[POWERPC] Schedule removal of arch/ppc
Kazunori Asayama (2):
[POWERPC] spufs: Fix lost events in poll/epoll on mfc
[POWERPC] spufs: Save dma_tagstatus_R in CSA
Kumar Gala (24):
[POWERPC] Remove set_cfg_type for PCI indirect users that don't need it
[POWERPC] 52xx: Remove support for PCI bus_offset
[POWERPC] Pass the pci_controller into pci_exclude_device
[POWERPC] Remove hack to determine the 2nd PHBs bus number
[POWERPC] Remove bus_offset in places its not really used
[POWERPC] Added self_busno to indicate which bus number the PHB is
[POWERPC] Removed remnants of bus_offset
[POWERPC] Added indirect_type to handle variants of PCI ops
[POWERPC] 86xx: Workaround PCI_PRIMARY_BUS usage
[POWERPC] Merge asm-ppc/pci-bridge.h into asm-power/pci-bridge.h
[POWERPC] Remove local_number from pci_controller
[POWERPC] Removed dead code related to PCI on ppc32
[POWERPC] Use global_number in ppc32 pci_controller
[POWERPC] Merge ppc32 and ppc64 pcibios_alloc_controller() prototypes
[POWERPC] Move pci_bus_to_hose users to pci_bus_to_host
[POWERPC] Move common PCI code out of pci_32/pci_64
[POWERPC] Use ppc64 style list management for pci_controller on ppc32
[POWERPC] Add copyright header to pci-common.c based on pci_{32,64}.c
[POWERPC] Reworked interrupt numbers for OpenPIC based Freescale chips
[POWERPC] Kill pcibios_enable_resources()
[POWERPC] Fix up interrupt senses for MPC85xx boards
[POWERPC] Merge asm-ppc/mmu_context.h into asm-power/mmu_context.h
[POWERPC] Move inline asm eieio to using eieio inline function
[POWERPC] CPM_UART: Use inline function form of eieio
Laurent Pinchart (1):
[PPC] Add linux/pagemap.h to arch/ppc/mm/tlb.c
Li Yang (3):
[POWERPC] qe_lib: export symbols for QE driver to compile as module
[POWERPC] 83xx: USB platform code rework
[POWERPC] Fix typo in Ebony default DTS
Linas Vepstas (5):
[POWERPC] pseries: asm/pci-bridge.h CONFIG_ minor cleanup
[POWERPC] Add EEH sysfs blinkenlights
[POWERPC] Show EEH per-device false positives
[POWERPC] Remove dead EEH code
[POWERPC] Tweak EEH copyright info
Manish Ahuja (1):
[POWERPC] Remove extra return statement
Mark A. Greer (5):
[POWERPC] Remove 'make zImage.dts' feature
[POWERPC] When appropriate, wrap device tree with zImage
[POWERPC] Update holly to use new dts wrapping feature
[POWERPC] Call add_preferred_console when MPSC is console
[POWERPC] Remove 'console=' from cmdline on prpmc2800
Masakazu Mokuno (1):
[POWERPC] PS3: Compare firmware version
Masashi Kimoto (1):
[POWERPC] PS3: Add support for HDMI RGB Full Range mode
Mathieu Desnoyers (1):
[POWERPC] Remove unnecessary #undef printk from prom.c
Michael Ellerman (8):
[POWERPC] Split virq setup logic out into irq_setup_virq()
[POWERPC] Add irq_create_direct_mapping()
[POWERPC] Add for_each_compatible_node()
[POWERPC] Turn off debugging in arch/powerpc/kernel/pci_64.c
[POWERPC] Check for the root node in of_detach_node()
[POWERPC] Generalise device_node flag interface
[POWERPC] Add a warning to help trackdown device_node refcounting bugs
[POWERPC] Make the debugfs "powerpc" dir globally accessible
Michael Neuling (2):
[POWERPC] Fix stolen time for SMT without LPAR
[POWERPC] Do firmware feature fixups after features are initialised
Mike Wolf (1):
[POWERPC] Oprofile support for Power 5++
Milton Miller (1):
[POWERPC] kexec: Send slaves to new kernel earlier
Mohan Kumar M (1):
[POWERPC] Fix interrupt distribution in ppc970
Nathan Lynch (1):
[POWERPC] Remove spinlock from struct cpu_purr_data
Olaf Hering (1):
[POWERPC] Make two xmon variables static
Olof Johansson (4):
[POWERPC] pasemi: Electra IDE/pata_platform glue
[POWERPC] Uninline and export virq_to_hw()
[POWERPC] pasemi: Rename platform
[POWERPC] pasemi: Don't auto-select CONFIG_EMBEDDED
Robert P. J. Day (2):
[POWERPC] VIOTAPE: Use designated initializers for fops member structures.
[POWERPC] Remove dead code for preventing pread() and pwrite() calls
Roland Dreier (1):
[POWERPC] Add cputable entry for PowerPC 440SPe Rev. B
Roy Zang (4):
[POWERPC] Document the global utilities node define and example
[POWERPC] Fix the node index confusion for SOC
[POWERPC] 85xx: Fix 8548CDS reset bug
[POWERPC] Remove redundant pci_read_irq_line() function for 85xx platform
Sachin P. Sant (1):
[POWERPC] Fix Kexec/Kdump for power6
Sebastian Siewior (2):
[POWERPC] spufs: fix building spufs/spu_save_dump.h
[POWERPC] spufs: Add bit definition
Segher Boessenkool (1):
[POWERPC] Fix VDSO compile warning
Sonny Rao (1):
[POWERPC] Check for NULL ppc_md.init_IRQ() before calling
Stephen Rothwell (1):
[POWERPC] Fix viodasd geometry calculations
Timur Tabi (1):
[POWERPC] Fix MAC address entries for 83xx, 85xx, and 86xx device trees
Tony Breeds (4):
[POWERPC] Move iSeries_tb_recal into its own late_initcall.
[POWERPC] Create a dummy zImage if no valid platform has been selected
[POWERPC] Modify sched_clock() to make CONFIG_PRINTK_TIME more sane
[POWERPC] Add __read_mostly support for powerpc
Vitaly Bordug (2):
[POWERPC] 8xx: mpc885ads pcmcia support
[POWERPC] dts: kill hardcoded phandles
Wade Farnsworth (4):
[POWERPC] 86xx: Add uli1575 pci-bridge sector to MPC8641HPCN dts file.
[POWERPC] Fix drivers/rtc/Kconfig for powerpc
[POWERPC] Add a check for keyboard/mouse device nodes in check_legacy_ioport()
[POWERPC] Create add_rtc() function to enable the RTC CMOS driver
York Sun (1):
[POWERPC] Let subordinate transparent bridges be transparent.
Zhang Wei (4):
[POWERPC] Remove PCI-e errata for MPC8641 silicon ver 1.0
[POWERPC] 86xx: Avoid system halt if link training isn't at least L0.
[POWERPC] MPC8641HPCN: Set IDE in ULI1575 to not native mode.
[POWERPC] 86xx: Created quirk_fsl_pcie_transparent() to initialize bridge resources.
will schmidt (2):
[POWERPC] During VM oom condition, kill all threads in process group
[POWERPC] Oprofile enhanced instruction sampling support
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-07-05 1:45 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-07-05 1:45 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Did my pull request fall through the cracks, or is there a problem
with it?
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
Thanks,
Paul.
arch/powerpc/configs/mpc7448_hpc2_defconfig | 212 +++++++-----------
arch/powerpc/configs/mpc8272_ads_defconfig | 293 +++++++++++++++----------
arch/powerpc/configs/mpc8313_rdb_defconfig | 310 +++++++++++++-------------
arch/powerpc/configs/mpc832x_mds_defconfig | 176 ++++++---------
arch/powerpc/configs/mpc832x_rdb_defconfig | 229 ++++++++-----------
arch/powerpc/configs/mpc834x_itx_defconfig | 265 +++++++++++-----------
arch/powerpc/configs/mpc834x_itxgp_defconfig | 232 ++++++++++---------
arch/powerpc/configs/mpc834x_mds_defconfig | 195 ++++++++--------
arch/powerpc/configs/mpc836x_mds_defconfig | 176 ++++++---------
arch/powerpc/configs/mpc8540_ads_defconfig | 201 ++++++++---------
arch/powerpc/configs/mpc8544_ds_defconfig | 193 +++++++---------
arch/powerpc/configs/mpc8560_ads_defconfig | 201 ++++++++---------
arch/powerpc/configs/mpc8568mds_defconfig | 191 +++++++---------
arch/powerpc/configs/mpc85xx_cds_defconfig | 206 +++++++++--------
arch/powerpc/configs/mpc8641_hpcn_defconfig | 200 ++++++++---------
arch/powerpc/configs/mpc866_ads_defconfig | 213 +++++++++---------
arch/powerpc/configs/mpc885_ads_defconfig | 222 +++++++++----------
arch/powerpc/kernel/irq.c | 6 +
arch/powerpc/platforms/cell/cbe_cpufreq.c | 15 +
drivers/net/Kconfig | 2
include/asm-powerpc/irq.h | 5
21 files changed, 1781 insertions(+), 1962 deletions(-)
commit 795bb15e0735bd2b0015ca333fa157399b72c168
Author: Kumar Gala <galak@kernel.crashing.org>
Date: Mon Jul 2 00:04:36 2007 -0500
[POWERPC] Update defconfigs
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
commit 9f7905812e5919862acb6ede63e10d3d1bb4958e
Author: Olof Johansson <olof@lixom.net>
Date: Mon Jun 4 14:47:04 2007 +1000
[POWERPC] Uninline and export virq_to_hw() for the pasemi_mac driver
Uninline virq_to_hw and export it so modules can use it. The alternative
would be to export the irq_map array instead, but it's an infrequently
called function, and keeping the array unexported seems considerably
cleaner.
This is needed so that the pasemi_mac driver can be compiled as a module.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit ee5d1b7f2a01ce4d95ca247b5a499b72f31cdbe8
Author: Christian Krafft <krafft@de.ibm.com>
Date: Thu Jun 28 21:14:38 2007 +1000
[POWERPC] Fix PMI breakage in cbe_cbufreq driver
The recent change to cell_defconfig to enable cpufreq on Cell exposed
the fact that the cbe_cpufreq driver currently needs the PMI interface
code to compile, but Kconfig doesn't make sure that the PMI interface
code gets built if cbe_cpufreq is enabled.
In fact cbe_cpufreq can work without PMI, so this ifdefs out the code
that deals with PMI. This is a minimal solution for 2.6.22; a more
comprehensive solution will be merged for 2.6.23.
Signed-off-by: Christian Krafft <krafft@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 86affd5a00a92e491e5f00ed659492767519fdf7
Author: David Gibson <david@gibson.dropbear.id.au>
Date: Thu Jun 28 11:27:57 2007 +1000
[POWERPC] Disable old EMAC driver in arch/powerpc
The EMAC driver, in drivers/net/ibm_emac, for the embedded Ethernet
MAC found in PowerPC 4xx embedded chips is not suitable for
arch/powerpc. It will not build because it relies on the old arch/ppc
OCP mechanism. BenH has a new, device-tree aware version of the
driver which will work in arch/powerpc, but until it's merged, this
patch will disable the old, non-building version.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-07-02 4:25 Paul Mackerras
2007-07-02 6:04 ` Paul Mackerras
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2007-07-02 4:25 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
My defconfig updates exposed some compile failures on powerpc, which
these three commits fix.
Thanks,
Paul.
arch/powerpc/kernel/irq.c | 6 ++++++
arch/powerpc/platforms/cell/cbe_cpufreq.c | 15 ++++++++++-----
drivers/net/Kconfig | 2 +-
include/asm-powerpc/irq.h | 5 +----
4 files changed, 18 insertions(+), 10 deletions(-)
commit 9f7905812e5919862acb6ede63e10d3d1bb4958e
Author: Olof Johansson <olof@lixom.net>
Date: Mon Jun 4 14:47:04 2007 +1000
[POWERPC] Uninline and export virq_to_hw() for the pasemi_mac driver
Uninline virq_to_hw and export it so modules can use it. The alternative
would be to export the irq_map array instead, but it's an infrequently
called function, and keeping the array unexported seems considerably
cleaner.
This is needed so that the pasemi_mac driver can be compiled as a module.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit ee5d1b7f2a01ce4d95ca247b5a499b72f31cdbe8
Author: Christian Krafft <krafft@de.ibm.com>
Date: Thu Jun 28 21:14:38 2007 +1000
[POWERPC] Fix PMI breakage in cbe_cbufreq driver
The recent change to cell_defconfig to enable cpufreq on Cell exposed
the fact that the cbe_cpufreq driver currently needs the PMI interface
code to compile, but Kconfig doesn't make sure that the PMI interface
code gets built if cbe_cpufreq is enabled.
In fact cbe_cpufreq can work without PMI, so this ifdefs out the code
that deals with PMI. This is a minimal solution for 2.6.22; a more
comprehensive solution will be merged for 2.6.23.
Signed-off-by: Christian Krafft <krafft@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 86affd5a00a92e491e5f00ed659492767519fdf7
Author: David Gibson <david@gibson.dropbear.id.au>
Date: Thu Jun 28 11:27:57 2007 +1000
[POWERPC] Disable old EMAC driver in arch/powerpc
The EMAC driver, in drivers/net/ibm_emac, for the embedded Ethernet
MAC found in PowerPC 4xx embedded chips is not suitable for
arch/powerpc. It will not build because it relies on the old arch/ppc
OCP mechanism. BenH has a new, device-tree aware version of the
driver which will work in arch/powerpc, but until it's merged, this
patch will disable the old, non-building version.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git merge branch
2007-07-02 4:25 Paul Mackerras
@ 2007-07-02 6:04 ` Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-07-02 6:04 UTC (permalink / raw)
To: torvalds, linuxppc-dev
Linus,
I wrote:
> Please do:
>
> git pull \
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
>
> My defconfig updates exposed some compile failures on powerpc, which
> these three commits fix.
I have added another commit with a defconfig update for the Freescale
embedded platforms, from Kumar Gala, so you'll get 4 commits when you
do the pull.
Thanks,
Paul.
arch/powerpc/configs/mpc7448_hpc2_defconfig | 212 +++++++-----------
arch/powerpc/configs/mpc8272_ads_defconfig | 293 +++++++++++++++----------
arch/powerpc/configs/mpc8313_rdb_defconfig | 310 +++++++++++++-------------
arch/powerpc/configs/mpc832x_mds_defconfig | 176 ++++++---------
arch/powerpc/configs/mpc832x_rdb_defconfig | 229 ++++++++-----------
arch/powerpc/configs/mpc834x_itx_defconfig | 265 +++++++++++-----------
arch/powerpc/configs/mpc834x_itxgp_defconfig | 232 ++++++++++---------
arch/powerpc/configs/mpc834x_mds_defconfig | 195 ++++++++--------
arch/powerpc/configs/mpc836x_mds_defconfig | 176 ++++++---------
arch/powerpc/configs/mpc8540_ads_defconfig | 201 ++++++++---------
arch/powerpc/configs/mpc8544_ds_defconfig | 193 +++++++---------
arch/powerpc/configs/mpc8560_ads_defconfig | 201 ++++++++---------
arch/powerpc/configs/mpc8568mds_defconfig | 191 +++++++---------
arch/powerpc/configs/mpc85xx_cds_defconfig | 206 +++++++++--------
arch/powerpc/configs/mpc8641_hpcn_defconfig | 200 ++++++++---------
arch/powerpc/configs/mpc866_ads_defconfig | 213 +++++++++---------
arch/powerpc/configs/mpc885_ads_defconfig | 222 +++++++++----------
17 files changed, 1763 insertions(+), 1952 deletions(-)
commit 795bb15e0735bd2b0015ca333fa157399b72c168
Author: Kumar Gala <galak@kernel.crashing.org>
Date: Mon Jul 2 00:04:36 2007 -0500
[POWERPC] Update defconfigs
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
^ permalink raw reply [flat|nested] 146+ messages in thread
* Please pull powerpc.git merge branch
@ 2007-06-26 10:08 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-06-26 10:08 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get two more bug fixes for powerpc, plus defconfig updates.
Thanks,
Paul.
arch/powerpc/configs/cell_defconfig | 243 ++++++---------
arch/powerpc/configs/celleb_defconfig | 169 +++-------
arch/powerpc/configs/chrp32_defconfig | 353 +++++++++++++--------
arch/powerpc/configs/ebony_defconfig | 138 +++-----
arch/powerpc/configs/g5_defconfig | 342 +++++++++++----------
arch/powerpc/configs/holly_defconfig | 125 ++------
arch/powerpc/configs/iseries_defconfig | 36 --
arch/powerpc/configs/linkstation_defconfig | 384 ++++++++++-------------
arch/powerpc/configs/lite5200_defconfig | 182 +++++------
arch/powerpc/configs/maple_defconfig | 248 +++++++--------
arch/powerpc/configs/pasemi_defconfig | 58 ----
arch/powerpc/configs/pmac32_defconfig | 375 +++++++++++------------
arch/powerpc/configs/ppc64_defconfig | 460 +++++++++++++++++-----------
arch/powerpc/configs/prpmc2800_defconfig | 98 +-----
arch/powerpc/configs/ps3_defconfig | 79 +----
arch/powerpc/configs/pseries_defconfig | 387 ++++++++++++++----------
arch/powerpc/kernel/signal_64.c | 10 -
arch/powerpc/kernel/vdso32/gettimeofday.S | 4
arch/powerpc/kernel/vdso64/gettimeofday.S | 7
19 files changed, 1748 insertions(+), 1950 deletions(-)
commit ae62fbb5f1f796d87cbdbe6701e13f2b52d5c0a7
Author: Paul Mackerras <paulus@samba.org>
Date: Tue Jun 26 14:49:11 2007 +1000
[POWERPC] Fix subtle FP state corruption bug in signal return on SMP
This fixes a bug which can cause corruption of the floating-point state
on return from a signal handler. If we have a signal handler that has
used the floating-point registers, and it happens to context-switch to
another task while copying the interrupted floating-point state from the
user stack into the thread struct (e.g. because of a page fault, or
because it gets preempted), the context switch code will think that the
FP registers contain valid FP state that needs to be copied into the
thread_struct, and will thus overwrite the values that the signal return
code has put into the thread_struct.
This can occur because we clear the MSR bits that indicate the presence
of valid FP state after copying the state into the thread_struct. To fix
this we just move the clearing of the MSR bits to before the copy. A
similar potential problem also occurs with the Altivec state, and this
fixes that in the same way.
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 74609f4536f2b8fd6a48381bbbe3cd37da20a527
Author: Tony Breeds <tony@bakeyournoodle.com>
Date: Tue Jun 26 09:50:32 2007 +1000
[POWERPC] Fix VDSO gettimeofday() when called with NULL struct timeval
Consider the prototype for gettimeofday():
int gettimofday(struct timeval *tv, struct timezone *tz);
Although it is valid to call with /either/ tv or tz being NULL, and
the C version of sys_gettimeofday() supports this, the current version
of gettimeofday() in the VDSO will SEGV if called with a NULL tv.
This adds a check for tv being NULL so that it doesn't SEGV.
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit ca74c013441200b162f6a384b23b833d1865a9e8
Author: Paul Mackerras <paulus@samba.org>
Date: Tue Jun 26 14:19:35 2007 +1000
[POWERPC] Update defconfigs
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit d30d6badd1769a00bc5a800b8af4e8b3f169c633
Author: will schmidt <will_schmidt@vnet.ibm.com>
Date: Sat Jun 23 01:24:56 2007 +1000
[POWERPC] Update g5_defconfig
Update the g5_defconfig with default settings.
This is to keep things up to date, and specifically to ensure that the
CONFIG_MACINTOSH_DRIVERS option is enabled. This also turns on
CONFIG_MSI.
Signed-off-by: Will Schmidt <will_schmidt@vnet.ibm.com>
cc: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-06-20 12:46 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-06-20 12:46 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get two more bug fixes for powerpc. Both bugs cause an oops in
some circumstances.
(Please also do the pull that Kumar requested; I haven't pulled in his
commits in this instance.)
Thanks,
Paul.
arch/powerpc/mm/fault.c | 5 ++---
arch/powerpc/platforms/powermac/setup.c | 3 +++
2 files changed, 5 insertions(+), 3 deletions(-)
commit c5f226c7e95bf318879fb6ae02fc0dfb0f6d408c
Author: Tony Breeds <tony@bakeyournoodle.com>
Date: Wed Jun 20 15:17:29 2007 +1000
[POWERPC] Fix powermac late initcall to only run on powermac
Current ppc64_defconfig kernel fails to boot on iSeries, dying with:
Unable to handle kernel paging request for data at address 0x00000000
Faulting instruction address: 0xc00000000071b258
Oops: Kernel access of bad area, sig: 11 [#1]
SMP NR_CPUS=32 iSeries
<snip>
NIP [c00000000071b258] .iSeries_src_init+0x34/0x64
LR [c000000000701bb4] .kernel_init+0x1fc/0x3bc
Call Trace:
[c000000007d0be30] [0000000000008000] 0x8000 (unreliable)
[c000000007d0bea0] [c000000000701bb4] .kernel_init+0x1fc/0x3bc
[c000000007d0bf90] [c0000000000262d4] .kernel_thread+0x4c/0x68
Instruction dump:
e922cba8 3880ffff 78840420 f8010010 f821ff91 60000000 e8090000 78095fe3
4182002c e922cb58 e862cbb0 e9290140 <e8090000> f8410028 7c0903a6 e9690010
Kernel panic - not syncing: Attempted to kill init!
This happens because some powermac code unconditionally sets
ppc_md.progress to NULL. This patch makes sure the powermac late
initcall is only run on powermac machines.
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 9ba4ace39fdfe22268daca9f28c5df384ae462cf
Author: Segher Boessenkool <segher@kernel.crashing.org>
Date: Wed Jun 20 01:07:04 2007 +1000
[POWERPC] PowerPC: Prevent data exception in kernel space (32-bit)
The "is_exec" branch of the protection check in do_page_fault()
didn't do anything on 32-bit PowerPC. So if a userland program
jumps to a page with Linux protection flags "---p", all the tests
happily fall through, and handle_mm_fault() is called, which in
turn calls handle_pte_fault(), which calls update_mmu_cache(),
which goes flush the dcache to a page with no access rights.
Boom.
This fixes it.
Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-06-19 5:39 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-06-19 5:39 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get a fix from Ben H for some refcounting bugs in the snd-powermac
driver.
Thanks,
Paul.
sound/ppc/pmac.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
commit 41e904dee22066ae7ac3a7f695b2c8bd43ce4e04
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue Jun 19 14:37:39 2007 +1000
[POWERPC] Fix snd-powermac refcounting bugs
The old snd-powermac driver has some serious refcounting issues when
initialisation fails, which is the case on all new machines with
a layout-id since those are handled by the new snd-aoa driver.
Some of those bugs seem to have been under the radar for some time
(like double pci_dev_put), but one was actually added in 2.6.22 with
Stephen attempt at teaching refcounting to the driver which didn't
do it at all.
This patch fixes both, thus removing all sort of kref errors that
would happen if that driver gets loaded on a G5 machine or a recent
PowerBook due to OF nodes left around with a 0 refcount.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-06-15 5:00 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-06-15 5:00 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get two more bug-fixes for powerpc.
Thanks,
Paul.
arch/powerpc/kernel/udbg.c | 8 +++++++-
arch/powerpc/platforms/powermac/setup.c | 13 ++++++++++++-
arch/powerpc/platforms/powermac/smp.c | 1 -
3 files changed, 19 insertions(+), 3 deletions(-)
commit 220ddc0847ebd42d18ee78c7e1c2f4c2e3be637d
Author: Milton Miller <miltonm@bga.com>
Date: Sun Jun 10 14:32:43 2007 +1000
[POWERPC] Fix console output getting dropped on platforms without udbg_putc
Previously, registering this early console would just result
in dropping early buffered printk output until a udbg_putc
was registered.
However, commit 69331af79cf29e26d1231152a172a1a10c2df511
clears the CON_PRINTBUFFER flag on the main console when a
CON_BOOT (early) console has been registered, resulting in
the buffered messages never being displayed to the user.
This fixes the problem by making sure we don't register udbg_console
on platforms that don't implement udbg_putc.
Signed-off-by: Milton Miller <miltonm@bga.com>
Acked-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit c63c4faa8cf055319c7ed557d2050c1c3776fac5
Author: Paul Mackerras <paulus@samba.org>
Date: Thu Jun 7 22:42:19 2007 +1000
[POWERPC] Fix per-cpu allocation on oldworld SMP powermacs
The per-cpu area(a) for the secondary CPU(s) isn't getting allocated
on old SMP powermacs that don't have the secondary CPU(s) listed in
the device tree, as per-cpu areas are now only allocated for CPUs in
the cpu_possible_map, and we aren't setting the bits for the secondary
CPU(s) until smp_prepare_cpus(), which is after per-cpu allocation.
Therefore this sets the bits for CPUs 1..3 in cpu_possible_map in
pmac_setup_arch, so they get per-cpu data allocated.
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-04-11 22:29 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-04-11 22:29 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get a bugfix from Domen Puncer (via Sylvain Munaut) that should go
in 2.6.21 if possible.
Thanks,
Paul.
arch/powerpc/platforms/52xx/mpc52xx_pic.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 22132178b26c907d19f661a4ae7fd265962d417e
Author: Domen Puncer <domen.puncer@telargo.com>
Date: Wed Apr 11 00:27:49 2007 +0200
[POWERPC] mpc52xx_pic: fix main interrupt masking
The bit setting was off by one.
Tested with RTC and GPIO_WKUP interrupts.
Signed-off-by: Domen Puncer <domen.puncer@telargo.com>
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-03-28 23:51 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-03-28 23:51 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get the dcr_unmap fix posted by Jean-Christophe Dubois.
Thanks,
Paul.
arch/powerpc/sysdev/dcr.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 190a4408ecb577391ea5fbd1f90148a6992a5756
Author: Jean-Christophe Dubois <jdubois@mc.com>
Date: Wed Mar 28 11:07:41 2007 +0100
[POWERPC] Fix dcr_unmap()
Fix a bug in dcr_unmap().
At unmap time the DCR offset need to be added instead of substracted.
Signed-off-by: Jean-Christophe Dubois <jdubois@mc.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-03-22 4:31 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-03-22 4:31 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
I have three more powerpc bug fixes to go in for 2.6.21, so please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
The full commit messages are below.
Thanks,
Paul.
arch/powerpc/kernel/process.c | 9 ++++-
arch/powerpc/platforms/pseries/hvCall.S | 41 ++++++++++++++++++++++-
arch/powerpc/platforms/pseries/lpar.c | 2 +
arch/powerpc/platforms/pseries/plpar_wrappers.h | 16 +++++++++
include/asm-powerpc/hvcall.h | 14 ++++++++
5 files changed, 78 insertions(+), 4 deletions(-)
commit 4f5fa2fb1259f506d20e8af447117ec3ec426a53
Author: Anton Blanchard <anton@samba.org>
Date: Tue Mar 20 14:29:54 2007 -0500
[POWERPC] Bypass hcall stats until cpu features have run
I noticed that we execute hcalls before cpu feature code has run (eg
for setting up the bolted kernel region). This means that we may be
executing code that is not appropriate for the processor we have.
Create an unconditional branch that we nop out all the time to fix this.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit b4aea36b7956eeebfc56314ce0944db1441255ce
Author: Mohan Kumar M <mohan@in.ibm.com>
Date: Wed Mar 21 11:21:32 2007 +0530
[POWERPC] Avoid hypervisor statistics calculation in real mode
kexec invokes plpar_hcall hypervisor call in real mode. plpar_hcall
refers to per cpu variables for accounting hypervisor statistics.
These variables may not be in the RMO region, so accesses to them
in real mode may result in a data storage exception.
This fixes this problem by using a new plpar_hcall_raw function which
does not update the hypervisor call statistics. Thanks to Anton for
suggesting this idea.
Signed-off-by: Mohan Kumar M <mohan@in.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit f144e7c7272bf527c380bffaa5e789dc28a09d8d
Author: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Sat Mar 10 03:23:03 2007 -0500
[POWERPC] Fix atomicity of TIF update in flush_thread()
Fix atomicity of TIF update in flush_thread() for powerpc
Fixes it correctly with *_ti_thread_flag.
Race :
parent process executing :
sys_ptrace()
(lock_kernel())
(ptrace_get_task_struct(pid))
arch_ptrace()
ptrace_detach()
ptrace_disable(child);
clear_singlestep(child);
clear_tsk_thread_flag(child, TIF_SINGLESTEP);
(which clears the TIF_SINGLESTEP flag atomically from a different
process)
(put_task_struct(child))
(unlock_kernel())
And at the same time, in the child process :
sys_execve()
do_execve()
search_binary_handler()
load_elf_binary()
flush_old_exec()
flush_thread()
doing a non-atomic thread flag update
Applies on 2.6.20.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-03-13 0:47 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-03-13 0:47 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
A few more powerpc bug fixes have come in, so please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
I pulled in the Cell fixes that Arnd collected together, and added
three commits from Stephen Rothwell relating to new system calls. The
full commit messages are below.
Thanks,
Paul.
arch/powerpc/configs/cell_defconfig | 151 ++++++++++++++++++++++++----
arch/powerpc/mm/hash_utils_64.c | 6 +
arch/powerpc/mm/hugetlbpage.c | 4 +
arch/powerpc/platforms/cell/spu_base.c | 81 +++++++++++++--
arch/powerpc/platforms/cell/spufs/file.c | 24 +++-
arch/powerpc/platforms/cell/spufs/run.c | 4 -
arch/powerpc/platforms/cell/spufs/sched.c | 20 +---
arch/powerpc/platforms/cell/spufs/spufs.h | 6 -
arch/powerpc/platforms/cell/spufs/switch.c | 62 +----------
arch/powerpc/platforms/ps3/mm.c | 2
arch/powerpc/platforms/ps3/system-bus.c | 2
drivers/ps3/ps3av.c | 9 +-
drivers/ps3/sys-manager.c | 6 +
drivers/ps3/vuart.c | 2
include/asm-powerpc/spu.h | 7 +
include/asm-powerpc/spu_csa.h | 4 -
include/asm-powerpc/systbl.h | 3 -
include/asm-powerpc/unistd.h | 4 +
18 files changed, 263 insertions(+), 134 deletions(-)
commit 7b3c384db1ff0f336b59d5062617915e216eaec1
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri Mar 9 11:58:11 2007 +1100
[POWERPC] sys_move_pages should be callable from an SPU
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 4b0092c215fc678e325193cf97ddcb4be6a550c3
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri Mar 9 11:57:10 2007 +1100
[POWERPC] Wire up sys_epoll_pwait
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 4cd723b4a0cc3e061e0a3fd86a1ec9a227f17c0b
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri Mar 9 11:54:57 2007 +1100
[POWERPC] Allocate syscall number for sys_getcpu
I forgot to do this when wiring up the syscall.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit c886c2bf804c029499694adcc0decfdd32a0cd8b
Author: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Date: Sat Mar 10 00:05:39 2007 +0100
[POWERPC] update cell_defconfig
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
commit ef596c697a4d80048eccf50530153d7e3330c127
Author: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date: Sat Mar 10 00:05:38 2007 +0100
[POWERPC] ps3: always make sure were running on a PS3
Add missing checks to PS3 specific drivers ps3av and sys-manager to verify that
we are actually running on a PS3 (pointed out by Arnd).
Correct existing checks in other subsystems/drivers to return -ENODEV instead
of zero.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
commit 94b2a4393c500a620de90c3266d595926302e26b
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sat Mar 10 00:05:37 2007 +0100
[POWERPC] Fix spu SLB invalidations
The SPU code doesn't properly invalidate SPUs SLBs when necessary,
for example when changing a segment size from the hugetlbfs code. In
addition, it saves and restores the SLB content on context switches
which makes it harder to properly handle those invalidations.
This patch removes the saving & restoring for now, something more
efficient might be found later on. It also adds a spu_flush_all_slbs(mm)
that can be used by the core mm code to flush the SLBs of all SPEs that
are running a given mm at the time of the flush.
In order to do that, it adds a spinlock to the list of all SPEs and move
some bits & pieces from spufs to spu_base.c
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 50b520d4efbce45281f58112789470ec7965fd33
Author: Christoph Hellwig <hch@lst.de>
Date: Sat Mar 10 00:05:36 2007 +0100
[POWERPC] avoid SPU_ACTIVATE_NOWAKE optimization
This optimization was added recently but is still buggy,
so back it out for now.
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
commit aa0ed2bdb663608d5e409faecff3e1e81a3d413a
Author: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Date: Sat Mar 10 00:05:35 2007 +0100
[POWERPC] spufs: fix possible memory corruption is spufs_mem_write
Due to a buggy unsigned comparison, it was possible to write
beyond the end of the local store file in spufs under some
circumstances.
This rewrites the buggy function to look more like
simple_copy_from_buffer.
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Cc: Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git merge branch
@ 2007-03-08 4:01 Paul Mackerras
2007-03-09 21:08 ` Paul Mackerras
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2007-03-08 4:01 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
There are 6 commits there. Three of them fix compile warnings, one is
a bug fix, one works around a problem on rev 1.0 PPC970MP processors,
and one adds a missing newline in some help text.
Thanks,
Paul.
arch/powerpc/kernel/cputable.c | 16 ++++++
arch/powerpc/kernel/prom_parse.c | 2 -
arch/powerpc/platforms/celleb/scc_epci.c | 82 ++++++++++++++++++++++-------
arch/powerpc/platforms/powermac/feature.c | 5 +-
arch/powerpc/platforms/powermac/pci.c | 7 ++
arch/powerpc/xmon/xmon.c | 2 -
6 files changed, 88 insertions(+), 26 deletions(-)
commit b5d99e64bc6ec1eef03ed5ffe99088b28f5ad4a4
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed Mar 7 11:27:55 2007 +0100
[POWERPC] Fix warning in powermac pci.c
This fixes a warning due to unused result from pci_enable_device() in
powermac pci.c
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit e71c5c38ed578b4fff3139cc5c76fb5d0544f80c
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed Mar 7 11:27:45 2007 +0100
[POWERPC] Fix warning in powermac feature.c
This fixes a warning due to unused return from pci_enable_device() in
powermac feature.c core99_ata100_enable() function.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 84532c91206bc6748991fb1ae3ba8a1894d339fa
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed Mar 7 11:27:37 2007 +0100
[POWERPC] Fix warning in prom_parse.c of_irq_map_oldworld()
This function spews a warning due to possible use of an uninitialized
variable. This can happen on broken device-trees or when called with
a NULL argument. Makes ure we properly fail instead.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 8388374f1cd45ef67039d3ea128d250fac484df3
Author: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
Date: Fri Mar 2 16:59:25 2007 +0900
[POWERPC] Celleb: bug fix caused by not casting pointer types
This fixes a bug caused by changes of pointer type in
commit f1fda89522c5aaa1bd4ef69605e85e6ee9c85faf.
hose->cfg_addr type is "volatile unsigned int __iomem *", so
"hose->cfg_addr + X" will not make an intended address.
This patch also adds comments for usage of cfg_addr and cfg_data in
pci_controller structure. We use them in irregular way, and the
original code is short of explanations about them.
Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit c99176a230097b076c2f98e4bf963399fe114ffd
Author: Michael Ellerman <michael@ellerman.id.au>
Date: Mon Feb 26 18:14:06 2007 +0900
[POWERPC] Add missing newline in xmon help output
My patch to add spu disassembly (af89fb8041562508895c8f3ba04790d7c2f4338c)
removed a newline from the xmon help that it shouldn't have, put it back.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 3546e811f13673f2364c15d966a178e8b670cbce
Author: Olof Johansson <olof@lixom.net>
Date: Mon Feb 26 00:35:14 2007 -0600
[POWERPC] No DEEPNAP on 970MP 1.0
970MP rev 1.0 is reported to have nonworking DEEPNAP support, we've had
bug reports of lockups on those machines. Appearantly Apple used them
on some dual-core dual-cpu systems. Rev 1.1 is OK, and that's the one
that all 4-way systems seem to use.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git merge branch
2007-03-08 4:01 Paul Mackerras
@ 2007-03-09 21:08 ` Paul Mackerras
2007-03-09 23:31 ` Arnd Bergmann
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2007-03-09 21:08 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
I wrote:
> Please do:
>
> git pull \
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
>
> There are 6 commits there. Three of them fix compile warnings, one is
> a bug fix, one works around a problem on rev 1.0 PPC970MP processors,
> and one adds a missing newline in some help text.
I have pulled 3 more commits from Kumar Gala and pushed them out, so
when you do the pull you'll see the commits below in addition to the
ones I listed previously.
Thanks,
Paul.
arch/powerpc/platforms/83xx/mpc834x_mds.c | 8 ++++----
arch/powerpc/platforms/85xx/Kconfig | 1 +
arch/powerpc/platforms/embedded6xx/Kconfig | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
commit f194bda4ce7e71cc95535f494a4a5515cd91ed85
Author: Kumar Gala <galak@kernel.crashing.org>
Date: Wed Mar 7 23:14:57 2007 -0600
[POWERPC] 85xx: Enable CONFIG_SERIAL_8250_SHARE_IRQ
On chip 8250 UARTs share an interrupts on existing 85xx processors.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
commit 49fdf3f078f8f5d84ecd10d62624c9158e755ec7
Author: Segher Boessenkool <segher@kernel.crashing.org>
Date: Thu Feb 22 23:52:02 2007 +0100
[POWERPC] Select u-image as default image for Linkstation
Fixes image build error:
ln: accessing `arch/powerpc/boot/zImage': No such file or directory
make[1]: *** [arch/powerpc/boot/zImage] Error 1
make: *** [zImage] Error 2
Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
Acked-by: G. Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
commit aea12b75480c0842028bd1bfe0146d9148db2298
Author: Li Yang <leoli@freescale.com>
Date: Tue Mar 6 17:11:06 2007 +0800
[POWERPC] 83xx: Minor fixes for 834x_mds USB setup code
Fix broken node manipulating code, and clarify inaccurate comment.
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git merge branch
2007-03-09 21:08 ` Paul Mackerras
@ 2007-03-09 23:31 ` Arnd Bergmann
0 siblings, 0 replies; 146+ messages in thread
From: Arnd Bergmann @ 2007-03-09 23:31 UTC (permalink / raw)
To: linuxppc-dev; +Cc: torvalds, Paul Mackerras
On Friday 09 March 2007, Paul Mackerras wrote:
> > Please do:
> >=20
> > git pull \
> > git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
> >=20
> > There are 6 commits there. =A0Three of them fix compile warnings, one is
> > a bug fix, one works around a problem on rev 1.0 PPC970MP processors,
> > and one adds a missing newline in some help text.
>=20
> I have pulled 3 more commits from Kumar Gala and pushed them out, so
> when you do the pull you'll see the commits below in addition to the
> ones I listed previously.
I was late again and only today managed to go through my patch collection
to see what still needs to be merged in 2.6.21.
There are three fixes for run-time bugs, one is for making ps3 support not
break other platforms, and the final one is an updated defconfig for -rc3.
Please pull these from
git://git.kernel.org/pub/scm/linux/kernel/git/arnd/cell-2.6.git cell-merge
=2D--
arch/powerpc/configs/cell_defconfig | 151 ++++++++++++++++++++++++=
=2D----
arch/powerpc/mm/hash_utils_64.c | 6 +
arch/powerpc/mm/hugetlbpage.c | 4
arch/powerpc/platforms/cell/spu_base.c | 81 +++++++++++++--
arch/powerpc/platforms/cell/spufs/file.c | 24 ++--
arch/powerpc/platforms/cell/spufs/run.c | 4
arch/powerpc/platforms/cell/spufs/sched.c | 20 ---
arch/powerpc/platforms/cell/spufs/spufs.h | 6 -
arch/powerpc/platforms/cell/spufs/switch.c | 62 -----------
arch/powerpc/platforms/ps3/mm.c | 2
arch/powerpc/platforms/ps3/system-bus.c | 2
drivers/ps3/ps3av.c | 9 +
drivers/ps3/sys-manager.c | 6 +
drivers/ps3/vuart.c | 2
include/asm-powerpc/spu.h | 7 +
include/asm-powerpc/spu_csa.h | 4
16 files changed, 258 insertions(+), 132 deletions(-)
=2D--
commit c886c2bf804c029499694adcc0decfdd32a0cd8b
Author: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Date: Sat Mar 10 00:05:39 2007 +0100
[POWERPC] update cell_defconfig
=20
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
commit ef596c697a4d80048eccf50530153d7e3330c127
Author: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date: Sat Mar 10 00:05:38 2007 +0100
[POWERPC] ps3: always make sure were running on a PS3
=20
Add missing checks to PS3 specific drivers ps3av and sys-manager to ver=
ify that
we are actually running on a PS3 (pointed out by Arnd).
=20
Correct existing checks in other subsystems/drivers to return -ENODEV i=
nstead
of zero.
=20
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
commit 94b2a4393c500a620de90c3266d595926302e26b
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sat Mar 10 00:05:37 2007 +0100
[POWERPC] Fix spu SLB invalidations
=20
The SPU code doesn't properly invalidate SPUs SLBs when necessary,
for example when changing a segment size from the hugetlbfs code. In
addition, it saves and restores the SLB content on context switches
which makes it harder to properly handle those invalidations.
=20
This patch removes the saving & restoring for now, something more
efficient might be found later on. It also adds a spu_flush_all_slbs(mm)
that can be used by the core mm code to flush the SLBs of all SPEs that
are running a given mm at the time of the flush.
=20
In order to do that, it adds a spinlock to the list of all SPEs and move
some bits & pieces from spufs to spu_base.c
=20
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 50b520d4efbce45281f58112789470ec7965fd33
Author: Christoph Hellwig <hch@lst.de>
Date: Sat Mar 10 00:05:36 2007 +0100
[POWERPC] avoid SPU_ACTIVATE_NOWAKE optimization
=20
This optimization was added recently but is still buggy,
so back it out for now.
=20
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
commit aa0ed2bdb663608d5e409faecff3e1e81a3d413a
Author: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Date: Sat Mar 10 00:05:35 2007 +0100
[POWERPC] spufs: fix possible memory corruption is spufs_mem_write
=20
Due to a buggy unsigned comparison, it was possible to write
beyond the end of the local store file in spufs under some
circumstances.
=20
This rewrites the buggy function to look more like
simple_copy_from_buffer.
=20
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Cc: Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
^ permalink raw reply [flat|nested] 146+ messages in thread
* Please pull powerpc.git 'merge' branch
@ 2007-01-22 11:50 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-01-22 11:50 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
or, if the mirroring hasn't caught up:
git pull \
master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git merge
The full log messages are below. The bulk of it, in terms of lines
changed, is the defconfig update. There are also five bugfixes and a
documentation update.
Thanks,
Paul.
.../powerpc/mpc52xx-device-tree-bindings.txt | 6 +
arch/powerpc/boot/dts/lite5200.dts | 6 +
arch/powerpc/boot/dts/lite5200b.dts | 6 +
arch/powerpc/configs/cell_defconfig | 6 -
arch/powerpc/configs/chrp32_defconfig | 161 ++++++++++----
arch/powerpc/configs/g5_defconfig | 237 +++++++++++++++-----
arch/powerpc/configs/iseries_defconfig | 132 +++++++----
arch/powerpc/configs/linkstation_defconfig | 111 ++++++---
arch/powerpc/configs/lite5200_defconfig | 39 ++-
arch/powerpc/configs/maple_defconfig | 91 ++++++--
arch/powerpc/configs/mpc7448_hpc2_defconfig | 175 +++++++++++----
arch/powerpc/configs/mpc834x_itx_defconfig | 187 +++++++++++++---
arch/powerpc/configs/mpc834x_mds_defconfig | 97 +++++++-
arch/powerpc/configs/mpc8360emds_defconfig | 105 +++++++--
arch/powerpc/configs/mpc8540_ads_defconfig | 89 ++++++--
arch/powerpc/configs/mpc8560_ads_defconfig | 96 ++++++--
arch/powerpc/configs/mpc85xx_cds_defconfig | 96 ++++++--
arch/powerpc/configs/mpc8641_hpcn_defconfig | 98 ++++++--
arch/powerpc/configs/pmac32_defconfig | 202 ++++++++++++-----
arch/powerpc/configs/ppc64_defconfig | 5
arch/powerpc/configs/ps3_defconfig | 39 +++
arch/powerpc/configs/pseries_defconfig | 224 +++++++++++++++----
arch/powerpc/kernel/pci_32.c | 5
arch/powerpc/platforms/83xx/mpc832x_mds.c | 2
arch/powerpc/platforms/83xx/mpc8360e_pb.c | 2
arch/powerpc/platforms/pseries/iommu.c | 3
arch/powerpc/sysdev/mmio_nvram.c | 40 ++-
include/asm-powerpc/atomic.h | 8 -
28 files changed, 1698 insertions(+), 570 deletions(-)
commit e89debcd18a3ef74b27894e479d6b9e658fc6de6
Author: Paul Mackerras <paulus@samba.org>
Date: Mon Jan 22 22:39:24 2007 +1100
[POWERPC] Update defconfigs
Mostly took the defaults, except tried to get the netfilter options
more or less as they were before.
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 434f98c48fc1d2a1f562a28a1562a7b53e940957
Author: Robert Jennings <rcj@linux.vnet.ibm.com>
Date: Wed Jan 17 10:50:20 2007 -0600
[POWERPC] atomic_dec_if_positive sign extension fix
On 64-bit machines, if an atomic counter is explicitly set to a
negative value, the atomic_dec_if_positive function will decrement and
store the next smallest value in the atomic counter, contrary to its
intended operation.
The comparison to determine if the decrement will make the result
negative was done by the "addic." instruction, which operates on a
64-bit value, namely the zero-extended word loaded from the atomic
variable. This patch uses an explicit word compare (cmpwi) and
changes the addic. to an addi (also changing "=&r" to "=&b" so that r0
isn't used, and addi doesn't become li).
This also fixes a bug for both 32-bit and 64-bit in that previously
0x80000000 was considered positive, since the result after
decrementing is positive. Now it is considered negative.
Also, I clarify the return value in the comments just to make it clear
that the value returned is always the decremented value, even if that
value is not stored back to the atomic counter.
Signed-off-by: Robert Jennings <rcj@linux.vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 06cd9396778d5b70ba27fa8158db78d6bc0f007b
Author: Li Yang <leoli@freescale.com>
Date: Wed Jan 17 14:42:22 2007 +0800
[POWERPC] Fix OF node refcnt underflow in 836x and 832x platform code
Incorrect use of of_find_node_by_name() causes of_node_put()
on a node which has already been put. It causes the refcount of
the node to underflow, which triggers the WARN_ON in kref_get
for 836x and 832x. This fixes it.
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 121361f72ca93cb6710e368bb89f9d976b1da443
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Fri Jan 19 00:00:14 2007 -0700
[POWERPC] Make it blatantly clear; mpc5200 device tree is not yet stable
Documentation-only change. The 5200 device tree layout has not yet
stablized, so nobody should depend on the layout of the tree.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Sylvain Munaut <tnt@246tNt.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 77319254f109963213f33cbb15e0103f2e81a64a
Author: Linas Vepstas <linas@austin.ibm.com>
Date: Wed Jan 10 19:16:29 2007 -0600
[POWERPC] Fix broken DMA on non-LPAR pSeries
It appears that the iommu table address is never stored, and thus
never found, on non-lpar systems. Thus, for example, during boot:
<7>[ 93.067916] PCI: Scanning bus 0001:41
<7>[ 93.068542] PCI: Found 0001:41:01.0 [8086/100f] 000200 00
<7>[ 93.068550] PCI: Calling quirk c0000000007822e0 for 0001:41:01.0
<7>[ 93.069815] PCI: Fixups for bus 0001:41
<4>[ 93.070167] iommu: Device 0001:41:01.0 has no iommu table
<7>[ 93.070251] PCI: Bus scan for 0001:41 returning with max=41
No iommu table? How can that be? Well, circa line 471 of
arch/powerpc/platforms/pseries/iommu.c we see the code:
while (dn && PCI_DN(dn) && PCI_DN(dn)->iommu_table == NULL)
dn = dn->parent;
and a few lines later is the surprising print statement about
the missing table. Seems that this loop ran unto the end, never
once finding a non-null PCI_DN(dn)->iommu_table.
The problem can be found a few lines earlier: it sems that the
value of PCI_DN(dn)->iommu_table is never ever set. Thus, the
patch sets it.
The patch was tested on a Power4 system running in full system
partition mode, which is where I saw the problem. It works; I've
not done any wider testing. Had a brief discussion on this on irc.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 6984ee797a8798128e94ab2447c8ed91f0156eb5
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu Jan 11 16:08:41 2007 +1100
[POWERPC] Fix cell's mmio nvram to properly parse device tree
The mmio nvram driver (used by cell only atm) isn't properly parsing
the device-tree, meaning that nvram isn't found correctly on the new
Cell blades. It works ok for old blades where the nvram is at the
root of the device tree but fails on Malta and CAB when it's hanging
off axon. This fixes it by using the proper OF parsing functions.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 4ef6e68117e93111590d9d4ada1a282304241169
Author: Benjamin Herrenschmidt <benh@au1.ibm.com>
Date: Thu Jan 11 16:38:22 2007 +1100
[POWERPC] Remove bogus sanity check in pci -> OF node code
The new implementation of pci_device_to_OF_node() on ppc32 has a bogus
sanity check in it that can cause oopses at boot when no device node is
present, and might hit correct cases with older/weird apple device-trees
where they have the type "vci" for the chaos bridge.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git 'merge' branch
@ 2007-01-09 9:45 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2007-01-09 9:45 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
or, if the mirroring hasn't caught up:
git pull \
master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git merge
There are an assortment of bug fixes there (most of which fix
potential oopses or compile failures), plus documentation and
defconfig updates. I have included the full log messages below.
Thanks,
Paul.
.../powerpc/mpc52xx-device-tree-bindings.txt | 4
arch/powerpc/Kconfig | 4
arch/powerpc/boot/dts/lite5200.dts | 4
arch/powerpc/boot/dts/lite5200b.dts | 4
arch/powerpc/configs/ppc64_defconfig | 251 ++++++++++++++++----
arch/powerpc/kernel/asm-offsets.c | 3
arch/powerpc/kernel/entry_64.S | 13 -
arch/powerpc/mm/hugetlbpage.c | 8 -
arch/powerpc/platforms/52xx/lite5200.c | 1
arch/powerpc/platforms/52xx/mpc52xx_common.c | 7 -
arch/powerpc/platforms/iseries/lpevents.c | 4
arch/powerpc/platforms/iseries/mf.c | 4
arch/powerpc/platforms/iseries/proc.c | 11 +
arch/powerpc/platforms/iseries/setup.c | 3
arch/powerpc/platforms/iseries/viopath.c | 4
arch/powerpc/platforms/maple/setup.c | 1
arch/powerpc/platforms/pasemi/setup.c | 1
arch/powerpc/platforms/pseries/hvCall.S | 9 -
arch/powerpc/platforms/pseries/hvCall_inst.c | 4
arch/powerpc/platforms/pseries/xics.c | 5
arch/powerpc/sysdev/Makefile | 2
drivers/serial/mpc52xx_uart.c | 2
include/asm-powerpc/bug.h | 27 ++
include/asm-powerpc/hvcall.h | 2
include/asm-powerpc/mpc52xx.h | 1
25 files changed, 282 insertions(+), 97 deletions(-)
commit dc40127ca5c6e1da48d2b5f9d0c65b5795faac12
Author: Anton Blanchard <anton@samba.org>
Date: Tue Jan 9 02:43:02 2007 +1100
[POWERPC] Fix bugs in the hypervisor call stats code
There were a few issues with the HCALL_STATS code:
- PURR cpu feature checks were backwards
- We iterated one entry off the end of the hcall_stats array
- Remove dead update_hcall_stats() function prototype
I noticed one thing while debugging, and that is we call H_ENTER (to set
up the MMU hashtable in early init) before we have done the cpu fixups.
This means we will execute the PURR SPR reads even on a CPU that isnt
capable of it. I wonder if we can move the CPU feature fixups earlier.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit ab87e8dc88a7cae341c403547cea6b022f5ac023
Author: Anton Blanchard <anton@samba.org>
Date: Tue Jan 9 02:37:16 2007 +1100
[POWERPC] Fix corruption in hcall9
It looks to me like we are corrupting r12 in the hcall9 function.
Although we have r0 free we cant use offsets against it, so save
away r12 in there instead. r12 holds the ninth return value from
the hypervisor call, so without this fix, the caller will see the
wrong value for the ninth element in the array that gets the return
values.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit e75b171768b8b98ec5fd57acb3e87a30c97c9472
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu Jan 4 17:06:21 2007 +1100
[POWERPC] iSeries: fix setup initcall
Clearing the progress indicator should only be done if we are running
on legacy iSeries.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit e9966ff85013be0ef56d3c76f3b4d5c02488d964
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu Jan 4 17:05:13 2007 +1100
[POWERPC] iSeries: fix viopath initialisation
/proc/iSeries/config should only be created if we are running on legacy
iSeries.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 13d2c9bbb09e37e8a231a36b279a97861d6d5407
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu Jan 4 17:04:21 2007 +1100
[POWERPC] iSeries: fix lpevents initialisation
/proc/iSeries/lpevents should only be created if we are running
on legacy iSeries.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 8404e654300cb807428b839d5ae56fd45b5acb92
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu Jan 4 17:03:16 2007 +1100
[POWERPC] iSeries: fix proc/iSeries initialisation
These proc files should only be created if we are running on legacy
iSeries.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit d9523aa157e9fbb93467dcd0d1bed9604153bf7f
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu Jan 4 17:01:51 2007 +1100
[POWERPC] iSeries: fix mf proc initialisation
This proc file should only be created if we are running on legacy
iSeries. Since we can now run the same kernel on legacy iSeries and
other machines, we currently get the /proc/iSeries directory and the
files in it on non-iSeries machines, and accessing them causes an oops
in some cases. This and the following patches make sure that these
files are not created on non-iSeries machines, thus avoiding the oops.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 7232846b8d682a56407839e3774d03be0c7806c8
Author: Olaf Hering <olaf@aepfle.de>
Date: Wed Jan 3 18:33:56 2007 +0100
[POWERPC] disable PReP and EFIKA during make oldconfig
New boards should not be enabled per default.
Disable EFIKA and PReP per default.
Anyone who really needes the new code can enable it during make oldconfig.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit c98750c2eb07b0bf49db0630cb5017ede005ce14
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jan 2 15:45:37 2007 -0700
[POWERPC] Fix mpc52xx serial driver to work for arch/ppc again
The mpc52xx_uart_of_enumerate() function was added when adding 52xx
support to arch/powerpc, but it must not be called for arch/ppc.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 9b3a6f4ab98809c93ac57fa5e11dff0575046efc
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jan 2 15:45:29 2007 -0700
[POWERPC] Don't include powerpc/sysdev/rom.o for arch/ppc builds
sysdev/rom.c is for arch/powerpc only. Don't compile it when building
an arch/ppc kernel.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Sylvain Munaut <tnt@246tNt.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit a5b6ad6691763ee5eba46665d014d5abfe433df2
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jan 2 15:44:44 2007 -0700
[POWERPC] Fix mpc52xx fdt to use correct device_type for sound devices
This corrects the documented interface for mpc52xx device trees.
Sound devices should be using 'sound' for the device_type field, not
the type of sound interface.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Sylvain Munaut <tnt@246tNt.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 5c334eed6ecd66cebfbc80267149e755510d8bc8
Author: Sylvain Munaut <tnt@246tNt.com>
Date: Tue Jan 2 23:29:53 2007 +0100
[POWERPC] 52xx: Don't use device_initcall to probe of_platform_bus
Using device_initcall makes it happen for every platform that
compiles this file in. This is really bad, for obvious reasons.
Instead, we use the .init field of the machine description. If
the platform needs the hook to do something specific it can provides
its own function and call mpc52xx_declare_of_platform_devices from
there. If not, the mpc52xx_declare_of_platform_devices function can
directly be used as the init hook.
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 56c336cb05d58991f3e9d5f0ec098ba0f219a15e
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue Jan 2 16:13:50 2007 +1100
[POWERPC] Add legacy iSeries to ppc64_defconfig
Since we can now boot legacy iSeries and other machines with the same
config, enable legacy iSeries in ppc64_defconfig.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 338e997d94840baca115fb35dcf82867b1f3dc32
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue Jan 2 16:11:09 2007 +1100
[POWERPC] Update ppc64_defconfig
Enabled new netfilter stuff corresponding to what was enabled before
under different names, and turned on the gxt4500 video driver;
otherwise just took the defaults.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 007d88d042d7b71aa2c9fc615aef97888e20ddf3
Author: David Woodhouse <dwmw2@infradead.org>
Date: Mon Jan 1 18:45:34 2007 +0000
[POWERPC] Fix manual assembly WARN_ON() in enter_rtas().
When we switched over to the generic BUG mechanism we forgot to change
the assembly code which open-codes a WARN_ON() in enter_rtas(), so the
bug table got corrupted.
This patch provides an EMIT_BUG_ENTRY macro for use in assembly code,
and uses it in entry_64.S. Tested with CONFIG_DEBUG_BUGVERBOSE on ppc64
but not without -- I tried to turn it off but it wouldn't go away; I
suspect Aunt Tillie probably needed it.
This version gets __FILE__ and __LINE__ right in the assembly version --
rather than saying include/asm-powerpc/bug.h line 21 every time which is
a little suboptimal.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 673aeb76d07f49f2b07792f813bc2a9fee212ab7
Author: Michal Ostrowski <mostrows@watson.ibm.com>
Date: Wed Dec 20 07:29:40 2006 -0600
[POWERPC] Avoid calling get_irq_server() with a real, not virtual irq.
We can use default_server when masking an interrupt vector.
get_irq_server() assumes a virtual irq, so badness may happen if we
give it a real one.
Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 5e264a5215e4b703b1bbeb2910ea4441886be8d7
Author: Nathan Lynch <ntl@pobox.com>
Date: Tue Jan 2 16:37:06 2007 -0600
[POWERPC] Fix unbalanced uses of of_node_put
The (maple|pasemi)_init_IRQ functions call of_node_put(root) once more
than they should, causing the refcount of the root node to underflow,
which triggers the WARN_ON in kref_get.
Signed-off-by: Nathan Lynch <ntl@pobox.com>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 6aa3e1e9447134ccda8b04b91c4ba8182274a78e
Author: David Gibson <david@gibson.dropbear.id.au>
Date: Fri Dec 22 09:23:03 2006 +1100
[POWERPC] Fix bogus BUG_ON() in in hugetlb_get_unmapped_area()
The powerpc specific version of hugetlb_get_unmapped_area() makes some
unwarranted assumptions about what checks have been made to its
parameters by its callers. This will lead to a BUG_ON() if a 32-bit
process attempts to make a hugepage mapping which extends above
TASK_SIZE (4GB).
I'm not sure if these assumptions came about because they were valid
with earlier versions of the get_unmapped_area() path, or if it was
always broken. Nonetheless this patch fixes the logic, and removes
the crash.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git 'merge' branch
@ 2006-12-20 10:23 Paul Mackerras
2006-12-20 10:52 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2006-12-20 10:23 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
or, if the mirroring hasn't caught up:
git pull \
master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get some bug fixes for powerpc, plus a documentation update and a
defconfig update, as listed below.
Thanks,
Paul.
Documentation/powerpc/booting-without-of.txt | 19 +
arch/powerpc/boot/Makefile | 3
arch/powerpc/configs/cell_defconfig | 358 +++++++++++++++++++++++---
arch/powerpc/kernel/of_platform.c | 1
arch/powerpc/kernel/pci_64.c | 1
arch/powerpc/kernel/prom_parse.c | 15 +
arch/powerpc/kernel/signal_32.c | 16 +
arch/powerpc/platforms/Makefile | 2
arch/powerpc/platforms/cell/io-workarounds.c | 2
arch/powerpc/platforms/cell/spu_priv1_mmio.c | 95 ++++---
arch/powerpc/platforms/iseries/Kconfig | 2
drivers/block/viodasd.c | 6
drivers/cdrom/viocd.c | 4
drivers/char/viocons.c | 7 +
drivers/char/viotape.c | 5
drivers/net/iseries_veth.c | 9 -
include/asm-powerpc/spu.h | 2
17 files changed, 441 insertions(+), 106 deletions(-)
Arnd Bergmann (4):
[POWERPC] cell: update cell_defconfig
[POWERPC] cell: add forward struct declarations to spu.h
[POWERPC] spufs: fix assignment of node numbers
[POWERPC] powerpc: add scanning of ebc bus to of_platform
Benjamin Herrenschmidt (3):
[POWERPC] cell: Fix spufs with "new style" device-tree
[POWERPC] Workaround oldworld OF bug with IRQs & P2P bridges
[POWERPC] Fix build of cell zImage.initrd
David Woodhouse (1):
[POWERPC] Probe Efika platform before CHRP.
Jens Osterkamp (1):
[POWERPC] cell: Enable spider workarounds on all PCI buses
Linas Vepstas (1):
[POWERPC] Fix PCI device channel state initialization
Paul Mackerras (1):
[POWERPC] Fix register save area alignment for swapcontext syscall
Stephen Rothwell (6):
[POWERPC] iSeries: fix viodasd init
[POWERPC] iSeries: fix viotape init
[POWERPC] iSeries: fix iseries_veth init
[POWERPC] iSeries: fix viocd init
[POWERPC] iSeries: fix viocons init
[POWERPC] iSeries: fix CONFIG_VIOPATH dependency
Vitaly Wool (1):
[POWERPC] Update MTD OF documentation
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git 'merge' branch
2006-12-20 10:23 Paul Mackerras
@ 2006-12-20 10:52 ` Benjamin Herrenschmidt
2006-12-20 11:15 ` Arnd Bergmann
0 siblings, 1 reply; 146+ messages in thread
From: Benjamin Herrenschmidt @ 2006-12-20 10:52 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, torvalds
> Jens Osterkamp (1):
> [POWERPC] cell: Enable spider workarounds on all PCI buses
That one isn't totally correct I think, but it can go in, it won't harm,
it's just that the PCIe busses on the spider chip might need a slightly
different workaround. I'll send a separate patch on top of this one to
fix it.
Ben.
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git 'merge' branch
2006-12-20 10:52 ` Benjamin Herrenschmidt
@ 2006-12-20 11:15 ` Arnd Bergmann
2006-12-20 11:18 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 146+ messages in thread
From: Arnd Bergmann @ 2006-12-20 11:15 UTC (permalink / raw)
To: linuxppc-dev; +Cc: torvalds, Paul Mackerras
On Wednesday 20 December 2006 11:52, Benjamin Herrenschmidt wrote:
>=20
> > Jens Osterkamp (1):
> > =A0 =A0 =A0 [POWERPC] cell: Enable spider workarounds on all PCI buses
>=20
> That one isn't totally correct I think, but it can go in, it won't harm,
> it's just that the PCIe busses on the spider chip might need a slightly
> different workaround. I'll send a separate patch on top of this one to
> fix it.
Thanks. I thought that a fix for the PCIe bus had already gone in.
Once you have done it, Jens' patch will be the the right one.
Arnd <><
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git 'merge' branch
2006-12-20 11:15 ` Arnd Bergmann
@ 2006-12-20 11:18 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 146+ messages in thread
From: Benjamin Herrenschmidt @ 2006-12-20 11:18 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linuxppc-dev, torvalds, Paul Mackerras
On Wed, 2006-12-20 at 12:15 +0100, Arnd Bergmann wrote:
> On Wednesday 20 December 2006 11:52, Benjamin Herrenschmidt wrote:
> >
> > > Jens Osterkamp (1):
> > > [POWERPC] cell: Enable spider workarounds on all PCI buses
> >
> > That one isn't totally correct I think, but it can go in, it won't harm,
> > it's just that the PCIe busses on the spider chip might need a slightly
> > different workaround. I'll send a separate patch on top of this one to
> > fix it.
>
> Thanks. I thought that a fix for the PCIe bus had already gone in.
> Once you have done it, Jens' patch will be the the right one.
Got distracted with getting the EMAC driver in shape for CAB, took me a
tad longer than expected (maybe I wasn't very motivated :-)
Ben.
^ permalink raw reply [flat|nested] 146+ messages in thread
* Please pull powerpc.git 'merge' branch
@ 2006-11-22 2:35 Paul Mackerras
2006-11-22 2:47 ` Linus Torvalds
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2006-11-22 2:35 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Since the mirroring on kernel.org is slow today, please do:
git pull \
master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git merge
or, once the mirror catches up:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
It turns out that two commits that were merged post 2.6.18 were
incorrect and need to be reverted. Also there is a fix for embedded
systems using the Freescale MPC83xx family processors.
Thanks,
Paul.
arch/powerpc/kernel/time.c | 42 -----------------------------
arch/powerpc/platforms/83xx/mpc832x_mds.c | 19 +++++++++++++
arch/powerpc/platforms/83xx/mpc834x_itx.c | 4 ---
include/asm-powerpc/time.h | 4 ---
4 files changed, 19 insertions(+), 50 deletions(-)
commit 8746ed3dae14e87e9f7ad8e44649b72e22b33274
Author: Kim Phillips <kim.phillips@freescale.com>
Date: Tue Nov 21 18:19:42 2006 -0600
[POWERPC] Fix ucc_geth of_device discovery on mpc832x
mpc832x, as in mpc8360, needs to explicitly find and create the
platform device for ucc_geth in 2.6.19. This code will likely be
readapted to Benh's new of_ methods for 2.6.20.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit df9c23095fc8652798c41dd860676d3dafb2f1dc
Author: Kim Phillips <kim.phillips@freescale.com>
Date: Tue Nov 21 10:31:14 2006 -0600
[POWERPC] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class"
This reverts commit 7a69af63e788a324d162201a0b23df41bcf158dd.
As advised by David Brownell:
http://marc.theaimsgroup.com/?l=linux-kernel&m=116387226902131&w=2
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 6c12c18dfb0ccae21816de3e0c323b5250450d82
Author: Kim Phillips <kim.phillips@freescale.com>
Date: Tue Nov 21 10:31:08 2006 -0600
[POWERPC] Revert "[POWERPC] Enable generic rtc hook for the MPC8349 mITX"
This reverts commit a8ed4f7ec3aa472134d7de6176f823b2667e450b.
As advised by David Brownell:
http://marc.theaimsgroup.com/?l=linux-kernel&m=116387226902131&w=2
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git 'merge' branch
2006-11-22 2:35 Paul Mackerras
@ 2006-11-22 2:47 ` Linus Torvalds
2006-11-22 21:40 ` Paul Mackerras
0 siblings, 1 reply; 146+ messages in thread
From: Linus Torvalds @ 2006-11-22 2:47 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
On Wed, 22 Nov 2006, Paul Mackerras wrote:
>
> [POWERPC] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class"
>
> This reverts commit 7a69af63e788a324d162201a0b23df41bcf158dd.
>
> As advised by David Brownell:
>
> http://marc.theaimsgroup.com/?l=linux-kernel&m=116387226902131&w=2
Btw, when doing a web-pointer like this, _please_ don't just leave it
hanging like that.
For one thing, there's no guarantee that the web-server will continue to
exist, or not move around the data. And even _if_ the data still exists
and at that address, when looking at bugs of old history it's really
irritating to have to fire up a web browser - not to mention that maybe
you're on an airplane or other place without internet access. Git works
fine disconnected.
So the rule is:
- it's perfectly _fine_ to point to web addresses for "further
information" (especially things like bugzilla, of course)
- but the commit message also has to stand on its own, even _without_ the
pointer. So at least add a sentence about why - even if the web pointer
would explain it more.
So even if you just say something trivial like
As pointed out by David Brownell, that commit was just a total
thinko, and could never work.
at least it doesn't leave the commit message _totally_ without any
context.
Linus
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git 'merge' branch
2006-11-22 2:47 ` Linus Torvalds
@ 2006-11-22 21:40 ` Paul Mackerras
2006-11-22 21:53 ` Linus Torvalds
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2006-11-22 21:40 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linuxppc-dev
Linus Torvalds writes:
> Btw, when doing a web-pointer like this, _please_ don't just leave it
> hanging like that.
So, does that mean you want me to re-do those two commits and send
another pull request?
Paul.
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git 'merge' branch
2006-11-22 21:40 ` Paul Mackerras
@ 2006-11-22 21:53 ` Linus Torvalds
0 siblings, 0 replies; 146+ messages in thread
From: Linus Torvalds @ 2006-11-22 21:53 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
On Thu, 23 Nov 2006, Paul Mackerras wrote:
> Linus Torvalds writes:
>
> > Btw, when doing a web-pointer like this, _please_ don't just leave it
> > hanging like that.
>
> So, does that mean you want me to re-do those two commits and send
> another pull request?
No, I pulled and pushed out, I just don't want to see uninformative commit
messages like this in the future..
Linus
^ permalink raw reply [flat|nested] 146+ messages in thread
* Please pull powerpc.git 'merge' branch
@ 2006-11-16 2:19 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2006-11-16 2:19 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Since the mirroring on kernel.org is slow today, please do:
git pull \
master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git merge
or, once the mirror catches up:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get the two commits from Stephen Rothwell listed below.
Thanks,
Paul.
include/asm-powerpc/systbl.h | 1 +
include/asm-powerpc/topology.h | 8 +++++++-
include/asm-powerpc/unistd.h | 3 ++-
3 files changed, 10 insertions(+), 2 deletions(-)
commit 9716a340310a383751a06589d0775fad04bd3f54
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon Nov 13 14:52:42 2006 +1100
[POWERPC] Wire up sys_move_pages
All the infrastructure is already in place for this, so we only need
to allocate a syscall number and hook it up.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 056f4faa572f64fa926491a7d42c627c9dc507a7
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon Nov 13 14:51:46 2006 +1100
[POWERPC] Add the thread_siblings files to sysfs
This adds the /sys/devices/system/cpu/*/topology/thread_siblings
files on powerpc. These files are already available on other
architectures.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git 'merge' branch
@ 2006-11-11 11:32 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2006-11-11 11:32 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get some more PowerPC bugfixes, as listed below. I have included
the full commit messages this time.
Thanks,
Paul.
arch/powerpc/Kconfig | 2 +
arch/powerpc/boot/wrapper | 4 +--
arch/powerpc/boot/zImage.lds.S | 5 +++
arch/powerpc/kernel/rtas_flash.c | 47 ++++++++++++++++++++++++-------
arch/powerpc/platforms/cell/spu_base.c | 41 ++++++++++++++++++++++-----
drivers/serial/cpm_uart/cpm_uart.h | 2 +
drivers/serial/cpm_uart/cpm_uart_core.c | 16 +++++------
drivers/serial/cpm_uart/cpm_uart_cpm1.c | 2 +
8 files changed, 88 insertions(+), 31 deletions(-)
commit 36b600f2649e3be49039efe31edeeb64277dbd99
Author: Geoff Levand <geoffrey.levand@am.sony.com>
Date: Thu Nov 2 21:08:45 2006 -0800
[POWERPC] cell: set ARCH_SPARSEMEM_DEFAULT in Kconfig
The current cell processor support needs sparsemem, so set it as
the default memory model.
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 ab56dbddc8a23ff3f4602855aaf0fcb3c814118b
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri Nov 10 15:11:20 2006 +1100
[POWERPC] Fix cell "new style" mapping and add debug
This fixes a typo in the "new style" code for mapping SPE resources,
which causes it to try to map the same resource 4 times.
It also adds some pr_debug's that are useful to track down issues with
the firmware when bringinh up new machines.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit ae883cab9457aad0fb3342249e1207873d3b64de
Author: John Rose <johnrose@austin.ibm.com>
Date: Wed Nov 8 10:07:30 2006 -0600
[POWERPC] pseries: Force 4k update_flash block and list sizes
The enablement of 64k pages on pseries platforms exposed a bug in
the RTAS mechanism for updating firmware. RTAS assumes 4k for flash
block and list sizes, and use of any other sizes results in a failure,
even though PAPR does not specify any such requirement.
This patch changes the rtas_flash module to force the use of 4k memory
block and list sizes when preparing and sending a firmware image to
RTAS. The rtas_flash function now uses a slab cache of 4k blocks with
4k alignment, rather than get_zeroed_page(), to allocate the memory for
the flash blocks and lists. The 4k alignment requirement is specified
in PAPR.
Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 0091cf5a6ae6e52fc95ceb53200975ef2c81c206
Author: Kalle Pokki <kalle.pokki@iki.fi>
Date: Wed Nov 1 15:08:13 2006 +0200
[POWERPC] CPM_UART: Fix non-console initialisation
The cpm_uart driver is initialised incorrectly, if there is a frame buffer
console, and CONFIG_SERIAL_CPM_CONSOLE is defined. The driver fails to
call cpm_uart_init_portdesc() and set_lineif() in this case.
Signed-off-by: Kalle Pokki <kalle.pokki@iki.fi>
Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 599540a85595bd5950354bd95f5ebf9c6e07c971
Author: Kalle Pokki <kalle.pokki@iki.fi>
Date: Wed Nov 1 09:52:41 2006 +0200
[POWERPC] CPM_UART: Fix non-console transmit
The SMC and SCC hardware transmitter is enabled at the wrong
place. Simply writing twice to the non-console port, like
$ echo asdf > /dev/ttyCPM1
$ echo asdf > /dev/ttyCPM1
puts the shell into endless uninterruptible sleep, since the
transmitter is stopped after the first write, and is not enabled
before the shutdown function of the second write. Thus the transmit
buffers are never emptied.
Signed-off-by: Kalle Pokki <kalle.pokki@iki.fi>
Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 621da0f8af228525e4b40390e36fbdc44a587cf1
Author: Paul Mackerras <paulus@samba.org>
Date: Thu Nov 9 16:00:06 2006 +1100
[POWERPC] Make sure initrd and dtb sections get into zImage correctly
The "wrapper" script was using the wrong names for the initrd and
dtb (device-tree blob) sections. This fixes it, and also ensures
the symbols for the start and end of the dtb get defined correctly.
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git 'merge' branch
@ 2006-11-01 7:30 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2006-11-01 7:30 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get some more PowerPC bugfixes, as listed below. I have included
the full commit messages this time.
Thanks,
Paul.
arch/powerpc/kernel/Makefile | 1
arch/powerpc/kernel/btext.c | 2
arch/powerpc/kernel/iommu.c | 77 ++++++----
arch/powerpc/kernel/perfmon_fsl_booke.c | 221 ----------------------------
arch/powerpc/kernel/pmc.c | 2
arch/powerpc/kernel/traps.c | 18 +-
arch/powerpc/kernel/vio.c | 4 -
arch/powerpc/lib/sstep.c | 5 -
arch/powerpc/mm/hugetlbpage.c | 3
arch/powerpc/oprofile/Makefile | 2
arch/powerpc/oprofile/common.c | 10 +
arch/powerpc/oprofile/op_model_7450.c | 2
arch/powerpc/oprofile/op_model_fsl_booke.c | 170 +++++++++++++++++-----
arch/powerpc/oprofile/op_model_power4.c | 2
arch/powerpc/oprofile/op_model_rs64.c | 2
arch/powerpc/platforms/iseries/iommu.c | 11 -
arch/powerpc/platforms/pseries/iommu.c | 35 +---
arch/powerpc/sysdev/dart.h | 1
arch/powerpc/sysdev/dart_iommu.c | 8 -
arch/powerpc/sysdev/qe_lib/qe.c | 3
arch/ppc/kernel/traps.c | 18 +-
drivers/video/offb.c | 36 +++--
include/asm-powerpc/current.h | 12 +-
include/asm-powerpc/io.h | 7 +
include/asm-powerpc/iommu.h | 22 +++
include/asm-powerpc/oprofile_impl.h | 87 +++++++++++
include/asm-powerpc/pmc.h | 13 --
include/asm-powerpc/system.h | 6 -
include/asm-powerpc/tce.h | 3
29 files changed, 381 insertions(+), 402 deletions(-)
delete mode 100644 arch/powerpc/kernel/perfmon_fsl_booke.c
commit 4393c4f6788cee65095dd838cfeca6edefbfeb52
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed Nov 1 15:11:39 2006 +1100
[POWERPC] Make alignment exception always check exception table
The alignment exception used to only check the exception table for
-EFAULT, not for other errors. That opens an oops window if we can
coerce the kernel into getting an alignment exception for other reasons
in what would normally be a user-protected accessor, which can be done
via some of the futex ops. This fixes it by always checking the
exception tables.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 0d69a052d4d7c4085706b9ac0d1bd28ff90c9fca
Author: Gui,Jian <guij@cn.ibm.com>
Date: Wed Nov 1 10:50:15 2006 +0800
[POWERPC] Disallow kprobes on emulate_step and branch_taken
On powerpc, probing on emulate_step function will crash 2.6.18.1 when
it is triggered.
When kprobe is triggered, emulate_step() is on its kernel path and
will cause recursive kprobe fault. And branch_taken() is called
in emulate_step(). This disallows kprobes on both of them.
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 292f86f005e3867277b2126c2399eea3e773a4fc
Author: Hugh Dickins <hugh@veritas.com>
Date: Tue Oct 31 18:41:51 2006 +0000
[POWERPC] Make mmiowb's io_sync preempt safe
If mmiowb() is always used prior to releasing spinlock as Doc suggests,
then it's safe against preemption; but I'm not convinced that's always
the case. If preemption occurs between sync and get_paca()->io_sync = 0,
I believe there's no problem. But in the unlikely event that gcc does
the store relative to another register than r13 (as it did with current),
then there's a small danger of setting another cpu's io_sync to 0, after
it had just set it to 1. Rewrite ppc64 mmiowb to prevent that.
The remaining io_sync assignments in io.h all get_paca()->io_sync = 1,
which is harmless even if preempted to the wrong cpu (the context switch
itself syncs); and those in spinlock.h are while preemption is disabled.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 96268889ee369b36203b7a06e8aabb197270216e
Author: Hugh Dickins <hugh@veritas.com>
Date: Tue Oct 31 18:40:39 2006 +0000
[POWERPC] Make high hugepage areas preempt safe
Checking source for other get_paca()->field preemption dangers found that
open_high_hpage_areas does a structure copy into its paca while preemption
is enabled: unsafe however gcc accomplishes it. Just remove that copy:
it's done safely afterwards by on_each_cpu, as in open_low_hpage_areas.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Acked-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 5fe8e8b88e68e517637e3f8287f1fee89e2d9252
Author: Hugh Dickins <hugh@veritas.com>
Date: Tue Oct 31 18:39:31 2006 +0000
[POWERPC] Make current preempt-safe
Repeated -j20 kernel builds on a G5 Quad running an SMP PREEMPT kernel
would often collapse within a day, some exec failing with "Bad address".
In each case examined, load_elf_binary was doing a kernel_read, but
generic_file_aio_read's access_ok saw current->thread.fs.seg as USER_DS
instead of KERNEL_DS.
objdump of filemap.o shows gcc 4.1.0 emitting "mr r5,r13 ... ld r9,416(r5)"
here for get_paca()->__current, instead of the expected and much more usual
"ld r9,416(r13)"; I've seen other gcc4s do the same, but perhaps not gcc3s.
So, if the task is preempted and rescheduled on a different cpu in between
the mr and the ld, r5 will be looking at a different paca_struct from the
one it's now on, pick up the wrong __current, and perhaps the wrong seg.
Presumably much worse could happen elsewhere, though that split is rare.
Other architectures appear to be safe (x86_64's read_pda is more limiting
than get_paca), but ppc64 needs to force "current" into one instruction.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 302439d2167e0f1e01a6480ac40c06063f4e16a1
Author: Timur Tabi <timur@freescale.com>
Date: Tue Oct 31 17:53:42 2006 +0800
[POWERPC] qe_lib: qe_issue_cmd writes wrong value to CECDR
Changed qe_issue_cmd() to write cmd_input to the CECDR unmodified. It
was treating cmd_input as a virtual address and tried to convert it to
a physical address.
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 5d2efba64b231a1733c4048d1708d77e07f26426
Author: Linas Vepstas <linas@austin.ibm.com>
Date: Mon Oct 30 16:15:59 2006 +1100
[POWERPC] Use 4kB iommu pages even on 64kB-page systems
The 10Gigabit ethernet device drivers appear to be able to chew
up all 256MB of TCE mappings on pSeries systems, as evidenced by
numerous error messages:
iommu_alloc failed, tbl c0000000010d5c48 vaddr c0000000d875eff0 npages 1
Some experimentation indicates that this is essentially because
one 1500 byte ethernet MTU gets mapped as a 64K DMA region when
the large 64K pages are enabled. Thus, it doesn't take much to
exhaust all of the available DMA mappings for a high-speed card.
This patch changes the iommu allocator to work with its own
unique, distinct page size. Although the patch is long, its
actually quite simple: it just #defines a distinct IOMMU_PAGE_SIZE
and then uses this in all the places that matter.
As a side effect, it also dramatically improves network performance
on platforms with H-calls on iommu translation inserts/removes (since
we no longer call it 16 times for a 1500 bytes packet when the iommu HW
is still 4k).
In the future, we might want to make the IOMMU_PAGE_SIZE a variable
in the iommu_table instance, thus allowing support for different HW
page sizes in the iommu itself.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Olof Johansson <olof@lixom.net>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit dd6c89f686bdb2a5de72fab636fc839e5a0add6d
Author: Andy Fleming <afleming@freescale.com>
Date: Fri Oct 27 15:06:32 2006 -0500
[POWERPC] Fix oprofile support for e500 in arch/powerpc
Fixed a compile error in building the 85xx support with oprofile, and in
the process cleaned up some issues with the fsl_booke performance monitor
code.
* Reorganized FSL Book-E performance monitoring code so that the 7450
wouldn't be built if the e500 was, and cleaned it up so it was more
self-contained.
* Added a cpu_setup function for FSL Book-E. The original
cpu_setup function prototype had no arguments, assuming that
the reg_setup function would copy the required information into
variables which represented the registers. This was silly for
e500, since it has 1 register per counter (rather than 3 for
all counters), so the code has been restructured to have
cpu_setup take the current counter config array as an argument,
with op_powerpc_setup() invoking op_powerpc_cpu_setup() through
on_each_cpu(), and op_powerpc_cpu_setup() invoking the
model-specific cpu_setup function with an argument. The
argument is ignored on all other platforms at present.
* Fixed a confusing line where a trinary operator only had two
arguments
Signed-off-by: Andrew Fleming <afleming@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit e0da0daee14862e0a5c49f2059641a8deb27eca2
Author: Andy Fleming <afleming@freescale.com>
Date: Fri Oct 27 14:31:07 2006 -0500
[POWERPC] Fix rmb() for e500-based machines it
The e500 core generates an illegal instruction exception when it tries
to execute the lwsync instruction, which we currently use for rmb().
This fixes it by using the LWSYNC macro, which turns into a plain sync
on 32-bit machines.
Signed-off-by: Andrew Fleming <afleming@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 441cbd8dace80545db2ac43175ac1c097d96f75c
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu Oct 26 15:38:10 2006 +1000
[POWERPC] Fix various offb issues
This patch fixes a few issues in offb:
- A test was inverted causing the palette hack to never work
(no device node was passed down to the init function)
- Some cards seem to have their assigned-addresses property in a random
order, thus we need to try using of_get_pci_address() first, which will
fail if it's not a PCI device, and fallback to of_get_address() in that
case. of_get_pci_address() properly parsees assigned-addresses to test
the BAR number and thus will get it right whatever the order is.
- Some cards (like GXT4500) provide a linebytes of 0xffffffff in the
device-tree which does no good. This patch handles that by using the
screen width when that happens. (Also fixes btext.c while at it).
- Add detection of the GXT4500 in addition to the GXT2000 for the
palette hacks (we use the same hack, palette is linear in register space
at offset 0x6000).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git 'merge' branch
@ 2006-10-25 6:26 Paul Mackerras
2006-10-25 14:09 ` Kumar Gala
2006-10-25 14:22 ` Olof Johansson
0 siblings, 2 replies; 146+ messages in thread
From: Paul Mackerras @ 2006-10-25 6:26 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get some more PowerPC bugfixes, as listed below. There is also a
defconfig update and the addition of a new processor type (970GX) to
the cpu table. The first 4 listed under Ben H.'s name aren't strictly
bugfixes in themselves, but are needed for the Cell timebase hardware
bug workaround (the bug is that reads from the timebase may
occasionally not return monotonically increasing values, as they
implemented the timebase as two 32-bit counters).
Thanks,
Paul.
arch/powerpc/boot/Makefile | 2
arch/powerpc/configs/cell_defconfig | 19 +++-
arch/powerpc/kernel/cputable.c | 86 +++++++++++++++++++
arch/powerpc/kernel/head_64.S | 19 ----
arch/powerpc/kernel/misc_32.S | 74 -----------------
arch/powerpc/kernel/misc_64.S | 124 ----------------------------
arch/powerpc/kernel/module_32.c | 39 +++++++--
arch/powerpc/kernel/module_64.c | 49 +++++++++--
arch/powerpc/kernel/prom.c | 8 +-
arch/powerpc/kernel/setup_32.c | 8 +-
arch/powerpc/kernel/setup_64.c | 11 ++
arch/powerpc/kernel/time.c | 63 ++++----------
arch/powerpc/kernel/vdso.c | 43 ++++++++++
arch/powerpc/kernel/vdso32/vdso32.lds.S | 12 +++
arch/powerpc/kernel/vdso64/gettimeofday.S | 6 +
arch/powerpc/kernel/vdso64/vdso64.lds.S | 10 ++
arch/powerpc/oprofile/op_model_power4.c | 2
arch/powerpc/platforms/cell/spufs/file.c | 2
arch/powerpc/platforms/cell/spufs/hw_ops.c | 2
arch/powerpc/platforms/chrp/setup.c | 4 +
arch/powerpc/platforms/iseries/setup.c | 5 +
arch/powerpc/platforms/powermac/sleep.S | 3 -
arch/powerpc/sysdev/i8259.c | 5 +
arch/powerpc/sysdev/ipic.c | 4 -
arch/powerpc/sysdev/qe_lib/ucc.c | 2
arch/powerpc/sysdev/qe_lib/ucc_fast.c | 2
arch/powerpc/sysdev/qe_lib/ucc_slow.c | 2
arch/powerpc/sysdev/tsi108_dev.c | 4 -
arch/ppc/boot/simple/relocate.S | 6 +
arch/ppc/kernel/misc.S | 74 -----------------
arch/ppc/kernel/setup.c | 10 +-
include/asm-powerpc/asm-compat.h | 52 ++++++++++++
include/asm-powerpc/cputable.h | 37 +++-----
include/asm-powerpc/firmware.h | 17 ++--
include/asm-powerpc/i8259.h | 1
include/asm-powerpc/ppc_asm.h | 18 +++-
include/asm-powerpc/prom.h | 10 +-
include/asm-powerpc/reg.h | 26 ++++++
include/asm-powerpc/time.h | 27 ++++--
include/asm-powerpc/timex.h | 20 ++---
scripts/mod/modpost.c | 2
41 files changed, 456 insertions(+), 454 deletions(-)
Arnd Bergmann:
[POWERPC] spufs: fix another off-by-one bug in spufs_mbox_read
[POWERPC] cell: update defconfig
Benjamin Herrenschmidt:
[POWERPC] Consolidate feature fixup code
[POWERPC] Support nested cpu feature sections
[POWERPC] Support feature fixups in vdso's
[POWERPC] Support feature fixups in modules
[POWERPC] Cell timebase bug workaround
[POWERPC] Fix device_is_compatible() const warning
[POWERPC] Fix CHRP platforms with only 8259
Dwayne Grant Mcconnell:
[POWERPC] spufs: fix signal2 file to report signal2
Jake Moilanen:
[POWERPC] Add 970GX cputable entry
Liu Dave-r63238:
[POWERPC] Fix the UCC rx/tx clock of QE
Mark A. Greer:
[POWERPC] Don't require execute perms on wrapper when building zImage.initrd
Olaf Hering:
[POWERPC] Fix hang in start_ldr if _end or _edata is unaligned
Scott Wood:
[POWERPC] IPIC: Fix spinlock recursion in set_irq_handler
Srinivasa Ds:
[POWERPC] Fix build breakage with CONFIG_PPC32
Stephen Rothwell:
[POWERPC] Simplify stolen time calculation
Timur Tabi:
[POWERPC] Fix spelling errors in ucc_fast.c and ucc_slow.c
Zang Roy-r61911:
[POWERPC] Fix compiler warning message on get_property call
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git 'merge' branch
2006-10-25 6:26 Paul Mackerras
@ 2006-10-25 14:09 ` Kumar Gala
2006-10-25 21:37 ` Paul Mackerras
2006-10-25 14:22 ` Olof Johansson
1 sibling, 1 reply; 146+ messages in thread
From: Kumar Gala @ 2006-10-25 14:09 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, torvalds
On Oct 25, 2006, at 1:26 AM, Paul Mackerras wrote:
> Linus,
>
> Please do:
>
> git pull \
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
>
> to get some more PowerPC bugfixes, as listed below. There is also a
> defconfig update and the addition of a new processor type (970GX) to
> the cpu table. The first 4 listed under Ben H.'s name aren't strictly
> bugfixes in themselves, but are needed for the Cell timebase hardware
> bug workaround (the bug is that reads from the timebase may
> occasionally not return monotonically increasing values, as they
> implemented the timebase as two 32-bit counters).
Can you hold off on the this. The following patch is still under
discussion and the problem exists on more than just PPC.
[snip]
> Scott Wood:
> [POWERPC] IPIC: Fix spinlock recursion in set_irq_handler
- kumar
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git 'merge' branch
2006-10-25 14:09 ` Kumar Gala
@ 2006-10-25 21:37 ` Paul Mackerras
2006-10-25 22:02 ` Kumar Gala
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2006-10-25 21:37 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev, torvalds
Kumar Gala writes:
> Can you hold off on the this. The following patch is still under
> discussion and the problem exists on more than just PPC.
The patch that I put in fixes the problem in the situation where it
was found, right? That the problem may exist on other architectures
isn't a reason not to fix it here.
> > Scott Wood:
> > [POWERPC] IPIC: Fix spinlock recursion in set_irq_handler
Paul.
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git 'merge' branch
2006-10-25 21:37 ` Paul Mackerras
@ 2006-10-25 22:02 ` Kumar Gala
0 siblings, 0 replies; 146+ messages in thread
From: Kumar Gala @ 2006-10-25 22:02 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, torvalds
On Oct 25, 2006, at 4:37 PM, Paul Mackerras wrote:
> Kumar Gala writes:
>
>> Can you hold off on the this. The following patch is still under
>> discussion and the problem exists on more than just PPC.
>
> The patch that I put in fixes the problem in the situation where it
> was found, right? That the problem may exist on other architectures
> isn't a reason not to fix it here.
Just if we come up with a more general solution. I guess its ok if
we paper tape over it, just didn't want to if we decide the change
should be handled in more generic code.
>
>>> Scott Wood:
>>> [POWERPC] IPIC: Fix spinlock recursion in set_irq_handler
>
> Paul.
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git 'merge' branch
2006-10-25 6:26 Paul Mackerras
2006-10-25 14:09 ` Kumar Gala
@ 2006-10-25 14:22 ` Olof Johansson
2006-10-25 21:34 ` Paul Mackerras
1 sibling, 1 reply; 146+ messages in thread
From: Olof Johansson @ 2006-10-25 14:22 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, torvalds
On Wed, 25 Oct 2006 16:26:13 +1000 Paul Mackerras <paulus@samba.org> wrote:
> Jake Moilanen:
> [POWERPC] Add 970GX cputable entry
I didn't see them fix the head_64.S issue with this patch.
-Olof
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git 'merge' branch
2006-10-25 14:22 ` Olof Johansson
@ 2006-10-25 21:34 ` Paul Mackerras
2006-10-25 22:32 ` Olof Johansson
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2006-10-25 21:34 UTC (permalink / raw)
To: Olof Johansson; +Cc: linuxppc-dev, torvalds
Olof Johansson writes:
> On Wed, 25 Oct 2006 16:26:13 +1000 Paul Mackerras <paulus@samba.org> wrote:
>
> > Jake Moilanen:
> > [POWERPC] Add 970GX cputable entry
>
> I didn't see them fix the head_64.S issue with this patch.
There was no "issue", there was a possible further optimization, but
that's not a reason not to put in the cputable entry in the first
place.
Paul.
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git 'merge' branch
2006-10-25 21:34 ` Paul Mackerras
@ 2006-10-25 22:32 ` Olof Johansson
0 siblings, 0 replies; 146+ messages in thread
From: Olof Johansson @ 2006-10-25 22:32 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, torvalds
Add check for 970GX for __cpu_preinit_ppc970.
Signed-off-by: Olof Johansson <olof@lixom.net>
---
On Thu, 26 Oct 2006 07:34:31 +1000 Paul Mackerras <paulus@samba.org> wrote:
> There was no "issue", there was a possible further optimization, but
> that's not a reason not to put in the cputable entry in the first
> place.
For the deep nap stuff, yes. But the below was what I meant. Only
really needed on firmware that will never ship with a 970GX chip, but
for correctness sake it should still be in there.
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 645c7f1..d528641 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -1646,6 +1646,8 @@ #endif
cmpwi r0,0x3c /* 970FX */
beq 1f
cmpwi r0,0x44 /* 970MP */
+ beq 1f
+ cmpwi r0,0x45 /* 970GX */
bne 2f
1: bl .__cpu_preinit_ppc970
2:
^ permalink raw reply related [flat|nested] 146+ messages in thread
* Please pull powerpc.git 'merge' branch
@ 2006-10-17 4:02 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2006-10-17 4:02 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get some more PowerPC bugfixes, as listed below.
Paul.
arch/powerpc/configs/mpc834x_itx_defconfig | 2 +-
arch/powerpc/kernel/cputable.c | 2 +-
arch/powerpc/kernel/pci_32.c | 12 ++++++------
arch/powerpc/kernel/pci_64.c | 10 ++++++++--
arch/powerpc/kernel/process.c | 10 ++--------
arch/powerpc/kernel/traps.c | 3 +--
arch/powerpc/platforms/83xx/Kconfig | 13 +++++++++++++
arch/powerpc/platforms/83xx/Makefile | 2 ++
arch/powerpc/platforms/83xx/mpc8360e_pb.c | 19 +++++++++++++++++++
arch/powerpc/platforms/cell/spu_base.c | 15 +++++++++++----
arch/powerpc/platforms/cell/spufs/file.c | 1 +
arch/ppc/kernel/time.c | 4 ++++
arch/ppc/platforms/mpc8272ads_setup.c | 4 ++--
arch/ppc/platforms/mpc866ads_setup.c | 4 ++--
arch/ppc/platforms/mpc885ads_setup.c | 4 ++--
15 files changed, 75 insertions(+), 30 deletions(-)
Anton Blanchard:
[POWERPC] Never panic when taking altivec exceptions from userspace
[POWERPC] POWER6 has 6 PMCs
[POWERPC] Better check in show_instructions
[POWERPC] Check for offline nodes in pci NUMA code
Benjamin Herrenschmidt:
[POWERPC] Don't crash on cell with 2 BEs when !CONFIG_NUMA
Eric Sesterhenn:
[POWERPC] Off-by-one in /arch/ppc/platforms/mpc8*
Kumar Gala:
[POWERPC] ppc: Add missing calls to set_irq_regs
Li Yang:
[POWERPC] Fix MPC8360EMDS PB board support
[POWERPC] Add Makefile entry for MPC832x_mds support
Noguchi, Masato:
[POWERPC] spufs: fix support for read/write on cntl
Randy Vinson:
[POWERPC] Fix IO Window Updates on P2P bridges.
Timur Tabi:
[POWERPC] Add DOS partition table support to mpc834x_itx_defconfig
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git 'merge' branch
@ 2006-10-10 5:31 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2006-10-10 5:31 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get some PowerPC bugfixes, including a pile of pt_regs fixes for
ARCH=ppc from Al Viro, and a fix for a crash on resume on powerbooks
from Ben.
Thanks,
Paul.
arch/powerpc/boot/Makefile | 16 +--
arch/powerpc/configs/maple_defconfig | 56 ++++++++--
arch/powerpc/platforms/maple/pci.c | 187 ++++++++++++++++++++++++++++++++-
arch/powerpc/platforms/powermac/smp.c | 7 +
arch/powerpc/xmon/xmon.c | 6 +
arch/ppc/4xx_io/serial_sicc.c | 8 +
arch/ppc/8260_io/enet.c | 4 -
arch/ppc/8260_io/fcc_enet.c | 6 +
arch/ppc/8xx_io/commproc.c | 19 ++-
arch/ppc/8xx_io/cs4218_tdm.c | 4 -
arch/ppc/8xx_io/enet.c | 4 -
arch/ppc/8xx_io/fec.c | 7 +
arch/ppc/kernel/smp.c | 4 -
arch/ppc/platforms/apus_setup.c | 2
arch/ppc/platforms/hdpu.c | 22 ++--
arch/ppc/platforms/radstone_ppc7d.c | 10 +-
arch/ppc/platforms/sbc82xx.c | 4 -
arch/ppc/syslib/cpc700.h | 2
arch/ppc/syslib/cpc700_pic.c | 2
arch/ppc/syslib/cpm2_pic.c | 2
arch/ppc/syslib/cpm2_pic.h | 2
arch/ppc/syslib/gt64260_pic.c | 9 +-
arch/ppc/syslib/ibm440gx_common.c | 2
arch/ppc/syslib/ipic.c | 2
arch/ppc/syslib/m82xx_pci.c | 4 -
arch/ppc/syslib/m8xx_setup.c | 2
arch/ppc/syslib/m8xx_wdt.c | 4 -
arch/ppc/syslib/mpc52xx_pic.c | 2
arch/ppc/syslib/mv64360_pic.c | 18 +--
arch/ppc/syslib/open_pic2.c | 2
arch/ppc/syslib/ppc403_pic.c | 2
arch/ppc/syslib/ppc4xx_pic.c | 8 +
arch/ppc/syslib/ppc85xx_rio.c | 9 +-
arch/ppc/syslib/ppc8xx_pic.c | 4 -
arch/ppc/syslib/xilinx_pic.c | 2
drivers/i2c/busses/i2c-powermac.c | 28 +++--
drivers/macintosh/windfarm_pm112.c | 18 ++-
drivers/macintosh/windfarm_pm81.c | 24 ++--
drivers/macintosh/windfarm_pm91.c | 24 ++--
include/asm-ppc/commproc.h | 3 -
include/asm-ppc/gt64260.h | 2
include/asm-ppc/mpc52xx.h | 2
include/asm-ppc/mv64x60.h | 4 -
43 files changed, 370 insertions(+), 179 deletions(-)
Al Viro:
[POWERPC] ARCH=ppc pt_regs fixes
Benjamin Herrenschmidt:
[POWERPC] Make U4 PCIe work on maple
[POWERPC] Fix Maple secondary IDE interrupt
[POWERPC] Update maple defconfig
[POWERPC] Fix i2c-powermac platform device usage
[POWERPC] Fix windfarm platform device usage
Geoff Levand:
[POWERPC] cell: fix default zImage build target
Michael Ellerman:
[POWERPC] Fix boot wrapper invocation if CROSS_COMPILE contains spaces
Paul Mackerras:
[POWERPC] Fix xmon IRQ handler for pt_regs removal
[POWERPC] Fix secondary CPU startup on old "powersurge" SMP powermacs
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git 'merge' branch
@ 2006-10-07 12:33 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2006-10-07 12:33 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get a bunch of PowerPC bug fixes and comment and documentation
updates, including fixes for the irq breakage.
Thanks,
Paul.
arch/powerpc/boot/dts/mpc8349emitx.dts | 246 +++++++++++++++++++++
arch/powerpc/boot/of.c | 5
arch/powerpc/configs/iseries_defconfig | 86 ++++++-
arch/powerpc/configs/pseries_defconfig | 2
arch/powerpc/kernel/ibmebus.c | 2
arch/powerpc/kernel/iommu.c | 2
arch/powerpc/kernel/irq.c | 2
arch/powerpc/kernel/prom.c | 2
arch/powerpc/kernel/prom_parse.c | 17 +
arch/powerpc/kernel/time.c | 2
arch/powerpc/platforms/82xx/mpc82xx_ads.c | 5
arch/powerpc/platforms/85xx/mpc85xx_ads.c | 5
arch/powerpc/platforms/85xx/mpc85xx_cds.c | 7 -
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 5
arch/powerpc/platforms/cell/interrupt.c | 5
arch/powerpc/platforms/cell/spu_base.c | 6 -
arch/powerpc/platforms/chrp/setup.c | 7 -
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 5
arch/powerpc/platforms/iseries/irq.c | 17 +
arch/powerpc/platforms/iseries/irq.h | 2
arch/powerpc/platforms/iseries/lpevents.c | 4
arch/powerpc/platforms/iseries/mf.c | 4
arch/powerpc/platforms/iseries/smp.c | 6 -
arch/powerpc/platforms/iseries/smp.h | 6 +
arch/powerpc/platforms/iseries/viopath.c | 2
arch/powerpc/platforms/powermac/pic.c | 12 +
arch/powerpc/platforms/powermac/pic.h | 4
arch/powerpc/platforms/powermac/smp.c | 8 -
arch/powerpc/platforms/pseries/iommu.c | 3
arch/powerpc/platforms/pseries/setup.c | 2
arch/powerpc/platforms/pseries/xics.c | 4
arch/powerpc/sysdev/cpm2_pic.c | 2
arch/powerpc/sysdev/cpm2_pic.h | 2
arch/powerpc/sysdev/fsl_soc.c | 9 -
arch/powerpc/sysdev/i8259.c | 2
arch/powerpc/sysdev/ipic.c | 2
arch/powerpc/sysdev/mpic.c | 6 -
arch/powerpc/sysdev/qe_lib/qe_ic.c | 14 +
arch/powerpc/sysdev/tsi108_pci.c | 3
arch/ppc/kernel/time.c | 2
arch/ppc/platforms/85xx/mpc8560_ads.c | 6 -
arch/ppc/platforms/85xx/mpc85xx_cds_common.c | 6 -
arch/ppc/platforms/85xx/stx_gp3.c | 6 -
arch/ppc/platforms/85xx/tqm85xx.c | 6 -
arch/ppc/syslib/i8259.c | 2
arch/ppc/syslib/open_pic.c | 14 +
drivers/char/viocons.c | 2
include/asm-powerpc/i8259.h | 4
include/asm-powerpc/ibmebus.h | 2
include/asm-powerpc/ipic.h | 4
include/asm-powerpc/iseries/hv_lp_event.h | 2
include/asm-powerpc/iseries/it_lp_queue.h | 2
include/asm-powerpc/machdep.h | 2
include/asm-powerpc/mpic.h | 4
include/asm-powerpc/reg.h | 2
include/asm-ppc/floppy.h | 6 -
include/asm-ppc/machdep.h | 2
include/asm-ppc/open_pic.h | 6 -
include/asm-ppc/smp.h | 2
59 files changed, 453 insertions(+), 154 deletions(-)
create mode 100644 arch/powerpc/boot/dts/mpc8349emitx.dts
create mode 100644 arch/powerpc/platforms/iseries/smp.h
Anton Blanchard:
[POWERPC] Update MTFSF_L() comment
Benjamin Herrenschmidt:
[POWERPC] Fix zImage decompress location
[POWERPC] Don't get PCI IRQ from OF for devices with no IRQ
Brian King:
[POWERPC] Update pSeries defconfig for SATA
Geoff Levand:
[POWERPC] Minor fix for bootargs property
Nathan Lynch:
[POWERPC] linux,tce-size property is 32 bits
Nick Piggin:
[POWERPC] Fix harmless typo
Olaf Hering:
[POWERPC] Fix up after irq changes
[POWERPC] SPU fixup after irq changes
[POWERPC] PReP fixup after irq changes
Olof Johansson:
[POWERPC] Fix fsl_soc build breaks
Paul Mackerras:
[PPC] Fix some irq breakage with ARCH=ppc
Stephen Rothwell:
[POWERPC] Update iseries_defconfig
[POWERPC] Fix viocons for irq breakage
[POWERPC] Fix iseries/smp.c for irq breakage
Timur Tabi:
[POWERPC] Add DTS for MPC8349E-mITX board
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git 'merge' branch
@ 2006-09-13 12:47 Paul Mackerras
2006-09-14 19:14 ` Linus Torvalds
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2006-09-13 12:47 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get the last set of PowerPC updates for 2.6.18.
There are:
* A fix for the DART code from Ben H, which fixes the tg3 data
corruption issue that we have been chasing (it turned out that
adding barriers in tg3.c or to readl/writel didn't fix the problem).
* Changes to the readX/writeX and related functions to make them have
the expected semantics, i.e. ordered w.r.t. previous accesses to
RAM, etc.
* An implementation of futex_atomic_cmpxchg_inatomic.
* A compile fix for the 86xx platforms.
* A couple of kdump fixes.
* A couple of defconfig updates.
Thanks,
Paul.
arch/powerpc/configs/cell_defconfig | 58 ++-
arch/powerpc/configs/chrp32_defconfig | 31 +
arch/powerpc/configs/g5_defconfig | 9
arch/powerpc/configs/iseries_defconfig | 7
arch/powerpc/configs/maple_defconfig | 129 ++++--
arch/powerpc/configs/mpc7448_hpc2_defconfig | 64 ++-
arch/powerpc/configs/mpc834x_itx_defconfig | 20 +
arch/powerpc/configs/mpc834x_mds_defconfig | 104 ++++-
arch/powerpc/configs/mpc8540_ads_defconfig | 84 +++-
arch/powerpc/configs/mpc85xx_cds_defconfig | 75 +++
arch/powerpc/configs/mpc8641_hpcn_defconfig | 62 ++-
arch/powerpc/configs/pmac32_defconfig | 18 +
arch/powerpc/configs/ppc64_defconfig | 198 ++++++---
arch/powerpc/configs/pseries_defconfig | 8
arch/powerpc/kernel/crash.c | 2
arch/powerpc/kernel/misc.S | 49 +-
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 2
arch/powerpc/sysdev/dart_iommu.c | 7
arch/ppc/configs/prep_defconfig | 585 +++++++++++++++------------
include/asm-powerpc/eeh.h | 3
include/asm-powerpc/futex.h | 28 +
include/asm-powerpc/io.h | 43 +-
include/asm-powerpc/kdump.h | 2
include/asm-powerpc/paca.h | 1
include/asm-powerpc/spinlock.h | 17 +
include/asm-ppc/io.h | 20 +
26 files changed, 1102 insertions(+), 524 deletions(-)
commit eeac5c142b8687e35780b11b54b4c2f95b1a2436
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed Sep 13 22:12:52 2006 +1000
[POWERPC] Fix G5 DART (IOMMU) race causing occasional data corruption
It seems that the occasional data corruption observed with the tg3
driver wasn't due to missing barriers after all, but rather seems to
be due to the DART (= IOMMU) in the U4 northbridge reading stale
IOMMU table entries from memory due to a race. This fixes it by
making the CPU read the entry back from memory before using it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit f007cacffc8870702a1473d83ba5e4922d54e17c
Author: Paul Mackerras <paulus@samba.org>
Date: Wed Sep 13 22:08:26 2006 +1000
[POWERPC] Fix MMIO ops to provide expected barrier behaviour
This changes the writeX family of functions to have a sync instruction
before the MMIO store rather than after, because the generally expected
behaviour is that the device receiving the MMIO store can be guaranteed
to see the effects of any preceding writes to normal memory.
To preserve ordering between writeX and readX, and to preserve ordering
between preceding stores and the readX, the readX family of functions
have had an sync added before the load.
Although writeX followed by spin_unlock is not officially guaranteed
to keep the writeX inside the spin-locked region unless an mmiowb()
is used, there are currently drivers that depend on the previous
behaviour on powerpc, which was that the mmiowb wasn't actually required.
Therefore we have a per-cpu flag that is set by writeX, cleared by
__raw_spin_lock and mmiowb, and tested by __raw_spin_unlock. If it is
set, __raw_spin_unlock does a sync and clears it.
This changes both 32-bit and 64-bit readX/writeX. 32-bit already has a
sync in __raw_spin_unlock (since lwsync doesn't exist on 32-bit), and thus
doesn't need the per-cpu flag.
Tested on G5 (PPC970) and POWER5.
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 2e8e8dacc566cc91cd8707cb092e76c7bbfab178
Author: Mohan Kumar M <mohan@in.ibm.com>
Date: Tue Sep 12 17:48:21 2006 +0530
[POWERPC] Fix interrupt clearing in kdump shutdown sequence
Call chip->eoi(irq) to clear any pending interrupt in case of kdump
shutdown sequence. chip->end(irq) does not serve this purpose.
Signed-off-by: Mohan Kumar M <mohan@in.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit ebf2ed283897b752daa743952aff43d78b725183
Author: Olaf Hering <olaf@aepfle.de>
Date: Thu Sep 7 14:44:45 2006 +0200
[POWERPC] update prep_defconfig
Update PReP defconfig, disable some drivers for hardware that is not
used on those systems; enable SL82C105 IDE driver for Powerstack.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit e269d269e0b53a7a6cb1d04290f8174bf0488cb4
Author: Sachin P. Sant <sachinp@in.ibm.com>
Date: Fri Sep 8 07:59:52 2006 +0530
[POWERPC] kdump: Support kernels having 64k page size.
This is required to generate proper core files using kdump on ppc64.
Create a backup region of 64K size irrespective of the PAGE SIZE.
At present 32K was used as backup size. In the case of 64K page size,
second PT_LOAD segments starts at 32K and the first one is not page
aligned. __ioremap() (crash_dump.c) fails if pfn = 0 which is the
case for the second PT_LOAD segment. This is not an issue for 4K page
size because the the first page (32K backup) is copied to second
kernel memory and thus referencing with the second kernel pfn.
Signed-off-by: Sachin Sant <sachinp@in.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 69588298188b40ed7f75c98a6fd328d82f23ca21
Author: David Woodhouse <dwmw2@infradead.org>
Date: Mon Sep 4 21:53:14 2006 -0700
[POWERPC] Implement PowerPC futex_atomic_cmpxchg_inatomic().
The sys_[gs]et_robust_list() syscalls were wired up on PowerPC but
didn't work correctly because futex_atomic_cmpxchg_inatomic() wasn't
implemented. Implement it, based on __cmpxchg_u32().
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 20fb96e2aa009ae9892fde9ef7ffa82f56eebd11
Author: Jon Loeliger <jdl@freescale.com>
Date: Fri Sep 1 10:17:20 2006 -0500
[POWERPC] Add new, missing argument to of_irq_map_raw() for 86xx.
Ben speaks; we follow.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit fb7d527c1aec5e224fb3a0772337f8b5e59eecd0
Author: Paul Mackerras <paulus@samba.org>
Date: Sun Sep 10 11:04:36 2006 +1000
[POWERPC] Update defconfigs
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git 'merge' branch
2006-09-13 12:47 Paul Mackerras
@ 2006-09-14 19:14 ` Linus Torvalds
2006-09-14 22:55 ` Paul Mackerras
0 siblings, 1 reply; 146+ messages in thread
From: Linus Torvalds @ 2006-09-14 19:14 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
On Wed, 13 Sep 2006, Paul Mackerras wrote:
>
> git pull \
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
Hmm. I'm not at all sure this pull caused the problem, and it may have
started long before, but right now I have problems printing on my G5
machine.
I'll get around to trying to bisect it at some point, but before I even
start, I should probably check if anybody recognizes this immediately.
I blamed cupsd at first, because the problem ends up being that it just
hangs in running state, and I just assumed it was broken user space as
usual. But straceing the dang thing shows something strange, like this:
...
time(NULL) = 1024 <0.000009>
select(1024, [7 8 9 10 11 12 13 14], [], NULL, {1, 0}) = 0 (Timeout) <0.000006>
time(NULL) = 1024 <0.000006>
select(1024, [7 8 9 10 11 12 13 14], [], NULL, {1, 0}) = 0 (Timeout) <0.000004>
time(NULL) = 1024 <0.000007>
select(1024, [7 8 9 10 11 12 13 14], [], NULL, {1, 0}) = 0 (Timeout) <0.000006>
time(NULL) = 1024 <0.000007>
select(1024, [7 8 9 10 11 12 13 14], [], NULL, {1, 0}) = 0 (Timeout) <0.000005>
...
which actually looks like something is broken (it says timeout in 5
microseconds, even though the timeout structure is shown as being one
second).
Now, it's entirely possible that the _broken_ thing is actually strrace
itself (that return value from "time()" looks a bit strange too), and that
it's some tracing problem with rinning 32-bit programs on a 64-bit kernel.
But I thought I'd ask if somebody recognizes this before I start wasting
any more time on it..
Linus
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git 'merge' branch
2006-09-14 19:14 ` Linus Torvalds
@ 2006-09-14 22:55 ` Paul Mackerras
2006-09-14 23:36 ` Linus Torvalds
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2006-09-14 22:55 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linuxppc-dev
Linus Torvalds writes:
> Hmm. I'm not at all sure this pull caused the problem, and it may have
> started long before, but right now I have problems printing on my G5
> machine.
>
> I'll get around to trying to bisect it at some point, but before I even
> start, I should probably check if anybody recognizes this immediately.
Curious. It doesn't look familiar. I have had problems printing from
my G5 in the past few weeks, but I attributed it to something being
broken in debian unstable, and right now, running current git,
printing is working again for me.
> which actually looks like something is broken (it says timeout in 5
> microseconds, even though the timeout structure is shown as being one
> second).
>
> Now, it's entirely possible that the _broken_ thing is actually strrace
> itself (that return value from "time()" looks a bit strange too), and that
> it's some tracing problem with rinning 32-bit programs on a 64-bit kernel.
I just tried stracing the X server (I don't have a cupsd running) and
the selects look reasonable, e.g.:
select(256, [1 3 4 5 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25
26 27 28 29 30 32 33], NULL, NULL, {0, 484000}) = 1 (in [33], left {0,
460000}) <0.026111>
Is your cupsd a 32-bit or a 64-bit binary?
Paul.
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git 'merge' branch
2006-09-14 22:55 ` Paul Mackerras
@ 2006-09-14 23:36 ` Linus Torvalds
2006-09-15 19:59 ` Linus Torvalds
0 siblings, 1 reply; 146+ messages in thread
From: Linus Torvalds @ 2006-09-14 23:36 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
On Fri, 15 Sep 2006, Paul Mackerras wrote:
>
> Curious. It doesn't look familiar. I have had problems printing from
> my G5 in the past few weeks, but I attributed it to something being
> broken in debian unstable, and right now, running current git,
> printing is working again for me.
Ok, maybe the debian brokenness exists in FC5 too, and a "yum upgrade"
broke it for me rather than any kernel work. I guess I'll just have to try
different kernels and see if the kernel matters at all. The strace output
just made me assume that maybe the kernel _does_ do something wrong.
> I just tried stracing the X server (I don't have a cupsd running) and
> the selects look reasonable, e.g.:
>
> select(256, [1 3 4 5 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25
> 26 27 28 29 30 32 33], NULL, NULL, {0, 484000}) = 1 (in [33], left {0,
> 460000}) <0.026111>
>
> Is your cupsd a 32-bit or a 64-bit binary?
My cupsd is 32-bit (but so is my X server, so I'd assuge strace has the
same breakage). Strace looks ok when I trace "firefox", though (which is
using "poll()", not select). So..
Linus
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git 'merge' branch
2006-09-14 23:36 ` Linus Torvalds
@ 2006-09-15 19:59 ` Linus Torvalds
0 siblings, 0 replies; 146+ messages in thread
From: Linus Torvalds @ 2006-09-15 19:59 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
On Thu, 14 Sep 2006, Linus Torvalds wrote:
>
> Ok, maybe the debian brokenness exists in FC5 too, and a "yum upgrade"
> broke it for me rather than any kernel work.
That does seem to be the case. The printer is back up, apparently after a
"cups-lpr" update. Sorry about the noise, although the strace thing still
bothers me. Not enough to pursue it any more, though ;)
Linus
^ permalink raw reply [flat|nested] 146+ messages in thread
* Please pull powerpc.git 'merge' branch
@ 2006-08-31 4:34 Paul Mackerras
2006-08-31 4:49 ` Linus Torvalds
2006-09-03 19:16 ` Linus Torvalds
0 siblings, 2 replies; 146+ messages in thread
From: Paul Mackerras @ 2006-08-31 4:34 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get some more PowerPC updates for 2.6.18.
I have included the full commit messages this time. There are
(unfortunately) quite a few commits, because:
* People have been finding bugs. :P This includes the fix for Olaf's
problem where time wasn't advancing, plus one found recently where
memcpy not returning the correct value was causing an oops in the
ipsec code.
* Some of the embedded board maintainers have only just caught up with
Ben H's irq rework that went in near the end of the merge window.
Since their platforms don't compile without the fixes, and changes
in their code aren't going to affect a lot of users, I put them in.
* I have included some "device tree source" files, which are
essentially documentation as far as the kernel is concerned. They
don't directly affect any kernel code, but can be useful as a
reference when reading the code. (They would normally be compiled
to a binary form and supplied by board firmware to the kernel at boot.)
Thanks,
Paul.
Documentation/powerpc/booting-without-of.txt | 6
arch/powerpc/Kconfig | 20 -
arch/powerpc/boot/dts/mpc7448hpc2.dts | 190 ++++++
arch/powerpc/boot/dts/mpc8349emds.dts | 328 +++++++++++
arch/powerpc/configs/mpc834x_mds_defconfig | 0
arch/powerpc/kernel/fpu.S | 5
arch/powerpc/kernel/irq.c | 84 ++-
arch/powerpc/kernel/pci_64.c | 11
arch/powerpc/kernel/ppc_ksyms.c | 4
arch/powerpc/kernel/prom_init.c | 10
arch/powerpc/kernel/prom_parse.c | 17 -
arch/powerpc/kernel/smp-tbsync.c | 5
arch/powerpc/kernel/time.c | 25 -
arch/powerpc/lib/memcpy_64.S | 11
arch/powerpc/mm/44x_mmu.c | 4
arch/powerpc/platforms/83xx/mpc834x_itx.c | 49 --
arch/powerpc/platforms/83xx/mpc834x_sys.c | 56 --
arch/powerpc/platforms/83xx/mpc83xx.h | 1
arch/powerpc/platforms/83xx/pci.c | 9
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 26 -
arch/powerpc/platforms/86xx/pci.c | 3
arch/powerpc/platforms/embedded6xx/Kconfig | 1
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 2
arch/powerpc/sysdev/Makefile | 4
arch/powerpc/sysdev/ipic.c | 303 +++++++---
arch/powerpc/sysdev/ipic.h | 23 +
arch/powerpc/sysdev/mpic.c | 223 +++++--
arch/ppc/kernel/smp-tbsync.c | 7
arch/ppc/syslib/Makefile | 2
arch/ppc/syslib/ipic.c | 646 +++++++++++++++++++++
arch/ppc/syslib/ipic.h | 47 ++
include/asm-powerpc/io.h | 7
include/asm-powerpc/ipic.h | 12
include/asm-powerpc/mpc86xx.h | 3
include/asm-powerpc/mpic.h | 125 ++++
include/asm-powerpc/prom.h | 4
include/asm-powerpc/time.h | 4
37 files changed, 1934 insertions(+), 343 deletions(-)
create mode 100644 arch/powerpc/boot/dts/mpc7448hpc2.dts
create mode 100644 arch/powerpc/boot/dts/mpc8349emds.dts
rename arch/powerpc/configs/{mpc834x_sys_defconfig => mpc834x_mds_defconfig} (100%)
create mode 100644 arch/ppc/syslib/ipic.c
create mode 100644 arch/ppc/syslib/ipic.h
commit d0027bf09f09d95a23b8f476ba8cea28f2576781
Author: Paul Mackerras <paulus@samba.org>
Date: Thu Aug 31 13:22:58 2006 +1000
[POWERPC] Fix return value from memcpy
As pointed out by Herbert Xu <herbert@gondor.apana.org.au>, our
memcpy implementation didn't return the destination pointer as its
return value, and there is code in the kernel that expects that.
This fixes it.
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit e7498656b5e2e9e3806d263fecc90b2707d02093
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed Aug 30 17:11:34 2006 +1000
[POWERPC] iseries: Define insw et al. so libata/ide will compile
These are build fixes that enable (for example) libata and the ide
code to actually build on iSeries. The associated hardware will never
be supported on legacy iSeries, so the code paths don't actually need
to work, but it is useful (especially for a combined kernel) if the
code can build.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 467c37801c453849a2fe243c3226476ee3985868
Author: Paul Mackerras <paulus@samba.org>
Date: Wed Aug 30 16:10:47 2006 +1000
[POWERPC] Fix irq enable/disable in smp_generic_take_timebase
Eran Ben-Avi <eranpublic@yahoo.com> pointed out that the arch/ppc version
of smp_generic_take_timebase disables interrupts on entry but exits without
restoring them. However, both it and the arch/powerpc version have another
problem, which is that they use local_irq_disable/enable rather than
local_irq_save/restore, and they are called with interrupts disabled.
This fixes both problems; it changes a return to a break in the arch/ppc
version, and changes both versions to use local_irq_save/restore.
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit e0d872d536bb93335d5905b09fe374a163486d43
Author: Paul Mackerras <paulus@samba.org>
Date: Wed Aug 30 15:55:32 2006 +1000
[POWERPC] Fix problem with time not advancing on 32-bit platforms
This fixes a problem introduced in 5db9fa9593e2ff69f2b95f9d59229dc4faaa564d.
The last_jiffy per-cpu variable is only 32 bits on 32-bit machines, but it
was being compared with a 64-bit quantity (tb_next_jiffy), which resulted in
time not advancing.
This fixes it by changing last_jiffy to be 64 bits on all platforms. With
this, we no longer need tb_last_stamp as a 32-bit version of tb_last_jiffy,
so this gets rid of tb_last_stamp and we just use tb_last_jiffy instead.
This also fixes a bug when the boot cpu is not online, because using
tb_last_stamp could have caused the wrong timebase origin value to be used
when calculating the time of day.
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit fea23bfefb4e98efd3c36f00ccc0b60281dc99da
Author: Paul Mackerras <paulus@samba.org>
Date: Wed Aug 30 14:45:35 2006 +1000
[POWERPC] Restore copyright notice in arch/powerpc/kernel/fpu.S
This code got moved from head.S but the copyright notice on head.S didn't
get transferred with it. Noticed by Cort Dougan <cort@fsmlabs.com>.
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 11e9ed43ca8a741c2858c33d12120cf8817d3bff
Author: Will Schmidt <will_schmidt@vnet.ibm.com>
Date: Fri Aug 25 15:46:59 2006 -0500
[POWERPC] Fix up ibm_architecture_vec definition
This problem was noticed by one of the Phyp firmware folks.
Our ibm,client-architecture-support call was failing.
This corrects the vector length parameters being passed in.
Signed-off-by: Will Schmidt <will_schmidt@vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 006b64de607f895de2ba1e21d3179cddf059128f
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri Aug 25 14:46:23 2006 +1000
[POWERPC] Make OF irq map code detect more error cases
Device-tree bugs on js20 with some versions of SLOF were causing the
interrupt for IDE to not be parsed correctly and fail to boot. This
patch adds a bit more sanity checking to the parser to detect some of
those errors and fail instead of returning bogus information. The
powerpc PCI code can then trigger a fallback that works on those
machines.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 7233593b7844c2db930594ee9c0c872a6900bfcc
Author: Zang Roy-r61911 <tie-fei.zang@freescale.com>
Date: Fri Aug 25 14:16:30 2006 +1000
[POWERPC] Support for "weird" MPICs and fixup mpc7448_hpc2
This adds a new hardware information table for mpic. This enables
the mpic code to deal with mpic controllers with different register
layouts and hardware behaviours.
This introduces CONFIG_MPIC_WEIRD. For boards with non standard mpic
controllers, select CONFIG_MPIC_WEIRD and add its hardware information
in the mpic_infos[] array.
TSI108/109 PIC takes the first index of weird hardware information
table. :) The table can be extended. The Tsi108/109 PIC looks like
standard OpenPIC but, in fact, is different in register mapping and
behavior.
The patch does not affect the behavior of standard mpic. If
CONFIG_MPIC_WEIRD is not defined, the code is essentially identical to
the current code.
[benh@kernel.crashing.org:
This patch is a slightly cleaned up version of Zang Roy's support for
the TSI108 MPIC variant. It also fixes up MPC7448_hpc2 to use the new
version of the type macros and changes the way MPIC is selected in
Kconfig to better match what is done for other system devices.
]
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 3efbdd136e52ee4028b5bb5b848a6043cf61cd6e
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed Aug 30 08:58:00 2006 +1000
[POWERPC] Fix MPIC sense codes in documentation
The booting-without-of.txt had incorrect definition for the sense codes
for an OpenPIC controller
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 8ec8f2e85c6b88b4a1641eb3902275bcf2c6d60a
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon Aug 28 11:17:37 2006 +1000
[POWERPC] Fix performance regression in IRQ radix tree locking
When reworking the powerpc irq code, I figured out that we were using
the radix tree in a racy way. As a temporary fix, I put a spinlock in
there. However, this can have a significant impact on performances. This
patch reworks that to use a smarter technique based on the fact that
what we need is in fact a rwlock with extremely rare writers (thus
optimized for the read path).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 4b3afca9345f5beb9c607faeb2aef4f91dd91a13
Author: Zang Roy-r61911 <tie-fei.zang@freescale.com>
Date: Fri Aug 25 16:43:25 2006 +0800
[POWERPC] Add mpc7448hpc2 device tree source file
This patch adds the mpc7448hpc2 device tree source file.
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 1b9a93eb4638dcde0c3af42fd6c05e3911baa7db
Author: Kim Phillips <kim.phillips@freescale.com>
Date: Tue Aug 29 18:13:31 2006 -0500
[POWERPC] Add MPC8349E MDS device tree source file to arch/powerpc/boot/dts
Add MPC8349E MDS device tree source file to arch/powerpc/boot/dts
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit f1f17716d13bfb709809a3f5c84bda105b646b9e
Author: Kim Phillips <kim.phillips@freescale.com>
Date: Fri Aug 25 11:59:22 2006 -0500
[POWERPC] modify mpc83xx platforms to use new IRQ layer
This fixes MPC834x MDS (formerly SYS) and ITX platform code to get IRQ data (including PCI) from the device tree, and to use the new IPIC code.
renamed defconfig (sys -> mds), left one redundant NULL assignment in mpc83xx_pcibios_fixup to keep the compiler happy.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit b9f0f1bb2bcaae96dd3267f6bd3ad1ca44a1f5ad
Author: Kim Phillips <kim.phillips@freescale.com>
Date: Fri Aug 25 11:59:07 2006 -0500
[POWERPC] Adapt ipic driver to new host_ops interface, add set_irq_type to set IRQ sense
This converts ipic code to Benh's IRQ mods. For the IPIC, IRQ sense values in the device tree equal those in include/linux/irq.h; that's 8 for low assertion (most internal IRQs on mpc83xx), and 2 for high-to-low change.
spinlocks added to [un]mask, ack operations; default handler and type now set in host_map; and redundant condition check eliminated.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit bf4152dd7ccb6c060d786200a893dfe30193a07f
Author: Kim Phillips <kim.phillips@freescale.com>
Date: Fri Aug 25 11:58:53 2006 -0500
[POWERPC] back up old school ipic.[hc] to arch/ppc
Keep from breaking 83xx arch/ppc build. Back up old school arch/powerpc/sysdev/ipic.[hc] to arch/ppc/syslib.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit c85c41ad73c6db4cf4cc98c595cc5e2fdbdb53d5
Author: Jon Loeliger <jdl@freescale.com>
Date: Thu Aug 17 14:27:57 2006 -0500
[POWERPC] Use mpc8641hpcn PIC base address from dev tree.
After going through the trouble of setting up the PIC base
address in the pic@40000 device tree node, use it instead
of the obsolete hard-coded value.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 5dc599c206ad50e1b190edfbc98b7cf8ce361003
Author: Jon Loeliger <jdl@freescale.com>
Date: Tue Aug 15 16:19:02 2006 -0500
[POWERPC] Allow MPC8641 HPCN to build with CONFIG_PCI disabled too.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 054389f114fc55d525926b55e82b473b783a7d77
Author: Matt Porter <mporter@embeddedalley.com>
Date: Fri Aug 4 11:44:01 2006 -0500
[POWERPC] Fix powerpc 44x_mmu build
The PIN_SIZE definition name changed, update 44x_mmu.c accordingly.
Signed-off-by: Matt Porter <mporter@embeddedalley.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit af07ac276af6eec5111a6567cb7eaf4d222bd332
Author: Matt Porter <mporter@embeddedalley.com>
Date: Fri Aug 4 11:41:51 2006 -0500
[POWERPC] Remove flush_dcache_all export
Removes the flush_dcache_all export for non coherent platforms.
We removed the last in-kernel user of this years ago in arch/ppc
so it no longer serves a purpose. Plus, it breaks the build
at the moment.
Signed-off-by: Matt Porter <mporter@embeddedalley.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git 'merge' branch
2006-08-31 4:34 Paul Mackerras
@ 2006-08-31 4:49 ` Linus Torvalds
2006-09-03 19:16 ` Linus Torvalds
1 sibling, 0 replies; 146+ messages in thread
From: Linus Torvalds @ 2006-08-31 4:49 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
On Thu, 31 Aug 2006, Paul Mackerras wrote:
>
> [POWERPC] Fix problem with time not advancing on 32-bit platforms
I had just previously applied this to my tree, but apparently you used the
exact same patch, so it all merged fine.
Pulled and pushed out,
Linus
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git 'merge' branch
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 21:15 ` Benjamin Herrenschmidt
1 sibling, 2 replies; 146+ messages in thread
From: Linus Torvalds @ 2006-09-03 19:16 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
Hmm.
I wrote a sparse extension that warns if an initializer tries to
initialize the same entry multiple times.
Look what it found:
- arch/powerpc/platforms/powermac/pfunc_base.c:259
static struct pmf_handlers macio_mmio_handlers = {
.write_reg32 = macio_do_write_reg32,
.read_reg32 = macio_do_read_reg32,
.write_reg8 = macio_do_write_reg8,
.read_reg32 = macio_do_read_reg8,
.read_reg32_msrx = macio_do_read_reg32_msrx,
.read_reg8_msrx = macio_do_read_reg8_msrx,
.write_reg32_slm = macio_do_write_reg32_slm,
.write_reg8_slm = macio_do_write_reg8_slm,
.delay = macio_do_delay,
};
Can anybody see anything suspicious there?
Linus
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git 'merge' branch
2006-09-03 19:16 ` Linus Torvalds
@ 2006-09-03 19:23 ` Sergei Shtylyov
2006-09-03 19:29 ` Linus Torvalds
2006-09-03 21:15 ` Benjamin Herrenschmidt
1 sibling, 1 reply; 146+ messages in thread
From: Sergei Shtylyov @ 2006-09-03 19:23 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linuxppc-dev, Paul Mackerras
Hello.
Linus Torvalds wrote:
> I wrote a sparse extension that warns if an initializer tries to
> initialize the same entry multiple times.
Ugh, I expected the C compiler to catch this... :-/
> Look what it found:
> - arch/powerpc/platforms/powermac/pfunc_base.c:259
>
> static struct pmf_handlers macio_mmio_handlers = {
> .write_reg32 = macio_do_write_reg32,
> .read_reg32 = macio_do_read_reg32,
> .write_reg8 = macio_do_write_reg8,
> .read_reg32 = macio_do_read_reg8,
Cut and paste error, should be .read_reg8...
> .read_reg32_msrx = macio_do_read_reg32_msrx,
> .read_reg8_msrx = macio_do_read_reg8_msrx,
> .write_reg32_slm = macio_do_write_reg32_slm,
> .write_reg8_slm = macio_do_write_reg8_slm,
> .delay = macio_do_delay,
> };
> Can anybody see anything suspicious there?
I'm sorry for spoiling the fun for everybody else. ;-)
WBR, Sergei
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git 'merge' branch
2006-09-03 19:23 ` Sergei Shtylyov
@ 2006-09-03 19:29 ` Linus Torvalds
2006-09-03 20:41 ` Segher Boessenkool
0 siblings, 1 reply; 146+ messages in thread
From: Linus Torvalds @ 2006-09-03 19:29 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: linuxppc-dev, Paul Mackerras
On Sun, 3 Sep 2006, Sergei Shtylyov wrote:
>
> Linus Torvalds wrote:
>
> > I wrote a sparse extension that warns if an initializer tries to initialize
> > the same entry multiple times.
>
> Ugh, I expected the C compiler to catch this... :-/
Yeah, me too. The reason I wrote the sparse logic to catch it was that I
got another patch where I noticed what was going on, and the author said
he had compile-tested it without any warnings. So gcc obviously does _not_
warn about the obvious error.
> Cut and paste error, should be .read_reg8...
Yeah, the fix is obvious, but somebody who has more knowledge about this
particular piece of code and how it would affect things should test that
the bug wasn't hiding somethign else on a piece of hardware that is
relevant to that initializer (which I don't know what it would be).
Linus
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git 'merge' branch
2006-09-03 19:16 ` Linus Torvalds
2006-09-03 19:23 ` Sergei Shtylyov
@ 2006-09-03 21:15 ` Benjamin Herrenschmidt
2006-09-03 21:33 ` Linus Torvalds
1 sibling, 1 reply; 146+ messages in thread
From: Benjamin Herrenschmidt @ 2006-09-03 21:15 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linuxppc-dev, Paul Mackerras
On Sun, 2006-09-03 at 12:16 -0700, Linus Torvalds wrote:
> Hmm.
>
> I wrote a sparse extension that warns if an initializer tries to
> initialize the same entry multiple times.
>
> Look what it found:
>
> - arch/powerpc/platforms/powermac/pfunc_base.c:259
>
> static struct pmf_handlers macio_mmio_handlers = {
> .write_reg32 = macio_do_write_reg32,
> .read_reg32 = macio_do_read_reg32,
> .write_reg8 = macio_do_write_reg8,
> .read_reg32 = macio_do_read_reg8,
Yeah, a typo :) Go sparse !
I'll send a fix later today. I don't think the read32 is used that much
in practice, but yeah, that could have cause subtle issues on some
machine....
Ben.
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git 'merge' branch
2006-09-03 21:15 ` Benjamin Herrenschmidt
@ 2006-09-03 21:33 ` Linus Torvalds
2006-09-03 21:54 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 146+ messages in thread
From: Linus Torvalds @ 2006-09-03 21:33 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev, Paul Mackerras
On Mon, 4 Sep 2006, Benjamin Herrenschmidt wrote:
>
> I'll send a fix later today. I don't think the read32 is used that much
> in practice, but yeah, that could have cause subtle issues on some
> machine....
Well, it's not only read32 that is broken. read8 will obviously be NULL,
which may or may not mean that it is ever actually used.
Not knowing how this actually all ties together with users means that I
didn't just want to check in the obvious fix..
Linus
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git 'merge' branch
2006-09-03 21:33 ` Linus Torvalds
@ 2006-09-03 21:54 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 146+ messages in thread
From: Benjamin Herrenschmidt @ 2006-09-03 21:54 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linuxppc-dev, Paul Mackerras
On Sun, 2006-09-03 at 14:33 -0700, Linus Torvalds wrote:
>
> On Mon, 4 Sep 2006, Benjamin Herrenschmidt wrote:
> >
> > I'll send a fix later today. I don't think the read32 is used that much
> > in practice, but yeah, that could have cause subtle issues on some
> > machine....
>
> Well, it's not only read32 that is broken. read8 will obviously be NULL,
> which may or may not mean that it is ever actually used.
>
> Not knowing how this actually all ties together with users means that I
> didn't just want to check in the obvious fix..
Those things are used to "interpret" kind of blobs provided by the
firmware that muck around various magic IOs and control bits in Apple
ASIC. The "read" variants are rarely used (except for GPIOs but it's a
different set of primitives), except in a few cases where those blobs
are doing read, then and/or a bit, then write back. Is difficult to tell
precisely on what machine and in what circumstances though the firmware
will have used those and thus in which case we have a subtle breakage or
on the contrary subtely hiding a problem... I would fix them for 2.6.18
anyway.
Ben.
^ permalink raw reply [flat|nested] 146+ messages in thread
* Please pull powerpc.git 'merge' branch
@ 2006-08-24 0:44 Paul Mackerras
[not found] ` <20060824010508.GA17848@suse.de>
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2006-08-24 0:44 UTC (permalink / raw)
To: gregkh, linuxppc-dev
Greg,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get another set of PowerPC updates for 2.6.18.
Thanks,
Paul.
arch/powerpc/boot/dts/mpc8540ads.dts | 257 +++++++++++++++++
arch/powerpc/boot/dts/mpc8541cds.dts | 244 ++++++++++++++++
arch/powerpc/boot/dts/mpc8548cds.dts | 287 +++++++++++++++++++
arch/powerpc/boot/dts/mpc8555cds.dts | 244 ++++++++++++++++
arch/powerpc/kernel/legacy_serial.c | 8 -
arch/powerpc/kernel/prom_parse.c | 13 -
arch/powerpc/kernel/time.c | 25 +-
arch/powerpc/kernel/traps.c | 8 -
arch/powerpc/mm/hugetlbpage.c | 2
arch/powerpc/platforms/85xx/Kconfig | 1
arch/powerpc/platforms/85xx/mpc85xx_ads.c | 162 ++++-------
arch/powerpc/platforms/85xx/mpc85xx_cds.c | 210 ++++++--------
arch/powerpc/platforms/86xx/mpc8641_hpcn.h | 32 --
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 324 +++++++++++----------
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 73 ++---
arch/powerpc/platforms/powermac/bootx_init.c | 15 +
arch/powerpc/sysdev/fsl_soc.c | 30 +-
arch/powerpc/sysdev/tsi108_dev.c | 10 -
arch/powerpc/sysdev/tsi108_pci.c | 21 +
include/asm-powerpc/pgalloc.h | 2
include/asm-powerpc/system.h | 9 +
include/asm-powerpc/tsi108.h | 14 +
include/asm-powerpc/tsi108_irq.h | 124 ++++++++
23 files changed, 1593 insertions(+), 522 deletions(-)
create mode 100644 arch/powerpc/boot/dts/mpc8540ads.dts
create mode 100644 arch/powerpc/boot/dts/mpc8541cds.dts
create mode 100644 arch/powerpc/boot/dts/mpc8548cds.dts
create mode 100644 arch/powerpc/boot/dts/mpc8555cds.dts
create mode 100644 include/asm-powerpc/tsi108_irq.h
Adam Litke:
[POWERPC] hugepage BUG fix
Andy Fleming:
[POWERPC] Fix interrupts on 8540 ADS board
[POWERPC] Fix CDS IRQ handling and PCI code
[POWERPC] Add 85xx DTS files to powerpc
[POWERPC] Fix FEC node in 8540 ADS dts
Benjamin Herrenschmidt:
[POWERPC] Fix BootX booting with an initrd
Jon Loeliger:
[POWERPC] Rewrite the PPC 86xx IRQ handling to use Flat Device Tree
Li Yang:
[POWERPC] Fix compile problem without CONFIG_PCI
Nathan Lynch:
[POWERPC] Fix gettimeofday inaccuracies
Paul Mackerras:
[POWERPC] Correct masks used in emulating some instructions
Zang Roy-r61911:
[POWERPC] Update mpc7448hpc2 board irq support using device tree
[POWERPC] Pass UPIO_TSI flag to 8259 serial driver
^ permalink raw reply [flat|nested] 146+ messages in thread* Please pull powerpc.git 'merge' branch
@ 2006-08-18 2:10 Paul Mackerras
2006-08-18 14:15 ` Matt Porter
2006-08-18 16:20 ` Greg KH
0 siblings, 2 replies; 146+ messages in thread
From: Paul Mackerras @ 2006-08-18 2:10 UTC (permalink / raw)
To: gregkh, linuxppc-dev
Greg,
Please do:
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
to get the following PowerPC updates for 2.6.18.
Thanks,
Paul.
Documentation/powerpc/booting-without-of.txt | 10 -
arch/powerpc/Kconfig | 7 -
arch/powerpc/boot/dts/mpc8641_hpcn.dts | 339 ++++++++++++++++++++++++++
arch/powerpc/configs/g5_defconfig | 122 ++++++++-
arch/powerpc/configs/iseries_defconfig | 78 +++++-
arch/powerpc/configs/pseries_defconfig | 78 +++++-
arch/powerpc/kernel/Makefile | 4
arch/powerpc/kernel/cpu_setup_power4.S | 2
arch/powerpc/kernel/crash.c | 11 +
arch/powerpc/kernel/irq.c | 2
arch/powerpc/kernel/kprobes.c | 2
arch/powerpc/kernel/machine_kexec.c | 56 ++++
arch/powerpc/kernel/machine_kexec_64.c | 57 ----
arch/powerpc/kernel/rtas.c | 21 ++
arch/powerpc/kernel/traps.c | 16 +
arch/powerpc/platforms/pseries/setup.c | 2
arch/powerpc/platforms/pseries/xics.c | 6
arch/powerpc/sysdev/fsl_soc.c | 12 +
include/asm-powerpc/kexec.h | 3
include/asm-powerpc/rtas.h | 1
20 files changed, 695 insertions(+), 134 deletions(-)
create mode 100644 arch/powerpc/boot/dts/mpc8641_hpcn.dts
Ananth N Mavinakayanahalli:
[POWERPC] kprobes: Fix possible system crash during out-of-line single-stepping
Benjamin Herrenschmidt:
[POWERPC] Fix irq radix tree remapping typo
David Wilder:
[POWERPC] Make secondary CPUs call into kdump on reset exception
Haren Myneni:
[POWERPC] Fix might-sleep warning on removing cpus
Jon Loeliger:
[POWERPC] Convert to mac-address for ethernet MAC address data.
[POWERPC] Add MPC8641 HPCN Device Tree Source file.
[POWERPC] Offer PCI as a CONFIG choice for PPC_86xx.
[POWERPC] Fix the mpc8641_hpcn.dts file.
Michael Ellerman:
[POWERPC] Move some kexec logic into machine_kexec.c
[POWERPC] Make crash.c work on 32-bit and 64-bit
Olof Johansson:
[POWERPC] powerpc: Clear HID0 attention enable on PPC970 at boot time
Sonny Rao:
[POWERPC] fix PMU initialization on pseries lpar
Will Schmidt:
[POWERPC] update {g5,iseries,pseries}_defconfigs
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: Please pull powerpc.git 'merge' branch
2006-08-18 2:10 Paul Mackerras
@ 2006-08-18 14:15 ` Matt Porter
2006-08-18 16:20 ` Greg KH
1 sibling, 0 replies; 146+ messages in thread
From: Matt Porter @ 2006-08-18 14:15 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
On Fri, Aug 18, 2006 at 12:10:00PM +1000, Paul Mackerras wrote:
Paul,
Could you please add the following 4xx patches that were previously
posted? Thanks.
[PATCH] Remove flush_dcache_all export
[PATCH] Fix powerpc 44x_mmu build
-Matt
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: Please pull powerpc.git 'merge' branch
2006-08-18 2:10 Paul Mackerras
2006-08-18 14:15 ` Matt Porter
@ 2006-08-18 16:20 ` Greg KH
1 sibling, 0 replies; 146+ messages in thread
From: Greg KH @ 2006-08-18 16:20 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
On Fri, Aug 18, 2006 at 12:10:00PM +1000, Paul Mackerras wrote:
> Greg,
>
> Please do:
>
> git pull \
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
>
> to get the following PowerPC updates for 2.6.18.
Pulled from, and pushed out.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: please pull powerpc.git 'merge' branch
@ 2006-07-31 5:37 Paul Mackerras
2006-07-31 20:41 ` Linus Torvalds
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2006-07-31 5:37 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from the "merge" branch of
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
to get the commits listed below.
There is also a set of 5 patches for sound/aoa that need to go in
2.6.18. I'm trying to coordinate with Takashi Iwai about whether he
or I will send you those.
Paul.
arch/powerpc/Kconfig | 2
arch/powerpc/configs/pmac32_defconfig | 112 ++++++++-
arch/powerpc/kernel/head_64.S | 35 +++
arch/powerpc/kernel/legacy_serial.c | 13 +
arch/powerpc/kernel/misc_64.S | 2
arch/powerpc/kernel/prom_init.c | 36 +++
arch/powerpc/kernel/smp.c | 24 +-
arch/powerpc/kernel/udbg_16550.c | 6 -
arch/powerpc/mm/lmb.c | 3
arch/powerpc/platforms/chrp/setup.c | 12 +
arch/powerpc/platforms/maple/setup.c | 17 +
arch/powerpc/platforms/powermac/bootx_init.c | 35 ++-
arch/powerpc/platforms/powermac/cpufreq_64.c | 78 ++++---
arch/powerpc/platforms/pseries/setup.c | 6 -
drivers/ide/Kconfig | 14 -
drivers/macintosh/Kconfig | 11 +
drivers/macintosh/therm_pm72.c | 218 +++++++++++++++++-
drivers/macintosh/therm_pm72.h | 33 +++
drivers/macintosh/via-pmu-led.c | 2
drivers/video/offb.c | 307 ++++++++++++++------------
20 files changed, 703 insertions(+), 263 deletions(-)
Benjamin Herrenschmidt:
[POWERPC] Workaround Pegasos incorrect ISA "ranges"
[POWERPC] Fix 32 bits warning in prom_init.c
[POWERPC] Fix non-MPIC CHRPs with CONFIG_SMP set
[POWERPC] Fix default clock for udbg_16550
[POWERPC] Fix legacy_serial.c error handling on 32 bits
[POWERPC] More offb/bootx fixes
[POWERPC] Xserve G5 thermal control fixes
[POWERPC] Add cpufreq support for Xserve G5
Danny van Dyk:
[POWERPC] PMAC_APM_EMU should depend on ADB_PMU
Geoff Levand:
[POWERPC] Minor comment fix for misc_64.S
Jake Moilanen:
[POWERPC] Use H_CEDE on non-SMT
Johannes Berg:
[POWERPC] fix up front-LED Kconfig
Michael Ellerman:
[POWERPC] Fix mem= handling when the memory limit is > RMO size
Olaf Hering:
[POWERPC] force 64bit mode in fwnmi handlers to workaround firmware bugs
Segher Boessenkool:
[POWERPC] Fix new interrupt code (MPIC endianness)
[POWERPC] Fix new interrupt code (MPIC detection)
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: please pull powerpc.git 'merge' branch
2006-07-31 5:37 please " Paul Mackerras
@ 2006-07-31 20:41 ` Linus Torvalds
0 siblings, 0 replies; 146+ messages in thread
From: Linus Torvalds @ 2006-07-31 20:41 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
On Mon, 31 Jul 2006, Paul Mackerras wrote:
>
> Please do a pull from the "merge" branch of
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
Please change your "please pull" script so that the branch-name is
mentioned at the end of the same line as the repo name.
Not only does that make cut-and-paste work, it avoids the easy mistake of
not noticing the branch-name and instead merging the "master" branch by
mistake (which I did at first, and ended up fixing up a merge conflict
until I noticed that it wasn't even what you asked me to pull..).
Ok?
Linus
^ permalink raw reply [flat|nested] 146+ messages in thread
* please pull powerpc.git 'merge' branch
@ 2006-06-21 8:21 Paul Mackerras
2006-06-21 12:45 ` Kumar Gala
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2006-06-21 8:21 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from the "merge" branch of
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
to get the powerpc changes for 2.6.18 that have accumulated since the
2.6.17 merge window closed.
The powerpc changes are in the "master" branch in that tree. When I
did a test pull of your tree there were some conflicts, so I did the
merge and resolved the conflicts in the "merge" branch. I tried to
make the merge commit look like the ones you do (what script do you
use to do that, BTW?).
If you prefer to do the merge yourself, pull from the master branch,
and fix up the conflicts in include/asm-powerpc/spu.h (remove both
#includes in the conflict) and drivers/net/phy/Makefile (include both
lines that conflict).
Also, you'll notice that I have started using a "[POWERPC]" tag in the
commit headlines, similar to what other subsystems do.
Thanks,
Paul.
arch/powerpc/Kconfig | 52 +
arch/powerpc/Kconfig.debug | 13
arch/powerpc/Makefile | 1
arch/powerpc/boot/main.c | 27
arch/powerpc/boot/prom.h | 7
arch/powerpc/configs/cell_defconfig | 34 -
arch/powerpc/configs/mpc85xx_cds_defconfig | 846 +++++++++++++++
arch/powerpc/configs/mpc8641_hpcn_defconfig | 921 ++++++++++++++++
arch/powerpc/configs/pmac32_defconfig | 204 ++--
arch/powerpc/configs/pseries_defconfig | 75 +
arch/powerpc/kernel/align.c | 189 ++-
arch/powerpc/kernel/asm-offsets.c | 5
arch/powerpc/kernel/cpu_setup_6xx.S | 2
arch/powerpc/kernel/cpu_setup_power4.S | 17
arch/powerpc/kernel/cputable.c | 137 +-
arch/powerpc/kernel/crash.c | 13
arch/powerpc/kernel/crash_dump.c | 11
arch/powerpc/kernel/entry_64.S | 2
arch/powerpc/kernel/fpu.S | 6
arch/powerpc/kernel/head_32.S | 14
arch/powerpc/kernel/head_64.S | 29 +
arch/powerpc/kernel/iomap.c | 2
arch/powerpc/kernel/iommu.c | 23
arch/powerpc/kernel/irq.c | 25
arch/powerpc/kernel/lparcfg.c | 4
arch/powerpc/kernel/machine_kexec_64.c | 99 ++
arch/powerpc/kernel/misc_32.S | 2
arch/powerpc/kernel/misc_64.S | 5
arch/powerpc/kernel/nvram_64.c | 2
arch/powerpc/kernel/pci_32.c | 7
arch/powerpc/kernel/pci_64.c | 62 -
arch/powerpc/kernel/pci_direct_iommu.c | 18
arch/powerpc/kernel/pci_dn.c | 6
arch/powerpc/kernel/pci_iommu.c | 41 -
arch/powerpc/kernel/proc_ppc64.c | 2
arch/powerpc/kernel/process.c | 55 +
arch/powerpc/kernel/prom.c | 145 ++-
arch/powerpc/kernel/prom_init.c | 120 --
arch/powerpc/kernel/prom_parse.c | 25
arch/powerpc/kernel/ptrace.c | 2
arch/powerpc/kernel/rtas-rtc.c | 30 -
arch/powerpc/kernel/rtas.c | 108 +-
arch/powerpc/kernel/rtas_flash.c | 25
arch/powerpc/kernel/rtas_pci.c | 4
arch/powerpc/kernel/setup-common.c | 20
arch/powerpc/kernel/setup.h | 3
arch/powerpc/kernel/setup_32.c | 18
arch/powerpc/kernel/setup_64.c | 31 -
arch/powerpc/kernel/signal_32.c | 23
arch/powerpc/kernel/signal_64.c | 16
arch/powerpc/kernel/smp.c | 2
arch/powerpc/kernel/systbl.S | 311 ------
arch/powerpc/kernel/time.c | 67 +
arch/powerpc/kernel/traps.c | 8
arch/powerpc/kernel/udbg.c | 7
arch/powerpc/kernel/vdso.c | 57 +
arch/powerpc/kernel/vector.S | 4
arch/powerpc/kernel/vio.c | 344 +++++-
arch/powerpc/kernel/vmlinux.lds.S | 5
arch/powerpc/lib/Makefile | 5
arch/powerpc/lib/bitops.c | 150 ---
arch/powerpc/mm/hash_low_32.S | 34 -
arch/powerpc/mm/hash_low_64.S | 31 +
arch/powerpc/mm/hash_native_64.c | 2
arch/powerpc/mm/hash_utils_64.c | 84 +
arch/powerpc/mm/lmb.c | 43 +
arch/powerpc/mm/mem.c | 6
arch/powerpc/mm/mmu_context_32.c | 2
arch/powerpc/mm/mmu_context_64.c | 3
arch/powerpc/mm/numa.c | 8
arch/powerpc/mm/ppc_mmu_32.c | 16
arch/powerpc/mm/slb.c | 32 -
arch/powerpc/mm/slb_low.S | 17
arch/powerpc/mm/stab.c | 4
arch/powerpc/mm/tlb_32.c | 6
arch/powerpc/mm/tlb_64.c | 5
arch/powerpc/oprofile/Kconfig | 1
arch/powerpc/oprofile/Makefile | 4
arch/powerpc/oprofile/common.c | 6
arch/powerpc/oprofile/op_model_power4.c | 37 -
arch/powerpc/platforms/85xx/Kconfig | 9
arch/powerpc/platforms/85xx/Makefile | 1
arch/powerpc/platforms/85xx/mpc85xx_cds.c | 359 ++++++
arch/powerpc/platforms/85xx/mpc85xx_cds.h | 43 +
arch/powerpc/platforms/86xx/Kconfig | 36 +
arch/powerpc/platforms/86xx/Makefile | 10
arch/powerpc/platforms/86xx/mpc8641_hpcn.h | 54 +
arch/powerpc/platforms/86xx/mpc86xx.h | 28
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 326 ++++++
arch/powerpc/platforms/86xx/mpc86xx_pcie.c | 173 +++
arch/powerpc/platforms/86xx/mpc86xx_smp.c | 117 ++
arch/powerpc/platforms/86xx/pci.c | 325 ++++++
arch/powerpc/platforms/Makefile | 1
arch/powerpc/platforms/cell/Kconfig | 9
arch/powerpc/platforms/cell/Makefile | 23
arch/powerpc/platforms/cell/cbe_regs.c | 128 ++
arch/powerpc/platforms/cell/cbe_regs.h | 129 ++
arch/powerpc/platforms/cell/interrupt.c | 40 -
arch/powerpc/platforms/cell/iommu.c | 18
arch/powerpc/platforms/cell/pervasive.c | 104 --
arch/powerpc/platforms/cell/pervasive.h | 37 -
arch/powerpc/platforms/cell/ras.c | 112 ++
arch/powerpc/platforms/cell/ras.h | 9
arch/powerpc/platforms/cell/setup.c | 14
arch/powerpc/platforms/cell/spu_base.c | 179 ++-
arch/powerpc/platforms/cell/spu_callbacks.c | 314 ------
arch/powerpc/platforms/cell/spu_priv1.c | 133 --
arch/powerpc/platforms/cell/spu_priv1_mmio.c | 159 +++
arch/powerpc/platforms/cell/spufs/Makefile | 14
arch/powerpc/platforms/cell/spufs/context.c | 12
arch/powerpc/platforms/cell/spufs/file.c | 67 +
arch/powerpc/platforms/cell/spufs/hw_ops.c | 1
arch/powerpc/platforms/cell/spufs/inode.c | 30 -
arch/powerpc/platforms/cell/spufs/sched.c | 3
.../cell/spufs/spu_restore_dump.h_shipped | 1122 ++++++++++++++++++-----
.../platforms/cell/spufs/spu_save_dump.h_shipped | 922 +++++++++++++++----
arch/powerpc/platforms/cell/spufs/switch.c | 48 +
arch/powerpc/platforms/iseries/Makefile | 6
arch/powerpc/platforms/iseries/call_pci.h | 19
arch/powerpc/platforms/iseries/dt.c | 615 +++++++++++
arch/powerpc/platforms/iseries/iommu.c | 46 -
arch/powerpc/platforms/iseries/irq.c | 7
arch/powerpc/platforms/iseries/irq.h | 2
arch/powerpc/platforms/iseries/mf.c | 9
arch/powerpc/platforms/iseries/pci.c | 347 +-----
arch/powerpc/platforms/iseries/setup.c | 271 -----
arch/powerpc/platforms/iseries/setup.h | 2
arch/powerpc/platforms/iseries/vio.c | 131 --
arch/powerpc/platforms/maple/pci.c | 3
arch/powerpc/platforms/maple/setup.c | 2
arch/powerpc/platforms/powermac/cpufreq_32.c | 2
arch/powerpc/platforms/powermac/feature.c | 2
arch/powerpc/platforms/powermac/pci.c | 3
arch/powerpc/platforms/powermac/pfunc_core.c | 14
arch/powerpc/platforms/powermac/setup.c | 2
arch/powerpc/platforms/pseries/Makefile | 5
arch/powerpc/platforms/pseries/eeh_cache.c | 2
arch/powerpc/platforms/pseries/eeh_driver.c | 55 +
arch/powerpc/platforms/pseries/eeh_event.c | 50 -
arch/powerpc/platforms/pseries/iommu.c | 182 +--
arch/powerpc/platforms/pseries/rtasd.c | 6
arch/powerpc/platforms/pseries/scanlog.c | 6
arch/powerpc/platforms/pseries/setup.c | 6
arch/powerpc/platforms/pseries/vio.c | 274 -----
arch/powerpc/platforms/pseries/xics.c | 25
arch/powerpc/sysdev/Makefile | 4
arch/powerpc/sysdev/dart_iommu.c | 2
arch/powerpc/sysdev/mpic.c | 20
arch/ppc/Kconfig | 4
arch/ppc/mm/init.c | 2
arch/ppc/mm/mmu_context.c | 2
arch/ppc/mm/tlb.c | 6
arch/ppc/platforms/4xx/Kconfig | 2
arch/ppc/platforms/4xx/cpci405.c | 139 ++
arch/ppc/platforms/4xx/cpci405.h | 30 -
arch/um/sys-ppc/misc.S | 6
drivers/block/viodasd.c | 2
drivers/cdrom/viocd.c | 2
drivers/char/hvc_console.c | 4
drivers/char/hvc_rtas.c | 37 -
drivers/char/hvsi.c | 2
drivers/char/viotape.c | 2
drivers/i2c/busses/Kconfig | 4
drivers/macintosh/via-pmu.c | 4
drivers/net/Kconfig | 8
drivers/net/ibmveth.c | 2
drivers/net/iseries_veth.c | 27
drivers/net/phy/Kconfig | 5
drivers/net/phy/Makefile | 1
drivers/net/phy/vitesse.c | 112 ++
include/asm-powerpc/bitops.h | 6
include/asm-powerpc/cputable.h | 82 +
include/asm-powerpc/delay.h | 13
include/asm-powerpc/eeh.h | 15
include/asm-powerpc/eeh_event.h | 10
include/asm-powerpc/elf.h | 2
include/asm-powerpc/hvcall.h | 10
include/asm-powerpc/immap_86xx.h | 199 ++++
include/asm-powerpc/io.h | 6
include/asm-powerpc/iommu.h | 6
include/asm-powerpc/irq.h | 86 ++
include/asm-powerpc/iseries/iommu.h | 6
include/asm-powerpc/kdump.h | 29 -
include/asm-powerpc/kexec.h | 16
include/asm-powerpc/machdep.h | 5
include/asm-powerpc/mmu.h | 16
include/asm-powerpc/mmu_context.h | 12
include/asm-powerpc/mpc86xx.h | 47 +
include/asm-powerpc/mpic.h | 10
include/asm-powerpc/paca.h | 4
include/asm-powerpc/page.h | 11
include/asm-powerpc/pci-bridge.h | 14
include/asm-powerpc/pgtable-4k.h | 2
include/asm-powerpc/pgtable-64k.h | 2
include/asm-powerpc/pgtable.h | 10
include/asm-powerpc/processor.h | 16
include/asm-powerpc/prom.h | 9
include/asm-powerpc/ptrace.h | 2
include/asm-powerpc/reg.h | 69 +
include/asm-powerpc/rtas.h | 9
include/asm-powerpc/spu.h | 29 -
include/asm-powerpc/spu_csa.h | 13
include/asm-powerpc/spu_priv1.h | 182 +++
include/asm-powerpc/systbl.h | 306 +++++
include/asm-powerpc/tce.h | 35 -
include/asm-powerpc/topology.h | 9
include/asm-powerpc/udbg.h | 3
include/asm-powerpc/vio.h | 16
include/asm-ppc/mmu.h | 23
include/asm-ppc/mmu_context.h | 27
include/asm-ppc/mpc85xx.h | 3
include/asm-ppc/pgtable.h | 2
include/linux/delay.h | 5
include/linux/prctl.h | 7
kernel/sys.c | 13
215 files changed, 9825 insertions(+), 4033 deletions(-)
create mode 100644 arch/powerpc/configs/mpc85xx_cds_defconfig
create mode 100644 arch/powerpc/configs/mpc8641_hpcn_defconfig
delete mode 100644 arch/powerpc/lib/bitops.c
create mode 100644 arch/powerpc/platforms/85xx/mpc85xx_cds.c
create mode 100644 arch/powerpc/platforms/85xx/mpc85xx_cds.h
create mode 100644 arch/powerpc/platforms/86xx/Kconfig
create mode 100644 arch/powerpc/platforms/86xx/Makefile
create mode 100644 arch/powerpc/platforms/86xx/mpc8641_hpcn.h
create mode 100644 arch/powerpc/platforms/86xx/mpc86xx.h
create mode 100644 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
create mode 100644 arch/powerpc/platforms/86xx/mpc86xx_pcie.c
create mode 100644 arch/powerpc/platforms/86xx/mpc86xx_smp.c
create mode 100644 arch/powerpc/platforms/86xx/pci.c
create mode 100644 arch/powerpc/platforms/cell/cbe_regs.c
create mode 100644 arch/powerpc/platforms/cell/cbe_regs.h
create mode 100644 arch/powerpc/platforms/cell/ras.c
create mode 100644 arch/powerpc/platforms/cell/ras.h
delete mode 100644 arch/powerpc/platforms/cell/spu_priv1.c
create mode 100644 arch/powerpc/platforms/cell/spu_priv1_mmio.c
create mode 100644 arch/powerpc/platforms/iseries/dt.c
delete mode 100644 arch/powerpc/platforms/iseries/vio.c
delete mode 100644 arch/powerpc/platforms/pseries/vio.c
create mode 100644 drivers/net/phy/vitesse.c
create mode 100644 include/asm-powerpc/immap_86xx.h
rename arch/powerpc/platforms/iseries/iommu.h => include/asm-powerpc/iseries/iommu.h (91%)
create mode 100644 include/asm-powerpc/mpc86xx.h
create mode 100644 include/asm-powerpc/spu_priv1.h
create mode 100644 include/asm-powerpc/systbl.h
Amos Waterland:
[POWERPC] Fix builtin command line interaction with firmware
Andreas Schwab:
[POWERPC] Unify ppc syscall tables
Andrew Morton:
powerpc kbuild warning fix
Andy Fleming:
Add 85xx CDS to arch/powerpc
Anton Blanchard:
powerpc: remove io_page_mask
powerpc: add num_pmcs to 970MP cputable entry
Add a prctl to change the endianness of a process.
[POWERPC] 64bit FPSCR support
[POWERPC] Optimise some TOC usage
[POWERPC] Remove stale 64bit on 32bit kernel code
[POWERPC] Update pseries defconfig
[POWERPC] pcibus_to_node fixes
[POWERPC] node local IOMMU tables
[POWERPC] cleanup dma_mapping_ops
[POWERPC] Fix HV bit handling on non partitioned machines
[POWERPC] system call micro optimisation
[POWERPC] update pmac32_defconfig
[POWERPC] Fix mdelay badness on shared processor partitions
[POWERPC] Dont look for class-code in pci children
[POWERPC] support ibm,extended-*-frequency properties
Arnd Bergmann:
[POWERPC] disable floating point exceptions for init
arnd@arndb.de:
[POWERPC] cell: fix interrupt priority handling
[POWERPC] cell: update defconfig
[POWERPC] cell: always build spu base into the kernel
[POWERPC] spufs: restore mapping of mssync register
[POWERPC] spufs: set up correct SLB entries for 64k pages
[POWERPC] spufs: add a phys-id attribute to each SPU context
[POWERPC] spufs: fix initial state of wbox file
[POWERPC] spufs: dont try to access SPE channel 1 count
[POWERPC] spufs: fail spu_create with invalid flags
[POWERPC] spufs: one more fix for 64k pages
Benjamin Herrenschmidt:
powerpc vdso updates
powerpc: Fix buglet with MMU hash management
powerpc: Add udbg-immortal kernel option
[POWERPC] cell: add RAS support
Christoph Hellwig:
powerpc: implement pcibus_to_node and pcibus_to_cpumask
powerpc: node-aware dma allocations
Dave C Boutcher:
[POWERPC] check firmware state before suspending
Geoff Levand:
powerpc: remove do-nothing cpu setup routines
[POWERPC] spufs: split the Cell BE support into generic and platform dependant parts
[POWERPC] spufs: further abstract priv1 register access
[POWERPC] spufs: fix spu irq affinity setting
Haren Myneni:
powerpc: clear IPIs on kdump
Jake Moilanen:
[POWERPC] Add support for PCI-Express nodes in the device tree
[POWERPC] MSI abstraction
Jeremy Kerr:
powerpc: cell: use kzalloc in alloc_spu_context()
powerpc: Add of_parse_dma_window()
powerpc: pseries: Use generic dma-window parsing function
[POWERPC] cell: register SPUs as sysdevs
[POWERPC] spufs: use kzalloc in create_spu
Jimi Xenidis:
powerpc: Auto reserve of device tree blob
jimix@watson.ibm.com:
powerpc: udbg_printf() formatting attribute
Johannes Berg:
[POWERPC] make pmf irq_client functions safe against pmf interrupts coming in
John Rose:
powerpc: reorg RTAS delay code
[POWERPC] RTAS delay, fix module build breaks
Jon Loeliger:
[POWERPC] Guard L3CR references with CPU_FTR_L3CR.
[POWERPC] Prevent duplicate lmb reservations for Device Tree blob.
[POWERPC] Add the mpc8641 hpcn Kconfig and Makefiles.
[POWERPC] Add mpc8641_hpcn_defconfig config file.
[POWERPC] Add 8641 CPU table entry.
[POWERPC] Add starting of secondary 86xx CPUs.
[POWERPC] Add the MPC8641 HPCN platform files.
[POWERPC] Add mpc8641hpcn PCI/PCI-Express platform files.
[POWERPC] Add 8641 Register space and IRQ definitions.
[POWERPC] Document I2C_MPC option for 86xx too.
[POWERPC] Add Vitesse 8244 PHY for MPC8641 HPCN platform.
Jon Mason:
remove powerpc bitops in favor of existing generic bitops
Kelly Daly:
[POWERPC] re-enable OProfile for iSeries, using timer interrupt
Kumar Gala:
powerpc: provide ppc_md.panic() for both ppc32 & ppc64
Linas Vepstas:
powerpc/pseries: clear PCI failure counter if no new failures
powerpc/pseries: Increment fail counter in PCI recovery
[POWERPC] pseries: Print PCI slot location code on failure
Mark A. Greer:
[POWERPC] mpic: add support for serial mode interrupts
Masato Noguchi:
[POWERPC] spufs: remove stop_code from struct spu
[POWERPC] spufs: fix Makefile for "make clean"
[POWERPC] spufs: clear class2 interrupt status before wakeup
Matthias Fuchs:
[POWERPC] ppc32: fix CPCI405 board support
Michael Ellerman:
powerpc: Disable and EOI interrupts in machine_crash_shutdown()
powerpc: Make early debugging options behave with oldconfig
powerpc: Make early xmon logic immune to location of early parsing
powerpc: Parse early parameters earlier
powerpc: Unify mem= handling
powerpc: Kdump header cleanup
powerpc: Move crashkernel= handling into the kernel.
powerpc: Make rtas console _much_ faster
powerpc: Cleanup hvc_rtas.c a little
[POWERPC] spufs: fix deadlock in spu_create error path
Michael Neuling:
powerpc: whitespace cleanup in reg.h
powerpc: oprofile support for POWER6
mostrows@watson.ibm.com:
powerpc: Create /proc/rtas, /proc/ppc64/rtas if RTAS exists.
[POWERPC] Editable kernel command-line in zImage binary.
Nathan Lynch:
[POWERPC] Extra sanity check in EEH code
Olof Johansson:
powerpc: Quiet HVSI boot output
powerpc: Quiet time init output
powerpc: Quiet page order output
powerpc: Quiet VETH version printk
powerpc: Don't print chosen idle loop at every boot
powerpc: Less verbose mem configuration output
powerpc: Lack of ISA interrupts on XICS isn't dangerous
powerpc: Quiet PCI init printouts
powerpc: Quiet rtasd output at boot
powerpc: Quiet oprofile output at boot
powerpc: Remove stale iseries global
powerpc: kill union tce_entry
powerpc iommu: minor cleanup
Paul Mackerras:
powerpc: Implement support for setting little-endian mode via prctl
powerpc: Implement PR_[GS]ET_UNALIGN prctls for powerpc
powerpc: Fix bug in iommu_alloc_coherent causing hang during boot
powerpc: add context.vdso_base for 32-bit too
powerpc: Remove unused paca->pgdir field
powerpc: Fix some missed ppc32 mm->context.id conversions
powerpc: Use 64k pages without needing cache-inhibited large pages
powerpc: Simplify push_end definition in pci_32.c
Renzo Davoli:
powerpc: enable PPC_PTRACE_[GS]ETREGS on ppc32
Stephen Rothwell:
powerpc: add all the iSeries virtual devices to the device tree
powerpc: use the device tree for the iSeries vio bus probe
powerpc: use a common vio_match_device routine
powerpc: merge the rest of the vio code
powerpc: update iseries_veth device-tree information
powerpc: update iSeries viodasd device-tree entries
powerpc: update iSeries vdevice
powerpc: update iSeries viocd and viotape device-tree
powerpc: the iSeries vio lan driver changed device type
powerpc: tidy up iseries/pci.c
powerpc: reintroduce HvCallPci_configLoad32
powerpc: move iSeries PCI devices to the device tree
powerpc: remove iSeries_Global_Device_List
powerpc: remove Irq from pci_dn
powerpc: remove LogicalSlot from pci_dn
powerpc: iSeries PCI devices can now have a devpsec attribute
powerpc: clean up iSeries PCI probe
powerpc: make iSeries flat device tree stuff static
powerpc: give iSeries device tree nodes better names
powerpc: split device tree stuff out of iseries/setup.c
powerpc: make iSeries flattened device tree dynamic
powerpc: make iSeries flattened device tree dynamic - part 2
powerpc: cleanup of iSeries flat device tree
Will Schmidt:
nvram_print_partitions cosmetic fixup
powerpc: fix of_parse_dma_window
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: please pull powerpc.git 'merge' branch
2006-06-21 8:21 Paul Mackerras
@ 2006-06-21 12:45 ` Kumar Gala
2006-06-21 13:04 ` Jon Loeliger
2006-06-21 21:16 ` Paul Mackerras
0 siblings, 2 replies; 146+ messages in thread
From: Kumar Gala @ 2006-06-21 12:45 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, torvalds
> Jon Loeliger:
> [POWERPC] Guard L3CR references with CPU_FTR_L3CR.
> [POWERPC] Prevent duplicate lmb reservations for Device Tree
> blob.
> [POWERPC] Add the mpc8641 hpcn Kconfig and Makefiles.
> [POWERPC] Add mpc8641_hpcn_defconfig config file.
> [POWERPC] Add 8641 CPU table entry.
> [POWERPC] Add starting of secondary 86xx CPUs.
> [POWERPC] Add the MPC8641 HPCN platform files.
> [POWERPC] Add mpc8641hpcn PCI/PCI-Express platform files.
> [POWERPC] Add 8641 Register space and IRQ definitions.
> [POWERPC] Document I2C_MPC option for 86xx too.
> [POWERPC] Add Vitesse 8244 PHY for MPC8641 HPCN platform.
Paul, some of the 8641 patches still need some cleanup, any reason
you included them?
- kumar
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: please pull powerpc.git 'merge' branch
2006-06-21 12:45 ` Kumar Gala
@ 2006-06-21 13:04 ` Jon Loeliger
2006-06-21 13:08 ` Kumar Gala
2006-06-21 21:16 ` Paul Mackerras
1 sibling, 1 reply; 146+ messages in thread
From: Jon Loeliger @ 2006-06-21 13:04 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev, torvalds, Paul Mackerras
So, like, the other day Kumar Gala mumbled:
>
> Paul, some of the 8641 patches still need some cleanup, any reason
> you included them?
>
> - kumar
Kumar,
We'll fix the things that need to be fixed.
It's really all part of post-early-post-often.
Thanks,
jdl
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: please pull powerpc.git 'merge' branch
2006-06-21 13:04 ` Jon Loeliger
@ 2006-06-21 13:08 ` Kumar Gala
2006-06-21 13:27 ` Jon Loeliger
0 siblings, 1 reply; 146+ messages in thread
From: Kumar Gala @ 2006-06-21 13:08 UTC (permalink / raw)
To: Jon Loeliger; +Cc: linuxppc-dev, torvalds, Paul Mackerras
On Jun 21, 2006, at 8:04 AM, Jon Loeliger wrote:
> So, like, the other day Kumar Gala mumbled:
>>
>> Paul, some of the 8641 patches still need some cleanup, any reason
>> you included them?
>>
>> - kumar
>
> Kumar,
>
> We'll fix the things that need to be fixed.
> It's really all part of post-early-post-often.
I know you'll fix the issues. Its just that the usual model is to fix
the issues before pushing upstream.
Also, havent seen any comments on my last sent of responses on the
patches :)
- k
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: please pull powerpc.git 'merge' branch
2006-06-21 13:08 ` Kumar Gala
@ 2006-06-21 13:27 ` Jon Loeliger
0 siblings, 0 replies; 146+ messages in thread
From: Jon Loeliger @ 2006-06-21 13:27 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev, torvalds, Paul Mackerras
So, like, the other day Kumar Gala mumbled:
>
> I know you'll fix the issues. Its just that the usual model is to fix
> the issues before pushing upstream.
>
> Also, havent seen any comments on my last sent of responses on the
> patches :)
Well, where your comments are in conflict with Ben's, we'll let
you two duke it out. :-)
Where things need to be fixed, we'll fix it. (They really
were minor things for the most part.)
In the one case where you suggested removing an #include,
we can't; it is needed.
In the meantime, remember this is a _new_ board port. It's not
going to cause anyone undue stress with some form of breakage
on the new board!
Thanks,
jdl
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: please pull powerpc.git 'merge' branch
2006-06-21 12:45 ` Kumar Gala
2006-06-21 13:04 ` Jon Loeliger
@ 2006-06-21 21:16 ` Paul Mackerras
1 sibling, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2006-06-21 21:16 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev, torvalds
Kumar Gala writes:
> Paul, some of the 8641 patches still need some cleanup, any reason
> you included them?
Because the changes you requested were very minor, and it was
convenient to bundle up Jon's patches with the other ones I was
sending up to Linus.
Paul.
^ permalink raw reply [flat|nested] 146+ messages in thread
* please pull powerpc.git 'merge' branch
@ 2006-05-27 13:17 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2006-05-27 13:17 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from the "merge" branch of
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
There are 3 commits there: an update to MAINTAINERS, a fix for the
"Maple" PPC970FX evaluation boards, and a fix for the Freescale
embedded 8272 processor that is apparently needed for the console to
work on those chips. These fixes won't affect any other platforms and
are safe to go in for 2.6.17 IMO.
Thanks,
Paul.
MAINTAINERS | 4 +--
arch/powerpc/kernel/prom_init.c | 48 +++++++++++++++++++++++++++++--
arch/ppc/platforms/mpc8272ads_setup.c | 10 +++---
arch/ppc/syslib/pq2_devices.c | 16 +++++-----
arch/ppc/syslib/pq2_sys.c | 8 +++--
drivers/serial/cpm_uart/cpm_uart_core.c | 8 +++--
drivers/serial/cpm_uart/cpm_uart_cpm2.c | 2 +
7 files changed, 70 insertions(+), 26 deletions(-)
commit 54f4ee183aea859eb09f141dad3fc3c6f4fe0446
Author: Hollis Blanchard <hollisb@us.ibm.com>
Date: Thu May 25 16:36:53 2006 -0500
[PATCH] powerpc: fix RTC/NVRAM accesses on Maple
Due to a firmware device tree bug, RTC and NVRAM accesses (including
halt/reboot) on Maple have been broken since January, when an untested
build fix went in. This code patches the device tree in Linux.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 8e30a9a299ca30b6c4072c2182238d5f5dd1590d
Author: Vitaly Bordug <vbordug@ru.mvista.com>
Date: Wed May 24 21:40:18 2006 +0400
[PATCH] ppc32 CPM_UART: various fixes for pq2 uart users
This fixes various odd things that missed update together with cpm_uart
platform_device move. Unified resources names, restructurisation, etc.
Also, addressed issue with recent phys/virt translation rework. Being
cache-coherent, CPM2's do alloc_bootmem() for the console stuff, and it was
used to treat console buffer descriptor mapping 1:1 (as in CPM1 case),
which is definitely wrong.
Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 6d923f98fe0f31c174ace92f8b680d0d153663aa
Author: Arthur Othieno <apgo@patchbomb.org>
Date: Fri May 19 06:22:23 2006 -0400
[PATCH] powerpc: linuxppc64.org no more
http://linuxppc64.org has long been a redirect to the canonical
http://penguinppc.org/ppc64/ -- update all instances accordingly,
as ACKed by Hollis:
On Wed, Jan 18, 2006 at 09:48:08AM -0600, Hollis Blanchard wrote:
> On Wed, 2006-01-18 at 13:07 +0100, Olaf Hering wrote:
> > On Wed, Jan 18, Arthur Othieno wrote:
> > >
> > > What about the s/linuxppc64\.org/penguinppc\.org/g case? Or is
> > > penguinppc64.org preferable? Or am I just taking it too far? ;)
> >
> > They are redirected on DNS or HTTP level.
>
> HTTP level, but that doesn't answer his question.
>
> As the maintainer of that site, I would prefer to remove the
> linuxppc64.org reference.
Signed-off-by: Arthur Othieno <apgo@patchbomb.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* please pull powerpc.git 'merge' branch
@ 2006-05-16 12:35 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2006-05-16 12:35 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from the "merge" branch of
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
Two more small bug-fixes for powerpc. I have put the full commit
messages and patches below.
Thanks,
Paul.
commit 3de620e8394406fd01f450b8c6e3e74464e81a78
Author: Anton Blanchard <anton@samba.org>
Date: Wed May 10 13:05:54 2006 +1000
[PATCH] powerpc: fix kernel version display on pseries boxes
We are displaying the wrong thing on the operator panel (2x40
character LCD). This got broken in commit cebb21b5, when UTS_RELEASE
got changed to system_utsname.version.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 5eb55ef..5f79f01 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -255,7 +255,7 @@ static int __init pSeries_init_panel(voi
{
/* Manually leave the kernel version on the panel. */
ppc_md.progress("Linux ppc64\n", 0);
- ppc_md.progress(system_utsname.version, 0);
+ ppc_md.progress(system_utsname.release, 0);
return 0;
}
commit cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon May 15 15:46:03 2006 +1000
[PATCH] Fix pSeries identification in prom_init.c
The OF trampoline code prom_init.c still needs to identify IBM pSeries
(PAPR) machines in order to run some platform specific code on them like
instanciating the TCE tables. The code doing that detection was changed
recently in 2.6.17 early stages but was done slightly incorrectly. It
should be testing for an exact match of "chrp" and it currently tests
for anything that begins with "chrp". That means it will incorrectly
match with platforms using Maple-like device-trees and have open
firmware. This fixes it by using strcmp instead of strncmp to match what
the actual platform detection code does.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 078fb55..2d80653 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -1636,7 +1636,7 @@ #ifdef CONFIG_PPC64
compat, sizeof(compat)-1);
if (len <= 0)
return PLATFORM_GENERIC;
- if (strncmp(compat, RELOC("chrp"), 4))
+ if (strcmp(compat, RELOC("chrp")))
return PLATFORM_GENERIC;
/* Default to pSeries. We need to know if we are running LPAR */
^ permalink raw reply related [flat|nested] 146+ messages in thread* please pull powerpc.git 'merge' branch
@ 2006-05-09 9:13 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2006-05-09 9:13 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from the "merge" branch of
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
There are two commits there, both small bug-fixes for ARCH=ppc.
Thanks,
Paul.
arch/ppc/kernel/head_8xx.S | 4 ----
include/asm-ppc/page.h | 1 +
2 files changed, 1 insertions(+), 4 deletions(-)
commit c51e078f82096a7d35ac8ec2416272e843a0e1c4
Author: Marcelo Tosatti <marcelo@kvack.org>
Date: Fri May 5 17:09:29 2006 -0300
[PATCH] ppc32/8xx: Fix r3 trashing due to 8MB TLB page instantiation
Instantiation of 8MB pages on the TLB cache for the kernel static
mapping trashes r3 register on !CONFIG_8xx_CPU6 configurations.
This ensures r3 gets saved and restored.
Signed-off-by: Marcelo Tosatti <marcelo@kvack.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit e4de00215c3af02116db3d486bf53700dfe10619
Author: Paul Mackerras <paulus@samba.org>
Date: Tue May 9 16:00:59 2006 +1000
powerpc/32: Define an is_kernel_addr() to fix ARCH=ppc compilation
My commit 6bfd93c32a5065d0e858780b3beb0b667081601c broke the ARCH=ppc
compilation by using the is_kernel_addr() macro in asm/uaccess.h.
This fixes it by defining a suitable is_kernel_addr() for ARCH=ppc.
Signed-off-by: Paul Mackerras <paulus@samba.org>
^ permalink raw reply [flat|nested] 146+ messages in thread* please pull powerpc.git 'merge' branch
@ 2006-05-03 22:29 Paul Mackerras
0 siblings, 0 replies; 146+ messages in thread
From: Paul Mackerras @ 2006-05-03 22:29 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from the "merge" branch of
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
Five smallish bugfixes, plus one commit from me that has no effect on
existing machines, but will allow the kernel to run on some machines
that will shortly be released.
Thanks,
Paul.
Ananth N Mavinakayanahalli:
powerpc/kprobes: fix singlestep out-of-line
Linas Vepstas:
powerpc/pseries: avoid crash in PCI code if mem system not up
Paul Mackerras:
powerpc: Fix incorrect might_sleep in __get_user/__put_user on kernel addresses
powerpc: Use the ibm,pa-features property if available
Vitaly Bordug:
ppc32 CPM_UART: Fixed break send on SCC
ppc32 CPM_UART: fixes and improvements
arch/powerpc/kernel/kprobes.c | 14 +++---
arch/powerpc/kernel/prom.c | 70 ++++++++++++++++++++++++++++
arch/powerpc/platforms/pseries/eeh_event.c | 8 +++
arch/ppc/platforms/mpc866ads_setup.c | 2 -
drivers/serial/cpm_uart/cpm_uart.h | 19 ++++++--
drivers/serial/cpm_uart/cpm_uart_core.c | 37 ++++++++++++---
drivers/serial/cpm_uart/cpm_uart_cpm1.c | 2 +
drivers/serial/cpm_uart/cpm_uart_cpm2.c | 2 +
include/asm-powerpc/uaccess.h | 19 +++++---
include/asm-ppc/commproc.h | 1
include/asm-ppc/cpm2.h | 2 -
include/linux/fs_uart_pd.h | 60 ++++++++++++++++++++++++
12 files changed, 209 insertions(+), 27 deletions(-)
create mode 100644 include/linux/fs_uart_pd.h
^ permalink raw reply [flat|nested] 146+ messages in thread* please pull powerpc.git 'merge' branch
@ 2006-04-29 6:15 Paul Mackerras
2006-04-29 15:19 ` Olof Johansson
0 siblings, 1 reply; 146+ messages in thread
From: Paul Mackerras @ 2006-04-29 6:15 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from the "merge" branch of
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
to get the following powerpc updates. They are mostly bug-fixes;
there is also a defconfig update for Cell, plus a couple of commits
that will enable the kernel to run on forthcoming IBM machines.
These don't affect anything on the current machines, since the
firmware properties and methods they use aren't present.
Thanks,
Paul.
Alan Modra:
powerpc64: Fix loading of modules without a .toc section
Andreas Schwab:
sound/ppc: snd_pmac_toonie_init should be __init
powerpc: Wire up *at syscalls
Anton Blanchard:
powerpc: Add cputable entry for POWER6
Arnd Bergmann:
spufs: Disable local interrupts for SPE hash_page calls.
powerpc: update cell_defconfig
David Gibson:
powerpc: Fix pagetable bloat for hugepages
David Woodhouse:
powerpc: Use check_legacy_ioport() on ppc32 too.
Eugene Surovegin:
ppc32: add 440GX erratum 440_43 workaround
Paul Mackerras:
powerpc/pseries: Tell firmware our capabilities on new machines
Vitaly Bordug:
ppc32: odd fixes and improvements in ppc_sys
ppc32 CPM_UART: Convert to use platform devices
ppc32: Update board-specific code of the CPM UART users
ppc32 CPM_UART: Fixed odd address translations
arch/powerpc/configs/cell_defconfig | 40 ++--
arch/powerpc/kernel/cputable.c | 16 +
arch/powerpc/kernel/module_64.c | 16 +
arch/powerpc/kernel/prom_init.c | 112 ++++++++++
arch/powerpc/kernel/setup-common.c | 8 +
arch/powerpc/kernel/setup_64.c | 8 -
arch/powerpc/kernel/systbl.S | 13 +
arch/powerpc/mm/hugetlbpage.c | 295 ++++++++++++++++++++++++---
arch/powerpc/mm/init_64.c | 7 +
arch/powerpc/platforms/cell/spu_base.c | 10 +
arch/powerpc/platforms/cell/spu_callbacks.c | 13 +
arch/ppc/platforms/4xx/ocotea.c | 2
arch/ppc/platforms/mpc8272ads_setup.c | 114 ++++++++++
arch/ppc/platforms/mpc866ads_setup.c | 140 +++++++++++++
arch/ppc/platforms/mpc885ads_setup.c | 131 ++++++++++++
arch/ppc/platforms/pq2ads.c | 31 +++
arch/ppc/syslib/ibm440gx_common.c | 13 +
arch/ppc/syslib/ibm440gx_common.h | 4
arch/ppc/syslib/mpc8xx_devices.c | 25 ++
arch/ppc/syslib/ppc_sys.c | 4
arch/ppc/syslib/pq2_sys.c | 8 -
drivers/block/floppy.c | 2
drivers/input/serio/i8042-io.h | 4
drivers/serial/cpm_uart/cpm_uart.h | 49 ++++
drivers/serial/cpm_uart/cpm_uart_core.c | 280 ++++++++++++++++++++------
drivers/serial/cpm_uart/cpm_uart_cpm1.c | 54 -----
drivers/serial/cpm_uart/cpm_uart_cpm2.c | 14 -
fs/stat.c | 2
include/asm-powerpc/cputable.h | 14 +
include/asm-powerpc/io.h | 6 -
include/asm-powerpc/page_64.h | 1
include/asm-powerpc/pgalloc.h | 2
include/asm-powerpc/unistd.h | 20 ++
include/asm-ppc/ppc_sys.h | 2
include/asm-ppc/reg_booke.h | 1
sound/ppc/toonie.c | 2
36 files changed, 1234 insertions(+), 229 deletions(-)
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: please pull powerpc.git 'merge' branch
2006-04-29 6:15 Paul Mackerras
@ 2006-04-29 15:19 ` Olof Johansson
2006-04-29 23:47 ` Paul Mackerras
0 siblings, 1 reply; 146+ messages in thread
From: Olof Johansson @ 2006-04-29 15:19 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, torvalds
On Sat, Apr 29, 2006 at 04:15:10PM +1000, Paul Mackerras wrote:
> Anton Blanchard:
> powerpc: Add cputable entry for POWER6
I never saw this posted to the list.
+#define PPC_FEATURE_ARCH_2_05 0x00001000
Previously we've said implementation instead of specification
("PPC_FEATURE_POWER5_PLUS" etc). That's better than saying base
architecture version, since there are parts of the arch that might or
might not be implemented (i.e. optional features, etc).
> Paul Mackerras:
> powerpc/pseries: Tell firmware our capabilities on new machines
I never saw this one on the list either.
Don't you want to fall back to the ELF method if the prom call fails
(ret != 0)? Right you close and return.
-Olof
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: please pull powerpc.git 'merge' branch
2006-04-29 15:19 ` Olof Johansson
@ 2006-04-29 23:47 ` Paul Mackerras
2006-04-30 3:12 ` Segher Boessenkool
2006-04-30 3:50 ` Olof Johansson
0 siblings, 2 replies; 146+ messages in thread
From: Paul Mackerras @ 2006-04-29 23:47 UTC (permalink / raw)
To: Olof Johansson; +Cc: linuxppc-dev, torvalds
Olof Johansson writes:
> Previously we've said implementation instead of specification
> ("PPC_FEATURE_POWER5_PLUS" etc). That's better than saying base
> architecture version, since there are parts of the arch that might or
> might not be implemented (i.e. optional features, etc).
We now have the AT_PLATFORM string, which we didn't have when we added
the POWER5_PLUS etc. features. That specifies which particular
implementation we are on quite precisely. We don't want to have a bit
for every single implementation or we'll run out of bits.
The ARCH_2_05 bit means all the non-optional bits of the 2.05
architecture. If there are optional features in the architecture, we
have separate bits for them. For example, we don't have separate
bits for POWER4 and for 970; instead we have a HAS_ALTIVEC bit, and
for 970 we set both POWER4 and HAS_ALTIVEC. So the POWER4 bit is
really a "2.00 architecture version" bit.
> Don't you want to fall back to the ELF method if the prom call fails
> (ret != 0)? Right you close and return.
There are two return values here - the return from call-method, and
the return from ibm,client-architecture-support. If the latter does
not exist, call-method returns non-zero, which gets returned from
call_prom_ret, and we close the root node and try the elf-header
method. If the ibm,client-architecture-support method exists but
returns an error, call_prom_ret returns zero but puts a non-zero value
in ret. In that case we don't want to try the elf-header method.
So I claim that the code is correct as it is. :)
Paul.
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: please pull powerpc.git 'merge' branch
2006-04-29 23:47 ` Paul Mackerras
@ 2006-04-30 3:12 ` Segher Boessenkool
2006-04-30 4:20 ` Olof Johansson
2006-04-30 3:50 ` Olof Johansson
1 sibling, 1 reply; 146+ messages in thread
From: Segher Boessenkool @ 2006-04-30 3:12 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Olof Johansson, linuxppc-dev, torvalds
>> Previously we've said implementation instead of specification
>> ("PPC_FEATURE_POWER5_PLUS" etc). That's better than saying base
>> architecture version, since there are parts of the arch that might or
>> might not be implemented (i.e. optional features, etc).
>
> We now have the AT_PLATFORM string, which we didn't have when we added
> the POWER5_PLUS etc. features. That specifies which particular
> implementation we are on quite precisely. We don't want to have a bit
> for every single implementation or we'll run out of bits.
>
> The ARCH_2_05 bit means all the non-optional bits of the 2.05
> architecture. If there are optional features in the architecture, we
> have separate bits for them. For example, we don't have separate
> bits for POWER4 and for 970; instead we have a HAS_ALTIVEC bit, and
> for 970 we set both POWER4 and HAS_ALTIVEC. So the POWER4 bit is
> really a "2.00 architecture version" bit.
Except that the 970 at least is actually version 2.01. Sounds
like names are better than bare numbers -- you showed yourself that
numbers like this are confusing, but you also say that a cpu name
really means an arch version (which isn't so bad -- there generally
is only one "main" CPU per arch version anyway, and people generally
know what is compatible to what).
So please rename ARCH_2_05 to the name of the first CPU that implements
architecture 2.05?
Segher
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: please pull powerpc.git 'merge' branch
2006-04-30 3:12 ` Segher Boessenkool
@ 2006-04-30 4:20 ` Olof Johansson
2006-04-30 11:42 ` Arnd Bergmann
0 siblings, 1 reply; 146+ messages in thread
From: Olof Johansson @ 2006-04-30 4:20 UTC (permalink / raw)
To: Segher Boessenkool; +Cc: Olof Johansson, linuxppc-dev, torvalds, Paul Mackerras
On Sun, Apr 30, 2006 at 05:12:57AM +0200, Segher Boessenkool wrote:
> >>Previously we've said implementation instead of specification
> >>("PPC_FEATURE_POWER5_PLUS" etc). That's better than saying base
> >>architecture version, since there are parts of the arch that might or
> >>might not be implemented (i.e. optional features, etc).
> >
> >We now have the AT_PLATFORM string, which we didn't have when we added
> >the POWER5_PLUS etc. features. That specifies which particular
> >implementation we are on quite precisely. We don't want to have a bit
> >for every single implementation or we'll run out of bits.
> >
> >The ARCH_2_05 bit means all the non-optional bits of the 2.05
> >architecture. If there are optional features in the architecture, we
> >have separate bits for them. For example, we don't have separate
> >bits for POWER4 and for 970; instead we have a HAS_ALTIVEC bit, and
> >for 970 we set both POWER4 and HAS_ALTIVEC. So the POWER4 bit is
> >really a "2.00 architecture version" bit.
>
> Except that the 970 at least is actually version 2.01.
Are there any userspace-visible differences between 2.00 and 2.01?
> Sounds
> like names are better than bare numbers -- you showed yourself that
> numbers like this are confusing, but you also say that a cpu name
> really means an arch version (which isn't so bad -- there generally
> is only one "main" CPU per arch version anyway, and people generally
> know what is compatible to what).
It's actually about an even tradeoff between the two. We run the risk
of running out of bits eventually no matter what, and as long as it's
blindingly clear and well stated that it does not imply any optional
features, then it doesn't matter. This puts the burden on userspace
developers to know which features are optional, not just what works on
their POWER6 lab machine, etc.
> So please rename ARCH_2_05 to the name of the first CPU that implements
> architecture 2.05?
We already have SMT, ICACHE_SNOOP and ALTIVEC feature bits, so it probably
makes sense to stay in the ARCH_2_05 direction. Unfortunately it might
be tricky to rename the old defines now due to userland exposure.
I guess Cell breaks all this logic though. Which PPC base version does
it implement?
-Olof
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: please pull powerpc.git 'merge' branch
2006-04-30 4:20 ` Olof Johansson
@ 2006-04-30 11:42 ` Arnd Bergmann
2006-04-30 11:57 ` Arnd Bergmann
` (2 more replies)
0 siblings, 3 replies; 146+ messages in thread
From: Arnd Bergmann @ 2006-04-30 11:42 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Olof Johansson, torvalds, Paul Mackerras
On Sunday 30 April 2006 06:20, Olof Johansson wrote:
> We already have SMT, ICACHE_SNOOP and ALTIVEC feature bits, so it probably
> makes sense to stay in the ARCH_2_05 direction. Unfortunately it might
> be tricky to rename the old defines now due to userland exposure.
>
> I guess Cell breaks all this logic though. Which PPC base version does
> it implement?
The Cell Broadband Engine Architecture in theory is 2.03 and also mandates
some of the extensions that are optional in there.
The relevant sections in the specs are:
| 4.1.1 Optional Features in PowerPC Architecture, Book I (Required for
| CBEA)
| The following facilities and instructions are considered optional in
| the PowerPC Architecture, but are required for the PPE by the CBEA
| user mode environment.
| • Floating reciprocal estimate single A-form (fres)
| • Floating reciprocal square-root estimate A-form (frsqte)
| • Vector/SIMD multimedia extension
| Note: The optional PowerPC floating-point instructions that are
| mandatory in the CBEA are needed for the application space targeted
| by the CBEA.
|
| 4.1.3 Optional Features in PowerPC Architecture, Book II (Required
| for CBEA)
| The following facilities and instructions are considered optional
| in the PowerPC Architecture, but are required in the CBEA.
| • Data cache block touch X-form (dcbt)
| This is an optional version of dcbt that permits a program to
| provide a hint that a sequence of data cache blocks is likely
| to be needed soon.
| Book II describes these facilities and instructions.
I believe the actual implementation is missing one of the mandatory
features of 2.03 that was not in 2.02 though.
Arnd <><
^ permalink raw reply [flat|nested] 146+ messages in thread* Re: please pull powerpc.git 'merge' branch
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 15:03 ` Olof Johansson
2 siblings, 1 reply; 146+ messages in thread
From: Arnd Bergmann @ 2006-04-30 11:57 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Olof Johansson, torvalds, Paul Mackerras
On Sunday 30 April 2006 13:42, Arnd Bergmann wrote:
> The Cell Broadband Engine Architecture in theory is 2.03 and also mandates
> some of the extensions that are optional in there.
Oh, and it also has some extensions that are supposed to be part of later
powerpc architecture releases (CBEA, appendix E):
• Mediated interrupt
• Multiple concurrent large pages
• Add TL (TLB load control) bit to logical-partitioning control register
(LPCR) for software versus hardware load of TLB
• Change tlbie<l> of large page to always invalidate ERAT
• Hypervisor SPRs no longer readable when HV equals 0
Do we know which ones of these made it into 2.05?
Arnd <><
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: please pull powerpc.git 'merge' branch
2006-04-30 11:57 ` Arnd Bergmann
@ 2006-04-30 15:07 ` Olof Johansson
0 siblings, 0 replies; 146+ messages in thread
From: Olof Johansson @ 2006-04-30 15:07 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Olof Johansson, linuxppc-dev, torvalds, Paul Mackerras
On Sun, Apr 30, 2006 at 01:57:21PM +0200, Arnd Bergmann wrote:
> • Mediated interrupt
> • Multiple concurrent large pages
> • Add TL (TLB load control) bit to logical-partitioning control register
> (LPCR) for software versus hardware load of TLB
> • Change tlbie<l> of large page to always invalidate ERAT
> • Hypervisor SPRs no longer readable when HV equals 0
>
> Do we know which ones of these made it into 2.05?
I'm not sure that can be discussed on a public mailing list, given that
2.02 is the last non-secret architecture version at this time. :-)
-Olof
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: please pull powerpc.git 'merge' branch
2006-04-30 11:42 ` Arnd Bergmann
2006-04-30 11:57 ` Arnd Bergmann
@ 2006-04-30 13:04 ` Segher Boessenkool
2006-04-30 16:14 ` Arnd Bergmann
2006-04-30 15:03 ` Olof Johansson
2 siblings, 1 reply; 146+ messages in thread
From: Segher Boessenkool @ 2006-04-30 13:04 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Olof Johansson, linuxppc-dev, torvalds, Paul Mackerras
>> We already have SMT, ICACHE_SNOOP and ALTIVEC feature bits, so it
>> probably
>> makes sense to stay in the ARCH_2_05 direction. Unfortunately it
>> might
>> be tricky to rename the old defines now due to userland exposure.
>>
>> I guess Cell breaks all this logic though. Which PPC base version
>> does
>> it implement?
>
> The Cell Broadband Engine Architecture in theory is 2.03 and also
> mandates
The docs (for example, "CBE_Architecture_v10.pdf") say 2.02. One
more reason
to not use those arch version numbers.
Segher
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: please pull powerpc.git 'merge' branch
2006-04-30 11:42 ` Arnd Bergmann
2006-04-30 11:57 ` Arnd Bergmann
2006-04-30 13:04 ` Segher Boessenkool
@ 2006-04-30 15:03 ` Olof Johansson
2006-04-30 15:07 ` Olof Johansson
2 siblings, 1 reply; 146+ messages in thread
From: Olof Johansson @ 2006-04-30 15:03 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Olof Johansson, linuxppc-dev, torvalds, Paul Mackerras
On Sun, Apr 30, 2006 at 01:42:01PM +0200, Arnd Bergmann wrote:
> The Cell Broadband Engine Architecture in theory is 2.03 and also mandates
> some of the extensions that are optional in there.
> The relevant sections in the specs are:
Ok. So Cell should really set PPC_FEATURE_ARCH_2_02 then, and possible
PPC_FEATURE_CELL to signify the cell extensions?
Right now ARCH_2_02 is not set as far as I can see.
-Olof
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: please pull powerpc.git 'merge' branch
2006-04-30 15:03 ` Olof Johansson
@ 2006-04-30 15:07 ` Olof Johansson
0 siblings, 0 replies; 146+ messages in thread
From: Olof Johansson @ 2006-04-30 15:07 UTC (permalink / raw)
To: Olof Johansson; +Cc: linuxppc-dev, torvalds, Paul Mackerras, Arnd Bergmann
On Sun, Apr 30, 2006 at 10:03:56AM -0500, Olof Johansson wrote:
> On Sun, Apr 30, 2006 at 01:42:01PM +0200, Arnd Bergmann wrote:
>
> > The Cell Broadband Engine Architecture in theory is 2.03 and also mandates
> > some of the extensions that are optional in there.
> > The relevant sections in the specs are:
>
> Ok. So Cell should really set PPC_FEATURE_ARCH_2_02 then, and possible
> PPC_FEATURE_CELL to signify the cell extensions?
>
> Right now ARCH_2_02 is not set as far as I can see.
s/2_02/2_03/g
-Olof
^ permalink raw reply [flat|nested] 146+ messages in thread
* Re: please pull powerpc.git 'merge' branch
2006-04-29 23:47 ` Paul Mackerras
2006-04-30 3:12 ` Segher Boessenkool
@ 2006-04-30 3:50 ` Olof Johansson
1 sibling, 0 replies; 146+ messages in thread
From: Olof Johansson @ 2006-04-30 3:50 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Olof Johansson, linuxppc-dev, torvalds
On Sun, Apr 30, 2006 at 09:47:10AM +1000, Paul Mackerras wrote:
> Olof Johansson writes:
>
> > Previously we've said implementation instead of specification
> > ("PPC_FEATURE_POWER5_PLUS" etc). That's better than saying base
> > architecture version, since there are parts of the arch that might or
> > might not be implemented (i.e. optional features, etc).
>
> We now have the AT_PLATFORM string, which we didn't have when we added
> the POWER5_PLUS etc. features. That specifies which particular
> implementation we are on quite precisely. We don't want to have a bit
> for every single implementation or we'll run out of bits.
>
> The ARCH_2_05 bit means all the non-optional bits of the 2.05
> architecture. If there are optional features in the architecture, we
> have separate bits for them. For example, we don't have separate
> bits for POWER4 and for 970; instead we have a HAS_ALTIVEC bit, and
> for 970 we set both POWER4 and HAS_ALTIVEC. So the POWER4 bit is
> really a "2.00 architecture version" bit.
Ok, I guess that's more or less how it's been used, since there's only
been one implementation per architecture version in the past (970 series
being the main exception). The only one left out from the table seems
to be 2.01 (POWER4+), not sure if it had any userspace-visible changes
in the first place.
A rename of existing names might make sense for consistency/clarity. But
that's outside of __KERNEL__ so it would break userspace.
> > Don't you want to fall back to the ELF method if the prom call fails
> > (ret != 0)? Right you close and return.
>
> If the ibm,client-architecture-support method exists but
> returns an error, call_prom_ret returns zero but puts a non-zero value
> in ret.
Right, that's quite obvious from the implementation.
> In that case we don't want to try the elf-header method.
That was my question, if it made sense to fall back to it. And that's a
"no". Thanks. :-)
-Olof
^ permalink raw reply [flat|nested] 146+ messages in thread
end of thread, other threads:[~2008-04-03 11:33 UTC | newest]
Thread overview: 146+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-27 23:08 Please pull powerpc.git 'merge' branch Paul Mackerras
2007-01-27 23:15 ` Paul Mackerras
-- 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-10 12:20 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-22 11:50 Please pull powerpc.git 'merge' branch 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
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).