* Re: ipr SATA support is causing problems
From: Paul Mackerras @ 2006-11-10 23:06 UTC (permalink / raw)
To: Brian King; +Cc: akpm, linuxppc-dev, torvalds, James Bottomley
In-Reply-To: <45549962.108@us.ibm.com>
Brian King writes:
> I'm not sure what the best way to fix this one is... The ideal way is to
> change ipr to select CONFIG_ATA, but kconfig currently doesn't handle
> that and complains about recursive dependencies since IPR depends on
> CONFIG_SCSI and CONFIG_ATA selects CONFIG_SCSI. I'm guessing the
> libsas SATA usage has similar problems. Right now we both use a depends
> CONFIG_ATA statement. Ideally, kconfig should be fixed to handle this.
Well, the systems that use ipr for SATA would be in a very small
minority compared to those that use it for SCSI, wouldn't they? It
seems annoying to have to include all the libata stuff when I'm
configuring a kernel for a system that only uses ipr for SCSI. Thus I
would think that the solution is to allow ipr.c to be built without
the SATA bits, if that's what the user wants.
How hard would it be to make the SATA bits conditionally compiled in,
depending on CONFIG_ATA?
Paul.
^ permalink raw reply
* Re: [Fwd: [Bug 7431] New: ohci1394 Oops after a rmmod/modprobe cycle]
From: Stefan Richter @ 2006-11-10 23:07 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev, Olaf Hering, Gioele Barabucci
In-Reply-To: <tkrat.bedb19657ae90fd7@s5r6.in-berlin.de>
I wrote:
> On 7 Nov, Benjamin Herrenschmidt wrote:
>> On Tue, 2006-11-07 at 08:08 +0100, Olaf Hering wrote:
> [...]
>>> and it is the rmmod, not the insmod, that hangs the pismo.
>>> Adding some mdelay to the remove function doesnt help either.
>>
>> Tried not calling the pmac feature stuff at all in the rmmod ?
>
> Olaf?
>
>> I reckon there might be a problem with the cable power control on some
>> old models like... the pismo :-)
>
> Is there a way to detect affected machines or at least to blacklist
> known broken machines?
Actually, shouldn't ohci1394_pci_remove enlcose the platform code into
if (machine_is(powermac)) {
...
}
like ohci1394_pci_suspend and ohci1394_pci_resume do?
--
Stefan Richter
-=====-=-==- =-== -=-==
http://arcgraph.de/sr/
^ permalink raw reply
* Re: [Fwd: [Bug 7431] New: ohci1394 Oops after a rmmod/modprobe cycle]
From: Benjamin Herrenschmidt @ 2006-11-10 23:10 UTC (permalink / raw)
To: Stefan Richter; +Cc: linuxppc-dev, Olaf Hering, Gioele Barabucci
In-Reply-To: <tkrat.fa66c98c1012e645@s5r6.in-berlin.de>
On Sat, 2006-11-11 at 00:07 +0100, Stefan Richter wrote:
> I wrote:
> > On 7 Nov, Benjamin Herrenschmidt wrote:
> >> On Tue, 2006-11-07 at 08:08 +0100, Olaf Hering wrote:
> > [...]
> >>> and it is the rmmod, not the insmod, that hangs the pismo.
> >>> Adding some mdelay to the remove function doesnt help either.
> >>
> >> Tried not calling the pmac feature stuff at all in the rmmod ?
> >
> > Olaf?
> >
> >> I reckon there might be a problem with the cable power control on some
> >> old models like... the pismo :-)
> >
> > Is there a way to detect affected machines or at least to blacklist
> > known broken machines?
>
> Actually, shouldn't ohci1394_pci_remove enlcose the platform code into
>
> if (machine_is(powermac)) {
> ...
> }
>
> like ohci1394_pci_suspend and ohci1394_pci_resume do?
Yes.
Ben.
^ permalink raw reply
* Re: Help with an MMIO register read function
From: Arnd Bergmann @ 2006-11-10 23:10 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Carl Love
In-Reply-To: <1163199434.30540.13.camel@dyn9047021226.beaverton.ibm.com>
On Friday 10 November 2006 23:57, Carl Love wrote:
> I expect the SBI values to be 0x2000000 =A0not 0x200000000. =A0The L2 deb=
ug
> value should be 0x6 not 0x600000000000000. =A0It seems like the bits are
> there but shifted from where I would expect them to be. =A0Anyone have any
> thoughts as to what is wrong?
Hmm, maybe you confused the bit order in the specification? IBM
counts the MSB as bit 0, while everyone else counts the LSB as
bit 0.
Arnd <><
^ permalink raw reply
* [PATCH update 1/3] ieee1394: ohci1394: add PPC_PMAC platform code to driver probe
From: Stefan Richter @ 2006-11-10 23:22 UTC (permalink / raw)
To: linux1394-devel; +Cc: linuxppc-dev, Gioele Barabucci, Olaf Hering
In-Reply-To: <1163200208.4982.193.camel@localhost.localdomain>
Fixes http://bugzilla.kernel.org/show_bug.cgi?id=7431
iBook G3 threw a machine check exception and put the display backlight
to full brightness after ohci1394 was unloaded and reloaded.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
Patch update: There were braces missing. Thanks to Jens Maurer.
drivers/ieee1394/ohci1394.c | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
Index: linux/drivers/ieee1394/ohci1394.c
===================================================================
--- linux.orig/drivers/ieee1394/ohci1394.c 2006-11-08 18:19:56.000000000 +0100
+++ linux/drivers/ieee1394/ohci1394.c 2006-11-11 00:12:31.000000000 +0100
@@ -3215,6 +3215,19 @@ static int __devinit ohci1394_pci_probe(
struct ti_ohci *ohci; /* shortcut to currently handled device */
resource_size_t ohci_base;
+#ifdef CONFIG_PPC_PMAC
+ /* Necessary on some machines if ohci1394 was loaded/ unloaded before */
+ if (machine_is(powermac)) {
+ struct device_node *of_node = pci_device_to_OF_node(dev);
+
+ if (of_node) {
+ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, of_node,
+ 0, 1);
+ pmac_call_feature(PMAC_FTR_1394_ENABLE, of_node, 0, 1);
+ }
+ }
+#endif /* CONFIG_PPC_PMAC */
+
if (pci_enable_device(dev))
FAIL(-ENXIO, "Failed to enable OHCI hardware");
pci_set_master(dev);
@@ -3503,10 +3516,8 @@ static void ohci1394_pci_remove(struct p
#endif
#ifdef CONFIG_PPC_PMAC
- /* On UniNorth, power down the cable and turn off the chip
- * clock when the module is removed to save power on
- * laptops. Turning it back ON is done by the arch code when
- * pci_enable_device() is called */
+ /* On UniNorth, power down the cable and turn off the chip clock
+ * to save power on laptops */
{
struct device_node* of_node;
^ permalink raw reply
* [PATCH update 2/3] ieee1394: ohci1394: reformat PPC_PMAC platform code
From: Stefan Richter @ 2006-11-10 23:23 UTC (permalink / raw)
To: linux1394-devel; +Cc: linuxppc-dev, Gioele Barabucci, Olaf Hering
In-Reply-To: <tkrat.8573138b9ed5f558@s5r6.in-berlin.de>
Adjust whitespace and line lengths
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
drivers/ieee1394/ohci1394.c | 34 ++++++++++++++--------------------
1 files changed, 14 insertions(+), 20 deletions(-)
Index: linux/drivers/ieee1394/ohci1394.c
===================================================================
--- linux.orig/drivers/ieee1394/ohci1394.c 2006-11-11 00:12:31.000000000 +0100
+++ linux/drivers/ieee1394/ohci1394.c 2006-11-11 00:13:45.000000000 +0100
@@ -3218,12 +3218,11 @@ static int __devinit ohci1394_pci_probe(
#ifdef CONFIG_PPC_PMAC
/* Necessary on some machines if ohci1394 was loaded/ unloaded before */
if (machine_is(powermac)) {
- struct device_node *of_node = pci_device_to_OF_node(dev);
+ struct device_node *ofn = pci_device_to_OF_node(dev);
- if (of_node) {
- pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, of_node,
- 0, 1);
- pmac_call_feature(PMAC_FTR_1394_ENABLE, of_node, 0, 1);
+ if (ofn) {
+ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 1);
+ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1);
}
}
#endif /* CONFIG_PPC_PMAC */
@@ -3519,12 +3518,11 @@ static void ohci1394_pci_remove(struct p
/* On UniNorth, power down the cable and turn off the chip clock
* to save power on laptops */
{
- struct device_node* of_node;
+ struct device_node* ofn = pci_device_to_OF_node(ohci->dev);
- of_node = pci_device_to_OF_node(ohci->dev);
- if (of_node) {
- pmac_call_feature(PMAC_FTR_1394_ENABLE, of_node, 0, 0);
- pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, of_node, 0, 0);
+ if (ofn) {
+ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0);
+ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0);
}
}
#endif /* CONFIG_PPC_PMAC */
@@ -3584,12 +3582,10 @@ static int ohci1394_pci_suspend(struct p
/* PowerMac suspend code comes last */
#ifdef CONFIG_PPC_PMAC
if (machine_is(powermac)) {
- struct device_node *of_node;
+ struct device_node *ofn = pci_device_to_OF_node(pdev);
- /* Disable 1394 */
- of_node = pci_device_to_OF_node (pdev);
- if (of_node)
- pmac_call_feature(PMAC_FTR_1394_ENABLE, of_node, 0, 0);
+ if (ofn)
+ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0);
}
#endif /* CONFIG_PPC_PMAC */
@@ -3611,12 +3607,10 @@ static int ohci1394_pci_resume(struct pc
/* PowerMac resume code comes first */
#ifdef CONFIG_PPC_PMAC
if (machine_is(powermac)) {
- struct device_node *of_node;
+ struct device_node *ofn = pci_device_to_OF_node(pdev);
- /* Re-enable 1394 */
- of_node = pci_device_to_OF_node (pdev);
- if (of_node)
- pmac_call_feature (PMAC_FTR_1394_ENABLE, of_node, 0, 1);
+ if (ofn)
+ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1);
}
#endif /* CONFIG_PPC_PMAC */
^ permalink raw reply
* [PATCH update 3/3] ieee1394: ohci1394: call PMac code in shutdown only for proper machines
From: Stefan Richter @ 2006-11-10 23:26 UTC (permalink / raw)
To: linux1394-devel; +Cc: linuxppc-dev, Gioele Barabucci, Olaf Hering
In-Reply-To: <tkrat.210c1fb372b68f41@s5r6.in-berlin.de>
There has been an if(...) missing, for ages.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
drivers/ieee1394/ohci1394.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: linux/drivers/ieee1394/ohci1394.c
===================================================================
--- linux.orig/drivers/ieee1394/ohci1394.c 2006-11-11 00:13:45.000000000 +0100
+++ linux/drivers/ieee1394/ohci1394.c 2006-11-11 00:16:37.000000000 +0100
@@ -3517,7 +3517,7 @@ static void ohci1394_pci_remove(struct p
#ifdef CONFIG_PPC_PMAC
/* On UniNorth, power down the cable and turn off the chip clock
* to save power on laptops */
- {
+ if (machine_is(powermac)) {
struct device_node* ofn = pci_device_to_OF_node(ohci->dev);
if (ofn) {
^ permalink raw reply
* Re: [PATCH] PowerPC: clockevents and HRT support
From: Paul Mackerras @ 2006-11-10 23:52 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: tglx, greg.weeks, linuxppc-dev
In-Reply-To: <455487E2.9040701@ru.mvista.com>
Sergei Shtylyov writes:
> I think the usual rule is: "you want it, you do it". ;-)
Sure! And I will, at some point, if someone else doesn't do it
first.
My point is simply that as maintainer I won't accept a patch that
breaks an important feature, even if it adds another important
feature.
> Seriously, we have neither time, not hardware, nor docs for the h/w this
> accounting option applies to.
Really? You're working on machines that don't have a timebase
register? What powerpc chip doesn't have a timebase register, other
than the really old 601? :) The timebase is all the hardware that is
needed.
> And coercing the generic clcokevents/hrtimers
> code into calling the arch hooks is serious design decision which I felt is
> better to be left to Thomas as a maintainer...
CONFIG_VIRT_CPU_ACCOUNTING is used, and needed, on powerpc and s390,
both of which also want to do dynticks. If the current framework
can't cope with that, then it needs to be extended.
Paul.
^ permalink raw reply
* Re: [PATCH]: PowerPC: make sure the rtas stop-self token is defined.
From: Paul Mackerras @ 2006-11-10 23:55 UTC (permalink / raw)
To: Linas Vepstas; +Cc: linuxppc-dev
In-Reply-To: <20061110182253.GV30625@austin.ibm.com>
Linas Vepstas writes:
> I presume this looks reasonable, please apply.
OK, is this a fix for a bug that needs to be fixed before 2.6.19 is
release?
Thanks,
Paul.
^ permalink raw reply
* Re: [Fwd: [Bug 7431] New: ohci1394 Oops after a rmmod/modprobe cycle]
From: Stefan Richter @ 2006-11-10 23:55 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev, Olaf Hering, Gioele Barabucci
In-Reply-To: <1163200208.4982.193.camel@localhost.localdomain>
Benjamin Herrenschmidt wrote:
> On Sat, 2006-11-11 at 00:07 +0100, Stefan Richter wrote:
>> Actually, shouldn't ohci1394_pci_remove enlcose the platform code into
>>
>> if (machine_is(powermac)) {
> Yes.
And how does this expression evaluate on PowerBook G3 "Pismo"?
--
Stefan Richter
-=====-=-==- =-== -=-==
http://arcgraph.de/sr/
^ permalink raw reply
* [PATCH] make git ignore new wrapper generated files
From: Kim Phillips @ 2006-11-11 0:08 UTC (permalink / raw)
To: linuxppc-dev
The new 'wrapper' code generates files that git should ignore;
add them to .gitignore.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
---
arch/powerpc/boot/.gitignore | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index 45c9ad2..590e72f 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -1,20 +1,27 @@
addnote
+empty.c
+hack-coff
infblock.c
infblock.h
infcodes.c
infcodes.h
inffast.c
inffast.h
+inffixed.h
inflate.c
+inflate.h
inftrees.c
inftrees.h
infutil.c
infutil.h
kernel-vmlinux.strip.c
kernel-vmlinux.strip.gz
+mktree
uImage
zImage
zImage.vmode
+zImage.coff.lds
+zImage.lds
zconf.h
zlib.h
zutil.h
--
1.4.2.3
^ permalink raw reply related
* Re: [PATCH]: PowerPC: make sure the rtas stop-self token is defined.
From: Linas Vepstas @ 2006-11-11 0:52 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
In-Reply-To: <17749.4445.46239.450000@cargo.ozlabs.ibm.com>
On Sat, Nov 11, 2006 at 10:55:09AM +1100, Paul Mackerras wrote:
> Linas Vepstas writes:
>
> > I presume this looks reasonable, please apply.
>
> OK, is this a fix for a bug that needs to be fixed before 2.6.19 is
> release?
Probably not. This was uncovered during "unusual" testing, with user
catting values int sysfs files. Since you need to be root to do this,
I don't think its a security flaw.
--linas
^ permalink raw reply
* Re: [PATCH]: PowerPC: make sure the rtas stop-self token is defined.
From: Linas Vepstas @ 2006-11-11 1:01 UTC (permalink / raw)
To: Nathan Lynch; +Cc: linuxppc-dev, paulus
In-Reply-To: <20061110200152.GC23089@localdomain>
On Fri, Nov 10, 2006 at 02:01:52PM -0600, Nathan Lynch wrote:
> Linas Vepstas wrote:
> >
> > There are a variety of code paths that lead to rtas_stop_self()
> > being called, primarily through cpu_die(). However, rtas_stop_self()
> > has a BUG_ON(rtas_args->token == RTAS_UNKNOWN_SERVICE); in it, and
> > this rtas token is only set up if CONFIG_HOTPLUG_CPU is defined.
> >
> > Rather than wrapping all of the callers of rtas_stop_self()
> > with CONFIG_HOTPLUG_CPU, it seems wiser to just unwrap the token
> > definition.
>
> Is there actually a code path that calls rtas_stop_self with
> CONFIG_HOTPLUG_CPU=n? That would be a bug, I think.
Yeah, that was my first reaction too, right next to "user error".
But then I started tracing the code paths, and after they multiplied
a bit, it was clear that the answer wouldn't be clear.
So then I philosophized a bit: if the code cannot be called
unless CONFIG_HOTPLUG_CPU=y, then I should add #ifdef CONFIG_HOTPLUG_CPU
to make sure that the code doesn't even get compiled in.
Well, there used to be such ifdefs (according to Joel) but someone
removed the ifdefs. I'm guessing that these got removed during the
powerpc tree migration.
So... Rather than wrapping all of the callers of rtas_stop_self() ...
--linas
^ permalink raw reply
* Re: [Fwd: [Bug 7431] New: ohci1394 Oops after a rmmod/modprobe cycle]
From: Benjamin Herrenschmidt @ 2006-11-11 1:31 UTC (permalink / raw)
To: Stefan Richter; +Cc: linuxppc-dev, Olaf Hering, Gioele Barabucci
In-Reply-To: <45551185.8080704@s5r6.in-berlin.de>
On Sat, 2006-11-11 at 00:55 +0100, Stefan Richter wrote:
> Benjamin Herrenschmidt wrote:
> > On Sat, 2006-11-11 at 00:07 +0100, Stefan Richter wrote:
> >> Actually, shouldn't ohci1394_pci_remove enlcose the platform code into
> >>
> >> if (machine_is(powermac)) {
>
> > Yes.
>
> And how does this expression evaluate on PowerBook G3 "Pismo"?
This will be true on all powerpc based apple machines, so it will be
true there too.
Ben.
^ permalink raw reply
* Re: Help with an MMIO register read function
From: Benjamin Herrenschmidt @ 2006-11-11 1:46 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linuxppc-dev, Carl Love
In-Reply-To: <200611110010.28788.arnd@arndb.de>
On Sat, 2006-11-11 at 00:10 +0100, Arnd Bergmann wrote:
> On Friday 10 November 2006 23:57, Carl Love wrote:
> > I expect the SBI values to be 0x2000000 not 0x200000000. The L2 debug
> > value should be 0x6 not 0x600000000000000. It seems like the bits are
> > there but shifted from where I would expect them to be. Anyone have any
> > thoughts as to what is wrong?
>
> Hmm, maybe you confused the bit order in the specification? IBM
> counts the MSB as bit 0, while everyone else counts the LSB as
> bit 0.
I think in this case the problem is that he's using readq() which
byteswaps.
Ben.
^ permalink raw reply
* Re: [PATCH 0/16] patches for 2.6.20
From: Arnd Bergmann @ 2006-11-11 1:56 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Paul Mackerras
In-Reply-To: <4554DA4D.9010909@am.sony.com>
On Friday 10 November 2006 21:00, Geoff Levand wrote:
> This is the set of patches I have queued for 2.6.20. =A0Patches 1-6 have
> already been posted, but I did some re-work on a few to bring them up
> to the latest powerpc.git. =A0Patches 7-16 are new and add the core
> platform support for the PS3 game console.
>=20
> For the convenience of anyone interested, I have put this patchset, plus
> a few other drivers I am working on with some info here:
I've taken the patches you submitted now and merged them with my series,
which already contains the big set of patches that Benjamin Herrenschmidt
sent out earlier this week.
I have a version for 2.6.19-rc5 and one based on the 2.6.18 release
on kernel.org:
http://kernel.org/pub/linux/kernel/people/arnd/patches/2.6.18-arnd6/
http://kernel.org/pub/linux/kernel/people/arnd/patches/2.6.19-rc5-arnd1/
http://kernel.org/git/?p=3Dlinux/kernel/git/arnd/cell-2.6.git
git://kernel.org/pub/scm/linux/kernel/git/arnd/cell.git 2.6.19-rc5-arnd1
This is the first release that combines support for the IBM QS20 blade,
boards based on the new Axon south bridge as well as finally the
Playstation 3.
Arnd <><
^ permalink raw reply
* Re: [PATCH 2/16] spufs: change ppc_rtas declaration to weak
From: Arnd Bergmann @ 2006-11-11 2:03 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Paul Mackerras
In-Reply-To: <4554DA5E.3010103@am.sony.com>
On Friday 10 November 2006 21:00, Geoff Levand wrote:
> Change the definition of powerpc's cond_syscall() to use the standard gcc
> weak attribute specifier which provides proper support for C linkage as
> needed by spu_syscall_table[].
>=20
> Fixes this powerpc build error with CONFIG_SPU_FS=3Dy, CONFIG_PPC_RTAS=3D=
n:
>=20
> =A0arch/powerpc/platforms/built-in.o: undefined reference to `ppc_rtas'
>=20
>=20
> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
>=20
Acked-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply
* Re: [PATCH 3/16] cell: set ARCH_SPARSEMEM_DEFAULT in Kconfig
From: Arnd Bergmann @ 2006-11-11 2:04 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Paul Mackerras
In-Reply-To: <4554DA6F.6060400@am.sony.com>
On Friday 10 November 2006 21:00, Geoff Levand wrote:
> 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@arndb.de>
^ permalink raw reply
* Re: [PATCH 5/16] cell: replace spu.nid with spu.node
From: Arnd Bergmann @ 2006-11-11 2:05 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Paul Mackerras
In-Reply-To: <4554DA8A.4090407@am.sony.com>
On Friday 10 November 2006 21:01, Geoff Levand wrote:
> Replace the use of the platform specific variable spu.nid with the
> platform independednt variable spu.node.
>
>
> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply
* Re: [PATCH 15/16] cell: add ps3 platform spu support
From: Arnd Bergmann @ 2006-11-11 2:08 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Paul Mackerras
In-Reply-To: <4554DB2C.1000002@am.sony.com>
On Friday 10 November 2006 21:03, Geoff Levand wrote:
> Adds spu support for the PS3 Platform.
>
> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
>
Acked-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply
* Re: [PATCH 8/16] powerpc: add ps3 platform hvcalls
From: Arnd Bergmann @ 2006-11-11 2:13 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Paul Mackerras
In-Reply-To: <4554DAD7.2090709@am.sony.com>
On Friday 10 November 2006 21:02, Geoff Levand wrote:
> Adds the ps3pf hvcalls.
>
> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
This one reminds of the inline hcall abstraction layer I did
some time ago. The implementation in your patch is a lot
less elegant than both the pseries in its current incarnation
and the one that I did (IMHO). Any opinions on how we should
proceed here?
I can dig out my patch again in the version I did for the
ps3 hypervisor, if there is demand, or I could help moving
over so code that is more like the pseries one. Unfortunately
the calling conventions are very different from pseries
(the hcall number is passed in r11, not in one of the argument
registers), so that would not be as nice as Anton's implementation.
Arnd <><
^ permalink raw reply
* [PATCH 0/32] My current serie of patches for 2.6.20 for review
From: Benjamin Herrenschmidt @ 2006-11-11 6:24 UTC (permalink / raw)
To: linuxppc-dev
This should be ready for merge in powerpc tree and 2.6.20 as soon
as the merge window opens.
One prerequisite is Geoff's patch testing ppc_md.init_early for
NULL before calling it as I removed pasemi's init_early (now
empty) with the DMA patch.
[Note: Differences since the last version are the renaming of
dev_sysdata to dev_archdata along with a few more cosmetic
mostly changes to that patch, adapting the others to that change,
a bug fix for iseries, and pasemi was missing from the DMA changes,
this version fixes it]
Note that the first 5 ones require specific comments:
* ibmveth: Remove ibmveth "liobn" field
is already queued with Jeff Garzik and will get in 2.6.20
via his merge tree
* Call platform_notify_remove later
is queued in -mm and Andrew sent it to Greg, I expect greg to
merge it in 2.6.20
* Driver core: add notification of bus events
is queued in Greg's tree and scheduled for merge in 2.6.20
* arch provides generic iomap missing accessors
was written by Linus but is not merged yet. He asked me to
resend it when needed, so I'll include it with the other patches
when the merge window opens.
* Add arch specific dev_archdata to struct device
this seems to be generally accepted and should be merged by Greg
or Andrew in 2.6.20
* Change ACPI to use dev_archdata instead of firmware_data
this is a patch that goes along the previous one (though not actually
necessary). It doesn't actually need to go in powerpc.git nor 2.6.20,
I included it in this serie for completeness
This patch set started its life as the support for the new "Axon"
southbridge for cell (which includes such things as MMIO mapped DCR
and 4xx-type devices). However, as things evolved, I ended up doing
a lot more than just the basic support. Among other highlights of
this patch serie are:
- Generic DCR support for both 4xx-type DCRs and MMIO mapped DCR and
MPIC & EMAC changes to work with that
- Souped up of_platform_driver to make it easier to register entire
trees of devices at once, along with PCI host bridge detection support
for 64 bits architectures. Note that some name changes might break
compile of some platforms. I hope to have fixed everything before I
merge but don't forget to tell me if I missed something.
- Completely reworked 64 bits DMA operations
- Possibility to "hook" on PCI MMIO and PCI operations from the platform
code for use by iSeries, Cell and possibly others who have to deal with
weird hypervisor or PCI host bridge erratas. Currently supported only on
64 bits but would be easy to make it work on 32 bits if ever needed.
- Merged 32 and 64 bits io.h. ARCH=powerpc now uses asm-powerpc/io.h
for both. ARCH=ppc still uses the old one in asm-ppc as I really don't
feel like dealing with some of the cruft in there.
- As a consequence of the 2 above, new accessors are available that match
what is done by other architectures: {read,write}{w,l,q}_be for big endian
PCI MMIO accesses, {read,write}s{b,w,l} for MMIO "repeat" operations, and
a significant cleanup of the EEH stuff.
- Cell IOMMU support (mostly written by Jeremy Kerr)
And more ...
^ permalink raw reply
* [PATCH 0/32] My current serie of patches for 2.6.20 for review
From: Benjamin Herrenschmidt @ 2006-11-11 6:24 UTC (permalink / raw)
To: linuxppc-dev
This should be ready for merge in powerpc tree and 2.6.20 as soon
as the merge window opens.
One prerequisite is Geoff's patch testing ppc_md.init_early for
NULL before calling it as I removed pasemi's init_early (now
empty) with the DMA patch.
[Note: Differences since the last version are the renaming of
dev_sysdata to dev_archdata along with a few more cosmetic
mostly changes to that patch, adapting the others to that change,
a bug fix for iseries, and pasemi was missing from the DMA changes,
this version fixes it]
Note that the first 5 ones require specific comments:
* ibmveth: Remove ibmveth "liobn" field
is already queued with Jeff Garzik and will get in 2.6.20
via his merge tree
* Call platform_notify_remove later
is queued in -mm and Andrew sent it to Greg, I expect greg to
merge it in 2.6.20
* Driver core: add notification of bus events
is queued in Greg's tree and scheduled for merge in 2.6.20
* arch provides generic iomap missing accessors
was written by Linus but is not merged yet. He asked me to
resend it when needed, so I'll include it with the other patches
when the merge window opens.
* Add arch specific dev_archdata to struct device
this seems to be generally accepted and should be merged by Greg
or Andrew in 2.6.20
* Change ACPI to use dev_archdata instead of firmware_data
this is a patch that goes along the previous one (though not actually
necessary). It doesn't actually need to go in powerpc.git nor 2.6.20,
I included it in this serie for completeness
This patch set started its life as the support for the new "Axon"
southbridge for cell (which includes such things as MMIO mapped DCR
and 4xx-type devices). However, as things evolved, I ended up doing
a lot more than just the basic support. Among other highlights of
this patch serie are:
- Generic DCR support for both 4xx-type DCRs and MMIO mapped DCR and
MPIC & EMAC changes to work with that
- Souped up of_platform_driver to make it easier to register entire
trees of devices at once, along with PCI host bridge detection support
for 64 bits architectures. Note that some name changes might break
compile of some platforms. I hope to have fixed everything before I
merge but don't forget to tell me if I missed something.
- Completely reworked 64 bits DMA operations
- Possibility to "hook" on PCI MMIO and PCI operations from the platform
code for use by iSeries, Cell and possibly others who have to deal with
weird hypervisor or PCI host bridge erratas. Currently supported only on
64 bits but would be easy to make it work on 32 bits if ever needed.
- Merged 32 and 64 bits io.h. ARCH=powerpc now uses asm-powerpc/io.h
for both. ARCH=ppc still uses the old one in asm-ppc as I really don't
feel like dealing with some of the cruft in there.
- As a consequence of the 2 above, new accessors are available that match
what is done by other architectures: {read,write}{w,l,q}_be for big endian
PCI MMIO accesses, {read,write}s{b,w,l} for MMIO "repeat" operations, and
a significant cleanup of the EEH stuff.
- Cell IOMMU support (mostly written by Jeremy Kerr)
And more ...
^ permalink raw reply
* [PATCH 0/32] My current serie of patches for 2.6.20 for review
From: Benjamin Herrenschmidt @ 2006-11-11 6:24 UTC (permalink / raw)
To: linuxppc-dev
This should be ready for merge in powerpc tree and 2.6.20 as soon
as the merge window opens.
One prerequisite is Geoff's patch testing ppc_md.init_early for
NULL before calling it as I removed pasemi's init_early (now
empty) with the DMA patch.
[Note: Differences since the last version are the renaming of
dev_sysdata to dev_archdata along with a few more cosmetic
mostly changes to that patch, adapting the others to that change,
a bug fix for iseries, and pasemi was missing from the DMA changes,
this version fixes it]
Note that the first 5 ones require specific comments:
* ibmveth: Remove ibmveth "liobn" field
is already queued with Jeff Garzik and will get in 2.6.20
via his merge tree
* Call platform_notify_remove later
is queued in -mm and Andrew sent it to Greg, I expect greg to
merge it in 2.6.20
* Driver core: add notification of bus events
is queued in Greg's tree and scheduled for merge in 2.6.20
* arch provides generic iomap missing accessors
was written by Linus but is not merged yet. He asked me to
resend it when needed, so I'll include it with the other patches
when the merge window opens.
* Add arch specific dev_archdata to struct device
this seems to be generally accepted and should be merged by Greg
or Andrew in 2.6.20
* Change ACPI to use dev_archdata instead of firmware_data
this is a patch that goes along the previous one (though not actually
necessary). It doesn't actually need to go in powerpc.git nor 2.6.20,
I included it in this serie for completeness
This patch set started its life as the support for the new "Axon"
southbridge for cell (which includes such things as MMIO mapped DCR
and 4xx-type devices). However, as things evolved, I ended up doing
a lot more than just the basic support. Among other highlights of
this patch serie are:
- Generic DCR support for both 4xx-type DCRs and MMIO mapped DCR and
MPIC & EMAC changes to work with that
- Souped up of_platform_driver to make it easier to register entire
trees of devices at once, along with PCI host bridge detection support
for 64 bits architectures. Note that some name changes might break
compile of some platforms. I hope to have fixed everything before I
merge but don't forget to tell me if I missed something.
- Completely reworked 64 bits DMA operations
- Possibility to "hook" on PCI MMIO and PCI operations from the platform
code for use by iSeries, Cell and possibly others who have to deal with
weird hypervisor or PCI host bridge erratas. Currently supported only on
64 bits but would be easy to make it work on 32 bits if ever needed.
- Merged 32 and 64 bits io.h. ARCH=powerpc now uses asm-powerpc/io.h
for both. ARCH=ppc still uses the old one in asm-ppc as I really don't
feel like dealing with some of the cruft in there.
- As a consequence of the 2 above, new accessors are available that match
what is done by other architectures: {read,write}{w,l,q}_be for big endian
PCI MMIO accesses, {read,write}s{b,w,l} for MMIO "repeat" operations, and
a significant cleanup of the EEH stuff.
- Cell IOMMU support (mostly written by Jeremy Kerr)
And more ...
^ permalink raw reply
* [PATCH 1/32] ibmveth: Remove ibmveth "liobn" field
From: Benjamin Herrenschmidt @ 2006-11-11 6:24 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <1163226282.72526.823314634857.qpush@butch>
Remove the now unused "liobn" field in ibmveth which also avoids
having insider knowledge of the iommu table in that driver.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Santiago Leon <santil@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---
Already in Jeff's queue.
drivers/net/ibmveth.c | 4 ----
drivers/net/ibmveth.h | 1 -
2 files changed, 5 deletions(-)
Index: linux-cell/drivers/net/ibmveth.c
===================================================================
--- linux-cell.orig/drivers/net/ibmveth.c 2006-10-23 14:41:38.000000000 +1000
+++ linux-cell/drivers/net/ibmveth.c 2006-10-25 14:12:05.000000000 +1000
@@ -50,7 +50,6 @@
#include <asm/semaphore.h>
#include <asm/hvcall.h>
#include <asm/atomic.h>
-#include <asm/iommu.h>
#include <asm/vio.h>
#include <asm/uaccess.h>
#include <linux/seq_file.h>
@@ -1000,8 +999,6 @@ static int __devinit ibmveth_probe(struc
adapter->mac_addr = 0;
memcpy(&adapter->mac_addr, mac_addr_p, 6);
- adapter->liobn = dev->iommu_table->it_index;
-
netdev->irq = dev->irq;
netdev->open = ibmveth_open;
netdev->poll = ibmveth_poll;
@@ -1115,7 +1112,6 @@ static int ibmveth_seq_show(struct seq_f
seq_printf(seq, "%s %s\n\n", ibmveth_driver_string, ibmveth_driver_version);
seq_printf(seq, "Unit Address: 0x%x\n", adapter->vdev->unit_address);
- seq_printf(seq, "LIOBN: 0x%lx\n", adapter->liobn);
seq_printf(seq, "Current MAC: %02X:%02X:%02X:%02X:%02X:%02X\n",
current_mac[0], current_mac[1], current_mac[2],
current_mac[3], current_mac[4], current_mac[5]);
Index: linux-cell/drivers/net/ibmveth.h
===================================================================
--- linux-cell.orig/drivers/net/ibmveth.h 2006-10-06 13:48:09.000000000 +1000
+++ linux-cell/drivers/net/ibmveth.h 2006-10-25 14:10:39.000000000 +1000
@@ -118,7 +118,6 @@ struct ibmveth_adapter {
struct net_device_stats stats;
unsigned int mcastFilterSize;
unsigned long mac_addr;
- unsigned long liobn;
void * buffer_list_addr;
void * filter_list_addr;
dma_addr_t buffer_list_dma;
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox