linux-next: build failure after merge of the pci tree

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi Bjorn,

After merging the pci tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

arch/powerpc/platforms/powernv/pci-ioda.c: In function 'pnv_pci_window_alignment':
arch/powerpc/platforms/powernv/pci-ioda.c:1163:13: error: 'struct pci_dev' has no member named 'pcie_type'

Caused by commit ac161fbfdaa2 ("powerpc/powernv: I/O and memory alignment
for P2P bridges").  pcie_type was removed in commit b2ef39be5744 ("PCI:
Remove unused field pcie_type from struct pci_dev") (also in the pci
tree).

I have used the pci tree from next-20120910 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 --]

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

On Mon, Sep 10, 2012 at 7:29 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Bjorn,
>
> After merging the pci tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> arch/powerpc/platforms/powernv/pci-ioda.c: In function 'pnv_pci_window_alignment':
> arch/powerpc/platforms/powernv/pci-ioda.c:1163:13: error: 'struct pci_dev' has no member named 'pcie_type'
>
> Caused by commit ac161fbfdaa2 ("powerpc/powernv: I/O and memory alignment
> for P2P bridges").  pcie_type was removed in commit b2ef39be5744 ("PCI:
> Remove unused field pcie_type from struct pci_dev") (also in the pci
> tree).
>
> I have used the pci tree from next-20120910 for today.

Thanks.

Gavin, Ben, I folded in the trivial fix and updated both my
pci/gavin-window-alignment and next branches.

Ben, I think you'll need to pull in pci/jiang-pcie-cap before
pci/gavin-window-alignment to get both pieces.

Bjorn

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi all,

After merging the pci tree, today's linux-next build (arm64 defconfig)
failed like this:

In file included from <command-line>:
drivers/pci/controller/dwc/pcie-tegra194.c: In function 'tegra_pcie_ep_irq_thread':
include/linux/compiler_types.h:435:45: error: call to '__compiletime_assert_497' declared with attribute error: FIELD_PREP: value too large for the field
  435 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
      |                                             ^
include/linux/compiler_types.h:416:25: note: in definition of macro '__compiletime_assert'
  416 |                         prefix ## suffix();                             \
      |                         ^~~~~~
include/linux/compiler_types.h:435:9: note: in expansion of macro '_compiletime_assert'
  435 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
      |         ^~~~~~~~~~~~~~~~~~~
include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert'
   39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
      |                                     ^~~~~~~~~~~~~~~~~~
include/linux/bitfield.h:68:17: note: in expansion of macro 'BUILD_BUG_ON_MSG'
   68 |                 BUILD_BUG_ON_MSG(__builtin_constant_p(_val) ?           \
      |                 ^~~~~~~~~~~~~~~~
include/linux/bitfield.h:114:17: note: in expansion of macro '__BF_FIELD_CHECK'
  114 |                 __BF_FIELD_CHECK(_mask, 0ULL, _val, "FIELD_PREP: ");    \
      |                 ^~~~~~~~~~~~~~~~
drivers/pci/controller/dwc/pcie-tegra194.c:498:29: note: in expansion of macro 'FIELD_PREP'
  498 |                 val = 110 | FIELD_PREP(PCI_LTR_SCALE_SHIFT, 2) | LTR_MSG_REQ;
      |                             ^~~~~~~~~~

Caused by commit

  18ca6c2c2d0e ("PCI: dwc: Use FIELD_GET/PREP()")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the pci tree

[Ilpo Järvinen]

On Tue, 24 Oct 2023, Stephen Rothwell wrote:

> Hi all,
> 
> After merging the pci tree, today's linux-next build (arm64 defconfig)
> failed like this:
> 
> In file included from <command-line>:
> drivers/pci/controller/dwc/pcie-tegra194.c: In function 'tegra_pcie_ep_irq_thread':
> include/linux/compiler_types.h:435:45: error: call to '__compiletime_assert_497' declared with attribute error: FIELD_PREP: value too large for the field
>   435 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
>       |                                             ^
> include/linux/compiler_types.h:416:25: note: in definition of macro '__compiletime_assert'
>   416 |                         prefix ## suffix();                             \
>       |                         ^~~~~~
> include/linux/compiler_types.h:435:9: note: in expansion of macro '_compiletime_assert'
>   435 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
>       |         ^~~~~~~~~~~~~~~~~~~
> include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert'
>    39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
>       |                                     ^~~~~~~~~~~~~~~~~~
> include/linux/bitfield.h:68:17: note: in expansion of macro 'BUILD_BUG_ON_MSG'
>    68 |                 BUILD_BUG_ON_MSG(__builtin_constant_p(_val) ?           \
>       |                 ^~~~~~~~~~~~~~~~
> include/linux/bitfield.h:114:17: note: in expansion of macro '__BF_FIELD_CHECK'
>   114 |                 __BF_FIELD_CHECK(_mask, 0ULL, _val, "FIELD_PREP: ");    \
>       |                 ^~~~~~~~~~~~~~~~
> drivers/pci/controller/dwc/pcie-tegra194.c:498:29: note: in expansion of macro 'FIELD_PREP'
>   498 |                 val = 110 | FIELD_PREP(PCI_LTR_SCALE_SHIFT, 2) | LTR_MSG_REQ;
>       |                             ^~~~~~~~~~
> 
> Caused by commit
> 
>   18ca6c2c2d0e ("PCI: dwc: Use FIELD_GET/PREP()")
> 
> I have reverted that commit for today.

Thanks for providing the full error message. I already was trying to
investigate it and reproduce the problem because LKP's report I got about 
this failed to provide the full error message.

It seems that the original code was more complex than it looked and the 
patch is wrong and suboptimal on multiple counts. I'll provide a fixed 
v2.

-- 
 i.

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi all,

After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: modpost: "dw_pcie_write_dbi2" [drivers/pci/controller/dwc/pcie-rcar-gen4.ko] undefined!

Caused by commit

  8227bf7a81e6 ("PCI: rcar-gen4: Add R-Car Gen4 PCIe controller support for host mode")

or

  d3c54d8ba855 ("PCI: rcar-gen4: Add endpoint mode support")

I have used the pci tree from next-20231020 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

RE: linux-next: build failure after merge of the pci tree

[Yoshihiro Shimoda]

Hi Stephen,

> From: Stephen Rothwell, Sent: Monday, October 23, 2023 9:06 AM
> 
> Hi all,
> 
> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> ERROR: modpost: "dw_pcie_write_dbi2" [drivers/pci/controller/dwc/pcie-rcar-gen4.ko] undefined!
> 
> Caused by commit
> 
>   8227bf7a81e6 ("PCI: rcar-gen4: Add R-Car Gen4 PCIe controller support for host mode")
> 
> or
> 
>   d3c54d8ba855 ("PCI: rcar-gen4: Add endpoint mode support")
> 
> I have used the pci tree from next-20231020 for today.

Thank you for the report!

Bjorn, Krzysztof, I should have added the following patch on patch-set v25.
However, I completely forgot it...
https://lore.kernel.org/linux-pci/20230926122431.3974714-8-yoshihiro.shimoda.uh@renesas.com/

I confirmed that the patch above can be applied on the latest pci.git / next branch.
However, should I resend whole patches with the patch above as v26?

Best regards,
Yoshihiro Shimoda

> --
> Cheers,
> Stephen Rothwell

Re: linux-next: build failure after merge of the pci tree

[Krzysztof Wilczyński]

Hello,

> > Hi all,
> > 
> > After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> > 
> > ERROR: modpost: "dw_pcie_write_dbi2" [drivers/pci/controller/dwc/pcie-rcar-gen4.ko] undefined!
[...]

> However, I completely forgot it...

That's OK.  Don't worry. :)

> https://lore.kernel.org/linux-pci/20230926122431.3974714-8-yoshihiro.shimoda.uh@renesas.com/
> 
> I confirmed that the patch above can be applied on the latest pci.git / next branch.

I will take care of it.

> However, should I resend whole patches with the patch above as v26?

No.  There is no need to send another series.

Different question: aren't RCar systems based on Arm?  I wonder why this
even built on a x86_64 - unless I am wrong about this.

	Krzysztof

RE: linux-next: build failure after merge of the pci tree

[Yoshihiro Shimoda]

Hello Krzysztof,

> From: Krzysztof Wilczyński, Sent: Monday, October 23, 2023 4:35 PM
> 
> > > Hi all,
> > >
> > > After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> > > failed like this:
> > >
> > > ERROR: modpost: "dw_pcie_write_dbi2" [drivers/pci/controller/dwc/pcie-rcar-gen4.ko] undefined!
> [...]
> 
> > However, I completely forgot it...
> 
> That's OK.  Don't worry. :)
> 
> > https://lore.kernel.org/linux-pci/20230926122431.3974714-8-yoshihiro.shimoda.uh@renesas.com/
> >
> > I confirmed that the patch above can be applied on the latest pci.git / next branch.
> 
> I will take care of it.

Thank you very much for your support!

> > However, should I resend whole patches with the patch above as v26?
> 
> No.  There is no need to send another series.

I got it.

> Different question: aren't RCar systems based on Arm?

You're correct. R-Car systems based on Arm.

>  I wonder why this
> even built on a x86_64 - unless I am wrong about this.

This is because I added COMPILE_TEST to the Kconfig like below:

---
config PCIE_RCAR_GEN4_HOST
        tristate "Renesas R-Car Gen4 PCIe controller (host mode)"
        depends on ARCH_RENESAS || COMPILE_TEST
---

Best regards,
Yoshihiro Shimoda

> 	Krzysztof

Re: linux-next: build failure after merge of the pci tree

[Krzysztof Wilczyński]

Hello,

> > > > After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> > > > failed like this:
> > > >
> > > > ERROR: modpost: "dw_pcie_write_dbi2" [drivers/pci/controller/dwc/pcie-rcar-gen4.ko] undefined!
> > [...]
> > 
> > > However, I completely forgot it...
> > 
> > That's OK.  Don't worry. :)
> > 
> > > https://lore.kernel.org/linux-pci/20230926122431.3974714-8-yoshihiro.shimoda.uh@renesas.com/
> > >
> > > I confirmed that the patch above can be applied on the latest pci.git / next branch.
> > 
> > I will take care of it.
> 
> Thank you very much for your support!
[...]

Done.  Applied to the following branch:

  https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/log/?h=controller/rcar

Bjorn will push updated next when he has a moment.

[...]
> This is because I added COMPILE_TEST to the Kconfig like below:
> 
> ---
> config PCIE_RCAR_GEN4_HOST
>         tristate "Renesas R-Car Gen4 PCIe controller (host mode)"
>         depends on ARCH_RENESAS || COMPILE_TEST

Ah yes, sorry!  I should have assumed as much. :)  Thank you!

	Krzysztof

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi all,

After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

arch/x86/pci/fixup.c: In function 'amd_rp_pme_suspend':
arch/x86/pci/fixup.c:929:13: error: 'pm_suspend_target_state' undeclared (first use in this function)
  929 |         if (pm_suspend_target_state == PM_SUSPEND_ON)
      |             ^~~~~~~~~~~~~~~~~~~~~~~
arch/x86/pci/fixup.c:929:13: note: each undeclared identifier is reported only once for each function it appears in
arch/x86/pci/fixup.c:929:40: error: 'PM_SUSPEND_ON' undeclared (first use in this function); did you mean 'RPM_SUSPENDING'?
  929 |         if (pm_suspend_target_state == PM_SUSPEND_ON)
      |                                        ^~~~~~~~~~~~~
      |                                        RPM_SUSPENDING
arch/x86/pci/fixup.c: In function 'amd_rp_pme_resume':
arch/x86/pci/fixup.c:951:27: error: implicit declaration of function 'FIELD_GET' [-Werror=implicit-function-declaration]
  951 |         rp->pme_support = FIELD_GET(PCI_PM_CAP_PME_MASK, pmc);
      |                           ^~~~~~~~~

Caused by commit

  624306d2c241 ("x86/PCI: Avoid PME from D3hot/D3cold for AMD Rembrandt and Phoenix USB4")

I have used the pci tree from next-20231005 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the pci tree

[Mario Limonciello]

On 10/5/2023 19:56, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> arch/x86/pci/fixup.c: In function 'amd_rp_pme_suspend':
> arch/x86/pci/fixup.c:929:13: error: 'pm_suspend_target_state' undeclared (first use in this function)
>    929 |         if (pm_suspend_target_state == PM_SUSPEND_ON)
>        |             ^~~~~~~~~~~~~~~~~~~~~~~
> arch/x86/pci/fixup.c:929:13: note: each undeclared identifier is reported only once for each function it appears in
> arch/x86/pci/fixup.c:929:40: error: 'PM_SUSPEND_ON' undeclared (first use in this function); did you mean 'RPM_SUSPENDING'?
>    929 |         if (pm_suspend_target_state == PM_SUSPEND_ON)
>        |                                        ^~~~~~~~~~~~~
>        |                                        RPM_SUSPENDING
> arch/x86/pci/fixup.c: In function 'amd_rp_pme_resume':
> arch/x86/pci/fixup.c:951:27: error: implicit declaration of function 'FIELD_GET' [-Werror=implicit-function-declaration]
>    951 |         rp->pme_support = FIELD_GET(PCI_PM_CAP_PME_MASK, pmc);
>        |                           ^~~~~~~~~
> 
> Caused by commit
> 
>    624306d2c241 ("x86/PCI: Avoid PME from D3hot/D3cold for AMD Rembrandt and Phoenix USB4")
> 
> I have used the pci tree from next-20231005 for today.
> 

It happened because of a last minute decision to move to 
arch/x86/pci/fixup.c from drivers/pci/quirks.c when Bjorn committed it.

Here's the fix for it:

diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index ee0509eb8674..f347c20247d3 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -3,9 +3,11 @@
   * Exceptions for specific devices. Usually work-arounds for fatal 
design flaws.
   */

+#include <linux/bitfield.h>
  #include <linux/delay.h>
  #include <linux/dmi.h>
  #include <linux/pci.h>
+#include <linux/suspend.h>
  #include <linux/vgaarb.h>
  #include <asm/amd_nb.h>
  #include <asm/hpet.h>

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

On Fri, Oct 06, 2023 at 11:56:04AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> arch/x86/pci/fixup.c: In function 'amd_rp_pme_suspend':
> arch/x86/pci/fixup.c:929:13: error: 'pm_suspend_target_state' undeclared (first use in this function)
>   929 |         if (pm_suspend_target_state == PM_SUSPEND_ON)
>       |             ^~~~~~~~~~~~~~~~~~~~~~~
> arch/x86/pci/fixup.c:929:13: note: each undeclared identifier is reported only once for each function it appears in
> arch/x86/pci/fixup.c:929:40: error: 'PM_SUSPEND_ON' undeclared (first use in this function); did you mean 'RPM_SUSPENDING'?
>   929 |         if (pm_suspend_target_state == PM_SUSPEND_ON)
>       |                                        ^~~~~~~~~~~~~
>       |                                        RPM_SUSPENDING
> arch/x86/pci/fixup.c: In function 'amd_rp_pme_resume':
> arch/x86/pci/fixup.c:951:27: error: implicit declaration of function 'FIELD_GET' [-Werror=implicit-function-declaration]
>   951 |         rp->pme_support = FIELD_GET(PCI_PM_CAP_PME_MASK, pmc);
>       |                           ^~~~~~~~~
> 
> Caused by commit
> 
>   624306d2c241 ("x86/PCI: Avoid PME from D3hot/D3cold for AMD Rembrandt and Phoenix USB4")

How embarrassing.  I moved this from drivers/pci to arch/x86 and
obviously didn't even compile it afterwards.  Should be fixed now.

Bjorn

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi all,

After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/pci/switch/switchtec.c: In function 'switchtec_dev_read':
drivers/pci/switch/switchtec.c:623:1: error: label 'out' defined but not used [-Werror=unused-label]
  623 | out:
      | ^~~

Caused by commit

  fbc855bce49e ("PCI: switchtec: Return -EFAULT for copy_to_user() errors")

I have used the pci tree from next-20230113 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

On Mon, Jan 16, 2023 at 09:53:25AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/pci/switch/switchtec.c: In function 'switchtec_dev_read':
> drivers/pci/switch/switchtec.c:623:1: error: label 'out' defined but not used [-Werror=unused-label]
>   623 | out:
>       | ^~~
> 
> Caused by commit
> 
>   fbc855bce49e ("PCI: switchtec: Return -EFAULT for copy_to_user() errors")
> 
> I have used the pci tree from next-20230113 for today.

Should be fixed.

Lorenzo, just FYI, I cherry-picked the commits from your pci/switchtec
branch into a local pci/switchtec branch to fix this.

Bjorn

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi all,

After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/iommu/apple-dart.c: In function 'apple_dart_get_resv_regions':
drivers/iommu/apple-dart.c:762:2: error: implicit declaration of function 'iommu_dma_get_resv_regions'; did you mean 'iommu_get_resv_regions'? [-Werror=implicit-function-declaration]
  762 |  iommu_dma_get_resv_regions(dev, head);
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~
      |  iommu_get_resv_regions

Caused by commit

  946d619fa25f ("iommu/dart: Exclude MSI doorbell from PCIe device IOVA range")

Unfortunately, the linux/dma-iommu.h include was removed by commit

  b2b2781a9755 ("iommu/dart: Clean up IOVA cookie crumbs")

which is now in Linus' tree.

I have added this merge fixup for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 5 Nov 2021 09:51:19 +1100
Subject: [PATCH] iommu/dart: restore include of linux/dma-iommu.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/iommu/apple-dart.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c
index b7265a8e9540..565ef5598811 100644
--- a/drivers/iommu/apple-dart.c
+++ b/drivers/iommu/apple-dart.c
@@ -15,6 +15,7 @@
 #include <linux/bitfield.h>
 #include <linux/clk.h>
 #include <linux/dev_printk.h>
+#include <linux/dma-iommu.h>
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi all,

After merging the pci tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/misc/cxl/pci.c: In function 'cxl_vphb_error_detected':
drivers/misc/cxl/pci.c:1816:15: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
 1816 |   err_handler = afu_drv->err_handler;
      |               ^
drivers/misc/cxl/pci.c: In function 'cxl_pci_slot_reset':
drivers/misc/cxl/pci.c:2041:16: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
 2041 |    err_handler = afu_drv->err_handler;
      |                ^
drivers/misc/cxl/pci.c: In function 'cxl_pci_resume':
drivers/misc/cxl/pci.c:2090:16: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
 2090 |    err_handler = afu_drv->err_handler;
      |                ^
cc1: all warnings being treated as errors

Caused by commit

  115c9d41e583 ("cxl: Factor out common dev->driver expressions")

I have used the pci tree from next-20211015 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

On Mon, Oct 18, 2021 at 09:55:25AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the pci tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/misc/cxl/pci.c: In function 'cxl_vphb_error_detected':
> drivers/misc/cxl/pci.c:1816:15: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
>  1816 |   err_handler = afu_drv->err_handler;
>       |               ^
> drivers/misc/cxl/pci.c: In function 'cxl_pci_slot_reset':
> drivers/misc/cxl/pci.c:2041:16: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
>  2041 |    err_handler = afu_drv->err_handler;
>       |                ^
> drivers/misc/cxl/pci.c: In function 'cxl_pci_resume':
> drivers/misc/cxl/pci.c:2090:16: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
>  2090 |    err_handler = afu_drv->err_handler;
>       |                ^
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   115c9d41e583 ("cxl: Factor out common dev->driver expressions")
> 
> I have used the pci tree from next-20211015 for today.

Sorry about this.  I think I fixed it and updated my -next branch.

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi all,

After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: modpost: "dw_pcie_ep_reset_bar" [drivers/pci/controller/dwc/pcie-qcom-ep.ko] undefined!
ERROR: modpost: "dw_pcie_ep_raise_msi_irq" [drivers/pci/controller/dwc/pcie-qcom-ep.ko] undefined!
ERROR: modpost: "dw_pcie_ep_raise_legacy_irq" [drivers/pci/controller/dwc/pcie-qcom-ep.ko] undefined!

Caused by commit

  3872e6f0544f ("PCI: qcom-ep: Add Qualcomm PCIe Endpoint controller driver")

I have used the pci tree from next-20211008 fot today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the pci tree

[Manivannan Sadhasivam]

Hi Stephen,

On Mon, Oct 11, 2021 at 10:12:50AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> ERROR: modpost: "dw_pcie_ep_reset_bar" [drivers/pci/controller/dwc/pcie-qcom-ep.ko] undefined!
> ERROR: modpost: "dw_pcie_ep_raise_msi_irq" [drivers/pci/controller/dwc/pcie-qcom-ep.ko] undefined!
> ERROR: modpost: "dw_pcie_ep_raise_legacy_irq" [drivers/pci/controller/dwc/pcie-qcom-ep.ko] undefined!
> 
> Caused by commit
> 
>   3872e6f0544f ("PCI: qcom-ep: Add Qualcomm PCIe Endpoint controller driver")
> 
> I have used the pci tree from next-20211008 fot today.
> 

I have submitted a patch for fixing this issue:

https://patchwork.kernel.org/project/linux-pci/patch/20211010115937.15856-1-manivannan.sadhasivam@linaro.org/

Thanks,
Mani

> -- 
> Cheers,
> Stephen Rothwell

Re: linux-next: build failure after merge of the pci tree

[Lorenzo Pieralisi]

On Mon, Oct 11, 2021 at 11:07:37AM +0530, Manivannan Sadhasivam wrote:
> Hi Stephen,
> 
> On Mon, Oct 11, 2021 at 10:12:50AM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> > 
> > ERROR: modpost: "dw_pcie_ep_reset_bar" [drivers/pci/controller/dwc/pcie-qcom-ep.ko] undefined!
> > ERROR: modpost: "dw_pcie_ep_raise_msi_irq" [drivers/pci/controller/dwc/pcie-qcom-ep.ko] undefined!
> > ERROR: modpost: "dw_pcie_ep_raise_legacy_irq" [drivers/pci/controller/dwc/pcie-qcom-ep.ko] undefined!
> > 
> > Caused by commit
> > 
> >   3872e6f0544f ("PCI: qcom-ep: Add Qualcomm PCIe Endpoint controller driver")
> > 
> > I have used the pci tree from next-20211008 fot today.
> > 
> 
> I have submitted a patch for fixing this issue:
> 
> https://patchwork.kernel.org/project/linux-pci/patch/20211010115937.15856-1-manivannan.sadhasivam@linaro.org/

I have squashed it in the original commit it is fixing.

Thanks,
Lorenzo

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi all,

After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/pci/controller/pcie-xilinx-cpm.c: In function 'xilinx_cpm_pcie_probe':
drivers/pci/controller/pcie-xilinx-cpm.c:553:8: error: implicit declaration of function 'pci_parse_request_of_pci_ranges' [-Werror=implicit-function-declaration]
  553 |  err = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
      |        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  f0fdb84da7a9 ("PCI: Move DT resource setup into devm_pci_alloc_host_bridge()")

interacting with commit

  e5672b8109a9 ("PCI: xilinx-cpm: Add Versal CPM Root Port driver")

I have used the pci tree from next-20200731 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi all,

After merging the pci tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/pci/pci.c:2176:6: error: redefinition of 'pcie_clear_device_status'
 2176 | void pcie_clear_device_status(struct pci_dev *dev)
      |      ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/pci/pci.c:37:
drivers/pci/pci.h:668:20: note: previous definition of 'pcie_clear_device_status' was here
  668 | static inline void pcie_clear_device_status(struct pci_dev *dev) { }
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  02c111e4a5a3 ("PCI/ERR: Rename pci_aer_clear_device_status() to pcie_clear_device_status()")

CONFIG_PCIEAER is not set for this build.

I have used the pci tree from next-20200721 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi all,

After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

In file included from <command-line>:32:
./usr/include/linux/pcitest.h:25:2: error: unknown type name 'bool'
   25 |  bool use_dma;
      |  ^~~~

Caused by commit

  f6628e69c581 ("tools: PCI: Add 'd' command line option to support DMA")

I have used the pci tree from next-20200312 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi all,

After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: "pci_speed_string" [drivers/pci/controller/pcie-brcmstb.ko] undefined!
ERROR: "pcie_link_speed" [drivers/pci/controller/pcie-brcmstb.ko] undefined!

Caused by commit

  31483a35dbed ("PCI: Use pci_speed_string() for all PCI/PCI-X/PCIe strings")

I have used the pci tree from next-20200306 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

On Mon, Mar 9, 2020 at 6:08 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> ERROR: "pci_speed_string" [drivers/pci/controller/pcie-brcmstb.ko] undefined!
> ERROR: "pcie_link_speed" [drivers/pci/controller/pcie-brcmstb.ko] undefined!

Fixed, thanks!

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi all,

After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/pci/controller/dwc/pcie-tegra194.c:24:10: fatal error: linux/pci-aspm.h: No such file or directory
   24 | #include <linux/pci-aspm.h>
      |          ^~~~~~~~~~~~~~~~~~

Caused by commit

  81564976b1a9 ("PCI: tegra: Add Tegra194 PCIe support")

I have reverted that commit for todat.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

[+cc Krzysztof]

On Thu, Aug 29, 2019 at 10:23 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/pci/controller/dwc/pcie-tegra194.c:24:10: fatal error: linux/pci-aspm.h: No such file or directory
>    24 | #include <linux/pci-aspm.h>
>       |          ^~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
>   81564976b1a9 ("PCI: tegra: Add Tegra194 PCIe support")
>
> I have reverted that commit for todat.

Thanks, Stephen.

I *could* fix this by removing that include in the merge, since the
contents of linux/pci-aspm.h were moved into linux/pci.h by
https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?id=7ce2e76a0420

But as far as I can tell, pcie-tegra194.c doesn't actually require
anything from linux/pci-aspm.h, so I'd rather amend the tegra194
commit https://git.kernel.org/cgit/linux/kernel/git/lpieralisi/pci.git/commit/?id=81564976b1a9
so it doesn't include pci-aspm.h in the first place.

Bjorn

Re: linux-next: build failure after merge of the pci tree

[Vidya Sagar]

On 8/30/2019 6:00 PM, Bjorn Helgaas wrote:
> [+cc Krzysztof]
> 
> On Thu, Aug 29, 2019 at 10:23 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Hi all,
>>
>> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
>> failed like this:
>>
>> drivers/pci/controller/dwc/pcie-tegra194.c:24:10: fatal error: linux/pci-aspm.h: No such file or directory
>>     24 | #include <linux/pci-aspm.h>
>>        |          ^~~~~~~~~~~~~~~~~~
>>
>> Caused by commit
>>
>>    81564976b1a9 ("PCI: tegra: Add Tegra194 PCIe support")
>>
>> I have reverted that commit for todat.
> 
> Thanks, Stephen.
> 
> I *could* fix this by removing that include in the merge, since the
> contents of linux/pci-aspm.h were moved into linux/pci.h by
> https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?id=7ce2e76a0420
> 
> But as far as I can tell, pcie-tegra194.c doesn't actually require
> anything from linux/pci-aspm.h, so I'd rather amend the tegra194
> commit https://git.kernel.org/cgit/linux/kernel/git/lpieralisi/pci.git/commit/?id=81564976b1a9
> so it doesn't include pci-aspm.h in the first place.
Thanks Bjorn for the reply.
Yes. This header file is not required for now and can be removed.
Is there any action required from my side for this?

> 
> Bjorn
> 

Re: linux-next: build failure after merge of the pci tree

[Lorenzo Pieralisi]

On Sat, Aug 31, 2019 at 09:51:05AM +0530, Vidya Sagar wrote:
> On 8/30/2019 6:00 PM, Bjorn Helgaas wrote:
> > [+cc Krzysztof]
> > 
> > On Thu, Aug 29, 2019 at 10:23 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > 
> > > Hi all,
> > > 
> > > After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> > > failed like this:
> > > 
> > > drivers/pci/controller/dwc/pcie-tegra194.c:24:10: fatal error: linux/pci-aspm.h: No such file or directory
> > >     24 | #include <linux/pci-aspm.h>
> > >        |          ^~~~~~~~~~~~~~~~~~
> > > 
> > > Caused by commit
> > > 
> > >    81564976b1a9 ("PCI: tegra: Add Tegra194 PCIe support")
> > > 
> > > I have reverted that commit for todat.
> > 
> > Thanks, Stephen.
> > 
> > I *could* fix this by removing that include in the merge, since the
> > contents of linux/pci-aspm.h were moved into linux/pci.h by
> > https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?id=7ce2e76a0420
> > 
> > But as far as I can tell, pcie-tegra194.c doesn't actually require
> > anything from linux/pci-aspm.h, so I'd rather amend the tegra194
> > commit https://git.kernel.org/cgit/linux/kernel/git/lpieralisi/pci.git/commit/?id=81564976b1a9
> > so it doesn't include pci-aspm.h in the first place.
> Thanks Bjorn for the reply.
> Yes. This header file is not required for now and can be removed.
> Is there any action required from my side for this?

I updated my pci/tegra branch so that Bjorn can pull it.

Lorenzo

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

On Sat, Aug 31, 2019 at 3:49 AM Lorenzo Pieralisi
<lorenzo.pieralisi@arm.com> wrote:
>
> On Sat, Aug 31, 2019 at 09:51:05AM +0530, Vidya Sagar wrote:
> > On 8/30/2019 6:00 PM, Bjorn Helgaas wrote:
> > > [+cc Krzysztof]
> > >
> > > On Thu, Aug 29, 2019 at 10:23 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > Hi all,
> > > >
> > > > After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> > > > failed like this:
> > > >
> > > > drivers/pci/controller/dwc/pcie-tegra194.c:24:10: fatal error: linux/pci-aspm.h: No such file or directory
> > > >     24 | #include <linux/pci-aspm.h>
> > > >        |          ^~~~~~~~~~~~~~~~~~
> > > >
> > > > Caused by commit
> > > >
> > > >    81564976b1a9 ("PCI: tegra: Add Tegra194 PCIe support")
> > > >
> > > > I have reverted that commit for todat.
> > >
> > > Thanks, Stephen.
> > >
> > > I *could* fix this by removing that include in the merge, since the
> > > contents of linux/pci-aspm.h were moved into linux/pci.h by
> > > https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?id=7ce2e76a0420
> > >
> > > But as far as I can tell, pcie-tegra194.c doesn't actually require
> > > anything from linux/pci-aspm.h, so I'd rather amend the tegra194
> > > commit https://git.kernel.org/cgit/linux/kernel/git/lpieralisi/pci.git/commit/?id=81564976b1a9
> > > so it doesn't include pci-aspm.h in the first place.
> > Thanks Bjorn for the reply.
> > Yes. This header file is not required for now and can be removed.
> > Is there any action required from my side for this?
>
> I updated my pci/tegra branch so that Bjorn can pull it.

I pulled it and updated my "next" branch, thanks!

Re: linux-next: build failure after merge of the pci tree

[Vidya Sagar]

On 8/31/2019 2:19 PM, Lorenzo Pieralisi wrote:
> On Sat, Aug 31, 2019 at 09:51:05AM +0530, Vidya Sagar wrote:
>> On 8/30/2019 6:00 PM, Bjorn Helgaas wrote:
>>> [+cc Krzysztof]
>>>
>>> On Thu, Aug 29, 2019 at 10:23 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>>
>>>> Hi all,
>>>>
>>>> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
>>>> failed like this:
>>>>
>>>> drivers/pci/controller/dwc/pcie-tegra194.c:24:10: fatal error: linux/pci-aspm.h: No such file or directory
>>>>      24 | #include <linux/pci-aspm.h>
>>>>         |          ^~~~~~~~~~~~~~~~~~
>>>>
>>>> Caused by commit
>>>>
>>>>     81564976b1a9 ("PCI: tegra: Add Tegra194 PCIe support")
>>>>
>>>> I have reverted that commit for todat.
>>>
>>> Thanks, Stephen.
>>>
>>> I *could* fix this by removing that include in the merge, since the
>>> contents of linux/pci-aspm.h were moved into linux/pci.h by
>>> https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?id=7ce2e76a0420
>>>
>>> But as far as I can tell, pcie-tegra194.c doesn't actually require
>>> anything from linux/pci-aspm.h, so I'd rather amend the tegra194
>>> commit https://git.kernel.org/cgit/linux/kernel/git/lpieralisi/pci.git/commit/?id=81564976b1a9
>>> so it doesn't include pci-aspm.h in the first place.
>> Thanks Bjorn for the reply.
>> Yes. This header file is not required for now and can be removed.
>> Is there any action required from my side for this?
> 
> I updated my pci/tegra branch so that Bjorn can pull it.
Thanks a lot Lorenzo and Bjorn.

- Vidya Sagar
> 
> Lorenzo
> 

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi Bjorn,

After merging the pci tree, today's linux-next build (powerpc allnoconfig)
failed like this:

ld: drivers/pci/pci.o: in function `pci_bus_error_reset':
pci.c:(.text+0x5fba): undefined reference to `pci_slot_mutex'
ld: pci.c:(.text+0x5fc2): undefined reference to `pci_slot_mutex'

Caused by commit

  131b0ca2c7b2 ("PCI/ERR: Use slot reset if available")

I have applied the following hack for today (there is probably a better
way):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 26 Sep 2018 14:55:37 +1000
Subject: [PATCH] pci: move pci_slot_mutex so it is available where needed

Fixes: 131b0ca2c7b2 ("PCI/ERR: Use slot reset if available")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/pci/pci.c  | 2 ++
 drivers/pci/slot.c | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 8c1e99a637d8..1fa67db6b21e 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -5190,6 +5190,8 @@ static int pci_bus_reset(struct pci_bus *bus, int probe)
 	return ret;
 }
 
+DEFINE_MUTEX(pci_slot_mutex);
+
 /**
  * pci_bus_error_reset - reset the bridge's subordinate bus
  * @bridge: The parent device that connects to the bus to reset
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
index 3da03fcc6fbf..c46d5e1ff536 100644
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -14,7 +14,6 @@
 
 struct kset *pci_slots_kset;
 EXPORT_SYMBOL_GPL(pci_slots_kset);
-DEFINE_MUTEX(pci_slot_mutex);
 
 static ssize_t pci_slot_attr_show(struct kobject *kobj,
 					struct attribute *attr, char *buf)
-- 
2.18.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the pci tree

[Keith Busch]

On Wed, Sep 26, 2018 at 03:00:51PM +1000, Stephen Rothwell wrote:
> Hi Bjorn,
> 
> After merging the pci tree, today's linux-next build (powerpc allnoconfig)
> failed like this:
> 
> ld: drivers/pci/pci.o: in function `pci_bus_error_reset':
> pci.c:(.text+0x5fba): undefined reference to `pci_slot_mutex'
> ld: pci.c:(.text+0x5fc2): undefined reference to `pci_slot_mutex'
> 
> Caused by commit
> 
>   131b0ca2c7b2 ("PCI/ERR: Use slot reset if available")
> 
> I have applied the following hack for today (there is probably a better
> way):

Thanks for the notice. Does this mean you don't have CONFIG_SYSFS? I
must admit I missed that connection for building slot.c.

 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 26 Sep 2018 14:55:37 +1000
