* linux-next: build failure after merge of the pci-current tree
@ 2012-01-05 0:07 Stephen Rothwell
2012-01-05 0:11 ` Jesse Barnes
2012-01-05 2:16 ` Stephen Rothwell
0 siblings, 2 replies; 19+ messages in thread
From: Stephen Rothwell @ 2012-01-05 0:07 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Dave Jones
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
Hi Jesse,
After merging the pci-current tree, today's linux-next build (x86_64
allmodconfig) failed like this:
arch/x86/pci/acpi.c:81:46: error: expected '}' before ';' token
Caused by commit 4c33d0af35ba ("PCI: Add Dell Studio 1557 to pci=nocrs
blacklist"). Please build test your tree ...
I have used the pci-current tree from next-20120104 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the pci-current tree
2012-01-05 0:07 linux-next: build failure after merge of the pci-current tree Stephen Rothwell
@ 2012-01-05 0:11 ` Jesse Barnes
2012-01-05 0:19 ` Stephen Rothwell
2012-01-05 2:16 ` Stephen Rothwell
1 sibling, 1 reply; 19+ messages in thread
From: Jesse Barnes @ 2012-01-05 0:11 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Dave Jones
[-- Attachment #1: Type: text/plain, Size: 583 bytes --]
On Thu, 5 Jan 2012 11:07:12 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jesse,
>
> After merging the pci-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> arch/x86/pci/acpi.c:81:46: error: expected '}' before ';' token
>
> Caused by commit 4c33d0af35ba ("PCI: Add Dell Studio 1557 to pci=nocrs
> blacklist"). Please build test your tree ...
>
> I have used the pci-current tree from next-20120104 for today.
Arg failure of my hand merge. Will fix now.
--
Jesse Barnes, Intel Open Source Technology Center
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the pci-current tree
2012-01-05 0:11 ` Jesse Barnes
@ 2012-01-05 0:19 ` Stephen Rothwell
2012-01-05 0:27 ` Dave Jones
0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2012-01-05 0:19 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Dave Jones
[-- Attachment #1: Type: text/plain, Size: 306 bytes --]
Hi Jesse,
On Wed, 4 Jan 2012 16:11:22 -0800 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Arg failure of my hand merge.
Not really, the original was broken (as is the version in fc16 (which has
been disabled there)).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the pci-current tree
2012-01-05 0:19 ` Stephen Rothwell
@ 2012-01-05 0:27 ` Dave Jones
0 siblings, 0 replies; 19+ messages in thread
From: Dave Jones @ 2012-01-05 0:27 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jesse Barnes, linux-next, linux-kernel
On Thu, Jan 05, 2012 at 11:19:40AM +1100, Stephen Rothwell wrote:
> Hi Jesse,
>
> On Wed, 4 Jan 2012 16:11:22 -0800 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> >
> > Arg failure of my hand merge.
>
> Not really, the original was broken (as is the version in fc16 (which has
> been disabled there)).
ugh, sorry about that. too many trees.
the one I build-tested had it right, but I generated an incremental
from a wrong one..
Dave
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the pci-current tree
2012-01-05 0:07 linux-next: build failure after merge of the pci-current tree Stephen Rothwell
2012-01-05 0:11 ` Jesse Barnes
@ 2012-01-05 2:16 ` Stephen Rothwell
1 sibling, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2012-01-05 2:16 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Dave Jones
[-- Attachment #1: Type: text/plain, Size: 685 bytes --]
Hi Jesse,
On Thu, 5 Jan 2012 11:07:12 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the pci-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> arch/x86/pci/acpi.c:81:46: error: expected '}' before ';' token
>
> Caused by commit 4c33d0af35ba ("PCI: Add Dell Studio 1557 to pci=nocrs
> blacklist"). Please build test your tree ...
>
> I have used the pci-current tree from next-20120104 for today.
Of course I got the same failure in the pci tree, so I used the
next-20120104 version of it as well.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the pci-current tree
2011-11-03 5:19 ` Stephen Rothwell
@ 2011-11-03 15:02 ` Jesse Barnes
0 siblings, 0 replies; 19+ messages in thread
From: Jesse Barnes @ 2011-11-03 15:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Randy Dunlap, Paul Gortmaker
[-- Attachment #1: Type: text/plain, Size: 917 bytes --]
On Thu, 3 Nov 2011 16:19:59 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Thu, 3 Nov 2011 14:32:56 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Thu, 3 Nov 2011 12:53:25 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the pci-current tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/pci/ats.c:13:26: fatal error: linux/export.h: No such file or directory
> > >
> > > Caused by commit 571eba1b8aa9 ("PCI: Fix compile errors with PCI_ATS and !
> > > PCI_IOV").
> >
> > I have added that patch as a merge fix where I merge the module.h split
> > up tree. (Included below for Paul's benefit.)
>
> Actually, this was already in the moduleh tree. Sorry for the noise.
Ok I'll drop it from my tree then.
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the pci-current tree
2011-11-03 3:32 ` Stephen Rothwell
@ 2011-11-03 5:19 ` Stephen Rothwell
2011-11-03 15:02 ` Jesse Barnes
0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2011-11-03 5:19 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Randy Dunlap, Paul Gortmaker
[-- Attachment #1: Type: text/plain, Size: 798 bytes --]
Hi all,
On Thu, 3 Nov 2011 14:32:56 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 3 Nov 2011 12:53:25 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the pci-current tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/pci/ats.c:13:26: fatal error: linux/export.h: No such file or directory
> >
> > Caused by commit 571eba1b8aa9 ("PCI: Fix compile errors with PCI_ATS and !
> > PCI_IOV").
>
> I have added that patch as a merge fix where I merge the module.h split
> up tree. (Included below for Paul's benefit.)
Actually, this was already in the moduleh tree. Sorry for the noise.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the pci-current tree
2011-11-03 1:53 Stephen Rothwell
2011-11-03 2:04 ` Jesse Barnes
2011-11-03 3:22 ` Stephen Rothwell
@ 2011-11-03 3:32 ` Stephen Rothwell
2011-11-03 5:19 ` Stephen Rothwell
2 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2011-11-03 3:32 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Randy Dunlap, Paul Gortmaker
[-- Attachment #1: Type: text/plain, Size: 1641 bytes --]
Hi Jesse,
On Thu, 3 Nov 2011 12:53:25 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the pci-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/pci/ats.c:13:26: fatal error: linux/export.h: No such file or directory
>
> Caused by commit 571eba1b8aa9 ("PCI: Fix compile errors with PCI_ATS and !
> PCI_IOV").
I have added that patch as a merge fix where I merge the module.h split
up tree. (Included below for Paul's benefit.)
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Mon, 31 Oct 2011 10:31:01 -0700
Subject: [PATCH] PCI: Fix compile errors with PCI_ATS and !PCI_IOV
For linux-next (where the module-split tree is being worked),
drivers/pci/ats.c also needs to include <linux/export.h> to fix build
warnings:
drivers/pci/ats.c:96:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/pci/ats.c:127:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
etc.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
drivers/pci/ats.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c
index f727a09..7ec56fb 100644
--- a/drivers/pci/ats.c
+++ b/drivers/pci/ats.c
@@ -10,6 +10,7 @@
* PASID support added by Joerg Roedel <joerg.roedel@amd.com>
*/
+#include <linux/export.h>
#include <linux/pci-ats.h>
#include <linux/pci.h>
--
1.7.7.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the pci-current tree
2011-11-03 1:53 Stephen Rothwell
2011-11-03 2:04 ` Jesse Barnes
@ 2011-11-03 3:22 ` Stephen Rothwell
2011-11-03 3:32 ` Stephen Rothwell
2 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2011-11-03 3:22 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Randy Dunlap
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
Hi Jesse,
On Thu, 3 Nov 2011 12:53:25 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the pci-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/pci/ats.c:13:26: fatal error: linux/export.h: No such file or directory
So this affected the pci tree as well. So I have used the pci tree from
next-20111102.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the pci-current tree
2011-11-03 2:04 ` Jesse Barnes
@ 2011-11-03 2:37 ` Stephen Rothwell
0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2011-11-03 2:37 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Randy Dunlap
[-- Attachment #1: Type: text/plain, Size: 503 bytes --]
Hi Jesse,
On Wed, 2 Nov 2011 19:04:36 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Oh I thought Randy said this stuff was in -next already... Sorry for
> the trouble.
It is in -next, but merged way after your tree is merged. You can't
depend on stuff in -next in your trees ... This sort of fix needs to be
carried in -next itself until the bits get merged by Linus.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the pci-current tree
2011-11-03 1:53 Stephen Rothwell
@ 2011-11-03 2:04 ` Jesse Barnes
2011-11-03 2:37 ` Stephen Rothwell
2011-11-03 3:22 ` Stephen Rothwell
2011-11-03 3:32 ` Stephen Rothwell
2 siblings, 1 reply; 19+ messages in thread
From: Jesse Barnes @ 2011-11-03 2:04 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Randy Dunlap
On Thu, 3 Nov 2011 12:53:25 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jesse,
>
> After merging the pci-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/pci/ats.c:13:26: fatal error: linux/export.h: No such file or directory
>
> Caused by commit 571eba1b8aa9 ("PCI: Fix compile errors with PCI_ATS and !
> PCI_IOV").
>
> You didn't build this, right? :-( linux/export.h does not yet exist in
> Linus' tree ... I have used the pci-current tree from next-20111102 for
> today.
Oh I thought Randy said this stuff was in -next already... Sorry for
the trouble.
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 19+ messages in thread
* linux-next: build failure after merge of the pci-current tree
@ 2011-11-03 1:53 Stephen Rothwell
2011-11-03 2:04 ` Jesse Barnes
` (2 more replies)
0 siblings, 3 replies; 19+ messages in thread
From: Stephen Rothwell @ 2011-11-03 1:53 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Randy Dunlap
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
Hi Jesse,
After merging the pci-current tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/pci/ats.c:13:26: fatal error: linux/export.h: No such file or directory
Caused by commit 571eba1b8aa9 ("PCI: Fix compile errors with PCI_ATS and !
PCI_IOV").
You didn't build this, right? :-( linux/export.h does not yet exist in
Linus' tree ... I have used the pci-current tree from next-20111102 for
today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the pci-current tree
2011-08-02 1:23 ` Stephen Rothwell
@ 2011-08-02 15:53 ` Jesse Barnes
0 siblings, 0 replies; 19+ messages in thread
From: Jesse Barnes @ 2011-08-02 15:53 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jon Mason, Jordan Hargrave
On Tue, 2 Aug 2011 11:23:36 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jesse,
>
> On Tue, 2 Aug 2011 10:48:38 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the pci-current tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > ERROR: ".pcie_bus_configure_settings" [drivers/pci/hotplug/pci_hotplug.ko] undefined!
> >
> > Caused by commit b03e7495a862 ("PCI: Set PCI-E Max Payload Size on
> > fabric"). Missing EXPORT_SYMBOL?
> >
> > I have used the pci-current tree from next-20110801 for today.
>
> And the same for the pci tree (which is identical today).
Jon just sent me the fix and I pushed it out. Should be fixed now.
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the pci-current tree
2011-08-02 0:48 Stephen Rothwell
@ 2011-08-02 1:23 ` Stephen Rothwell
2011-08-02 15:53 ` Jesse Barnes
0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2011-08-02 1:23 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Jon Mason, Jordan Hargrave
[-- Attachment #1: Type: text/plain, Size: 653 bytes --]
Hi Jesse,
On Tue, 2 Aug 2011 10:48:38 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the pci-current tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> ERROR: ".pcie_bus_configure_settings" [drivers/pci/hotplug/pci_hotplug.ko] undefined!
>
> Caused by commit b03e7495a862 ("PCI: Set PCI-E Max Payload Size on
> fabric"). Missing EXPORT_SYMBOL?
>
> I have used the pci-current tree from next-20110801 for today.
And the same for the pci tree (which is identical today).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* linux-next: build failure after merge of the pci-current tree
@ 2011-08-02 0:48 Stephen Rothwell
2011-08-02 1:23 ` Stephen Rothwell
0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2011-08-02 0:48 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Jon Mason, Jordan Hargrave
[-- Attachment #1: Type: text/plain, Size: 487 bytes --]
Hi Jesse,
After merging the pci-current tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
ERROR: ".pcie_bus_configure_settings" [drivers/pci/hotplug/pci_hotplug.ko] undefined!
Caused by commit b03e7495a862 ("PCI: Set PCI-E Max Payload Size on
fabric"). Missing EXPORT_SYMBOL?
I have used the pci-current tree from next-20110801 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the pci-current tree
2011-07-07 18:19 ` Ram Pai
@ 2011-07-08 22:49 ` Jesse Barnes
0 siblings, 0 replies; 19+ messages in thread
From: Jesse Barnes @ 2011-07-08 22:49 UTC (permalink / raw)
To: Ram Pai; +Cc: Stephen Rothwell, linux-next, linux-kernel
On Thu, 7 Jul 2011 11:19:10 -0700
Ram Pai <linuxram@us.ibm.com> wrote:
> On Thu, Jul 07, 2011 at 08:52:05AM -0700, Jesse Barnes wrote:
> > On Thu, 7 Jul 2011 10:58:23 +1000
> > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > > Hi Jesse,
> > >
> > > After merging the pci-current tree, today's linux-next build (powerpc
> > > ppc64_defconfig) failed like this:
> > >
> > > drivers/built-in.o:(.toc1+0xb98): undefined reference to `pci_realloc'
> > >
> > > Caused by commit 72007d2b4797 ("PCI: conditional resource-reallocation
> > > through kernel parameter pci=realloc").
> > >
> > > I have used the pci-current tree from next-20110706 for today.
> >
> > Oops, x86 bits used in common code. I've pushed a fix that just moves
> > the variable into setup-bus.c rather than x86/pci/common.c.
>
> Jesse,
>
> I have fixed the problem and have a better patch. See if it is acceptable for you.
Yes, much better, thanks. I'll send it to Linus tomorrow if I don't
hear any complaints.
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the pci-current tree
2011-07-07 15:52 ` Jesse Barnes
@ 2011-07-07 18:19 ` Ram Pai
2011-07-08 22:49 ` Jesse Barnes
0 siblings, 1 reply; 19+ messages in thread
From: Ram Pai @ 2011-07-07 18:19 UTC (permalink / raw)
To: Jesse Barnes; +Cc: Stephen Rothwell, linux-next, linux-kernel, Ram Pai
On Thu, Jul 07, 2011 at 08:52:05AM -0700, Jesse Barnes wrote:
> On Thu, 7 Jul 2011 10:58:23 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Hi Jesse,
> >
> > After merging the pci-current tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > drivers/built-in.o:(.toc1+0xb98): undefined reference to `pci_realloc'
> >
> > Caused by commit 72007d2b4797 ("PCI: conditional resource-reallocation
> > through kernel parameter pci=realloc").
> >
> > I have used the pci-current tree from next-20110706 for today.
>
> Oops, x86 bits used in common code. I've pushed a fix that just moves
> the variable into setup-bus.c rather than x86/pci/common.c.
Jesse,
I have fixed the problem and have a better patch. See if it is acceptable for you.
>
> Ram, did you see the microblaze patch I forwarded you? It moves some
> re-alloc control flags into common code; for -next it might be cleaner
> to use them in a few places. Any comments?
Yes I have seen that forwarded mail. I will look through it.
Here is the patch.
commit 213e491e64a6c77f2e52abcb563a592964dd1074
Author: Ram Pai <linuxram@us.ibm.com>
Date: Thu Jun 30 00:45:39 2011 -0700
PCI: conditional resource-reallocation through kernel parameter pci=realloc
Multiple attempts to dynamically reallocate pci resources have unfortunately
lead to regressions. Though we continue to fix the regressions and fine tune the
dynamic-reallocation behavior, we have not reached a acceptable state yet.
This patch provides a interim solution. It disables dynamic-reallocation; by
default, with the ability to enable it through pci=realloc kernel command line
parameter.
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
Documentation/kernel-parameters.txt | 2 ++
drivers/pci/pci.c | 2 ++
drivers/pci/pci.h | 2 ++
drivers/pci/setup-bus.c | 15 +++++++++++++++
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index fd248a31..aa47be7 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2015,6 +2015,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
the default.
off: Turn ECRC off
on: Turn ECRC on.
+ realloc reallocate PCI resources if allocations done by BIOS
+ are erroneous.
pcie_aspm= [PCIE] Forcibly enable or disable PCIe Active State Power
Management.
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 5f10c23..7df8e3c 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -3483,6 +3483,8 @@ static int __init pci_setup(char *str)
pci_no_msi();
} else if (!strcmp(str, "noaer")) {
pci_no_aer();
+ } else if (!strncmp(str, "realloc", 7)) {
+ pci_realloc();
} else if (!strcmp(str, "nodomains")) {
pci_no_domains();
} else if (!strncmp(str, "cbiosize=", 9)) {
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index ebaf0ed..2b3f60b 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -146,6 +146,8 @@ static inline void pci_no_msi(void) { }
static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
#endif
+extern void pci_realloc(void);
+
static inline int pci_no_d1d2(struct pci_dev *dev)
{
unsigned int parent_dstates = 0;
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 68b4fce..f6616cb 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -48,6 +48,13 @@ struct resource_list_x {
(head)->next = NULL; \
} while (0)
+int pci_realloc_enable = 0;
+#define pci_realloc_enabled() pci_realloc_enable
+void pci_realloc(void)
+{
+ pci_realloc_enable = 1;
+}
+
/**
* add_to_list() - add a new resource tracker to the list
* @head: Head of the list
@@ -1091,6 +1098,7 @@ static int __init pci_get_max_depth(void)
return depth;
}
+
/*
* first try will not touch pci bridge res
* second and later try will clear small leaf bridge res
@@ -1134,6 +1142,13 @@ again:
/* any device complain? */
if (!head.next)
goto enable_and_dump;
+
+ /* don't realloc if asked to do so */
+ if (!pci_realloc_enabled()) {
+ free_list(resource_list_x, &head);
+ goto enable_and_dump;
+ }
+
failed_type = 0;
for (list = head.next; list;) {
failed_type |= list->flags;
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the pci-current tree
2011-07-07 0:58 Stephen Rothwell
@ 2011-07-07 15:52 ` Jesse Barnes
2011-07-07 18:19 ` Ram Pai
0 siblings, 1 reply; 19+ messages in thread
From: Jesse Barnes @ 2011-07-07 15:52 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Ram Pai
On Thu, 7 Jul 2011 10:58:23 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jesse,
>
> After merging the pci-current tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/built-in.o:(.toc1+0xb98): undefined reference to `pci_realloc'
>
> Caused by commit 72007d2b4797 ("PCI: conditional resource-reallocation
> through kernel parameter pci=realloc").
>
> I have used the pci-current tree from next-20110706 for today.
Oops, x86 bits used in common code. I've pushed a fix that just moves
the variable into setup-bus.c rather than x86/pci/common.c.
Ram, did you see the microblaze patch I forwarded you? It moves some
re-alloc control flags into common code; for -next it might be cleaner
to use them in a few places. Any comments?
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 19+ messages in thread
* linux-next: build failure after merge of the pci-current tree
@ 2011-07-07 0:58 Stephen Rothwell
2011-07-07 15:52 ` Jesse Barnes
0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2011-07-07 0:58 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Ram Pai
[-- Attachment #1: Type: text/plain, Size: 482 bytes --]
Hi Jesse,
After merging the pci-current tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/built-in.o:(.toc1+0xb98): undefined reference to `pci_realloc'
Caused by commit 72007d2b4797 ("PCI: conditional resource-reallocation
through kernel parameter pci=realloc").
I have used the pci-current tree from next-20110706 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2012-01-05 2:16 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-05 0:07 linux-next: build failure after merge of the pci-current tree Stephen Rothwell
2012-01-05 0:11 ` Jesse Barnes
2012-01-05 0:19 ` Stephen Rothwell
2012-01-05 0:27 ` Dave Jones
2012-01-05 2:16 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-11-03 1:53 Stephen Rothwell
2011-11-03 2:04 ` Jesse Barnes
2011-11-03 2:37 ` Stephen Rothwell
2011-11-03 3:22 ` Stephen Rothwell
2011-11-03 3:32 ` Stephen Rothwell
2011-11-03 5:19 ` Stephen Rothwell
2011-11-03 15:02 ` Jesse Barnes
2011-08-02 0:48 Stephen Rothwell
2011-08-02 1:23 ` Stephen Rothwell
2011-08-02 15:53 ` Jesse Barnes
2011-07-07 0:58 Stephen Rothwell
2011-07-07 15:52 ` Jesse Barnes
2011-07-07 18:19 ` Ram Pai
2011-07-08 22:49 ` Jesse Barnes
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).