From patchwork Tue Jun 16 01:51:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 484766 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 198311401B5 for ; Tue, 16 Jun 2015 12:07:14 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=k+pAQC85; dkim-atps=neutral Received: from localhost ([::1]:37204 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4gHP-0003xe-OW for incoming@patchwork.ozlabs.org; Mon, 15 Jun 2015 22:07:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4gH2-0003F8-Kr for qemu-devel@nongnu.org; Mon, 15 Jun 2015 22:06:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4gBH-0006AB-PE for qemu-devel@nongnu.org; Mon, 15 Jun 2015 22:01:05 -0400 Received: from mail-oi0-x234.google.com ([2607:f8b0:4003:c06::234]:33880) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4gBH-00067q-7J for qemu-devel@nongnu.org; Mon, 15 Jun 2015 22:00:51 -0400 Received: by oigx81 with SMTP id x81so2154540oig.1 for ; Mon, 15 Jun 2015 19:00:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LVfOd6twglryEiwY8vw+L4EFgpoYMk8bdo16f6cagqI=; b=k+pAQC85zasDVBVCWTXcRku01u8PFFrIU4xLLXnUzI8IznaVNYFWsVxDl/BRh/IfDx +8wTW5Rsnnnp5XYP7Gt3WJBBce3Uv5chh3uqTORMHtvR/rCyxPxXGkHkV4TEE4CKDeYn j6bAzOlbjWhkFhXSrg9Q8QMt5/83q3uqr/D0CtBCxjCFcd68e5HCmvIvw6xqlPrBmwnQ xCHkhIosH/3U9A1gX8z+fC/iaUfDjpBThRdtvF7JrEsEkAcbBSJQmg+g9W1S5KigzbUf mnZAKsAiH9Ck3OR7w8aeH8In+RWyVDk3a1JzkylJOwQefGHRgKLUurD45aPlos4mnKod focw== X-Received: by 10.202.172.16 with SMTP id v16mr24852012oie.51.1434420050569; Mon, 15 Jun 2015 19:00:50 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id d80sm3180776oic.21.2015.06.15.19.00.49 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 15 Jun 2015 19:00:49 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 16 Jun 2015 11:51:55 +1000 Message-Id: <1434419515-3572-7-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434419515-3572-1-git-send-email-edgar.iglesias@gmail.com> References: <1434419515-3572-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c06::234 Cc: edgar.iglesias@xilinx.com, serge.fdrv@gmail.com, alex.bennee@linaro.org, agraf@suse.de Subject: [Qemu-devel] [PATCH v5 6/6] hw/arm/virt: Connect the Hypervisor timer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Edgar E. Iglesias" Reviewed-by: Peter Maydell Signed-off-by: Edgar E. Iglesias --- hw/arm/virt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index f822ea0..76f4611 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -407,6 +407,10 @@ static void create_gic(VirtBoardInfo *vbi, qemu_irq *pic) qdev_connect_gpio_out(cpudev, 1, qdev_get_gpio_in(gicdev, ppibase + ARCH_TIMER_VIRT_IRQ)); + /* Hypervisor timer. */ + qdev_connect_gpio_out(cpudev, 2, + qdev_get_gpio_in(gicdev, + ppibase + ARCH_TIMER_NS_EL2_IRQ)); sysbus_connect_irq(gicbusdev, i, qdev_get_gpio_in(cpudev, ARM_CPU_IRQ)); sysbus_connect_irq(gicbusdev, i + smp_cpus,