linux-next: pci tree build failure

linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 495 bytes --]

Hi Jesse,

Today's linux-next build (x86_64 allmodconfig) failed like this:

ERROR: "pci_set_cacheline_size" [drivers/pcmcia/pcmcia_core.ko] undefined!

Caused by commit 018bc96e8e27bfcafec9357ff370bf51241a7ea7 ("pccard:
configure CLS on attach") which neglected to EXPORT_SYMBOL
pci_set_cacheline_size.

I have used the version of the pci tree from next-20091006 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: pci tree build failure

[Tejun Heo]

Stephen Rothwell wrote:
> Hi Jesse,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> ERROR: "pci_set_cacheline_size" [drivers/pcmcia/pcmcia_core.ko] undefined!
> 
> Caused by commit 018bc96e8e27bfcafec9357ff370bf51241a7ea7 ("pccard:
> configure CLS on attach") which neglected to EXPORT_SYMBOL
> pci_set_cacheline_size.
> 
> I have used the version of the pci tree from next-20091006 for today.
> 

Oops, Jesse, can you please add EXPORT_SYMBOL_GPL() there?

Thanks.

-- 
tejun

Re: linux-next: pci tree build failure

[Jesse Barnes]

On Wed, 07 Oct 2009 10:45:35 +0900
Tejun Heo <tj@kernel.org> wrote:

> Stephen Rothwell wrote:
> > Hi Jesse,
> > 
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > 
> > ERROR: "pci_set_cacheline_size" [drivers/pcmcia/pcmcia_core.ko]
> > undefined!
> > 
> > Caused by commit 018bc96e8e27bfcafec9357ff370bf51241a7ea7 ("pccard:
> > configure CLS on attach") which neglected to EXPORT_SYMBOL
> > pci_set_cacheline_size.
> > 
> > I have used the version of the pci tree from next-20091006 for
> > today.
> > 
> 
> Oops, Jesse, can you please add EXPORT_SYMBOL_GPL() there?

Sure, sorry I missed it.

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

linux-next: pci tree build failure

[Stephen Rothwell]

Hi Jesse,

Today's linux-next build (powerpc allyesconfig) failed like this:

In file included from drivers/pci/pcie/pme/pcie_pme.c:22:
include/linux/pci-acpi.h:42: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'acpi_find_root_bridge_handle'

You seem to have lost the patch below which I have reapplied for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Jan 2010 19:36:11 +1100
Subject: [PATCH] pci: PCIE_PME seems to depend on ACPI

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/pci/pcie/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
index cf3c35f..b8b494b 100644
--- a/drivers/pci/pcie/Kconfig
+++ b/drivers/pci/pcie/Kconfig
@@ -49,4 +49,4 @@ config PCIEASPM_DEBUG
 
 config PCIE_PME
 	def_bool y
-	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL
+	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL && ACPI
-- 
1.6.6

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: pci tree build failure

[Jesse Barnes]

On Wed, 27 Jan 2010 17:49:00 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jesse,
> 
> Today's linux-next build (powerpc allyesconfig) failed like this:
> 
> In file included from drivers/pci/pcie/pme/pcie_pme.c:22:
> include/linux/pci-acpi.h:42: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'acpi_find_root_bridge_handle'
> 
> You seem to have lost the patch below which I have reapplied for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 18 Jan 2010 19:36:11 +1100
> Subject: [PATCH] pci: PCIE_PME seems to depend on ACPI
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/pci/pcie/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
> index cf3c35f..b8b494b 100644
> --- a/drivers/pci/pcie/Kconfig
> +++ b/drivers/pci/pcie/Kconfig
> @@ -49,4 +49,4 @@ config PCIEASPM_DEBUG
>  
>  config PCIE_PME
>  	def_bool y
> -	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL
> +	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL && ACPI

Sorry about that.  Sometimes I point git in the wrong direction and it
takes of a limb or two.  Should be fixed now.

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 347 bytes --]

Hi Jesse,

On Wed, 27 Jan 2010 09:31:13 -0800 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Sorry about that.  Sometimes I point git in the wrong direction and it
> takes of a limb or two.  Should be fixed now.

Yep, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

linux-next: pci tree build failure

[Stephen Rothwell]

Hi Jesse,

Today's linux-next build (ppc64 allyesconfig) failed like this:

In file included from drivers/pci/pcie/pme/pcie_pme.c:22:
include/linux/pci-acpi.h:42: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'acpi_find_root_bridge_handle'

This file was added in commit f3adb5a4f2e1dfdf9482af05481d0928a39477e8
("PCI PM: PCIe PME root port service driver") from the pci tree and seems
to depend on ACPI.  Maybe its building should depend on CONFIG_ACPI?

I added the following patch for today (I presume there is a better fix):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Jan 2010 19:36:11 +1100
Subject: [PATCH] pci: PCIE_PME seems to depend on ACPI

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/pci/pcie/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
index cf3c35f..b8b494b 100644
--- a/drivers/pci/pcie/Kconfig
+++ b/drivers/pci/pcie/Kconfig
@@ -49,4 +49,4 @@ config PCIEASPM_DEBUG
 
 config PCIE_PME
 	def_bool y
-	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL
+	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL && ACPI
-- 
1.6.6

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: pci tree build failure

[Rafael J. Wysocki]

On Monday 18 January 2010, Stephen Rothwell wrote:
> Hi Jesse,
> 
> Today's linux-next build (ppc64 allyesconfig) failed like this:
> 
> In file included from drivers/pci/pcie/pme/pcie_pme.c:22:
> include/linux/pci-acpi.h:42: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'acpi_find_root_bridge_handle'
> 
> This file was added in commit f3adb5a4f2e1dfdf9482af05481d0928a39477e8
> ("PCI PM: PCIe PME root port service driver") from the pci tree and seems
> to depend on ACPI.  Maybe its building should depend on CONFIG_ACPI?
> 
> I added the following patch for today (I presume there is a better fix):
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 18 Jan 2010 19:36:11 +1100
> Subject: [PATCH] pci: PCIE_PME seems to depend on ACPI
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/pci/pcie/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
> index cf3c35f..b8b494b 100644
> --- a/drivers/pci/pcie/Kconfig
> +++ b/drivers/pci/pcie/Kconfig
> @@ -49,4 +49,4 @@ config PCIEASPM_DEBUG
>  
>  config PCIE_PME
>  	def_bool y
> -	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL
> +	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL && ACPI

Thanks a lot, this is the right fix IMO.

Jesse, do you want me to resend the patch with this fix included or are you
going to take the Stephens patch to your tree?

Rafael

Re: linux-next: pci tree build failure

[Jesse Barnes]

On Mon, 18 Jan 2010 22:24:44 +0100
"Rafael J. Wysocki" <rjw@sisk.pl> wrote:

> On Monday 18 January 2010, Stephen Rothwell wrote:
> > Hi Jesse,
> > 
> > Today's linux-next build (ppc64 allyesconfig) failed like this:
> > 
> > In file included from drivers/pci/pcie/pme/pcie_pme.c:22:
> > include/linux/pci-acpi.h:42: error: expected '=', ',', ';', 'asm'
> > or '__attribute__' before 'acpi_find_root_bridge_handle'
> > 
> > This file was added in commit
> > f3adb5a4f2e1dfdf9482af05481d0928a39477e8 ("PCI PM: PCIe PME root
> > port service driver") from the pci tree and seems to depend on
> > ACPI.  Maybe its building should depend on CONFIG_ACPI?
> > 
> > I added the following patch for today (I presume there is a better
> > fix):
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 18 Jan 2010 19:36:11 +1100
> > Subject: [PATCH] pci: PCIE_PME seems to depend on ACPI
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/pci/pcie/Kconfig |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
> > index cf3c35f..b8b494b 100644
> > --- a/drivers/pci/pcie/Kconfig
> > +++ b/drivers/pci/pcie/Kconfig
> > @@ -49,4 +49,4 @@ config PCIEASPM_DEBUG
> >  
> >  config PCIE_PME
> >  	def_bool y
> > -	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL
> > +	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL &&
> > ACPI
> 
> Thanks a lot, this is the right fix IMO.
> 
> Jesse, do you want me to resend the patch with this fix included or
> are you going to take the Stephens patch to your tree?

I'll pull in Stephen's fix, thanks.

Jesse

Re: linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 532 bytes --]

Hi all,

On Tue, 19 Jan 2010 02:35:34 +0000 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> On Mon, 18 Jan 2010 22:24:44 +0100 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> > 
> > Thanks a lot, this is the right fix IMO.
> > 
> > Jesse, do you want me to resend the patch with this fix included or
> > are you going to take the Stephens patch to your tree?
> 
> I'll pull in Stephen's fix, thanks.

OK, thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: pci tree build failure

[Jesse Barnes]

Pushed this fix out to linux-next, thanks.

Jesse

On Mon, 18 Jan 2010 19:40:50 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jesse,
> 
> Today's linux-next build (ppc64 allyesconfig) failed like this:
> 
> In file included from drivers/pci/pcie/pme/pcie_pme.c:22:
> include/linux/pci-acpi.h:42: error: expected '=', ',', ';', 'asm' or
> '__attribute__' before 'acpi_find_root_bridge_handle'
> 
> This file was added in commit f3adb5a4f2e1dfdf9482af05481d0928a39477e8
> ("PCI PM: PCIe PME root port service driver") from the pci tree and
> seems to depend on ACPI.  Maybe its building should depend on
> CONFIG_ACPI?
> 
> I added the following patch for today (I presume there is a better
> fix):
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 18 Jan 2010 19:36:11 +1100
> Subject: [PATCH] pci: PCIE_PME seems to depend on ACPI
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/pci/pcie/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
> index cf3c35f..b8b494b 100644
> --- a/drivers/pci/pcie/Kconfig
> +++ b/drivers/pci/pcie/Kconfig
> @@ -49,4 +49,4 @@ config PCIEASPM_DEBUG
>  
>  config PCIE_PME
>  	def_bool y
> -	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL
> +	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL && ACPI

Re: linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 265 bytes --]

Hi Jesse,

On Wed, 20 Jan 2010 06:39:32 +0200 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Pushed this fix out to linux-next, thanks.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 690 bytes --]

