diff mbox

[v6,1/3] ARM: kconfig: allow PCI support to be selected with ARCH_MULTIPLATFORM

Message ID 1399478839-3564-2-git-send-email-will.deacon@arm.com
State Superseded
Headers show

Commit Message

Will Deacon May 7, 2014, 4:07 p.m. UTC
When targetting ARCH_MULTIPLATFORM, we may include support for SoCs with
PCI-capable devices (e.g. mach-virt with virtio-pci).

This patch allows PCI support to be selected for these SoCs by selecting
CONFIG_MIGHT_HAVE_PCI when CONFIG_ARCH_MULTIPLATFORM=y.

Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 arch/arm/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Stephen Warren May 8, 2014, 3:08 p.m. UTC | #1
On 05/07/2014 10:07 AM, Will Deacon wrote:
> When targetting ARCH_MULTIPLATFORM, we may include support for SoCs with
> PCI-capable devices (e.g. mach-virt with virtio-pci).
> 
> This patch allows PCI support to be selected for these SoCs by selecting
> CONFIG_MIGHT_HAVE_PCI when CONFIG_ARCH_MULTIPLATFORM=y.

> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig

> @@ -314,6 +314,7 @@ config ARCH_MULTIPLATFORM
>  	select CLKSRC_OF
>  	select COMMON_CLK
>  	select GENERIC_CLOCKEVENTS
> +	select MIGHT_HAVE_PCI

Doesn't ARCH_MULTIPLATFORM allow ARCH_$soc to be selected, and ARCH_$soc
selects MIGHT_HAVE_PCI?

That way, you can only enable PCI support if you have actually enabled
an SoC that has PCI, and equally ARCH_$soc selects MIGHT_HAVE_PCI just
like it always used to work before ARCH_MULTIPLATFORM.
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Will Deacon May 8, 2014, 3:15 p.m. UTC | #2
On Thu, May 08, 2014 at 04:08:25PM +0100, Stephen Warren wrote:
> On 05/07/2014 10:07 AM, Will Deacon wrote:
> > When targetting ARCH_MULTIPLATFORM, we may include support for SoCs with
> > PCI-capable devices (e.g. mach-virt with virtio-pci).
> > 
> > This patch allows PCI support to be selected for these SoCs by selecting
> > CONFIG_MIGHT_HAVE_PCI when CONFIG_ARCH_MULTIPLATFORM=y.
> 
> > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> 
> > @@ -314,6 +314,7 @@ config ARCH_MULTIPLATFORM
> >  	select CLKSRC_OF
> >  	select COMMON_CLK
> >  	select GENERIC_CLOCKEVENTS
> > +	select MIGHT_HAVE_PCI
> 
> Doesn't ARCH_MULTIPLATFORM allow ARCH_$soc to be selected, and ARCH_$soc
> selects MIGHT_HAVE_PCI?
> 
> That way, you can only enable PCI support if you have actually enabled
> an SoC that has PCI, and equally ARCH_$soc selects MIGHT_HAVE_PCI just
> like it always used to work before ARCH_MULTIPLATFORM.

Yeah, I initially had this only for mach-virt, but the last review suggested
moving it here:

  http://lists.infradead.org/pipermail/linux-arm-kernel/2014-May/252937.html

Will
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Stephen Warren May 8, 2014, 3:38 p.m. UTC | #3
On 05/08/2014 09:15 AM, Will Deacon wrote:
> On Thu, May 08, 2014 at 04:08:25PM +0100, Stephen Warren wrote:
>> On 05/07/2014 10:07 AM, Will Deacon wrote:
>>> When targetting ARCH_MULTIPLATFORM, we may include support for SoCs with
>>> PCI-capable devices (e.g. mach-virt with virtio-pci).
>>>
>>> This patch allows PCI support to be selected for these SoCs by selecting
>>> CONFIG_MIGHT_HAVE_PCI when CONFIG_ARCH_MULTIPLATFORM=y.
>>
>>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>>
>>> @@ -314,6 +314,7 @@ config ARCH_MULTIPLATFORM
>>>  	select CLKSRC_OF
>>>  	select COMMON_CLK
>>>  	select GENERIC_CLOCKEVENTS
>>> +	select MIGHT_HAVE_PCI
>>
>> Doesn't ARCH_MULTIPLATFORM allow ARCH_$soc to be selected, and ARCH_$soc
>> selects MIGHT_HAVE_PCI?
>>
>> That way, you can only enable PCI support if you have actually enabled
>> an SoC that has PCI, and equally ARCH_$soc selects MIGHT_HAVE_PCI just
>> like it always used to work before ARCH_MULTIPLATFORM.
> 
> Yeah, I initially had this only for mach-virt, but the last review suggested
> moving it here:
> 
>   http://lists.infradead.org/pipermail/linux-arm-kernel/2014-May/252937.html

Hmm. OK. I guess we should remove the select from the individual
ARCH_$soc then too?
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rob Herring May 14, 2014, 2:01 p.m. UTC | #4
On Wed, May 7, 2014 at 11:07 AM, Will Deacon <will.deacon@arm.com> wrote:
> When targetting ARCH_MULTIPLATFORM, we may include support for SoCs with
> PCI-capable devices (e.g. mach-virt with virtio-pci).
>
> This patch allows PCI support to be selected for these SoCs by selecting
> CONFIG_MIGHT_HAVE_PCI when CONFIG_ARCH_MULTIPLATFORM=y.

I generally think we should select all options for multi-platform that
only serve to hide other options like this.

You should remove the MIGHT_HAVE_PCI selections from all the
multi-platform enabled platforms as well.

Rob

>
> Signed-off-by: Will Deacon <will.deacon@arm.com>
> ---
>  arch/arm/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index db3c5414223e..860bea828ac4 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -314,6 +314,7 @@ config ARCH_MULTIPLATFORM
>         select CLKSRC_OF
>         select COMMON_CLK
>         select GENERIC_CLOCKEVENTS
> +       select MIGHT_HAVE_PCI
>         select MULTI_IRQ_HANDLER
>         select SPARSE_IRQ
>         select USE_OF
> --
> 1.9.2
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index db3c5414223e..860bea828ac4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -314,6 +314,7 @@  config ARCH_MULTIPLATFORM
 	select CLKSRC_OF
 	select COMMON_CLK
 	select GENERIC_CLOCKEVENTS
+	select MIGHT_HAVE_PCI
 	select MULTI_IRQ_HANDLER
 	select SPARSE_IRQ
 	select USE_OF