> Subject: [PATCH] pci: move pci_slot_mutex so it is available where needed
> 
> Fixes: 131b0ca2c7b2 ("PCI/ERR: Use slot reset if available")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/pci/pci.c  | 2 ++
>  drivers/pci/slot.c | 1 -
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index 8c1e99a637d8..1fa67db6b21e 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -5190,6 +5190,8 @@ static int pci_bus_reset(struct pci_bus *bus, int probe)
>  	return ret;
>  }
>  
> +DEFINE_MUTEX(pci_slot_mutex);
> +
>  /**
>   * pci_bus_error_reset - reset the bridge's subordinate bus
>   * @bridge: The parent device that connects to the bus to reset
> diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
> index 3da03fcc6fbf..c46d5e1ff536 100644
> --- a/drivers/pci/slot.c
> +++ b/drivers/pci/slot.c
> @@ -14,7 +14,6 @@
>  
>  struct kset *pci_slots_kset;
>  EXPORT_SYMBOL_GPL(pci_slots_kset);
> -DEFINE_MUTEX(pci_slot_mutex);
>  
>  static ssize_t pci_slot_attr_show(struct kobject *kobj,
>  					struct attribute *attr, char *buf)
> -- 
> 2.18.0

Re: linux-next: build failure after merge of the pci tree

[Keith Busch]

On Wed, Sep 26, 2018 at 08:25:40AM -0600, Keith Busch wrote:
> On Wed, Sep 26, 2018 at 03:00:51PM +1000, Stephen Rothwell wrote:
> > Hi Bjorn,
> > 
> > After merging the pci tree, today's linux-next build (powerpc allnoconfig)
> > failed like this:
> > 
> > ld: drivers/pci/pci.o: in function `pci_bus_error_reset':
> > pci.c:(.text+0x5fba): undefined reference to `pci_slot_mutex'
> > ld: pci.c:(.text+0x5fc2): undefined reference to `pci_slot_mutex'
> > 
> > Caused by commit
> > 
> >   131b0ca2c7b2 ("PCI/ERR: Use slot reset if available")
> > 
> > I have applied the following hack for today (there is probably a better
> > way):
> 
> Thanks for the notice. Does this mean you don't have CONFIG_SYSFS? I
> must admit I missed that connection for building slot.c.
> 
>  
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Wed, 26 Sep 2018 14:55:37 +1000
> > Subject: [PATCH] pci: move pci_slot_mutex so it is available where needed
> > 
> > Fixes: 131b0ca2c7b2 ("PCI/ERR: Use slot reset if available")
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/pci/pci.c  | 2 ++
> >  drivers/pci/slot.c | 1 -
> >  2 files changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> > index 8c1e99a637d8..1fa67db6b21e 100644
> > --- a/drivers/pci/pci.c
> > +++ b/drivers/pci/pci.c
> > @@ -5190,6 +5190,8 @@ static int pci_bus_reset(struct pci_bus *bus, int probe)
> >  	return ret;
> >  }
> >  
> > +DEFINE_MUTEX(pci_slot_mutex);
> > +
> >  /**
> >   * pci_bus_error_reset - reset the bridge's subordinate bus
> >   * @bridge: The parent device that connects to the bus to reset
> > diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
> > index 3da03fcc6fbf..c46d5e1ff536 100644
> > --- a/drivers/pci/slot.c
> > +++ b/drivers/pci/slot.c
> > @@ -14,7 +14,6 @@
> >  
> >  struct kset *pci_slots_kset;
> >  EXPORT_SYMBOL_GPL(pci_slots_kset);
> > -DEFINE_MUTEX(pci_slot_mutex);
> >  
> >  static ssize_t pci_slot_attr_show(struct kobject *kobj,
> >  					struct attribute *attr, char *buf)
> > -- 
> > 2.18.0

There's unfortunately second bug here when there are no slots, which
would be the case without CONFIG_SYSFS: the slot list is empty, and the
function just returned success, but it should have gone to the default
secondary bus reset behavior in that case. I'll send a patch shortly.

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

On Wed, Sep 26, 2018 at 9:56 AM Keith Busch <keith.busch@intel.com> wrote:
>
> On Wed, Sep 26, 2018 at 08:25:40AM -0600, Keith Busch wrote:
> > On Wed, Sep 26, 2018 at 03:00:51PM +1000, Stephen Rothwell wrote:
> > > Hi Bjorn,
> > >
> > > After merging the pci tree, today's linux-next build (powerpc allnoconfig)
> > > failed like this:
> > >
> > > ld: drivers/pci/pci.o: in function `pci_bus_error_reset':
> > > pci.c:(.text+0x5fba): undefined reference to `pci_slot_mutex'
> > > ld: pci.c:(.text+0x5fc2): undefined reference to `pci_slot_mutex'
> > >
> > > Caused by commit
> > >
> > >   131b0ca2c7b2 ("PCI/ERR: Use slot reset if available")
> > >
> > > I have applied the following hack for today (there is probably a better
> > > way):
> >
> > Thanks for the notice. Does this mean you don't have CONFIG_SYSFS? I
> > must admit I missed that connection for building slot.c.
> >
> >
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Wed, 26 Sep 2018 14:55:37 +1000
> > > Subject: [PATCH] pci: move pci_slot_mutex so it is available where needed
> > >
> > > Fixes: 131b0ca2c7b2 ("PCI/ERR: Use slot reset if available")
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > ---
> > >  drivers/pci/pci.c  | 2 ++
> > >  drivers/pci/slot.c | 1 -
> > >  2 files changed, 2 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> > > index 8c1e99a637d8..1fa67db6b21e 100644
> > > --- a/drivers/pci/pci.c
> > > +++ b/drivers/pci/pci.c
> > > @@ -5190,6 +5190,8 @@ static int pci_bus_reset(struct pci_bus *bus, int probe)
> > >     return ret;
> > >  }
> > >
> > > +DEFINE_MUTEX(pci_slot_mutex);
> > > +
> > >  /**
> > >   * pci_bus_error_reset - reset the bridge's subordinate bus
> > >   * @bridge: The parent device that connects to the bus to reset
> > > diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
> > > index 3da03fcc6fbf..c46d5e1ff536 100644
> > > --- a/drivers/pci/slot.c
> > > +++ b/drivers/pci/slot.c
> > > @@ -14,7 +14,6 @@
> > >
> > >  struct kset *pci_slots_kset;
> > >  EXPORT_SYMBOL_GPL(pci_slots_kset);
> > > -DEFINE_MUTEX(pci_slot_mutex);
> > >
> > >  static ssize_t pci_slot_attr_show(struct kobject *kobj,
> > >                                     struct attribute *attr, char *buf)
> > > --
> > > 2.18.0
>
> There's unfortunately second bug here when there are no slots, which
> would be the case without CONFIG_SYSFS: the slot list is empty, and the
> function just returned success, but it should have gone to the default
> secondary bus reset behavior in that case. I'll send a patch shortly.

I folded in Keith's patch for this, so you should be able to drop your
workaround, Stephen.

Re: linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi Bjorn,

On Wed, 26 Sep 2018 14:48:10 -0500 Bjorn Helgaas <bhelgaas@google.com> wrote:
>
> On Wed, Sep 26, 2018 at 9:56 AM Keith Busch <keith.busch@intel.com> wrote:
> >
> > On Wed, Sep 26, 2018 at 08:25:40AM -0600, Keith Busch wrote:  
> > >
> > > Thanks for the notice. Does this mean you don't have CONFIG_SYSFS? I
> > > must admit I missed that connection for building slot.c.

Yes, it was an "allnoconfig" powerpc build.

> > There's unfortunately second bug here when there are no slots, which
> > would be the case without CONFIG_SYSFS: the slot list is empty, and the
> > function just returned success, but it should have gone to the default
> > secondary bus reset behavior in that case. I'll send a patch shortly.  
> 
> I folded in Keith's patch for this, so you should be able to drop your
> workaround, Stephen.

OK, thanks.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi Bjorn,

After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

In file included from /home/sfr/next/next/drivers/pci/host/pcie-iproc.c:16:0:  
/home/sfr/next/next/include/linux/irqchip/arm-gic-v3.h:560:10: fatal error: asm/arch_gicv3.h: No such file or directory
 #include <asm/arch_gicv3.h>
          ^~~~~~~~~~~~~~~~~~

Caused by commit

  af3c73473d10 ("PCI: Improve host drivers compile test coverage")

I used the pci tree from next-20180323 for today.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

On Mon, Mar 26, 2018 at 12:31:43PM +1100, Stephen Rothwell wrote:
> Hi Bjorn,
> 
> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> In file included from /home/sfr/next/next/drivers/pci/host/pcie-iproc.c:16:0:  
> /home/sfr/next/next/include/linux/irqchip/arm-gic-v3.h:560:10: fatal error: asm/arch_gicv3.h: No such file or directory
>  #include <asm/arch_gicv3.h>
>           ^~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   af3c73473d10 ("PCI: Improve host drivers compile test coverage")
> 
> I used the pci tree from next-20180323 for today.

Thanks, I updated my tree to drop af3c73473d10 ("PCI: Improve host
drivers compile test coverage") for now.

I know Lorenzo is out this week, so he may not be able to do an
update, but if you post a new version, Rob, I'll see if I can pull it
in.

Bjorn

Re: linux-next: build failure after merge of the pci tree

[Rob Herring]

On Mon, Mar 26, 2018 at 2:53 PM, Bjorn Helgaas <helgaas@kernel.org> wrote:
> On Mon, Mar 26, 2018 at 12:31:43PM +1100, Stephen Rothwell wrote:
>> Hi Bjorn,
>>
>> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
>> failed like this:
>>
>> In file included from /home/sfr/next/next/drivers/pci/host/pcie-iproc.c:16:0:
>> /home/sfr/next/next/include/linux/irqchip/arm-gic-v3.h:560:10: fatal error: asm/arch_gicv3.h: No such file or directory
>>  #include <asm/arch_gicv3.h>
>>           ^~~~~~~~~~~~~~~~~~
>>
>> Caused by commit
>>
>>   af3c73473d10 ("PCI: Improve host drivers compile test coverage")
>>
>> I used the pci tree from next-20180323 for today.
>
> Thanks, I updated my tree to drop af3c73473d10 ("PCI: Improve host
> drivers compile test coverage") for now.
>
> I know Lorenzo is out this week, so he may not be able to do an
> update, but if you post a new version, Rob, I'll see if I can pull it
> in.

The simple fix is to just drop this hunk. Alternatively, we can add a
"depends on ARM_GIC_V3" and keep the compile coverage for arm64.

@@ -128,7 +128,7 @@ config PCIE_IPROC_PLATFORM

 config PCIE_IPROC_BCMA
        tristate "Broadcom iProc PCIe BCMA bus driver"
-       depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST)
+       depends on (ARM && ARCH_BCM_IPROC) || COMPILE_TEST
        select PCIE_IPROC
        select BCMA
        default ARCH_BCM_5301X

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

Hi Bjorn,

After merging the pci tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/pci/dwc/pcie-designware-ep.c: In function 'dw_pcie_ep_raise_msi_irq':
drivers/pci/dwc/pcie-designware-ep.c:293:8: error: too few arguments to function 'dw_pcie_ep_map_addr'
  ret = dw_pcie_ep_map_addr(epc, ep->msi_mem_phys, msg_addr,
        ^~~~~~~~~~~~~~~~~~~
drivers/pci/dwc/pcie-designware-ep.c:177:12: note: declared here
 static int dw_pcie_ep_map_addr(struct pci_epc *epc, u8 func_no,
            ^~~~~~~~~~~~~~~~~~~
drivers/pci/dwc/pcie-designware-ep.c:300:2: error: too few arguments to function 'dw_pcie_ep_unmap_addr'
  dw_pcie_ep_unmap_addr(epc, ep->msi_mem_phys);
  ^~~~~~~~~~~~~~~~~~~~~
drivers/pci/dwc/pcie-designware-ep.c:161:13: note: declared here
 static void dw_pcie_ep_unmap_addr(struct pci_epc *epc, u8 func_no,
             ^~~~~~~~~~~~~~~~~~~~~

Caused by commit

  4494738de0d9 ("PCI: endpoint: Add the function number as argument to EPC ops")

interacting with commit

  6f6d7873711c ("PCI: designware-ep: Add generic function for raising MSI irq")

This should have been fixed up in commit

  26b259ab4fe8 ("Merge remote-tracking branch 'lorenzo/pci/dwc' into next")

I have used the pci tree from next-20180131 for today.



-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the pci tree

[Niklas Cassel]

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

On Thu, Feb 01, 2018 at 10:51:14AM +1100, Stephen Rothwell wrote:
> Hi Bjorn,
> 
> After merging the pci tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/pci/dwc/pcie-designware-ep.c: In function 'dw_pcie_ep_raise_msi_irq':
> drivers/pci/dwc/pcie-designware-ep.c:293:8: error: too few arguments to function 'dw_pcie_ep_map_addr'
>   ret = dw_pcie_ep_map_addr(epc, ep->msi_mem_phys, msg_addr,
>         ^~~~~~~~~~~~~~~~~~~
> drivers/pci/dwc/pcie-designware-ep.c:177:12: note: declared here
>  static int dw_pcie_ep_map_addr(struct pci_epc *epc, u8 func_no,
>             ^~~~~~~~~~~~~~~~~~~
> drivers/pci/dwc/pcie-designware-ep.c:300:2: error: too few arguments to function 'dw_pcie_ep_unmap_addr'
>   dw_pcie_ep_unmap_addr(epc, ep->msi_mem_phys);
>   ^~~~~~~~~~~~~~~~~~~~~
> drivers/pci/dwc/pcie-designware-ep.c:161:13: note: declared here
>  static void dw_pcie_ep_unmap_addr(struct pci_epc *epc, u8 func_no,
>              ^~~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   4494738de0d9 ("PCI: endpoint: Add the function number as argument to EPC ops")
> 
> interacting with commit
> 
>   6f6d7873711c ("PCI: designware-ep: Add generic function for raising MSI irq")
> 
> This should have been fixed up in commit
> 
>   26b259ab4fe8 ("Merge remote-tracking branch 'lorenzo/pci/dwc' into next")
> 
> I have used the pci tree from next-20180131 for today.

Hello,

A suggested merge resolution included as an attachment.

Regards,
Niklas

[-- Attachment #2: dwc-ep.patch --]
[-- Type: text/x-diff, Size: 4180 bytes --]

diff --git a/drivers/pci/dwc/pci-dra7xx.c b/drivers/pci/dwc/pci-dra7xx.c
index 39e4a9744863..ed8558d638e5 100644
--- a/drivers/pci/dwc/pci-dra7xx.c
+++ b/drivers/pci/dwc/pci-dra7xx.c
@@ -368,7 +368,7 @@ static void dra7xx_pcie_raise_msi_irq(struct dra7xx_pcie *dra7xx,
 	dra7xx_pcie_writel(dra7xx, PCIECTRL_TI_CONF_MSI_XMT, reg);
 }
 
-static int dra7xx_pcie_raise_irq(struct dw_pcie_ep *ep,
+static int dra7xx_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
 				 enum pci_epc_irq_type type, u8 interrupt_num)
 {
 	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
diff --git a/drivers/pci/dwc/pcie-artpec6.c b/drivers/pci/dwc/pcie-artpec6.c
index 34ae163603ee..93b3df9ed1b5 100644
--- a/drivers/pci/dwc/pcie-artpec6.c
+++ b/drivers/pci/dwc/pcie-artpec6.c
@@ -445,7 +445,7 @@ static void artpec6_pcie_ep_init(struct dw_pcie_ep *ep)
 		dw_pcie_ep_reset_bar(pci, bar);
 }
 
-static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep,
+static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
 				  enum pci_epc_irq_type type, u8 interrupt_num)
 {
 	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
@@ -455,7 +455,7 @@ static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep,
 		dev_err(pci->dev, "EP cannot trigger legacy IRQs\n");
 		return -EINVAL;
 	case PCI_EPC_IRQ_MSI:
-		return dw_pcie_ep_raise_msi_irq(ep, interrupt_num);
+		return dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
 	default:
 		dev_err(pci->dev, "UNKNOWN IRQ type\n");
 	}
diff --git a/drivers/pci/dwc/pcie-designware-ep.c b/drivers/pci/dwc/pcie-designware-ep.c
index c0395e1f470a..3a6feeff5f5b 100644
--- a/drivers/pci/dwc/pcie-designware-ep.c
+++ b/drivers/pci/dwc/pcie-designware-ep.c
@@ -229,7 +229,7 @@ static int dw_pcie_ep_raise_irq(struct pci_epc *epc, u8 func_no,
 	if (!ep->ops->raise_irq)
 		return -EINVAL;
 
-	return ep->ops->raise_irq(ep, type, interrupt_num);
+	return ep->ops->raise_irq(ep, func_no, type, interrupt_num);
 }
 
 static void dw_pcie_ep_stop(struct pci_epc *epc)
@@ -267,7 +267,7 @@ static const struct pci_epc_ops epc_ops = {
 	.stop			= dw_pcie_ep_stop,
 };
 
-int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep,
+int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
 			     u8 interrupt_num)
 {
 	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
@@ -290,14 +290,14 @@ int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep,
 		msg_data = dw_pcie_readw_dbi(pci, MSI_MESSAGE_DATA_32);
 	}
 	msg_addr = ((u64) msg_addr_upper) << 32 | msg_addr_lower;
-	ret = dw_pcie_ep_map_addr(epc, ep->msi_mem_phys, msg_addr,
+	ret = dw_pcie_ep_map_addr(epc, func_no, ep->msi_mem_phys, msg_addr,
 				  epc->mem->page_size);
 	if (ret)
 		return ret;
 
 	writel(msg_data | (interrupt_num - 1), ep->msi_mem);
 
-	dw_pcie_ep_unmap_addr(epc, ep->msi_mem_phys);
+	dw_pcie_ep_unmap_addr(epc, func_no, ep->msi_mem_phys);
 
 	return 0;
 }
diff --git a/drivers/pci/dwc/pcie-designware.h b/drivers/pci/dwc/pcie-designware.h
index 7e52119f0e96..11b13864a406 100644
--- a/drivers/pci/dwc/pcie-designware.h
+++ b/drivers/pci/dwc/pcie-designware.h
@@ -186,8 +186,8 @@ enum dw_pcie_as_type {
 
 struct dw_pcie_ep_ops {
 	void	(*ep_init)(struct dw_pcie_ep *ep);
-	int	(*raise_irq)(struct dw_pcie_ep *ep, enum pci_epc_irq_type type,
-			     u8 interrupt_num);
+	int	(*raise_irq)(struct dw_pcie_ep *ep, u8 func_no,
+			     enum pci_epc_irq_type type, u8 interrupt_num);
 };
 
 struct dw_pcie_ep {
@@ -342,7 +342,8 @@ static inline int dw_pcie_host_init(struct pcie_port *pp)
 void dw_pcie_ep_linkup(struct dw_pcie_ep *ep);
 int dw_pcie_ep_init(struct dw_pcie_ep *ep);
 void dw_pcie_ep_exit(struct dw_pcie_ep *ep);
-int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 interrupt_num);
+int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
+			     u8 interrupt_num);
 void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar);
 #else
 static inline void dw_pcie_ep_linkup(struct dw_pcie_ep *ep)
@@ -358,7 +359,7 @@ static inline void dw_pcie_ep_exit(struct dw_pcie_ep *ep)
 {
 }
 
-static inline int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep,
+static inline int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
 					   u8 interrupt_num)
 {
 	return 0;

Re: linux-next: build failure after merge of the pci tree

[Lorenzo Pieralisi]

On Thu, Feb 01, 2018 at 09:56:09AM +0100, Niklas Cassel wrote:
> On Thu, Feb 01, 2018 at 10:51:14AM +1100, Stephen Rothwell wrote:
> > Hi Bjorn,
> > 
> > After merging the pci tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > drivers/pci/dwc/pcie-designware-ep.c: In function 'dw_pcie_ep_raise_msi_irq':
> > drivers/pci/dwc/pcie-designware-ep.c:293:8: error: too few arguments to function 'dw_pcie_ep_map_addr'
> >   ret = dw_pcie_ep_map_addr(epc, ep->msi_mem_phys, msg_addr,
> >         ^~~~~~~~~~~~~~~~~~~
> > drivers/pci/dwc/pcie-designware-ep.c:177:12: note: declared here
> >  static int dw_pcie_ep_map_addr(struct pci_epc *epc, u8 func_no,
> >             ^~~~~~~~~~~~~~~~~~~
> > drivers/pci/dwc/pcie-designware-ep.c:300:2: error: too few arguments to function 'dw_pcie_ep_unmap_addr'
> >   dw_pcie_ep_unmap_addr(epc, ep->msi_mem_phys);
> >   ^~~~~~~~~~~~~~~~~~~~~
> > drivers/pci/dwc/pcie-designware-ep.c:161:13: note: declared here
> >  static void dw_pcie_ep_unmap_addr(struct pci_epc *epc, u8 func_no,
> >              ^~~~~~~~~~~~~~~~~~~~~
> > 
> > Caused by commit
> > 
> >   4494738de0d9 ("PCI: endpoint: Add the function number as argument to EPC ops")
> > 
> > interacting with commit
> > 
> >   6f6d7873711c ("PCI: designware-ep: Add generic function for raising MSI irq")
> > 
> > This should have been fixed up in commit
> > 
> >   26b259ab4fe8 ("Merge remote-tracking branch 'lorenzo/pci/dwc' into next")
> > 
> > I have used the pci tree from next-20180131 for today.
> 
> Hello,
> 
> A suggested merge resolution included as an attachment.

The resolution is OK to me - we have not spotted it since
PCI_ENDPOINT is being turned on in the config file in question only
in -next, it is not on by default in current mainline, apologies.

Lorenzo

Re: linux-next: build failure after merge of the pci tree

[Niklas Cassel]

On Thu, Feb 01, 2018 at 11:10:54AM +0000, Lorenzo Pieralisi wrote:
> On Thu, Feb 01, 2018 at 09:56:09AM +0100, Niklas Cassel wrote:
> > On Thu, Feb 01, 2018 at 10:51:14AM +1100, Stephen Rothwell wrote:
> > > Hi Bjorn,
> > > 
> > > After merging the pci tree, today's linux-next build (arm
> > > multi_v7_defconfig) failed like this:
> > > 
> > > drivers/pci/dwc/pcie-designware-ep.c: In function 'dw_pcie_ep_raise_msi_irq':
> > > drivers/pci/dwc/pcie-designware-ep.c:293:8: error: too few arguments to function 'dw_pcie_ep_map_addr'
> > >   ret = dw_pcie_ep_map_addr(epc, ep->msi_mem_phys, msg_addr,
> > >         ^~~~~~~~~~~~~~~~~~~
> > > drivers/pci/dwc/pcie-designware-ep.c:177:12: note: declared here
> > >  static int dw_pcie_ep_map_addr(struct pci_epc *epc, u8 func_no,
> > >             ^~~~~~~~~~~~~~~~~~~
> > > drivers/pci/dwc/pcie-designware-ep.c:300:2: error: too few arguments to function 'dw_pcie_ep_unmap_addr'
> > >   dw_pcie_ep_unmap_addr(epc, ep->msi_mem_phys);
> > >   ^~~~~~~~~~~~~~~~~~~~~
> > > drivers/pci/dwc/pcie-designware-ep.c:161:13: note: declared here
> > >  static void dw_pcie_ep_unmap_addr(struct pci_epc *epc, u8 func_no,
> > >              ^~~~~~~~~~~~~~~~~~~~~
> > > 
> > > Caused by commit
> > > 
> > >   4494738de0d9 ("PCI: endpoint: Add the function number as argument to EPC ops")
> > > 
> > > interacting with commit
> > > 
> > >   6f6d7873711c ("PCI: designware-ep: Add generic function for raising MSI irq")
> > > 
> > > This should have been fixed up in commit
> > > 
> > >   26b259ab4fe8 ("Merge remote-tracking branch 'lorenzo/pci/dwc' into next")
> > > 
> > > I have used the pci tree from next-20180131 for today.
> > 
> > Hello,
> > 
> > A suggested merge resolution included as an attachment.
> 
> The resolution is OK to me - we have not spotted it since
> PCI_ENDPOINT is being turned on in the config file in question only
> in -next, it is not on by default in current mainline, apologies.
> 
> Lorenzo

Adding Kishon to CC, he should probably have a look.

https://marc.info/?l=linux-kernel&m=151747537928327&w=2

If Kishon approves the suggested merge resolution,
perhaps it can be squashed with Cyrille's patch.


Regards,
Niklas

Re: linux-next: build failure after merge of the pci tree

[Kishon Vijay Abraham I]

Hi Niklas,

On Thursday 01 February 2018 04:46 PM, Niklas Cassel wrote:
> On Thu, Feb 01, 2018 at 11:10:54AM +0000, Lorenzo Pieralisi wrote:
>> On Thu, Feb 01, 2018 at 09:56:09AM +0100, Niklas Cassel wrote:
>>> On Thu, Feb 01, 2018 at 10:51:14AM +1100, Stephen Rothwell wrote:
>>>> Hi Bjorn,
>>>>
>>>> After merging the pci tree, today's linux-next build (arm
>>>> multi_v7_defconfig) failed like this:
>>>>
>>>> drivers/pci/dwc/pcie-designware-ep.c: In function 'dw_pcie_ep_raise_msi_irq':
>>>> drivers/pci/dwc/pcie-designware-ep.c:293:8: error: too few arguments to function 'dw_pcie_ep_map_addr'
>>>>   ret = dw_pcie_ep_map_addr(epc, ep->msi_mem_phys, msg_addr,
>>>>         ^~~~~~~~~~~~~~~~~~~
>>>> drivers/pci/dwc/pcie-designware-ep.c:177:12: note: declared here
>>>>  static int dw_pcie_ep_map_addr(struct pci_epc *epc, u8 func_no,
>>>>             ^~~~~~~~~~~~~~~~~~~
>>>> drivers/pci/dwc/pcie-designware-ep.c:300:2: error: too few arguments to function 'dw_pcie_ep_unmap_addr'
>>>>   dw_pcie_ep_unmap_addr(epc, ep->msi_mem_phys);
>>>>   ^~~~~~~~~~~~~~~~~~~~~
>>>> drivers/pci/dwc/pcie-designware-ep.c:161:13: note: declared here
>>>>  static void dw_pcie_ep_unmap_addr(struct pci_epc *epc, u8 func_no,
>>>>              ^~~~~~~~~~~~~~~~~~~~~
>>>>
>>>> Caused by commit
>>>>
>>>>   4494738de0d9 ("PCI: endpoint: Add the function number as argument to EPC ops")
>>>>
>>>> interacting with commit
>>>>
>>>>   6f6d7873711c ("PCI: designware-ep: Add generic function for raising MSI irq")
>>>>
>>>> This should have been fixed up in commit
>>>>
>>>>   26b259ab4fe8 ("Merge remote-tracking branch 'lorenzo/pci/dwc' into next")
>>>>
>>>> I have used the pci tree from next-20180131 for today.
>>>
>>> Hello,
>>>
>>> A suggested merge resolution included as an attachment.
>>
>> The resolution is OK to me - we have not spotted it since
>> PCI_ENDPOINT is being turned on in the config file in question only
>> in -next, it is not on by default in current mainline, apologies.
>>
>> Lorenzo
> 
> Adding Kishon to CC, he should probably have a look.
> 
> https://marc.info/?l=linux-kernel&m=151747537928327&w=2
> 
> If Kishon approves the suggested merge resolution,
> perhaps it can be squashed with Cyrille's patch.

The patch looks good to me.

Thanks
Kishon

Re: linux-next: build failure after merge of the pci tree

[Niklas Cassel]

On Thu, Feb 01, 2018 at 04:52:01PM +0530, Kishon Vijay Abraham I wrote:
> Hi Niklas,
> 
> On Thursday 01 February 2018 04:46 PM, Niklas Cassel wrote:
> > On Thu, Feb 01, 2018 at 11:10:54AM +0000, Lorenzo Pieralisi wrote:
> >> On Thu, Feb 01, 2018 at 09:56:09AM +0100, Niklas Cassel wrote:
> >>> On Thu, Feb 01, 2018 at 10:51:14AM +1100, Stephen Rothwell wrote:
> >>>> Hi Bjorn,
> >>>>
> >>>> After merging the pci tree, today's linux-next build (arm
> >>>> multi_v7_defconfig) failed like this:
> >>>>
> >>>> drivers/pci/dwc/pcie-designware-ep.c: In function 'dw_pcie_ep_raise_msi_irq':
> >>>> drivers/pci/dwc/pcie-designware-ep.c:293:8: error: too few arguments to function 'dw_pcie_ep_map_addr'
> >>>>   ret = dw_pcie_ep_map_addr(epc, ep->msi_mem_phys, msg_addr,
> >>>>         ^~~~~~~~~~~~~~~~~~~
> >>>> drivers/pci/dwc/pcie-designware-ep.c:177:12: note: declared here
> >>>>  static int dw_pcie_ep_map_addr(struct pci_epc *epc, u8 func_no,
> >>>>             ^~~~~~~~~~~~~~~~~~~
> >>>> drivers/pci/dwc/pcie-designware-ep.c:300:2: error: too few arguments to function 'dw_pcie_ep_unmap_addr'
> >>>>   dw_pcie_ep_unmap_addr(epc, ep->msi_mem_phys);
> >>>>   ^~~~~~~~~~~~~~~~~~~~~
> >>>> drivers/pci/dwc/pcie-designware-ep.c:161:13: note: declared here
> >>>>  static void dw_pcie_ep_unmap_addr(struct pci_epc *epc, u8 func_no,
> >>>>              ^~~~~~~~~~~~~~~~~~~~~
> >>>>
> >>>> Caused by commit
> >>>>
> >>>>   4494738de0d9 ("PCI: endpoint: Add the function number as argument to EPC ops")
> >>>>
> >>>> interacting with commit
> >>>>
> >>>>   6f6d7873711c ("PCI: designware-ep: Add generic function for raising MSI irq")
> >>>>
> >>>> This should have been fixed up in commit
> >>>>
> >>>>   26b259ab4fe8 ("Merge remote-tracking branch 'lorenzo/pci/dwc' into next")
> >>>>
> >>>> I have used the pci tree from next-20180131 for today.
> >>>
> >>> Hello,
> >>>
> >>> A suggested merge resolution included as an attachment.
> >>
> >> The resolution is OK to me - we have not spotted it since
> >> PCI_ENDPOINT is being turned on in the config file in question only
> >> in -next, it is not on by default in current mainline, apologies.
> >>
> >> Lorenzo
> > 
> > Adding Kishon to CC, he should probably have a look.
> > 
> > https://marc.info/?l=linux-kernel&m=151747537928327&w=2
> > 
> > If Kishon approves the suggested merge resolution,
> > perhaps it can be squashed with Cyrille's patch.
> 
> The patch looks good to me.

Since dw_pcie_ep_map_addr()/dw_pcie_ep_unmap_addr() ignores
func_no, I guess another merge resoluton would be:

--- a/drivers/pci/dwc/pcie-designware-ep.c
+++ b/drivers/pci/dwc/pcie-designware-ep.c
@@ -290,14 +290,14 @@ int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep,
                msg_data = dw_pcie_readw_dbi(pci, MSI_MESSAGE_DATA_32);
        }
        msg_addr = ((u64) msg_addr_upper) << 32 | msg_addr_lower;
-       ret = dw_pcie_ep_map_addr(epc, ep->msi_mem_phys, msg_addr,
+       ret = dw_pcie_ep_map_addr(epc, 0, ep->msi_mem_phys, msg_addr,
                                  epc->mem->page_size);
        if (ret)
                return ret;
 
        writel(msg_data | (interrupt_num - 1), ep->msi_mem);
 
-       dw_pcie_ep_unmap_addr(epc, ep->msi_mem_phys);
+       dw_pcie_ep_unmap_addr(epc, 0, ep->msi_mem_phys);
 
        return 0;
 }


But in case pcie-designware-ep.c is ever going to support
multi-function devices (will it? will it not?), perhaps
the first merge resolution is prefered.


Regards,
Niklas

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

[+cc Kishon, linux-pci]

On Thu, Feb 01, 2018 at 09:56:09AM +0100, Niklas Cassel wrote:
> On Thu, Feb 01, 2018 at 10:51:14AM +1100, Stephen Rothwell wrote:
> > Hi Bjorn,
> > 
> > After merging the pci tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > drivers/pci/dwc/pcie-designware-ep.c: In function 'dw_pcie_ep_raise_msi_irq':
> > drivers/pci/dwc/pcie-designware-ep.c:293:8: error: too few arguments to function 'dw_pcie_ep_map_addr'
> >   ret = dw_pcie_ep_map_addr(epc, ep->msi_mem_phys, msg_addr,
> >         ^~~~~~~~~~~~~~~~~~~
> > drivers/pci/dwc/pcie-designware-ep.c:177:12: note: declared here
> >  static int dw_pcie_ep_map_addr(struct pci_epc *epc, u8 func_no,
> >             ^~~~~~~~~~~~~~~~~~~
> > drivers/pci/dwc/pcie-designware-ep.c:300:2: error: too few arguments to function 'dw_pcie_ep_unmap_addr'
> >   dw_pcie_ep_unmap_addr(epc, ep->msi_mem_phys);
> >   ^~~~~~~~~~~~~~~~~~~~~
> > drivers/pci/dwc/pcie-designware-ep.c:161:13: note: declared here
> >  static void dw_pcie_ep_unmap_addr(struct pci_epc *epc, u8 func_no,
> >              ^~~~~~~~~~~~~~~~~~~~~
> > 
> > Caused by commit
> > 
> >   4494738de0d9 ("PCI: endpoint: Add the function number as argument to EPC ops")
> > 
> > interacting with commit
> > 
> >   6f6d7873711c ("PCI: designware-ep: Add generic function for raising MSI irq")
> > 
> > This should have been fixed up in commit
> > 
> >   26b259ab4fe8 ("Merge remote-tracking branch 'lorenzo/pci/dwc' into next")
> > 
> > I have used the pci tree from next-20180131 for today.
> 
> Hello,
> 
> A suggested merge resolution included as an attachment.

I applied this resolution to the merge of lorenzo/pci/dwc.

> diff --git a/drivers/pci/dwc/pci-dra7xx.c b/drivers/pci/dwc/pci-dra7xx.c
> index 39e4a9744863..ed8558d638e5 100644
> --- a/drivers/pci/dwc/pci-dra7xx.c
> +++ b/drivers/pci/dwc/pci-dra7xx.c
> @@ -368,7 +368,7 @@ static void dra7xx_pcie_raise_msi_irq(struct dra7xx_pcie *dra7xx,
>  	dra7xx_pcie_writel(dra7xx, PCIECTRL_TI_CONF_MSI_XMT, reg);
>  }
>  
> -static int dra7xx_pcie_raise_irq(struct dw_pcie_ep *ep,
> +static int dra7xx_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>  				 enum pci_epc_irq_type type, u8 interrupt_num)
>  {
>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
> diff --git a/drivers/pci/dwc/pcie-artpec6.c b/drivers/pci/dwc/pcie-artpec6.c
> index 34ae163603ee..93b3df9ed1b5 100644
> --- a/drivers/pci/dwc/pcie-artpec6.c
> +++ b/drivers/pci/dwc/pcie-artpec6.c
> @@ -445,7 +445,7 @@ static void artpec6_pcie_ep_init(struct dw_pcie_ep *ep)
>  		dw_pcie_ep_reset_bar(pci, bar);
>  }
>  
> -static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep,
> +static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>  				  enum pci_epc_irq_type type, u8 interrupt_num)
>  {
>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
> @@ -455,7 +455,7 @@ static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep,
>  		dev_err(pci->dev, "EP cannot trigger legacy IRQs\n");
>  		return -EINVAL;
>  	case PCI_EPC_IRQ_MSI:
> -		return dw_pcie_ep_raise_msi_irq(ep, interrupt_num);
> +		return dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
>  	default:
>  		dev_err(pci->dev, "UNKNOWN IRQ type\n");
>  	}
> diff --git a/drivers/pci/dwc/pcie-designware-ep.c b/drivers/pci/dwc/pcie-designware-ep.c
> index c0395e1f470a..3a6feeff5f5b 100644
> --- a/drivers/pci/dwc/pcie-designware-ep.c
> +++ b/drivers/pci/dwc/pcie-designware-ep.c
> @@ -229,7 +229,7 @@ static int dw_pcie_ep_raise_irq(struct pci_epc *epc, u8 func_no,
>  	if (!ep->ops->raise_irq)
>  		return -EINVAL;
>  
> -	return ep->ops->raise_irq(ep, type, interrupt_num);
> +	return ep->ops->raise_irq(ep, func_no, type, interrupt_num);
>  }
>  
>  static void dw_pcie_ep_stop(struct pci_epc *epc)
> @@ -267,7 +267,7 @@ static const struct pci_epc_ops epc_ops = {
>  	.stop			= dw_pcie_ep_stop,
>  };
>  
> -int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep,
> +int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
>  			     u8 interrupt_num)
>  {
>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
> @@ -290,14 +290,14 @@ int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep,
>  		msg_data = dw_pcie_readw_dbi(pci, MSI_MESSAGE_DATA_32);
>  	}
>  	msg_addr = ((u64) msg_addr_upper) << 32 | msg_addr_lower;
> -	ret = dw_pcie_ep_map_addr(epc, ep->msi_mem_phys, msg_addr,
> +	ret = dw_pcie_ep_map_addr(epc, func_no, ep->msi_mem_phys, msg_addr,
>  				  epc->mem->page_size);
>  	if (ret)
>  		return ret;
>  
>  	writel(msg_data | (interrupt_num - 1), ep->msi_mem);
>  
> -	dw_pcie_ep_unmap_addr(epc, ep->msi_mem_phys);
> +	dw_pcie_ep_unmap_addr(epc, func_no, ep->msi_mem_phys);
>  
>  	return 0;
>  }
> diff --git a/drivers/pci/dwc/pcie-designware.h b/drivers/pci/dwc/pcie-designware.h
> index 7e52119f0e96..11b13864a406 100644
> --- a/drivers/pci/dwc/pcie-designware.h
> +++ b/drivers/pci/dwc/pcie-designware.h
> @@ -186,8 +186,8 @@ enum dw_pcie_as_type {
>  
>  struct dw_pcie_ep_ops {
>  	void	(*ep_init)(struct dw_pcie_ep *ep);
> -	int	(*raise_irq)(struct dw_pcie_ep *ep, enum pci_epc_irq_type type,
> -			     u8 interrupt_num);
> +	int	(*raise_irq)(struct dw_pcie_ep *ep, u8 func_no,
> +			     enum pci_epc_irq_type type, u8 interrupt_num);
>  };
>  
>  struct dw_pcie_ep {
> @@ -342,7 +342,8 @@ static inline int dw_pcie_host_init(struct pcie_port *pp)
>  void dw_pcie_ep_linkup(struct dw_pcie_ep *ep);
>  int dw_pcie_ep_init(struct dw_pcie_ep *ep);
>  void dw_pcie_ep_exit(struct dw_pcie_ep *ep);
> -int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 interrupt_num);
> +int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
> +			     u8 interrupt_num);
>  void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar);
>  #else
>  static inline void dw_pcie_ep_linkup(struct dw_pcie_ep *ep)
> @@ -358,7 +359,7 @@ static inline void dw_pcie_ep_exit(struct dw_pcie_ep *ep)
>  {
>  }
>  
> -static inline int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep,
> +static inline int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
>  					   u8 interrupt_num)
>  {
>  	return 0;

Re: linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

Hi Bjorn,

On Thu, 1 Feb 2018 13:00:33 -0600 Bjorn Helgaas <helgaas@kernel.org> wrote:
>
> I applied this resolution to the merge of lorenzo/pci/dwc.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

Hi Bjorn,

After merging the pci tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

arch/powerpc/kernel/pci-common.c: In function 'pcibios_setup
_device':
arch/powerpc/kernel/pci-common.c:406:15: error: 'virq' may be used uninitialized in this function [-Werror=maybe-uninitialized]
  pci_dev->irq = virq;
  ~~~~~~~~~~~~~^~~~~~
arch/powerpc/kernel/pci-common.c:365:15: note: 'virq' was declared here
  unsigned int virq;
               ^~~~

Caused by commit

  c5042ac60fe5 ("powerpc/pci: Use of_irq_parse_and_map_pci() helper")

I have applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 25 Jan 2018 16:44:19 +1100
Subject: [PATCH] powerpc/pci: fix for "Use of_irq_parse_and_map_pci() helper"

Fixes: c5042ac60fe5 ("powerpc/pci: Use of_irq_parse_and_map_pci() helper")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/kernel/pci-common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 6be3f2c22a9b..ae2ede4de6be 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -362,7 +362,7 @@ struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)
  */
 static int pci_read_irq_line(struct pci_dev *pci_dev)
 {
-	unsigned int virq;
+	unsigned int virq = 0;
 
 	pr_debug("PCI: Try to map irq for %s...\n", pci_name(pci_dev));
 
-- 
2.15.1

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the pci tree

[Rob Herring]

On Wed, Jan 24, 2018 at 11:49 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Bjorn,
>
> After merging the pci tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> arch/powerpc/kernel/pci-common.c: In function 'pcibios_setup
> _device':
> arch/powerpc/kernel/pci-common.c:406:15: error: 'virq' may be used uninitialized in this function [-Werror=maybe-uninitialized]
>   pci_dev->irq = virq;
>   ~~~~~~~~~~~~~^~~~~~
> arch/powerpc/kernel/pci-common.c:365:15: note: 'virq' was declared here
>   unsigned int virq;
>                ^~~~

I guess I need to update my PPC compiler from 4.8.0. It doesn't warn
or error on this. Neither did 0-day.

>
> Caused by commit
>
>   c5042ac60fe5 ("powerpc/pci: Use of_irq_parse_and_map_pci() helper")
>
> I have applied the following patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 25 Jan 2018 16:44:19 +1100
> Subject: [PATCH] powerpc/pci: fix for "Use of_irq_parse_and_map_pci() helper"
>
> Fixes: c5042ac60fe5 ("powerpc/pci: Use of_irq_parse_and_map_pci() helper")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/powerpc/kernel/pci-common.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Acked-by: Rob Herring <robh@kernel.org>

>
> diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
> index 6be3f2c22a9b..ae2ede4de6be 100644
> --- a/arch/powerpc/kernel/pci-common.c
> +++ b/arch/powerpc/kernel/pci-common.c
> @@ -362,7 +362,7 @@ struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)
>   */
>  static int pci_read_irq_line(struct pci_dev *pci_dev)
>  {
> -       unsigned int virq;
> +       unsigned int virq = 0;
>
>         pr_debug("PCI: Try to map irq for %s...\n", pci_name(pci_dev));
>
> --
> 2.15.1
>
> --
> Cheers,
> Stephen Rothwell

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

On Thu, Jan 25, 2018 at 07:55:58AM -0600, Rob Herring wrote:
> On Wed, Jan 24, 2018 at 11:49 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Bjorn,
> >
> > After merging the pci tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > arch/powerpc/kernel/pci-common.c: In function 'pcibios_setup
> > _device':
> > arch/powerpc/kernel/pci-common.c:406:15: error: 'virq' may be used uninitialized in this function [-Werror=maybe-uninitialized]
> >   pci_dev->irq = virq;
> >   ~~~~~~~~~~~~~^~~~~~
> > arch/powerpc/kernel/pci-common.c:365:15: note: 'virq' was declared here
> >   unsigned int virq;
> >                ^~~~
> 
> I guess I need to update my PPC compiler from 4.8.0. It doesn't warn
> or error on this. Neither did 0-day.
> 
> >
> > Caused by commit
> >
> >   c5042ac60fe5 ("powerpc/pci: Use of_irq_parse_and_map_pci() helper")
> >
> > I have applied the following patch for today:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 25 Jan 2018 16:44:19 +1100
> > Subject: [PATCH] powerpc/pci: fix for "Use of_irq_parse_and_map_pci() helper"
> >
> > Fixes: c5042ac60fe5 ("powerpc/pci: Use of_irq_parse_and_map_pci() helper")
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  arch/powerpc/kernel/pci-common.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Acked-by: Rob Herring <robh@kernel.org>
> 
> >
> > diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
> > index 6be3f2c22a9b..ae2ede4de6be 100644
> > --- a/arch/powerpc/kernel/pci-common.c
> > +++ b/arch/powerpc/kernel/pci-common.c
> > @@ -362,7 +362,7 @@ struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)
> >   */
> >  static int pci_read_irq_line(struct pci_dev *pci_dev)
> >  {
> > -       unsigned int virq;
> > +       unsigned int virq = 0;
> >
> >         pr_debug("PCI: Try to map irq for %s...\n", pci_name(pci_dev));
> >

I folded this fix into my branch, so it should be fixed tonight.
Thanks!

Re: linux-next: build failure after merge of the pci tree

[Michael Ellerman]

Rob Herring <robh@kernel.org> writes:

> On Wed, Jan 24, 2018 at 11:49 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi Bjorn,
>>
>> After merging the pci tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> arch/powerpc/kernel/pci-common.c: In function 'pcibios_setup
>> _device':
>> arch/powerpc/kernel/pci-common.c:406:15: error: 'virq' may be used uninitialized in this function [-Werror=maybe-uninitialized]
>>   pci_dev->irq = virq;
>>   ~~~~~~~~~~~~~^~~~~~
>> arch/powerpc/kernel/pci-common.c:365:15: note: 'virq' was declared here
>>   unsigned int virq;
>>                ^~~~
>
> I guess I need to update my PPC compiler from 4.8.0. It doesn't warn
> or error on this. Neither did 0-day.

https://toolchains.free-electrons.com/

Has 5.4.0 and 7.2.0 for both big and little endian.

cheers

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

Hi Bjorn,

After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/iommu/amd_iommu.c: In function 'get_alias':
drivers/iommu/amd_iommu.c:266:22: error: 'PCI_DEV_FLAGS_DMA_ALIAS_DEVFN' undeclared (first use in this function)
   pdev->dev_flags |= PCI_DEV_FLAGS_DMA_ALIAS_DEVFN;
                      ^
drivers/iommu/amd_iommu.c:266:22: note: each undeclared identifier is reported only once for each function it appears in
drivers/iommu/amd_iommu.c:267:7: error: 'struct pci_dev' has no member named 'dma_alias_devfn'  
   pdev->dma_alias_devfn = ivrs_alias & 0xff;
       ^

Caused by commit

  338c3149a221 ("PCI: Add support for multiple DMA aliases")

interacting with commit

  e3156048346c ("iommu/amd: Fix checking of pci dma aliases")

from Linus' tree (added before v4.6-rc5).

I added the following merge fix patch (which makes it build, but may need
more work):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 26 Apr 2016 11:07:25 +1000
Subject: [PATCH] iommu/amd: fix up for aliases API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/iommu/amd_iommu.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 5efadad4615b..3839fd2865a6 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -263,8 +263,7 @@ static u16 get_alias(struct device *dev)
 	 */
 	if (pci_alias == devid &&
 	    PCI_BUS_NUM(ivrs_alias) == pdev->bus->number) {
-		pdev->dev_flags |= PCI_DEV_FLAGS_DMA_ALIAS_DEVFN;
-		pdev->dma_alias_devfn = ivrs_alias & 0xff;
+		pci_add_dma_alias(pdev, ivrs_alias & 0xff);
 		pr_info("AMD-Vi: Added PCI DMA alias %02x.%d for %s\n",
 			PCI_SLOT(ivrs_alias), PCI_FUNC(ivrs_alias),
 			dev_name(dev));
-- 
2.7.0

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the pci tree

[Joerg Roedel]

On Tue, Apr 26, 2016 at 11:13:46AM +1000, Stephen Rothwell wrote:
> diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
> index 5efadad4615b..3839fd2865a6 100644
> --- a/drivers/iommu/amd_iommu.c
> +++ b/drivers/iommu/amd_iommu.c
> @@ -263,8 +263,7 @@ static u16 get_alias(struct device *dev)
>  	 */
>  	if (pci_alias == devid &&
>  	    PCI_BUS_NUM(ivrs_alias) == pdev->bus->number) {
> -		pdev->dev_flags |= PCI_DEV_FLAGS_DMA_ALIAS_DEVFN;
> -		pdev->dma_alias_devfn = ivrs_alias & 0xff;
> +		pci_add_dma_alias(pdev, ivrs_alias & 0xff);
>  		pr_info("AMD-Vi: Added PCI DMA alias %02x.%d for %s\n",
>  			PCI_SLOT(ivrs_alias), PCI_FUNC(ivrs_alias),
>  			dev_name(dev));

That is exactly the right fix, thanks Stephen. I'll work out how to fix
this in the iommu tree.


	Joerg

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

Hi Bjorn,

After merging the pci tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/pci/host/pci-keystone.c: In function 'ks_pcie_probe':
drivers/pci/host/pci-keystone.c:412:16: error: 'node' undeclared (first use in this function)
  ks_pcie->np = node;
                ^

Caused by commit

  7be92716c1aa ("PCI: keystone: Add error IRQ handler")

I have used the pci tree from next-20160421 for today.

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

Hi Bjorn,

After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/pci/host/pcie-designware.c: In function 'dw_pcie_host_init':
drivers/pci/host/pcie-designware.c:554:7: error: implicit declaration of function 'pci_has_flag' [-Werror=implicit-function-declaration]
  if (!pci_has_flag(PCI_PROBE_ONLY)) {
       ^
drivers/pci/host/pcie-designware.c:554:20: error: 'PCI_PROBE_ONLY' undeclared (first use in this function)
  if (!pci_has_flag(PCI_PROBE_ONLY)) {
                    ^

Caused by commit

  755007e88a5e ("PCI: qcom: Add Qualcomm PCIe controller driver")

Please only use CONFIG_COMPILE_TEST *after* testing for cross compile
problems ...

I have added thse folloeing patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 Jan 2016 12:37:58 +1100
Subject: [PATCH] PCI: qcom: the Qualcomm PCIe controller driver should not
 depend on COMPILE_TEST

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/pci/host/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index de403b206391..75a605426538 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -183,7 +183,7 @@ config PCI_HISI
 
 config PCIE_QCOM
 	bool "Qualcomm PCIe controller"
-	depends on ARCH_QCOM && OF || COMPILE_TEST
+	depends on ARCH_QCOM && OF
 	select PCIE_DW
 	select PCIEPORTBUS
 	help
-- 
2.6.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

On Mon, Jan 11, 2016 at 12:42:22PM +1100, Stephen Rothwell wrote:
> Hi Bjorn,
> 
> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/pci/host/pcie-designware.c: In function 'dw_pcie_host_init':
> drivers/pci/host/pcie-designware.c:554:7: error: implicit declaration of function 'pci_has_flag' [-Werror=implicit-function-declaration]
>   if (!pci_has_flag(PCI_PROBE_ONLY)) {
>        ^
> drivers/pci/host/pcie-designware.c:554:20: error: 'PCI_PROBE_ONLY' undeclared (first use in this function)
>   if (!pci_has_flag(PCI_PROBE_ONLY)) {
>                     ^
> 
> Caused by commit
> 
>   755007e88a5e ("PCI: qcom: Add Qualcomm PCIe controller driver")
> 
> Please only use CONFIG_COMPILE_TEST *after* testing for cross compile
> problems ...

My fault, sorry.  The build robot did catch this error, but I forgot
to check those results before merging pci/host-qcom.  I folded in your
patch.

> I have added thse folloeing patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 11 Jan 2016 12:37:58 +1100
> Subject: [PATCH] PCI: qcom: the Qualcomm PCIe controller driver should not
>  depend on COMPILE_TEST
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/pci/host/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
> index de403b206391..75a605426538 100644
> --- a/drivers/pci/host/Kconfig
> +++ b/drivers/pci/host/Kconfig
> @@ -183,7 +183,7 @@ config PCI_HISI
>  
>  config PCIE_QCOM
>  	bool "Qualcomm PCIe controller"
> -	depends on ARCH_QCOM && OF || COMPILE_TEST
> +	depends on ARCH_QCOM && OF
>  	select PCIE_DW
>  	select PCIEPORTBUS
>  	help
> -- 
> 2.6.4
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

Hi Bjorn,

After merging the pci tree, today's linux-next build (powerpc
allyesconfig) failed like this:

In file included from include/linux/kvm_host.h:20:0,
                 from arch/powerpc/kernel/asm-offsets.c:54:
include/linux/msi.h:174:21: fatal error: asm/msi.h: No such file or directory

Caused by commit

  f19eafec930f ("PCI: altera: Add Altera PCIe MSI driver")

I have disabled that driver for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Nov 2015 02:12:54 +1100
Subject: [PATCH] PCI: altera: disable MSI driver for now

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/pci/host/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 2af0571356e8..7a31ebbc4379 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -158,6 +158,7 @@ config PCIE_ALTERA
 config PCIE_ALTERA_MSI
 	bool "Altera PCIe MSI feature"
 	depends on PCI_MSI
+	depends on BROKEN
 	select PCI_MSI_IRQ_DOMAIN
 	help
 	  Say Y here if you want PCIe MSI support for the Altera FPGA.
-- 
2.6.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the pci tree

[Ley Foon Tan]

On Isn, 2015-11-02 at 02:23 +1100, Stephen Rothwell wrote:
> Hi Bjorn,
>
> After merging the pci tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> In file included from include/linux/kvm_host.h:20:0,
>                  from arch/powerpc/kernel/asm-offsets.c:54:
> include/linux/msi.h:174:21: fatal error: asm/msi.h: No such file or directory
>
> Caused by commit
>
>   f19eafec930f ("PCI: altera: Add Altera PCIe MSI driver")
>
> I have disabled that driver for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 2 Nov 2015 02:12:54 +1100
> Subject: [PATCH] PCI: altera: disable MSI driver for now
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/pci/host/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
> index 2af0571356e8..7a31ebbc4379 100644
> --- a/drivers/pci/host/Kconfig
> +++ b/drivers/pci/host/Kconfig
> @@ -158,6 +158,7 @@ config PCIE_ALTERA
>  config PCIE_ALTERA_MSI
>       bool "Altera PCIe MSI feature"
>       depends on PCI_MSI
> +     depends on BROKEN
>       select PCI_MSI_IRQ_DOMAIN
>       help
>         Say Y here if you want PCIe MSI support for the Altera FPGA.
> --
> 2.6.1
>
Hi Bjorn

This driver depends on the asm/msi.h and not all architectures include
the asm/msi.h.
We can fix this by adding "depends on ARM || NIOS2" to Kconfig, same as
altera pcie driver. What do you think?

Thanks.

Regards
Ley Foon


________________________________

Confidentiality Notice.
This message may contain information that is confidential or otherwise protected from disclosure. If you are not the intended recipient, you are hereby notified that any use, disclosure, dissemination, distribution, or copying of this message, or any attachments, is strictly prohibited. If you have received this message in error, please advise the sender by reply e-mail, and delete the message and any attachments. Thank you.

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

On Sun, Nov 1, 2015 at 6:00 PM, Ley Foon Tan <lftan@altera.com> wrote:
> On Isn, 2015-11-02 at 02:23 +1100, Stephen Rothwell wrote:
>> Hi Bjorn,
>>
>> After merging the pci tree, today's linux-next build (powerpc
>> allyesconfig) failed like this:
>>
>> In file included from include/linux/kvm_host.h:20:0,
>>                  from arch/powerpc/kernel/asm-offsets.c:54:
>> include/linux/msi.h:174:21: fatal error: asm/msi.h: No such file or directory
>>
>> Caused by commit
>>
>>   f19eafec930f ("PCI: altera: Add Altera PCIe MSI driver")
>>
>> I have disabled that driver for today:
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Mon, 2 Nov 2015 02:12:54 +1100
>> Subject: [PATCH] PCI: altera: disable MSI driver for now
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>>  drivers/pci/host/Kconfig | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
>> index 2af0571356e8..7a31ebbc4379 100644
>> --- a/drivers/pci/host/Kconfig
>> +++ b/drivers/pci/host/Kconfig
>> @@ -158,6 +158,7 @@ config PCIE_ALTERA
>>  config PCIE_ALTERA_MSI
>>       bool "Altera PCIe MSI feature"
>>       depends on PCI_MSI
>> +     depends on BROKEN
>>       select PCI_MSI_IRQ_DOMAIN
>>       help
>>         Say Y here if you want PCIe MSI support for the Altera FPGA.
>> --
>> 2.6.1
>>
> Hi Bjorn
>
> This driver depends on the asm/msi.h and not all architectures include
> the asm/msi.h.
> We can fix this by adding "depends on ARM || NIOS2" to Kconfig, same as
> altera pcie driver. What do you think?

I don't think your driver depends on asm/msi.h because ARM doesn't
have asm/msi.h either.

I think the best thing is to do this:

config PCIE_ALTERA_MSI
        bool "Altera PCIe MSI feature"
        depends on PCIE_ALTERA && PCI_MSI

That way we don't have to repeat the constraints from PCIE_ALTERA.
This is the same strategy used by PCI_XGENE & PCI_XGENE_MSI.

Bjorn

Re: linux-next: build failure after merge of the pci tree

[Ley Foon Tan]

On Isn, 2015-11-02 at 12:12 -0600, Bjorn Helgaas wrote:
> On Sun, Nov 1, 2015 at 6:00 PM, Ley Foon Tan <lftan@altera.com> wrote:
> > On Isn, 2015-11-02 at 02:23 +1100, Stephen Rothwell wrote:
> >> Hi Bjorn,
> >>
> >> After merging the pci tree, today's linux-next build (powerpc
> >> allyesconfig) failed like this:
> >>
> >> In file included from include/linux/kvm_host.h:20:0,
> >>                  from arch/powerpc/kernel/asm-offsets.c:54:
> >> include/linux/msi.h:174:21: fatal error: asm/msi.h: No such file or directory
> >>
> >> Caused by commit
> >>
> >>   f19eafec930f ("PCI: altera: Add Altera PCIe MSI driver")
> >>
> >> I have disabled that driver for today:
> >>
> >> From: Stephen Rothwell <sfr@canb.auug.org.au>
> >> Date: Mon, 2 Nov 2015 02:12:54 +1100
> >> Subject: [PATCH] PCI: altera: disable MSI driver for now
> >>
> >> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >> ---
> >>  drivers/pci/host/Kconfig | 1 +
> >>  1 file changed, 1 insertion(+)
> >>
> >> diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
> >> index 2af0571356e8..7a31ebbc4379 100644
> >> --- a/drivers/pci/host/Kconfig
> >> +++ b/drivers/pci/host/Kconfig
> >> @@ -158,6 +158,7 @@ config PCIE_ALTERA
> >>  config PCIE_ALTERA_MSI
> >>       bool "Altera PCIe MSI feature"
> >>       depends on PCI_MSI
> >> +     depends on BROKEN
> >>       select PCI_MSI_IRQ_DOMAIN
> >>       help
> >>         Say Y here if you want PCIe MSI support for the Altera FPGA.
> >> --
> >> 2.6.1
> >>
> > Hi Bjorn
> >
> > This driver depends on the asm/msi.h and not all architectures include
> > the asm/msi.h.
> > We can fix this by adding "depends on ARM || NIOS2" to Kconfig, same as
> > altera pcie driver. What do you think?
> 
> I don't think your driver depends on asm/msi.h because ARM doesn't
> have asm/msi.h either.
> 
> I think the best thing is to do this:
> 
> config PCIE_ALTERA_MSI
>         bool "Altera PCIe MSI feature"
>         depends on PCIE_ALTERA && PCI_MSI
> 
> That way we don't have to repeat the constraints from PCIE_ALTERA.
> This is the same strategy used by PCI_XGENE & PCI_XGENE_MSI.
> 
Okay. Thanks for the fix.

Regards
Ley Foon

Re: linux-next: build failure after merge of the pci tree

[Ley Foon Tan]

On Isn, 2015-11-02 at 02:23 +1100, Stephen Rothwell wrote:
> Hi Bjorn,
> 
> After merging the pci tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> In file included from include/linux/kvm_host.h:20:0,
>                  from arch/powerpc/kernel/asm-offsets.c:54:
> include/linux/msi.h:174:21: fatal error: asm/msi.h: No such file or directory
> 
> Caused by commit
> 
>   f19eafec930f ("PCI: altera: Add Altera PCIe MSI driver")
> 
> I have disabled that driver for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 2 Nov 2015 02:12:54 +1100
> Subject: [PATCH] PCI: altera: disable MSI driver for now
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/pci/host/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
> index 2af0571356e8..7a31ebbc4379 100644
> --- a/drivers/pci/host/Kconfig
> +++ b/drivers/pci/host/Kconfig
> @@ -158,6 +158,7 @@ config PCIE_ALTERA
>  config PCIE_ALTERA_MSI
>  	bool "Altera PCIe MSI feature"
>  	depends on PCI_MSI
> +	depends on BROKEN
>  	select PCI_MSI_IRQ_DOMAIN
>  	help
>  	  Say Y here if you want PCIe MSI support for the Altera FPGA.
> -- 
> 2.6.1
> 

Hi Bjorn

This driver depends on the asm/msi.h and not all architectures include
the asm/msi.h.
We can fix this by adding "depends on ARM || NIOS2" to Kconfig, same as
altera pcie driver. What do you think?

Thanks.

Regards
Ley Foon

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi Bjorn,

After merging the pci tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:


ERROR: ".pci_try_set_mwi" [drivers/scsi/qla2xxx/qla2xxx.ko] undefined!
ERROR: ".pci_clear_mwi" [drivers/scsi/qla2xxx/qla2xxx.ko] undefined!
ERROR: ".pci_try_set_mwi" [drivers/scsi/lpfc/lpfc.ko] undefined!

Caused by commit 9259d755975f ("PCI: Move EXPORT_SYMBOL so it
immediately follows function/variable").
arch/powerpc/include/asm/pci.h defines PCI_DISABLE_MWI and there are
two version of those functions depending on the setting of that symbol.

I have used the pci tree from next-20140610 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

On Tue, Jun 10, 2014 at 8:02 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Bjorn,
>
> After merging the pci tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
>
> ERROR: ".pci_try_set_mwi" [drivers/scsi/qla2xxx/qla2xxx.ko] undefined!
> ERROR: ".pci_clear_mwi" [drivers/scsi/qla2xxx/qla2xxx.ko] undefined!
> ERROR: ".pci_try_set_mwi" [drivers/scsi/lpfc/lpfc.ko] undefined!
>
> Caused by commit 9259d755975f ("PCI: Move EXPORT_SYMBOL so it
> immediately follows function/variable").
> arch/powerpc/include/asm/pci.h defines PCI_DISABLE_MWI and there are
> two version of those functions depending on the setting of that symbol.
>
> I have used the pci tree from next-20140610 for today.

Thanks.  This is my fault, not Ryan's.  I made more similar changes,
but didn't notice the #ifdefs around the definitions.  I fixed it and
will update my "next" branch tomorrow, after Fengguang's buildbot
confirms the fix.

Bjorn

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi Bjorn,

After merging the pci tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/pci/pci-sysfs.c: In function 'devspec_show':
drivers/pci/pci-sysfs.c:426:22: error: dereferencing pointer to incomplete type
drivers/pci/pci-sysfs.c:428:30: error: dereferencing pointer to incomplete type
drivers/pci/pci-sysfs.c:429:1: warning: control reaches end of non-void function [-Wreturn-type]

Caused by commit da647bb30834 ("PCI: Move Open Firmware devspec
attribute to PCI common code").  Presumably a forgotten include.

I have used the pci tree from next-20140521 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the pci tree

[Sebastian Ott]

Hello,

On Thu, 22 May 2014, Stephen Rothwell wrote:
> Hi Bjorn,
> 
> After merging the pci tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/pci/pci-sysfs.c: In function 'devspec_show':
> drivers/pci/pci-sysfs.c:426:22: error: dereferencing pointer to incomplete type
> drivers/pci/pci-sysfs.c:428:30: error: dereferencing pointer to incomplete type
> drivers/pci/pci-sysfs.c:429:1: warning: control reaches end of non-void function [-Wreturn-type]
> 
> Caused by commit da647bb30834 ("PCI: Move Open Firmware devspec
> attribute to PCI common code").  Presumably a forgotten include.
> 
> I have used the pci tree from next-20140521 for today.

Oops, sry for that one - this should fix it:

pci: fix compile failure on arm

Fix this compile error introduced by "PCI: Move Open Firmware
devspec attribute to PCI common code":

drivers/pci/pci-sysfs.c: In function 'devspec_show':
drivers/pci/pci-sysfs.c:426:22: error: dereferencing pointer to incomplete type
drivers/pci/pci-sysfs.c:428:30: error: dereferencing pointer to incomplete type
drivers/pci/pci-sysfs.c:429:1: warning: control reaches end of non-void function [-Wreturn-type]

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
---
 drivers/pci/pci-sysfs.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 4e0acef..d6e61ae 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -29,6 +29,7 @@
 #include <linux/slab.h>
 #include <linux/vgaarb.h>
 #include <linux/pm_runtime.h>
+#include <linux/of.h>
 #include "pci.h"
 
 static int sysfs_initialized;	/* = 0 */
-- 
1.8.5.5

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

On Thu, May 22, 2014 at 12:49 AM, Sebastian Ott
<sebott@linux.vnet.ibm.com> wrote:
> Hello,
>
> On Thu, 22 May 2014, Stephen Rothwell wrote:
>> Hi Bjorn,
>>
>> After merging the pci tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>>
>> drivers/pci/pci-sysfs.c: In function 'devspec_show':
>> drivers/pci/pci-sysfs.c:426:22: error: dereferencing pointer to incomplete type
>> drivers/pci/pci-sysfs.c:428:30: error: dereferencing pointer to incomplete type
>> drivers/pci/pci-sysfs.c:429:1: warning: control reaches end of non-void function [-Wreturn-type]
>>
>> Caused by commit da647bb30834 ("PCI: Move Open Firmware devspec
>> attribute to PCI common code").  Presumably a forgotten include.
>>
>> I have used the pci tree from next-20140521 for today.
>
> Oops, sry for that one - this should fix it:
>
> pci: fix compile failure on arm
>
> Fix this compile error introduced by "PCI: Move Open Firmware
> devspec attribute to PCI common code":
>
> drivers/pci/pci-sysfs.c: In function 'devspec_show':
> drivers/pci/pci-sysfs.c:426:22: error: dereferencing pointer to incomplete type
> drivers/pci/pci-sysfs.c:428:30: error: dereferencing pointer to incomplete type
> drivers/pci/pci-sysfs.c:429:1: warning: control reaches end of non-void function [-Wreturn-type]
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>

I folded this in and updated my "next" branch, thanks!

> ---
>  drivers/pci/pci-sysfs.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
> index 4e0acef..d6e61ae 100644
> --- a/drivers/pci/pci-sysfs.c
> +++ b/drivers/pci/pci-sysfs.c
> @@ -29,6 +29,7 @@
>  #include <linux/slab.h>
>  #include <linux/vgaarb.h>
>  #include <linux/pm_runtime.h>
> +#include <linux/of.h>
>  #include "pci.h"
>
>  static int sysfs_initialized;  /* = 0 */
> --
> 1.8.5.5
>

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi Bjorn,

After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/staging/telephony/ixj.c: In function 'ixj_probe_pci':
drivers/staging/telephony/ixj.c:7732:13: warning: assignment makes integer from pointer without a cast [enabled by default]
drivers/staging/telephony/ixj.c:7732:38: error: expected ';' before 'pci_resource_start'

Exposed by commit 545974a28f78 ("PCI: Convert pci_resource_<foo> macros to
static inlines").  The macro version of pci_resource_start() made this
RHS look like a function call and now it isn't.

Maybe it is time this driver just went away.

drivers/scsi/gdth.c: In function 'gdth_init_pci':
drivers/scsi/gdth.c:1111:34: error: lvalue required as left operand of assignment

This was also exposed by the above commit, but is caused by the driver
expecting to be able to assign to the result of pci_resource_start().

I have applied the following patch for today (the scsi one could probably
be done more correctly):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 6 Nov 2012 11:23:45 +1100
Subject: [PATCH] PCI: fixups for pci_resource_start conversion

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/scsi/gdth.c               |    2 +-
 drivers/staging/telephony/Kconfig |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index 5d72274..5209e81 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -1108,7 +1108,7 @@ static int __devinit gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr,
         command |= 6;
 	pci_write_config_word(pdev, PCI_COMMAND, command);
 	if (pci_resource_start(pdev, 8) == 1UL)
-	    pci_resource_start(pdev, 8) = 0UL;
+	    pdev->resource[8].start = 0UL;
         i = 0xFEFF0001UL;
 	pci_write_config_dword(pdev, PCI_ROM_ADDRESS, i);
         gdth_delay(1);
diff --git a/drivers/staging/telephony/Kconfig b/drivers/staging/telephony/Kconfig
index b5f78b6..c5893e2 100644
--- a/drivers/staging/telephony/Kconfig
+++ b/drivers/staging/telephony/Kconfig
@@ -20,6 +20,7 @@ if PHONE
 config PHONE_IXJ
 	tristate "QuickNet Internet LineJack/PhoneJack support"
 	depends on ISA || PCI
+	depends on BROKEN
 	---help---
 	  Say M if you have a telephony card manufactured by Quicknet
 	  Technologies, Inc.  These include the Internet PhoneJACK and
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: build failure after merge of the pci tree

[Greg Kroah-Hartman]

On Tue, Nov 06, 2012 at 11:27:29AM +1100, Stephen Rothwell wrote:
> Hi Bjorn,
> 
> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/staging/telephony/ixj.c: In function 'ixj_probe_pci':
> drivers/staging/telephony/ixj.c:7732:13: warning: assignment makes integer from pointer without a cast [enabled by default]
> drivers/staging/telephony/ixj.c:7732:38: error: expected ';' before 'pci_resource_start'
> 
> Exposed by commit 545974a28f78 ("PCI: Convert pci_resource_<foo> macros to
> static inlines").  The macro version of pci_resource_start() made this
> RHS look like a function call and now it isn't.
> 
> Maybe it is time this driver just went away.

It is gone in my tree, and it should be deleted in yours, do you not see
that?

thanks,

greg k-h

Re: linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi Greg,

On Tue, 6 Nov 2012 02:55:42 +0100 Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:
>
> It is gone in my tree, and it should be deleted in yours, do you not see
> that?

Unfortunately, your tree gets merged late in my set of trees ... so I'll
just keep the disabling patch and the problem will go away eventually.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

On Tue, Nov 06, 2012 at 11:27:29AM +1100, Stephen Rothwell wrote:
> Hi Bjorn,
> 
> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> ...

> drivers/scsi/gdth.c: In function 'gdth_init_pci':
> drivers/scsi/gdth.c:1111:34: error: lvalue required as left operand of assignment

Here's what I think we should do about the GDT issue.  I'll send this
via the usual channels.

commit c6156dd31228e608e0a820d2eed7403fd1fd620b
Author: Bjorn Helgaas <bhelgaas@google.com>
Date:   Tue Nov 6 14:19:03 2012 -0700

    [SCSI] gdth: Remove buggy ROM handling
    
    The ROM address handling in gdth_init_pci() is useless and possibly
    dangerous.  This patch removes it.
    
    "pci_resource_start(pdev, 8)" is not well-defined.  PCI resources 0-5 are
    standard PCI BARs and 6 is the expansion ROM.  Resource 8 is either an
    SR-IOV BAR (if CONFIG_PCI_IOV=y, resources 7-12 are SR-IOV BARs) or a
    bridge window (resources 7-10).
    
    The GDT device is neither an SR-IOV device nor a bridge, so in either case
    resource 8 should be zero since struct pci_dev is allocated with kzalloc().
    
    It is illegal for a driver to write an arbitrary address to the ROM BAR
    because it has no way of knowing whether the ROM will conflict with another
    device.
    
    I think the only effect of the code being removed was to:
    
      1) Enable the ROM at 0xFEFF0000 (possibly causing a conflict with
         another device)
      2) Delay one millisecond
      3) Write zero to the ROM BAR, disabling it
    
    I doubt the delay is needed, but I left it since it seems innocuous.
    
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index 5d72274..3efe4ef 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -1107,14 +1107,8 @@ static int __devinit gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr,
 	pci_read_config_word(pdev, PCI_COMMAND, &command);
         command |= 6;
 	pci_write_config_word(pdev, PCI_COMMAND, command);
-	if (pci_resource_start(pdev, 8) == 1UL)
-	    pci_resource_start(pdev, 8) = 0UL;
-        i = 0xFEFF0001UL;
-	pci_write_config_dword(pdev, PCI_ROM_ADDRESS, i);
-        gdth_delay(1);
-	pci_write_config_dword(pdev, PCI_ROM_ADDRESS,
-			       pci_resource_start(pdev, 8));
-        
+	gdth_delay(1);
+
         dp6m_ptr = ha->brd;
 
         /* Ensure that it is safe to access the non HW portions of DPMEM.

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi Jesse,

After merging the pci tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/pci/quirks.c: In function 'do_one_fixup_debug':
drivers/pci/quirks.c:2915:2: error: implicit declaration of function 'task_pid_nr' [-Werror=implicit-function-declaration]
drivers/pci/quirks.c:2916:2: error: implicit declaration of function 'ktime_get' [-Werror=implicit-function-declaration]
drivers/pci/quirks.c:2916:11: error: incompatible types when assigning to type 'ktime_t' from type 'int'
drivers/pci/quirks.c:2918:10: error: incompatible types when assigning to type 'ktime_t' from type 'int'

Caused by commit 49107584a885 ("PCI: Annotate PCI quirks in
initcall_debug style"). Some missing include files ...

I have used the pci tree from next-20120210 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: build failure after merge of the pci tree

[Jesse Barnes]

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

On Mon, 13 Feb 2012 13:21:25 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jesse,
> 
> After merging the pci tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/pci/quirks.c: In function 'do_one_fixup_debug':
> drivers/pci/quirks.c:2915:2: error: implicit declaration of function 'task_pid_nr' [-Werror=implicit-function-declaration]
> drivers/pci/quirks.c:2916:2: error: implicit declaration of function 'ktime_get' [-Werror=implicit-function-declaration]
> drivers/pci/quirks.c:2916:11: error: incompatible types when assigning to type 'ktime_t' from type 'int'
> drivers/pci/quirks.c:2918:10: error: incompatible types when assigning to type 'ktime_t' from type 'int'
> 
> Caused by commit 49107584a885 ("PCI: Annotate PCI quirks in
> initcall_debug style"). Some missing include files ...
> 
> I have used the pci tree from next-20120210 for today.

I pushed a v2 of the patch with the right #includes, hopefully it'll
build across arches this time.

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi Jesse,

After merging the pci tree, today's linux-next build
(powerpc_ppc64_defconfig) failed like this:

arch/powerpc/kernel/pci_64.c: In function 'pcibios_map_io_space':
arch/powerpc/kernel/pci_64.c:201:2: error: implicit declaration of function 'pcibios_phb_map_phb_io_space' [-Werror=implicit-function-declaration]

Caused by commit fb8fca4ff3f7 ("powerpc/PCI: split PHB part out of
pcibios_map_io_space()").

arch/powerpc/kernel/pci-common.c: In function 'pcibios_scan_phb':
arch/powerpc/kernel/pci-common.c:1726:7: error: incompatible type for argument 5 of 'pci_create_root_bus'
include/linux/pci.h:665:17: note: expected 'struct list_head *' but argument is of type 'struct list_head'

Caused by commit 3c73944e7ace ("powerpc/PCI: convert to
pci_create_root_bus()").

I have used the pci tree from next-20111205 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 --]

Re: linux-next: build failure after merge of the pci tree

[Bjorn Helgaas]

On Mon, Dec 5, 2011 at 5:18 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jesse,
>
> After merging the pci tree, today's linux-next build
> (powerpc_ppc64_defconfig) failed like this:
>
> arch/powerpc/kernel/pci_64.c: In function 'pcibios_map_io_space':
> arch/powerpc/kernel/pci_64.c:201:2: error: implicit declaration of function 'pcibios_phb_map_phb_io_space' [-Werror=implicit-function-declaration]
>
> Caused by commit fb8fca4ff3f7 ("powerpc/PCI: split PHB part out of
> pcibios_map_io_space()").
>
> arch/powerpc/kernel/pci-common.c: In function 'pcibios_scan_phb':
> arch/powerpc/kernel/pci-common.c:1726:7: error: incompatible type for argument 5 of 'pci_create_root_bus'
> include/linux/pci.h:665:17: note: expected 'struct list_head *' but argument is of type 'struct list_head'
>
> Caused by commit 3c73944e7ace ("powerpc/PCI: convert to
> pci_create_root_bus()").
>
> I have used the pci tree from next-20111205 for today.
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/

I fixed these; the updated patches are on
git://github.com/bjorn-helgaas/linux.git on
the "pci-scan-v4" branch (head f9da8b214fef1ac4072e4af2a663293ab965f796).

Here's the incremental diff from v3 to v4 (hand-created and whitespace-damaged):

diff --git a/c4677881a:arch/powerpc/kernel/pci_64.c
b/f9da8b214:arch/powerpc/kernel/pci_64.c
index 4401425..3318d39 100644
--- a/c4677881a:arch/powerpc/kernel/pci_64.c
+++ b/f9da8b214:arch/powerpc/kernel/pci_64.c
@@ -197,7 +198,7 @@ int __devinit pcibios_map_io_space(struct pci_bus *bus)
                return 0;
        }

-       return pcibios_phb_map_phb_io_space(pci_bus_to_host(bus));
+       return pcibios_map_phb_io_space(pci_bus_to_host(bus));
 }
 EXPORT_SYMBOL_GPL(pcibios_map_io_space);

diff --git a/c4677881a:arch/powerpc/kernel/pci-common.c
b/f9da8b214:arch/powerpc/kernel/pci-common.c
index 8c47c57..2aa707b 100644
--- a/c4677881a:arch/powerpc/kernel/pci-common.c
+++ b/f9da8b214:arch/powerpc/kernel/pci-common.c
@@ -1711,7 +1712,7 @@ void __devinit pcibios_scan_phb(struct
pci_controller *hose)

        /* Create an empty bus for the toplevel */
        bus = pci_create_root_bus(hose->parent, hose->first_busno,
-                                 hose->ops, hose, resources);
+                                 hose->ops, hose, &resources);
        if (bus == NULL) {
                pr_err("Failed to create bus for PCI domain %04x\n",
                        hose->global_number);

Re: linux-next: build failure after merge of the pci tree

[Jesse Barnes]

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

On Mon, 5 Dec 2011 20:16:54 -0700
Bjorn Helgaas <bhelgaas@google.com> wrote:

> On Mon, Dec 5, 2011 at 5:18 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Jesse,
> >
> > After merging the pci tree, today's linux-next build
> > (powerpc_ppc64_defconfig) failed like this:
> >
> > arch/powerpc/kernel/pci_64.c: In function 'pcibios_map_io_space':
> > arch/powerpc/kernel/pci_64.c:201:2: error: implicit declaration of function 'pcibios_phb_map_phb_io_space' [-Werror=implicit-function-declaration]
> >
> > Caused by commit fb8fca4ff3f7 ("powerpc/PCI: split PHB part out of
> > pcibios_map_io_space()").
> >
> > arch/powerpc/kernel/pci-common.c: In function 'pcibios_scan_phb':
> > arch/powerpc/kernel/pci-common.c:1726:7: error: incompatible type for argument 5 of 'pci_create_root_bus'
> > include/linux/pci.h:665:17: note: expected 'struct list_head *' but argument is of type 'struct list_head'
> >
> > Caused by commit 3c73944e7ace ("powerpc/PCI: convert to
> > pci_create_root_bus()").
> >
> > I have used the pci tree from next-20111205 for today.
> > --
> > Cheers,
> > Stephen Rothwell                    sfr@canb.auug.org.au
> > http://www.canb.auug.org.au/~sfr/
> 
> I fixed these; the updated patches are on
> git://github.com/bjorn-helgaas/linux.git on
> the "pci-scan-v4" branch (head f9da8b214fef1ac4072e4af2a663293ab965f796).
> 
> Here's the incremental diff from v3 to v4 (hand-created and whitespace-damaged):
> 
> diff --git a/c4677881a:arch/powerpc/kernel/pci_64.c
> b/f9da8b214:arch/powerpc/kernel/pci_64.c
> index 4401425..3318d39 100644
> --- a/c4677881a:arch/powerpc/kernel/pci_64.c
> +++ b/f9da8b214:arch/powerpc/kernel/pci_64.c
> @@ -197,7 +198,7 @@ int __devinit pcibios_map_io_space(struct pci_bus *bus)
>                 return 0;
>         }
> 
> -       return pcibios_phb_map_phb_io_space(pci_bus_to_host(bus));
> +       return pcibios_map_phb_io_space(pci_bus_to_host(bus));
>  }
>  EXPORT_SYMBOL_GPL(pcibios_map_io_space);
> 
> diff --git a/c4677881a:arch/powerpc/kernel/pci-common.c
> b/f9da8b214:arch/powerpc/kernel/pci-common.c
> index 8c47c57..2aa707b 100644
> --- a/c4677881a:arch/powerpc/kernel/pci-common.c
> +++ b/f9da8b214:arch/powerpc/kernel/pci-common.c
> @@ -1711,7 +1712,7 @@ void __devinit pcibios_scan_phb(struct
> pci_controller *hose)
> 
>         /* Create an empty bus for the toplevel */
>         bus = pci_create_root_bus(hose->parent, hose->first_busno,
> -                                 hose->ops, hose, resources);
> +                                 hose->ops, hose, &resources);
>         if (bus == NULL) {
>                 pr_err("Failed to create bus for PCI domain %04x\n",
>                         hose->global_number);
> 

I merged this fix into the original commit as a v2 patch, hope today's
linux-next builds.

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi Jesse,

After merging the pci tree, today's linux-next build (powerpc
pseries_defconfig) failed like this:

drivers/pci/pci.c:2605: error: redefinition of 'pcibios_set_master'
arch/powerpc/include/asm/pci.h:49: note: previous definition of 'pcibios_set_master' was here

Presumably caused by commit 481da3e3d53e ("PCI: Pull PCI 'latency timer'
setup up into the core").

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

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

Re: linux-next: build failure after merge of the pci tree

[Myron Stowe]

On Wed, 2011-10-26 at 00:44 +1100, Stephen Rothwell wrote:
> Hi Jesse,
> 
> After merging the pci tree, today's linux-next build (powerpc
> pseries_defconfig) failed like this:
> 
> drivers/pci/pci.c:2605: error: redefinition of 'pcibios_set_master'
> arch/powerpc/include/asm/pci.h:49: note: previous definition of
> 'pcibios_set_master' was here
> 
> Presumably caused by commit 481da3e3d53e ("PCI: Pull PCI 'latency
> timer'
> setup up into the core").
> 
Yes, commit 481da3e3d53e is the culprit here.  I was trying to not
modify architectures that had inline nop functions but it's now obvious
that the compiler sees the architecture specific include files before it
sees the __weak def I added in drivers/pci/pci.c

I think the best approach here is to remove the inline versions of
pcibios_set_master() for the architectures with inline nops.  This will
effectively add the new generic code to those architectures; which will
be a slight change in behavior for them.  This has the benefit of ending
up with most architectures utilizing the new generic code and only those
that absolutely must having specific versions of pcibios_set_master()
that over-rides the generic __weak code.  If we encounter issues going
forward with this approach for a specific architecture then we can add a
non-weak empty version back in for it.

If anyone has issues with such an approach please let me know.  In the
mean time -

I'll work on modifying the patch series accordingly.

Jesse: can you drop the series from pci-2.6/linux-next and I'll re-post
with v2?

Stephen: do you need me to do anything here or can you also drop the
series from linux-next?

Myron

Re: linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi Myron,

On Tue, 25 Oct 2011 11:14:38 -0600 Myron Stowe <mstowe@redhat.com> wrote:
>
> Stephen: do you need me to do anything here or can you also drop the
> series from linux-next?

I just use whatever is in Jesse's tree.

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

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

Re: linux-next: build failure after merge of the pci tree

[Narendra_K]

On Mon, Jan 10, 2011 at 07:24:11AM +0530, Stephen Rothwell wrote:
> Hi Jesse,
> 
> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/built-in.o: In function `T.647':
> pci-label.c:(.text+0x28514): undefined reference to `utf16s_to_utf8s'
> 
> Caused by commit a6247cd4be20cb5439db5cb7b0b6cc67fdc8e2a2 ("PCI: export
> ACPI _DSM provided firmware instance number and string to sysfs").
> 
> I have used the pci tree from next-20110107 for today.

[ It looks like my earlier post did not hit the lists, so reposting ]

Hi, 

I did a git pull of linux-next-20110110 (topmost commit is 
4c897f27ad2668534f719202a3b88abe8ec31011) and applied the patch. With 
CONFIG_DMI and CONFIG_ACPI both set, I did not encounter this build failure. 
The definition for `utf16s_to_utf8s' is available in 'include/linux/nls.h' 
which is included in 'drivers/pci/pci-label.c' and the build succeeded. Sorry 
if I am missing something here.

Stephen,

Could you share the .config which caused this build failure ?

With regards,
Narendra K

Re: linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi Narendra,

On Tue, 11 Jan 2011 20:48:21 +0530 <Narendra_K@Dell.com> wrote:
>
> On Mon, Jan 10, 2011 at 07:24:11AM +0530, Stephen Rothwell wrote:
> > 
> > After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> > 
> > drivers/built-in.o: In function `T.647':
> > pci-label.c:(.text+0x28514): undefined reference to `utf16s_to_utf8s'
> > 
> > Caused by commit a6247cd4be20cb5439db5cb7b0b6cc67fdc8e2a2 ("PCI: export
> > ACPI _DSM provided firmware instance number and string to sysfs").
> > 
> > I have used the pci tree from next-20110107 for today.
> 
> I did a git pull of linux-next-20110110 (topmost commit is 
> 4c897f27ad2668534f719202a3b88abe8ec31011) and applied the patch. With 
> CONFIG_DMI and CONFIG_ACPI both set, I did not encounter this build failure. 
> The definition for `utf16s_to_utf8s' is available in 'include/linux/nls.h' 
> which is included in 'drivers/pci/pci-label.c' and the build succeeded. Sorry 
> if I am missing something here.

I did an x86_64 allmodconfig build (see above) which has CONFIG_NLS=m and
so utf16s_to_utf8s is not available to built in code ...

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

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

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi Jesse,

After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/pci/hotplug/pciehp_core.c: In function 'pcied_init':
drivers/pci/hotplug/pciehp_core.c:348: error: implicit declaration of function 'alloc_ordered_workqueue'

That function is not declared anywhere except the (yet to be merged)
workqueues tree.

I have used the pci tree from next-20101015 for today.

Please build test what you are exporting for merging into linux-next.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the pci tree

[Jesse Barnes]

On Mon, 18 Oct 2010 13:20:35 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jesse,
> 
> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/pci/hotplug/pciehp_core.c: In function 'pcied_init':
> drivers/pci/hotplug/pciehp_core.c:348: error: implicit declaration of function 'alloc_ordered_workqueue'
> 
> That function is not declared anywhere except the (yet to be merged)
> workqueues tree.
> 
> I have used the pci tree from next-20101015 for today.
> 
> Please build test what you are exporting for merging into linux-next.

Arg, sorry about that, I'll drop these and just ack them for inclusion
by Tejun.

-- 
Jesse Barnes, Intel Open Source Technology Center

linux-next: build failure after merge of the pci tree

[Stephen Rothwell]

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

Hi Jesse,

After merging the pci tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

arch/powerpc/kernel/pci_64.c: In function 'pcibios_unmap_io_space':
arch/powerpc/kernel/pci_64.c:101: error: 'struct pci_bus' has no member named 'resource'
arch/powerpc/kernel/pci_64.c: In function 'pcibios_map_io_space':
arch/powerpc/kernel/pci_64.c:149: error: 'struct pci_bus' has no member named 'resource'
arch/powerpc/kernel/pci_64.c:149: error: 'struct pci_bus' has no member named 'resource'

Caused by commit 17561b77695fa7e3027ea455ba6ecddb1a1c72f2 ("PCI: replace
bus resource table with a list").  More care required - grep is your
friend!

I have used the pci tree form next-20100208 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: build failure after merge of the pci tree

[Bjorn Helgaas]

On Monday 08 February 2010 05:54:27 pm Stephen Rothwell wrote:
> Hi Jesse,
> 
> After merging the pci tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> arch/powerpc/kernel/pci_64.c: In function 'pcibios_unmap_io_space':
> arch/powerpc/kernel/pci_64.c:101: error: 'struct pci_bus' has no member named 'resource'
> arch/powerpc/kernel/pci_64.c: In function 'pcibios_map_io_space':
> arch/powerpc/kernel/pci_64.c:149: error: 'struct pci_bus' has no member named 'resource'
> arch/powerpc/kernel/pci_64.c:149: error: 'struct pci_bus' has no member named 'resource'

Crap, sorry.  Looks like I missed one in mn10300, too (and maybe
more).  Let me know if you see any others; I don't have cross-compile
setups for all arches.  But I'll fix up everything I can find.

Bjorn