From patchwork Thu Aug 13 10:44:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 52362 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by patches.linaro.org (Postfix) with ESMTPS id E59CF22EC6 for ; Thu, 13 Aug 2015 10:50:12 +0000 (UTC) Received: by wijp15 with SMTP id p15sf15682245wij.3 for ; Thu, 13 Aug 2015 03:50:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=rahykQix74wgEw/oyHilr0PVkP+fztOPokbK8UfVlMc=; b=Gvc3qDN6feJQF25CKGwfG3w/0R804TZPKi6Nys8bd0bT54tNrIZS4GOPHwMNx7B6/I wDZHSlqJ+DYgHRFIk/GH1u+FNr0rNRkNdzgoYjw3PZbRM0LeqLOTEk3DLSzCzmvLf7RO xuskPKp6iUYBRU1C+izbXUeAjEZgnFR/WGNEDVZ7ScYahohbxObLCq2qWRJqTJ8Yv/4A F+D0R8+AkuJw+PP24zUOjOVV0yxi8CqerfuyZJLYMzCLPmhr5v/7+qHiIaUQxh4/+A1h 13YVvnGHgrXyNYY18ToPPQxh85ZFYDL3uKsiwwMZpyLdyBWl0Gg2V9wexkY2hAZ9TDxQ xCaA== X-Gm-Message-State: ALoCoQm6LuCF1YnRsfOH3dxKowhfhwMKDDInK7M3tHPhTZ9qh0KaNJ3g9fOnmo86+fmrwRVohTHk X-Received: by 10.194.19.33 with SMTP id b1mr11015467wje.6.1439463012281; Thu, 13 Aug 2015 03:50:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.242.131 with SMTP id wq3ls130057lac.106.gmail; Thu, 13 Aug 2015 03:50:12 -0700 (PDT) X-Received: by 10.112.126.65 with SMTP id mw1mr18759753lbb.124.1439463011970; Thu, 13 Aug 2015 03:50:11 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id tp6si1791634lbb.97.2015.08.13.03.50.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Aug 2015 03:50:11 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by lagz9 with SMTP id z9so23845348lag.3 for ; Thu, 13 Aug 2015 03:50:11 -0700 (PDT) X-Received: by 10.152.22.99 with SMTP id c3mr36697075laf.32.1439463011880; Thu, 13 Aug 2015 03:50:11 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp859641lba; Thu, 13 Aug 2015 03:50:10 -0700 (PDT) X-Received: by 10.107.14.203 with SMTP id 194mr42595759ioo.195.1439463010318; Thu, 13 Aug 2015 03:50:10 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p65si1202801iop.13.2015.08.13.03.50.09 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 13 Aug 2015 03:50:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:41672 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPq5J-0005l1-6W for patch@linaro.org; Thu, 13 Aug 2015 06:50:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPq0R-0005WO-0O for qemu-devel@nongnu.org; Thu, 13 Aug 2015 06:45:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPq0N-0005TT-V4 for qemu-devel@nongnu.org; Thu, 13 Aug 2015 06:45:06 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34909) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPq0N-0005DT-NP for qemu-devel@nongnu.org; Thu, 13 Aug 2015 06:45:03 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1ZPq07-00070q-Ox for qemu-devel@nongnu.org; Thu, 13 Aug 2015 11:44:47 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 13 Aug 2015 11:44:27 +0100 Message-Id: <1439462687-26903-8-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1439462687-26903-1-git-send-email-peter.maydell@linaro.org> References: <1439462687-26903-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 07/27] 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: "Edgar E. Iglesias" Reviewed-by: Peter Maydell Signed-off-by: Edgar E. Iglesias Message-id: 1436791864-4582-8-git-send-email-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell --- hw/arm/virt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 42efad1..aab99f7 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -402,6 +402,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,