diff mbox

ARM: integrator: Make sure INTEGRATOR_AP depends on PCI

Message ID 20130814200442.GA20372@8bytes.org (mailing list archive)
State New, archived
Headers show

Commit Message

Joerg Roedel Aug. 14, 2013, 8:04 p.m. UTC 
On Wed, Aug 14, 2013 at 08:57:01PM +0100, Russell King - ARM Linux wrote:
> On Wed, Aug 14, 2013 at 09:50:18PM +0200, Joerg Roedel wrote:
> > Add this dependency to the Kconfig file to fix the following
> > build error when CONFIG_INTEGRATOR_AP is set but CONFIG_PCI
> > is not:
> 
> No, integrator does not require PCI, so this needs to be fixed by other
> means, such as finding out how the breakage was introduced, and fixing
> the real cause of this regression.

You are right, just found out that this introduces a recursive
dependency while compiling another config:

arch/arm/Kconfig:1403:error: recursive dependency detected!
arch/arm/Kconfig:1403:	symbol PCI depends on MIGHT_HAVE_PCI
arch/arm/Kconfig:108:	symbol MIGHT_HAVE_PCI is selected by ARCH_INTEGRATOR_AP
arch/arm/mach-integrator/Kconfig:5:	symbol ARCH_INTEGRATOR_AP depends on PCI

So when integrator does not depend on PCI this diff is more appropriate?

Comments

Linus Walleij Aug. 28, 2013, 7:26 a.m. UTC | #1 
On Wed, Aug 14, 2013 at 10:04 PM, Joerg Roedel <joro@8bytes.org> wrote:

> So when integrator does not depend on PCI this diff is more appropriate?
>
> diff --git a/arch/arm/mach-integrator/pci_v3.h b/arch/arm/mach-integrator/pci_v3.h
> index 755fd29..51738e0 100644
> --- a/arch/arm/mach-integrator/pci_v3.h
> +++ b/arch/arm/mach-integrator/pci_v3.h
> @@ -1,2 +1,9 @@
> -/* Simple oneliner include to the PCIv3 early init */
> +/* Define PCIv3 early init */
> +#ifdef CONFIG_PCI
>  extern int pci_v3_early_init(void);
> +#else
> +static inline int pci_v3_early_init(void)
> +{
> +       return 0;
> +}
> +#endif

Yes.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

And can you please create and send a proper patch with this
content to arm@kernel.org and the mailing list on CC, with
a request for the ARM SoC maintainers to apply it directly
as a fix?

You might as well add Cc: stable@vger.kernel.org as well.

Yours,
Linus Walleij
Joerg Roedel Aug. 28, 2013, 7:55 a.m. UTC | #2 
On Wed, Aug 28, 2013 at 09:26:57AM +0200, Linus Walleij wrote:
> On Wed, Aug 14, 2013 at 10:04 PM, Joerg Roedel <joro@8bytes.org> wrote:
> 
> > So when integrator does not depend on PCI this diff is more appropriate?
> >
> > diff --git a/arch/arm/mach-integrator/pci_v3.h b/arch/arm/mach-integrator/pci_v3.h
> > index 755fd29..51738e0 100644
> > --- a/arch/arm/mach-integrator/pci_v3.h
> > +++ b/arch/arm/mach-integrator/pci_v3.h
> > @@ -1,2 +1,9 @@
> > -/* Simple oneliner include to the PCIv3 early init */
> > +/* Define PCIv3 early init */
> > +#ifdef CONFIG_PCI
> >  extern int pci_v3_early_init(void);
> > +#else
> > +static inline int pci_v3_early_init(void)
> > +{
> > +       return 0;
> > +}
> > +#endif
> 
> Yes.
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
> 
> And can you please create and send a proper patch with this
> content to arm@kernel.org and the mailing list on CC, with
> a request for the ARM SoC maintainers to apply it directly
> as a fix?
> 
> You might as well add Cc: stable@vger.kernel.org as well.

Will do, thanks for your review.

Cheers,

	Joerg
Joerg Roedel Sept. 25, 2013, 10:13 a.m. UTC | #3 
On Wed, Aug 28, 2013 at 09:26:57AM +0200, Linus Walleij wrote:
> Yes.
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
> 
> And can you please create and send a proper patch with this
> content to arm@kernel.org and the mailing list on CC, with
> a request for the ARM SoC maintainers to apply it directly
> as a fix?
> 
> You might as well add Cc: stable@vger.kernel.org as well.

Okay, sorry, forgot about this one. But my compile-tests kindly reminded
me and I sent the patch out again now :)


	Joerg
diff mbox

Patch

diff --git a/arch/arm/mach-integrator/pci_v3.h b/arch/arm/mach-integrator/pci_v3.h
index 755fd29..51738e0 100644
--- a/arch/arm/mach-integrator/pci_v3.h
+++ b/arch/arm/mach-integrator/pci_v3.h
@@ -1,2 +1,9 @@ 
-/* Simple oneliner include to the PCIv3 early init */
+/* Define PCIv3 early init */
+#ifdef CONFIG_PCI
 extern int pci_v3_early_init(void);
+#else
+static inline int pci_v3_early_init(void)
+{
+	return 0;
+}
+#endif