From patchwork Mon May 11 13:40:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 48290 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4185721550 for ; Mon, 11 May 2015 13:44:17 +0000 (UTC) Received: by lbbqq2 with SMTP id qq2sf38753925lbb.0 for ; Mon, 11 May 2015 06:44:16 -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=G+swm0TP7N5zVEycvFmMeQI3PUwXEsarWyTN36wwyOc=; b=cwJtLgjMoERzM4pC0FhQKALSVwuywOiHMbl6ofZYsKPWnOW3b6tTM/E8JcKP3hg/Us 6MrAktuPzccWaLa76JOqbCF52IIuNscA+CV21Oe69/73L70dSEb+BK+HV2LN70QeA4XK oZa1Brf1C6IrAEOb9rtKYkl8CrSosrw2Q4VahESkkWyfibbEr0da0y5CtFIdnsfdfrTb EN4MylaU3C1FuiYsATCaczRGn6C+rOApS9uD5J2tZHfCsFLZpSe/pxxmZt7AqqSyXtav E92FJro9WrvovsqzzJLmtMFBrmaUE/VshfiIqtgamj/AYF6Sn1wLDyz4cbd15TByGjAb LWrQ== X-Gm-Message-State: ALoCoQnNaU3+688xf8zMFkC0iJHouPN7mF+StAhgR0RwYWpFm7xItaGgZ9tIBi3tNdqfnzf03R9s X-Received: by 10.112.14.101 with SMTP id o5mr7591237lbc.3.1431351856140; Mon, 11 May 2015 06:44:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.22.10 with SMTP id z10ls655797lae.24.gmail; Mon, 11 May 2015 06:44:16 -0700 (PDT) X-Received: by 10.112.156.97 with SMTP id wd1mr7927615lbb.30.1431351855985; Mon, 11 May 2015 06:44:15 -0700 (PDT) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id am2si8370690lac.130.2015.05.11.06.44.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 May 2015 06:44:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by lbcga7 with SMTP id ga7so94256760lbc.1 for ; Mon, 11 May 2015 06:44:15 -0700 (PDT) X-Received: by 10.152.87.204 with SMTP id ba12mr8288038lab.35.1431351855896; Mon, 11 May 2015 06:44:15 -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.108.230 with SMTP id hn6csp1514754lbb; Mon, 11 May 2015 06:44:15 -0700 (PDT) X-Received: by 10.140.30.245 with SMTP id d108mr13181504qgd.93.1431351854274; Mon, 11 May 2015 06:44:14 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 18si7306327qhh.89.2015.05.11.06.44.13 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 11 May 2015 06:44:14 -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]:37450 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yro0D-0007mw-8l for patch@linaro.org; Mon, 11 May 2015 09:44:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yrnwt-0002NN-Rr for qemu-devel@nongnu.org; Mon, 11 May 2015 09:40:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yrnws-0000eH-0t for qemu-devel@nongnu.org; Mon, 11 May 2015 09:40:47 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34139) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yrnwr-0000ZY-G4 for qemu-devel@nongnu.org; Mon, 11 May 2015 09:40:45 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Yrnwl-0005fm-Eu for qemu-devel@nongnu.org; Mon, 11 May 2015 14:40:39 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 11 May 2015 14:40:38 +0100 Message-Id: <1431351638-21705-20-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1431351638-21705-1-git-send-email-peter.maydell@linaro.org> References: <1431351638-21705-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 19/19] hw/arm/highbank.c: Wire FIQ between CPU <> GIC 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.217.175 as permitted sender) smtp.mail=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 Connect FIQ output of the GIC CPU interfaces to the CPUs. Signed-off-by: Peter Maydell Message-id: 1430502643-25909-18-git-send-email-peter.maydell@linaro.org --- hw/arm/highbank.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index b2d048b..f8353a7 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -217,6 +217,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) qemu_irq pic[128]; int n; qemu_irq cpu_irq[4]; + qemu_irq cpu_fiq[4]; MemoryRegion *sysram; MemoryRegion *dram; MemoryRegion *sysmem; @@ -269,6 +270,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) exit(1); } cpu_irq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ); + cpu_fiq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_FIQ); } sysmem = get_system_memory(); @@ -313,6 +315,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) sysbus_mmio_map(busdev, 0, MPCORE_PERIPHBASE); for (n = 0; n < smp_cpus; n++) { sysbus_connect_irq(busdev, n, cpu_irq[n]); + sysbus_connect_irq(busdev, n + smp_cpus, cpu_fiq[n]); } for (n = 0; n < 128; n++) {