Hi Jesse,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

drivers/pci/hotplug/rpaphp_core.c:433: error: unknown field 'get_max_bus_speed' specified in initializer
drivers/pci/hotplug/rpaphp_core.c:433: warning: excess elements in struct initializer
drivers/pci/hotplug/rpaphp_core.c:433: warning: (near initialization for 'rpaphp_hotplug_slot_ops')

Caused by commit 7227d60c98ad0e1af49c717a62515d74002dd754 ("PCI: Make
current and maximum bus speeds part of the PCI core").

I have used the version of the pci tree from next-20100104 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: pci tree build failure

[Matthew Wilcox]

On Tue, Jan 05, 2010 at 09:55:43AM +1100, Stephen Rothwell wrote:
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> drivers/pci/hotplug/rpaphp_core.c:433: error: unknown field 'get_max_bus_speed' specified in initializer
> drivers/pci/hotplug/rpaphp_core.c:433: warning: excess elements in struct initializer
> drivers/pci/hotplug/rpaphp_core.c:433: warning: (near initialization for 'rpaphp_hotplug_slot_ops')
> 
> Caused by commit 7227d60c98ad0e1af49c717a62515d74002dd754 ("PCI: Make
> current and maximum bus speeds part of the PCI core").
> 
> I have used the version of the pci tree from next-20100104 for today.

Doh, sorry.  I don't have a handy powerpc environment around to test with.
Can you try just deleting line 433?  (this should actually be the correct fix).

-- 
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."

Re: linux-next: pci tree build failure

[Jesse Barnes]

On Mon, 4 Jan 2010 16:10:01 -0700
Matthew Wilcox <matthew@wil.cx> wrote:

> On Tue, Jan 05, 2010 at 09:55:43AM +1100, Stephen Rothwell wrote:
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> > 
> > drivers/pci/hotplug/rpaphp_core.c:433: error: unknown field
> > 'get_max_bus_speed' specified in initializer
> > drivers/pci/hotplug/rpaphp_core.c:433: warning: excess elements in
> > struct initializer drivers/pci/hotplug/rpaphp_core.c:433: warning:
> > (near initialization for 'rpaphp_hotplug_slot_ops')
> > 
> > Caused by commit 7227d60c98ad0e1af49c717a62515d74002dd754 ("PCI:
> > Make current and maximum bus speeds part of the PCI core").
> > 
> > I have used the version of the pci tree from next-20100104 for
> > today.
> 
> Doh, sorry.  I don't have a handy powerpc environment around to test
> with. Can you try just deleting line 433?  (this should actually be
> the correct fix).

I just pushed that into my linux-next tree.

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

Re: linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 439 bytes --]

Hi Jesse,

On Mon, 4 Jan 2010 15:48:43 -0800 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> > Doh, sorry.  I don't have a handy powerpc environment around to test
> > with. Can you try just deleting line 433?  (this should actually be
> > the correct fix).
> 
> I just pushed that into my linux-next tree.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 498 bytes --]

Hi Jesse,

Today's linux-next build (x86_64 allmodconfig) failed like this:

arch/x86/pci/common.c:619: error: expected '}' before ';' token

Caused by commit 1c6804b093f5753c2a23aa36f31f66966035bd32 ("x86/PCI:
initialize PCI bus node numbers early").  This could not have been built
with CONFIG_NUMA set ...

I have used the version of the pci tree from next-20090714 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: pci tree build failure

[Jesse Barnes]

On Wed, 15 Jul 2009 11:45:10 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jesse,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> arch/x86/pci/common.c:619: error: expected '}' before ';' token
> 
> Caused by commit 1c6804b093f5753c2a23aa36f31f66966035bd32 ("x86/PCI:
> initialize PCI bus node numbers early").  This could not have been
> built with CONFIG_NUMA set ...
> 
> I have used the version of the pci tree from next-20090714 for today.

Arg, did I apply the patch w/o that fix?  Fixing now...

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 278 bytes --]

Hi Jesse,

On Wed, 15 Jul 2009 09:09:13 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Arg, did I apply the patch w/o that fix?  Fixing now...

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 493 bytes --]

Hi Jesse,

Today's linux-next build (x86_64 allmodconfig) failed like this:

ERROR: "pci_claim_resource" [drivers/pcmcia/yenta_socket.ko] undefined!

Caused by commit 6bb04b65dbff5a5bb01617351dbb0af577084752 ("yenta: Use
pci_claim_resource").  yenta can be built as a module, but
pci_claim_resource is not exported ...

I have used the pci tree from next-20090629 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: pci tree build failure

[Jesse Barnes]

On Tue, 30 Jun 2009 12:07:27 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jesse,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> ERROR: "pci_claim_resource" [drivers/pcmcia/yenta_socket.ko]
> undefined!
> 
> Caused by commit 6bb04b65dbff5a5bb01617351dbb0af577084752 ("yenta: Use
> pci_claim_resource").  yenta can be built as a module, but
> pci_claim_resource is not exported ...
> 
> I have used the pci tree from next-20090629 for today.

Damn, thought I built that.  linux-next earns its keep yet again.

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: linux-next: pci tree build failure

[Matthew Wilcox]

On Mon, Jun 29, 2009 at 07:13:24PM -0700, Jesse Barnes wrote:
> On Tue, 30 Jun 2009 12:07:27 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi Jesse,
> > 
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > 
> > ERROR: "pci_claim_resource" [drivers/pcmcia/yenta_socket.ko]
> > undefined!
> > 
> > Caused by commit 6bb04b65dbff5a5bb01617351dbb0af577084752 ("yenta: Use
> > pci_claim_resource").  yenta can be built as a module, but
> > pci_claim_resource is not exported ...
> > 
> > I have used the pci tree from next-20090629 for today.
> 
> Damn, thought I built that.  linux-next earns its keep yet again.

Sorry about that.  I thought I'd checked that.  Must have been confused
with another function.  There do seem to be legitimate *drivers*
that could use it (i2o for one), so I propose making it a full-bodied
'EXPORT_SYMBOL' and not bother with the _GPL tag.  Thoughts?

Re: linux-next: pci tree build failure

[Jesse Barnes]

On Mon, 29 Jun 2009 19:24:53 -0700
Matthew Wilcox <willy@linux.intel.com> wrote:

> On Mon, Jun 29, 2009 at 07:13:24PM -0700, Jesse Barnes wrote:
> > On Tue, 30 Jun 2009 12:07:27 +1000
> > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > > Hi Jesse,
> > > 
> > > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > > 
> > > ERROR: "pci_claim_resource" [drivers/pcmcia/yenta_socket.ko]
> > > undefined!
> > > 
> > > Caused by commit 6bb04b65dbff5a5bb01617351dbb0af577084752
> > > ("yenta: Use pci_claim_resource").  yenta can be built as a
> > > module, but pci_claim_resource is not exported ...
> > > 
> > > I have used the pci tree from next-20090629 for today.
> > 
> > Damn, thought I built that.  linux-next earns its keep yet again.
> 
> Sorry about that.  I thought I'd checked that.  Must have been
> confused with another function.  There do seem to be legitimate
> *drivers* that could use it (i2o for one), so I propose making it a
> full-bodied 'EXPORT_SYMBOL' and not bother with the _GPL tag.
> Thoughts?

Fine by me; that matches most of the PCI core (though the slots bits
are _GPL).

-- 
Jesse Barnes, Intel Open Source Technology Center

linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 669 bytes --]

Hi Jesse,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

arch/powerpc/kernel/msi.c: In function 'arch_msi_check_device':
arch/powerpc/kernel/msi.c:23: error: 'PCI_CAP_ID_MSI' undeclared (first use in this function)

Caused by commit 1c8d7b0a562da06d3ebe83f01b1ed553205d1ae4 ("PCI MSI: Add
support for multiple MSI").  PCI_CAP_ID_MSI is defined in
linux/pci_regs.h which is included by linux/pci.h, but neither is
included by arch/powerpc/kernel/msi.c.

I have used the version of the pci tree from next-20090320 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 808 bytes --]

Hi Jesse,

On Mon, 23 Mar 2009 12:49:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> arch/powerpc/kernel/msi.c: In function 'arch_msi_check_device':
> arch/powerpc/kernel/msi.c:23: error: 'PCI_CAP_ID_MSI' undeclared (first use in this function)
> 
> Caused by commit 1c8d7b0a562da06d3ebe83f01b1ed553205d1ae4 ("PCI MSI: Add
> support for multiple MSI").  PCI_CAP_ID_MSI is defined in
> linux/pci_regs.h which is included by linux/pci.h, but neither is
> included by arch/powerpc/kernel/msi.c.
> 
> I have used the version of the pci tree from next-20090320 for today.

This is still happening ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: pci tree build failure

[Jesse Barnes]

On Wed, 25 Mar 2009 12:21:21 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jesse,
> 
> On Mon, 23 Mar 2009 12:49:48 +1100 Stephen Rothwell
> <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> > 
> > arch/powerpc/kernel/msi.c: In function 'arch_msi_check_device':
> > arch/powerpc/kernel/msi.c:23: error: 'PCI_CAP_ID_MSI' undeclared
> > (first use in this function)
> > 
> > Caused by commit 1c8d7b0a562da06d3ebe83f01b1ed553205d1ae4 ("PCI
> > MSI: Add support for multiple MSI").  PCI_CAP_ID_MSI is defined in
> > linux/pci_regs.h which is included by linux/pci.h, but neither is
> > included by arch/powerpc/kernel/msi.c.
> > 
> > I have used the version of the pci tree from next-20090320 for
> > today.
> 
> This is still happening ...

Does this fix it?  Some header file changes must be to blame...

diff --git a/arch/powerpc/kernel/msi.c b/arch/powerpc/kernel/msi.c
index 0c16e2a..8bbc12d 100644
--- a/arch/powerpc/kernel/msi.c
+++ b/arch/powerpc/kernel/msi.c
@@ -9,6 +9,7 @@

 #include <linux/kernel.h>
 #include <linux/msi.h>
+#include <linux/pci.h>

 #include <asm/machdep.h>



-- 
Jesse Barnes, Intel Open Source Technology Center

Re: linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1349 bytes --]

Hi Jesse,

On Tue, 24 Mar 2009 18:38:00 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> On Wed, 25 Mar 2009 12:21:21 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > On Mon, 23 Mar 2009 12:49:48 +1100 Stephen Rothwell
> > <sfr@canb.auug.org.au> wrote:
> > >
> > > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> > > 
> > > arch/powerpc/kernel/msi.c: In function 'arch_msi_check_device':
> > > arch/powerpc/kernel/msi.c:23: error: 'PCI_CAP_ID_MSI' undeclared
> > > (first use in this function)
> > > 
> > > Caused by commit 1c8d7b0a562da06d3ebe83f01b1ed553205d1ae4 ("PCI
> > > MSI: Add support for multiple MSI").  PCI_CAP_ID_MSI is defined in
> > > linux/pci_regs.h which is included by linux/pci.h, but neither is
> > > included by arch/powerpc/kernel/msi.c.
> > > 
> > > I have used the version of the pci tree from next-20090320 for
> > > today.
> > 
> > This is still happening ...
> 
> Does this fix it?  Some header file changes must be to blame...

Yeah, that patch fixes it, but so does just reverting the commit above,
so I guess that powerpc file did not need any of the pci.h infrastructure
before.

Tested-by: Stephen Rothwell <sfr@canb.auug.org.au>

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: pci tree build failure

[Matthew Wilcox]

On Wed, Mar 25, 2009 at 02:41:17PM +1100, Stephen Rothwell wrote:
> Hi Jesse,
> 
> On Tue, 24 Mar 2009 18:38:00 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> >
> > On Wed, 25 Mar 2009 12:21:21 +1100
> > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > > On Mon, 23 Mar 2009 12:49:48 +1100 Stephen Rothwell
> > > <sfr@canb.auug.org.au> wrote:
> > > >
> > > > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> > > > 
> > > > arch/powerpc/kernel/msi.c: In function 'arch_msi_check_device':
> > > > arch/powerpc/kernel/msi.c:23: error: 'PCI_CAP_ID_MSI' undeclared
> > > > (first use in this function)
> > > > 
> > > > Caused by commit 1c8d7b0a562da06d3ebe83f01b1ed553205d1ae4 ("PCI
> > > > MSI: Add support for multiple MSI").  PCI_CAP_ID_MSI is defined in
> > > > linux/pci_regs.h which is included by linux/pci.h, but neither is
> > > > included by arch/powerpc/kernel/msi.c.
> > > > 
> > > > I have used the version of the pci tree from next-20090320 for
> > > > today.
> > > 
> > > This is still happening ...

I just got back from a long weekend ...

> > Does this fix it?  Some header file changes must be to blame...
> 
> Yeah, that patch fixes it, but so does just reverting the commit above,
> so I guess that powerpc file did not need any of the pci.h infrastructure
> before.
> 
> Tested-by: Stephen Rothwell <sfr@canb.auug.org.au>

I guess not.  I didn't compile-test it (I don't have a powerpc machine
or cross-compiler).  Seems odd, given that the whole purpose of the file
is to implement PCI MSI ... oh well.

Re: linux-next: pci tree build failure

[Jesse Barnes]

On Tue, 24 Mar 2009 21:30:01 -0700
Matthew Wilcox <willy@linux.intel.com> wrote:

> On Wed, Mar 25, 2009 at 02:41:17PM +1100, Stephen Rothwell wrote:
> > Hi Jesse,
> > 
> > On Tue, 24 Mar 2009 18:38:00 -0700 Jesse Barnes
> > <jbarnes@virtuousgeek.org> wrote:
> > >
> > > On Wed, 25 Mar 2009 12:21:21 +1100
> > > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > 
> > > > On Mon, 23 Mar 2009 12:49:48 +1100 Stephen Rothwell
> > > > <sfr@canb.auug.org.au> wrote:
> > > > >
> > > > > Today's linux-next build (powerpc ppc64_defconfig) failed
> > > > > like this:
> > > > > 
> > > > > arch/powerpc/kernel/msi.c: In function
> > > > > 'arch_msi_check_device': arch/powerpc/kernel/msi.c:23: error:
> > > > > 'PCI_CAP_ID_MSI' undeclared (first use in this function)
> > > > > 
> > > > > Caused by commit 1c8d7b0a562da06d3ebe83f01b1ed553205d1ae4
> > > > > ("PCI MSI: Add support for multiple MSI").  PCI_CAP_ID_MSI is
> > > > > defined in linux/pci_regs.h which is included by linux/pci.h,
> > > > > but neither is included by arch/powerpc/kernel/msi.c.
> > > > > 
> > > > > I have used the version of the pci tree from next-20090320 for
> > > > > today.
> > > > 
> > > > This is still happening ...
> 
> I just got back from a long weekend ...
> 
> > > Does this fix it?  Some header file changes must be to blame...
> > 
> > Yeah, that patch fixes it, but so does just reverting the commit
> > above, so I guess that powerpc file did not need any of the pci.h
> > infrastructure before.
> > 
> > Tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
> 
> I guess not.  I didn't compile-test it (I don't have a powerpc machine
> or cross-compiler).  Seems odd, given that the whole purpose of the
> file is to implement PCI MSI ... oh well.

Ok fix pushed.  Yeah it does seem weird.  This file clearly uses PCI
defines...

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 566 bytes --]

Hi Jesse,

On Wed, 25 Mar 2009 08:55:50 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Ok fix pushed.  Yeah it does seem weird.  This file clearly uses PCI
> defines...

Thanks.

Actually all that file required was a "forward" declaration of "struct
pci_dev".  It was not accessing the pci_dev in any way, just passing
pointers to them on to other routines.  I guess it got such a declaration
indirectly.

/me likes to understand ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: pci tree build failure

[Jesse Barnes]

On Thu, 26 Mar 2009 14:05:31 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jesse,
> 
> On Wed, 25 Mar 2009 08:55:50 -0700 Jesse Barnes
> <jbarnes@virtuousgeek.org> wrote:
> >
> > Ok fix pushed.  Yeah it does seem weird.  This file clearly uses PCI
> > defines...
> 
> Thanks.
> 
> Actually all that file required was a "forward" declaration of "struct
> pci_dev".  It was not accessing the pci_dev in any way, just passing
> pointers to them on to other routines.  I guess it got such a
> declaration indirectly.
> 
> /me likes to understand ...

Looked liked it used the PCI MSI capability ID offset though?  In that
case it would really want at least pci_regs.h, but pci.h seems a little
more complete in this case.

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 523 bytes --]

Hi Jesse,

On Wed, 25 Mar 2009 20:37:11 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Looked liked it used the PCI MSI capability ID offset though?  In that
> case it would really want at least pci_regs.h, but pci.h seems a little
> more complete in this case.

The patch that broke the build added that usage ... and introduced the
need for pci_regs.g to be included (or pci.h , as you say).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: pci tree build failure

[Stephen Rothwell]

Hi Jesse,

Today's linux-next build (x86_64 allmodconfig) failed like this:

usr/include/linux/pci.h:21: included file 'linux/io.h' is not exported

Caused by commit 4be3c3f680d40d60a1513dcf1a10c3779defcd73 ("PCI: include
io.h in pci.h so that ioremap_nocache is defined").

I applied the following patch.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Oct 2008 13:33:43 +1100
Subject: [PATCH] pci: move include of io.h so it doesn't need to be exported

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/pci.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 955ab70..752def8 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -18,7 +18,6 @@
 #define LINUX_PCI_H
 
 #include <linux/pci_regs.h>	/* The pci register defines */
-#include <linux/io.h>
 
 /*
  * The PCI interface treats multi-function devices as independent
@@ -52,6 +51,7 @@
 #include <linux/kobject.h>
 #include <asm/atomic.h>
 #include <linux/device.h>
+#include <linux/io.h>
 
 /* Include the ID list */
 #include <linux/pci_ids.h>
-- 
1.5.6.5

Re: linux-next: pci tree build failure

[Jesse Barnes]

On Tuesday, October 21, 2008 7:39 pm Stephen Rothwell wrote:
> Hi Jesse,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> usr/include/linux/pci.h:21: included file 'linux/io.h' is not exported
>
> Caused by commit 4be3c3f680d40d60a1513dcf1a10c3779defcd73 ("PCI: include
> io.h in pci.h so that ioremap_nocache is defined").
>
> I applied the following patch.

Ah thanks, I forgot about the header export stuff...

Jesse

linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 864 bytes --]

Hi Jesse,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

drivers/pci/probe.c: In function 'pci_create_legacy_files':
drivers/pci/probe.c:69: error: 'pci_read_legacy_io' undeclared (first use in this function)
drivers/pci/probe.c:70: error: 'pci_write_legacy_io' undeclared (first use in this function)
drivers/pci/probe.c:80: error: 'pci_mmap_legacy_mem' undeclared (first use in this function)

Direct cause (probably) is commit 913d3708831ec551ca8560ea2cc793f738df88d6
("powerpc/PCI: Add legacy PCI access via sysfs") which I have reverted.
Actually caused by the removal of commit
d965c04f27d4df28b1ce77b0aea6329c07a8e13d ("PCI: Add ability to mmap
legacy_io on some platforms") which the above commit depends on.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: pci tree build failure

[Benjamin Herrenschmidt]

On Thu, 2008-10-16 at 14:41 +1100, Stephen Rothwell wrote:
> Hi Jesse,
> 
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> drivers/pci/probe.c: In function 'pci_create_legacy_files':
> drivers/pci/probe.c:69: error: 'pci_read_legacy_io' undeclared (first use in this function)
> drivers/pci/probe.c:70: error: 'pci_write_legacy_io' undeclared (first use in this function)
> drivers/pci/probe.c:80: error: 'pci_mmap_legacy_mem' undeclared (first use in this function)
> 
> Direct cause (probably) is commit 913d3708831ec551ca8560ea2cc793f738df88d6
> ("powerpc/PCI: Add legacy PCI access via sysfs") which I have reverted.
> Actually caused by the removal of commit
> d965c04f27d4df28b1ce77b0aea6329c07a8e13d ("PCI: Add ability to mmap
> legacy_io on some platforms") which the above commit depends on.

Yup, Jesse, patch 1/2 is still good :-) It's patch 2/2 that I've been
updating 3 times :-)

Cheers,
Ben

Re: linux-next: pci tree build failure

[Jesse Barnes]

On Wednesday, October 15, 2008 8:44 pm Benjamin Herrenschmidt wrote:
> On Thu, 2008-10-16 at 14:41 +1100, Stephen Rothwell wrote:
> > Hi Jesse,
> >
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> >
> > drivers/pci/probe.c: In function 'pci_create_legacy_files':
> > drivers/pci/probe.c:69: error: 'pci_read_legacy_io' undeclared (first use
> > in this function) drivers/pci/probe.c:70: error: 'pci_write_legacy_io'
> > undeclared (first use in this function) drivers/pci/probe.c:80: error:
> > 'pci_mmap_legacy_mem' undeclared (first use in this function)
> >
> > Direct cause (probably) is commit
> > 913d3708831ec551ca8560ea2cc793f738df88d6 ("powerpc/PCI: Add legacy PCI
> > access via sysfs") which I have reverted. Actually caused by the removal
> > of commit
> > d965c04f27d4df28b1ce77b0aea6329c07a8e13d ("PCI: Add ability to mmap
> > legacy_io on some platforms") which the above commit depends on.
>
> Yup, Jesse, patch 1/2 is still good :-) It's patch 2/2 that I've been
> updating 3 times :-)

Hm, I must have applied the wrong ones... but I didn't do a ppc build to test.  
I'll fix it up.

Thanks,
Jesse

Re: linux-next: pci tree build failure

[Benjamin Herrenschmidt]

> Hm, I must have applied the wrong ones... but I didn't do a ppc build to test.  
> I'll fix it up.

Thanks. So apply 1/2 from my orginal post and v3 of 2/2 that I sent
yesterday. Let me know if you want me to just resend both.

Cheers,
Ben.
 

Re: linux-next: pci tree build failure

[Jesse Barnes]

On Wednesday, October 15, 2008 9:28 pm Benjamin Herrenschmidt wrote:
> > Hm, I must have applied the wrong ones... but I didn't do a ppc build to
> > test. I'll fix it up.
>
> Thanks. So apply 1/2 from my orginal post and v3 of 2/2 that I sent
> yesterday. Let me know if you want me to just resend both.

No I've got them.  I must have accidentally dropped the 1/2 when I rebased 
last time, so d965c04f27d4df28b1ce77b0aea6329c07a8e13d is an orphan (btw 
Stephen how did you find it?).

Just test building & booting now, then I'll send Linus the pull request.

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

Re: linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

Hi Jesse,

On Sat, 18 Oct 2008 15:41:00 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> No I've got them.  I must have accidentally dropped the 1/2 when I rebased 
> last time, so d965c04f27d4df28b1ce77b0aea6329c07a8e13d is an orphan (btw 
> Stephen how did you find it?).

I have older versions of your tree in my git repository.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: pci tree build failure

[Jesse Barnes]

On Saturday, October 18, 2008 9:15 pm Stephen Rothwell wrote:
> Hi Jesse,
>
> On Sat, 18 Oct 2008 15:41:00 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> 
wrote:
> > No I've got them.  I must have accidentally dropped the 1/2 when I
> > rebased last time, so d965c04f27d4df28b1ce77b0aea6329c07a8e13d is an
> > orphan (btw Stephen how did you find it?).
>
> I have older versions of your tree in my git repository.

Ah cool.  I was using 'git fsck --lost-found' and couldn't see the ones I 
clobbered.  Oh well.

Jesse

Re: linux-next: pci tree build failure

[Rafael J. Wysocki]

On Thursday, 17 of July 2008, Stephen Rothwell wrote:
> Hi Jesse,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> drivers/xen/manage.c: In function 'xen_suspend':
> drivers/xen/manage.c:66: error: too few arguments to function 'device_power_up'
> drivers/xen/manage.c: In function 'do_suspend':
> drivers/xen/manage.c:117: error: too few arguments to function 'device_resume'
> 
> Caused by commit 1eede070a59e1cc73da51e1aaa00d9ab86572cfc ("Introduce new
> top level suspend and hibernation callbacks") interacting with new
> usages ...
> 
> I applied the patch below (which could be incorrect).

The patch is correct.

Thanks,
Rafael


> The above commit is now in Linus' tree, so this needs to be fixed in the
> merge of the x86(?) tree.
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 
> From aa015dc0cceb8478a89421c4015e81f78a9cf106 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 17 Jul 2008 13:01:15 +1000
> Subject: [PATCH] pci: fix xen fallout from PM API change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/xen/manage.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
> index 2bb268e..a5bc91a 100644
> --- a/drivers/xen/manage.c
> +++ b/drivers/xen/manage.c
> @@ -63,7 +63,7 @@ static int xen_suspend(void *data)
>  	gnttab_resume();
>  	xen_mm_unpin_all();
>  
> -	device_power_up();
> +	device_power_up(PMSG_RESUME);
>  
>  	if (!*cancelled) {
>  		xen_irq_resume();
> @@ -114,7 +114,7 @@ static void do_suspend(void)
>  	} else
>  		xenbus_suspend_cancel();
>  
> -	device_resume();
> +	device_resume(PMSG_RESUME);
>  
>  	/* Make sure timer events get retriggered on all CPUs */
>  	clock_was_set();

Re: linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

Hi Rafael,

On Fri, 18 Jul 2008 00:57:06 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
>
> The patch is correct.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: pci tree build failure

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Rafael,
> 
> On Fri, 18 Jul 2008 00:57:06 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> >
> > The patch is correct.
> 
> Thanks.

heh, i've done the exactly same change yesterday night, independently, 
in tip/xen-64bit - where this interaction originates from. (see below)

but i zapped it and took yours instead because yours came 19 hours 
earlier - i should have checked my mbox sooner ;)

Jeremy, is this change fine with you too?

( btw., could you please Cc: lkml to all patches? It's not like 
  linux-next is irrelevant to lkml - it's highly on topic in fact - and 
  what seems like future stuff today is an actuality tomorrow that 
  people might want to grep for. )

	Ingo

---------------------------->
commit dc860d89be3e640b98e9e202611466cc22575166
Author: Ingo Molnar <mingo@elte.hu>
Date:   Thu Jul 17 23:58:52 2008 +0200

    x86, xen: adopt suspend/resume API use
    
    the device_power_up()/device_resume() APIs got changed by:
    1eede070a5 "Introduce new top level suspend and hibernation callbacks".
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 drivers/xen/manage.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 2bb268e..a5bc91a 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -63,7 +63,7 @@ static int xen_suspend(void *data)
 	gnttab_resume();
 	xen_mm_unpin_all();
 
-	device_power_up();
+	device_power_up(PMSG_RESUME);
 
 	if (!*cancelled) {
 		xen_irq_resume();
@@ -114,7 +114,7 @@ static void do_suspend(void)
 	} else
 		xenbus_suspend_cancel();
 
-	device_resume();
+	device_resume(PMSG_RESUME);
 
 	/* Make sure timer events get retriggered on all CPUs */
 	clock_was_set();

linux-next: pci tree build failure

[Stephen Rothwell]

Hi Jesse,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

drivers/pci/pci.c: In function 'pci_pm_init':
drivers/pci/pci.c:1248: error: implicit declaration of function 'device_set_wakeup_capable'

Caused by commit eb9d0fe40e313c0a74115ef456a2e43a6c8da72f ("PCI ACPI:
Rework PCI handling of wake-up").  I applied the patch below - which may
not be correct, but makes the build work.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

>From 2b2c4f28d7900f5d043960b94aaae177bc1adcd9 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Jul 2008 11:24:37 +1000
Subject: [PATCH] pci: include linux/pm_wakeup.h for device_set_wakeup_capable

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/pci/pci.c         |    1 +
 include/linux/pm_wakeup.h |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index e632a58..3d92b71 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -17,6 +17,7 @@
 #include <linux/string.h>
 #include <linux/log2.h>
 #include <linux/pci-aspm.h>
+#include <linux/pm_wakeup.h>
 #include <asm/dma.h>	/* isa_dma_bridge_buggy */
 #include "pci.h"
 
diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h
index 3af0c8d..0aae777 100644
--- a/include/linux/pm_wakeup.h
+++ b/include/linux/pm_wakeup.h
@@ -63,6 +63,8 @@ static inline void device_init_wakeup(struct device *dev, int val)
 	dev->power.can_wakeup = !!val;
 }
 
+static inline void device_set_wakeup_capable(struct device *dev, int val) { }
+
 static inline int device_can_wakeup(struct device *dev)
 {
 	return dev->power.can_wakeup;
-- 
1.5.6

Re: linux-next: pci tree build failure

[Rafael J. Wysocki]

On Tuesday, 8 of July 2008, Stephen Rothwell wrote:
> Hi Jesse,
> 
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> drivers/pci/pci.c: In function 'pci_pm_init':
> drivers/pci/pci.c:1248: error: implicit declaration of function 'device_set_wakeup_capable'
> 
> Caused by commit eb9d0fe40e313c0a74115ef456a2e43a6c8da72f ("PCI ACPI:
> Rework PCI handling of wake-up").  I applied the patch below - which may
> not be correct, but makes the build work.

The patch is correct IMO.

Sorry for the troubles cause by the PCI wake-up patchset, I hope we'll sort
them out quickly.

Thanks,
Rafael


> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 
> From 2b2c4f28d7900f5d043960b94aaae177bc1adcd9 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 8 Jul 2008 11:24:37 +1000
> Subject: [PATCH] pci: include linux/pm_wakeup.h for device_set_wakeup_capable
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/pci/pci.c         |    1 +
>  include/linux/pm_wakeup.h |    2 ++
>  2 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index e632a58..3d92b71 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -17,6 +17,7 @@
>  #include <linux/string.h>
>  #include <linux/log2.h>
>  #include <linux/pci-aspm.h>
> +#include <linux/pm_wakeup.h>
>  #include <asm/dma.h>	/* isa_dma_bridge_buggy */
>  #include "pci.h"
>  
> diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h
> index 3af0c8d..0aae777 100644
> --- a/include/linux/pm_wakeup.h
> +++ b/include/linux/pm_wakeup.h
> @@ -63,6 +63,8 @@ static inline void device_init_wakeup(struct device *dev, int val)
>  	dev->power.can_wakeup = !!val;
>  }
>  
> +static inline void device_set_wakeup_capable(struct device *dev, int val) { }
> +
>  static inline int device_can_wakeup(struct device *dev)
>  {
>  	return dev->power.can_wakeup;

Re: linux-next: pci tree build failure

[Alan Stern]

On Mon, 30 Jun 2008, Stephen Rothwell wrote:

> Hi Jesse,
> 
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> drivers/usb/core/driver.c: In function 'do_unbind_rebind':
> drivers/usb/core/driver.c:865: error: 'struct dev_pm_info' has no member named 'sleeping'
> 
> Due to commit 1eede070a59e1cc73da51e1aaa00d9ab86572cfc ("Introduce new
> top level suspend and hibernation callbacks") from the pci tree (which
> removed the sleeping field of the dev_pm_info structure) and commit
> fafa0857b87640d4c297777d432174b8778ac4fd ("USB: Force unbinding of
> drivers lacking reset_resume or other methods") from the usb tree which
> adds a reference.

I knew this was going to happen.  There was no way around it.

> For now I have reverted commit fafa0857b87640d4c297777d432174b8778ac4fd
> ("USB: Force unbinding of drivers lacking reset_resume or other methods")
> from the usb tree since that gives me a building tree without the pain of
> trying to revert 1eede070a59e1cc73da51e1aaa00d9ab86572cfc (which has
> several dependent commits).
> 
> A better solution would be nice (hint, hint).

Instead of reverting that USB commit, take a look at it.  There's a big 
FIXME comment at the point where the obsolete field member is used.  
For now you can insert a patch to remove that line of code.

That's not a correct fix, but it will allow things to build and run.  
Unfortunately it's not possible at this time to submit a correct fix
because the clash occurs between patches in two different development
trees.  In addition, the correct fix involves a non-trivial rewrite of
the USB-PM interface; it can't simply be dashed off.

Alan Stern

Re: linux-next: pci tree build failure

[Jesse Barnes]

On Monday, June 30, 2008 7:11 am Alan Stern wrote:
> On Mon, 30 Jun 2008, Stephen Rothwell wrote:
> > Hi Jesse,
> >
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> >
> > drivers/usb/core/driver.c: In function 'do_unbind_rebind':
> > drivers/usb/core/driver.c:865: error: 'struct dev_pm_info' has no member
> > named 'sleeping'
> >
> > Due to commit 1eede070a59e1cc73da51e1aaa00d9ab86572cfc ("Introduce new
> > top level suspend and hibernation callbacks") from the pci tree (which
> > removed the sleeping field of the dev_pm_info structure) and commit
> > fafa0857b87640d4c297777d432174b8778ac4fd ("USB: Force unbinding of
> > drivers lacking reset_resume or other methods") from the usb tree which
> > adds a reference.
>
> I knew this was going to happen.  There was no way around it.
>
> > For now I have reverted commit fafa0857b87640d4c297777d432174b8778ac4fd
> > ("USB: Force unbinding of drivers lacking reset_resume or other methods")
> > from the usb tree since that gives me a building tree without the pain of
> > trying to revert 1eede070a59e1cc73da51e1aaa00d9ab86572cfc (which has
> > several dependent commits).
> >
> > A better solution would be nice (hint, hint).
>
> Instead of reverting that USB commit, take a look at it.  There's a big
> FIXME comment at the point where the obsolete field member is used.
> For now you can insert a patch to remove that line of code.
>
> That's not a correct fix, but it will allow things to build and run.
> Unfortunately it's not possible at this time to submit a correct fix
> because the clash occurs between patches in two different development
> trees.  In addition, the correct fix involves a non-trivial rewrite of
> the USB-PM interface; it can't simply be dashed off.

We had some ACPI cross-dependencies like that, so I ended up pulling directly 
from Len's ACPI tree into my PCI tree, but that only worked because we both 
use git.  Doing it with Greg's stuff would probably be harder, especially if 
that area is in flux.  But as long as some sort of correct fix is in progress 
we can put it off until the merge window...

Jesse

linux-next: pci tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]

[Resent due to failing to pass vger's filters]

Hi Jesse,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

drivers/usb/core/driver.c: In function 'do_unbind_rebind':
drivers/usb/core/driver.c:865: error: 'struct dev_pm_info' has no member named 'sleeping'

Due to commit 1eede070a59e1cc73da51e1aaa00d9ab86572cfc ("Introduce new
top level suspend and hibernation callbacks") from the pci tree (which
removed the sleeping field of the dev_pm_info structure) and commit
fafa0857b87640d4c297777d432174b8778ac4fd ("USB: Force unbinding of
drivers lacking reset_resume or other methods") from the usb tree which
adds a reference.

For now I have reverted commit fafa0857b87640d4c297777d432174b8778ac4fd
("USB: Force unbinding of drivers lacking reset_resume or other methods")
from the usb tree since that gives me a building tree without the pain of
trying to revert 1eede070a59e1cc73da51e1aaa00d9ab86572cfc (which has
several dependent commits).

A better solution would be nice (hint, hint).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/


[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]