diff mbox

[TRIVIAL] Enable GICv2m on ARM virt machine

Message ID 00f501d0ce9c$4d57bcc0$e8073640$@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Pavel Fedin Aug. 4, 2015, 9:59 a.m. UTC
qemu implementation of "virt" includes GICv2m. This commit allows to use
it also on ARM32 architecture.

Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
---
 arch/arm/Kconfig            | 1 +
 arch/arm/include/asm/Kbuild | 1 +
 2 files changed, 2 insertions(+)

Comments

Marc Zyngier Aug. 7, 2015, 8:52 a.m. UTC | #1
Hi Pavel,

On 04/08/15 10:59, Pavel Fedin wrote:
> qemu implementation of "virt" includes GICv2m. This commit allows to use
> it also on ARM32 architecture.
> 
> Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
> ---
>  arch/arm/Kconfig            | 1 +
>  arch/arm/include/asm/Kbuild | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 45df48b..1091025 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -815,6 +815,7 @@ config ARCH_VIRT
>  	bool "Dummy Virtual Machine" if ARCH_MULTI_V7
>  	select ARM_AMBA
>  	select ARM_GIC
> +	select ARM_GIC_V2M if PCI_MSI
>  	select ARM_PSCI
>  	select HAVE_ARM_ARCH_TIMER
>  
> diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
> index 3c4596d..01806f5 100644
> --- a/arch/arm/include/asm/Kbuild
> +++ b/arch/arm/include/asm/Kbuild
> @@ -14,6 +14,7 @@ generic-y += local.h
>  generic-y += local64.h
>  generic-y += mcs_spinlock.h
>  generic-y += msgbuf.h
> +generic-y += msi.h
>  generic-y += param.h
>  generic-y += parport.h
>  generic-y += poll.h
> 

You may want to add a comment about the dependency chain that requires
the generic msi.h.

Thanks,

	M.
Pavel Fedin Aug. 7, 2015, 10:20 a.m. UTC | #2
Hello!

> You may want to add a comment about the dependency chain that requires
> the generic msi.h.

 The error i get is:
--- cut ---
In file included from kernel/irq/chip.c:14:0:
include/linux/msi.h:123:21: fatal error: asm/msi.h: No such file or directory
 #include <asm/msi.h>
                     ^
--- cut ---

This portion in linux/msi.h sits under #ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN, which is activated by
the following chain:
ARM_GIC_V2M => PCI_MSI_IRQ_DOMAIN => GENERIC_MSI_IRQ_DOMAIN

 Do i need to respin just because of comment?

Kind regards,
Pavel Fedin
Expert Engineer
Samsung Electronics Research center Russia
Marc Zyngier Aug. 7, 2015, 10:33 a.m. UTC | #3
On 07/08/15 11:20, Pavel Fedin wrote:
> Hello!
> 
>> You may want to add a comment about the dependency chain that requires
>> the generic msi.h.
> 
>  The error i get is:
> --- cut ---
> In file included from kernel/irq/chip.c:14:0:
> include/linux/msi.h:123:21: fatal error: asm/msi.h: No such file or directory
>  #include <asm/msi.h>
>                      ^
> --- cut ---
> 
> This portion in linux/msi.h sits under #ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN, which is activated by
> the following chain:
> ARM_GIC_V2M => PCI_MSI_IRQ_DOMAIN => GENERIC_MSI_IRQ_DOMAIN
> 
>  Do i need to respin just because of comment?

That's for Russell to decide, really. But I feel that adding an include
file that affects the whole architecture (and not just a single
platform) deserves an explanation in the commit log.

Thanks,

	M.
diff mbox

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 45df48b..1091025 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -815,6 +815,7 @@  config ARCH_VIRT
 	bool "Dummy Virtual Machine" if ARCH_MULTI_V7
 	select ARM_AMBA
 	select ARM_GIC
+	select ARM_GIC_V2M if PCI_MSI
 	select ARM_PSCI
 	select HAVE_ARM_ARCH_TIMER
 
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index 3c4596d..01806f5 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -14,6 +14,7 @@  generic-y += local.h
 generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += msgbuf.h
+generic-y += msi.h
 generic-y += param.h
 generic-y += parport.h
 generic-y += poll.h