On Fri, Nov 23, 2012 at 11:31 AM, Will Deacon <will.deacon@xxxxxxx> wrote:
> On Sat, Nov 10, 2012 at 03:46:32PM +0000, Christoffer Dall wrote:
>> From: Marc Zyngier <marc.zyngier@xxxxxxx>
>>
>> It is now possible to select CONFIG_KVM_ARM_TIMER to enable the
>> KVM architected timer support.
>>
>> Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx>
>> Signed-off-by: Christoffer Dall <c.dall@xxxxxxxxxxxxxxxxxxxxxx>
>> ---
>> arch/arm/kvm/Kconfig | 7 +++++++
>> arch/arm/kvm/Makefile | 1 +
>> arch/arm/kvm/arm.c | 11 +++++++++++
>> arch/arm/kvm/vgic.c | 1 +
>> 4 files changed, 20 insertions(+)
>>
>> diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig
>> index 3c979ce..eaecb9f 100644
>> --- a/arch/arm/kvm/Kconfig
>> +++ b/arch/arm/kvm/Kconfig
>> @@ -58,6 +58,13 @@ config KVM_ARM_VGIC
>> ---help---
>> Adds support for a hardware assisted, in-kernel GIC emulation.
>>
>> +config KVM_ARM_TIMER
>> + bool "KVM support for Architected Timers"
>> + depends on KVM_ARM_VGIC && ARM_ARCH_TIMER
>> + select HAVE_KVM_IRQCHIP
>> + ---help---
>> + Adds support for the Architected Timers in virtual machines
>> +
>
> This should probably be default y
>
yes, good idea, they all should, like this:
diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig
index 60d3d2a..739500b 100644
--- a/arch/arm/kvm/Kconfig
+++ b/arch/arm/kvm/Kconfig
@@ -21,6 +21,7 @@ config KVM
select PREEMPT_NOTIFIERS
select ANON_INODES
select KVM_MMIO
+ select KVM_ARM_HOST
depends on ARM_VIRT_EXT && ARM_LPAE
---help---
Support hosting virtualized guest machines. You will also
@@ -54,6 +55,7 @@ config KVM_ARM_VGIC
bool "KVM support for Virtual GIC"
depends on KVM_ARM_HOST && OF
select HAVE_KVM_IRQCHIP
+ default y
---help---
Adds support for a hardware assisted, in-kernel GIC emulation.
@@ -61,6 +63,7 @@ config KVM_ARM_TIMER
bool "KVM support for Architected Timers"
depends on KVM_ARM_VGIC && ARM_ARCH_TIMER
select HAVE_KVM_IRQCHIP
+ default y
---help---
Adds support for the Architected Timers in virtual machines
--
Thanks,
-Christoffer
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
