From patchwork Thu Aug 8 16:04:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18889 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 35F0125E72 for ; Thu, 8 Aug 2013 16:04:24 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id s1sf1013999qcw.0 for ; Thu, 08 Aug 2013 09:04:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=nnO+rYUyUQdlX54lrMWt8Ft9baHSlecMyzU73yrtgpw=; b=IPZ134s91rL8rXOrO6mVxWWjXjAwllqhejIwPB8OrMha/KRJzNEogPxDR418WKs2/z wLzYcsmdQcX7MDbwkLYiSmT0QzrcFUu/tWllNLV6C6GELpm7mjlhnX+pNWQWZk57ItXD uRWuFmEMXJcHSpMbf1RcNCKihwMBA2/sVvK+hPkvIeETuS5qZaIlsrTC+PVetTqJXFkn lBC/rx/s/xXgpDRU1H1ElJ9ly9e+k8H5i2HiK/MvZnC63k3cjETCxCWB52aWUHvvb/zR jNRT7oC3KfB16OvuQZ+CO2QECVYEY3joLPemRTJWj34bJ50h6aLje0OF2sb3QOgWopJn K3jw== X-Received: by 10.236.221.198 with SMTP id r66mr3834237yhp.5.1375977863952; Thu, 08 Aug 2013 09:04:23 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.110.195 with SMTP id ic3ls1149467qeb.62.gmail; Thu, 08 Aug 2013 09:04:23 -0700 (PDT) X-Received: by 10.52.115.129 with SMTP id jo1mr3029160vdb.63.1375977863829; Thu, 08 Aug 2013 09:04:23 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id vf5si3242324vdc.18.2013.08.08.09.04.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:23 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id hf12so255977vcb.41 for ; Thu, 08 Aug 2013 09:04:23 -0700 (PDT) X-Gm-Message-State: ALoCoQlOvOHkFpr5uzgTnocpGUeY0LitpqjVAs2PWYMN8ItPIeWqzqZVbFl6x0vdGhXv0/HSpVP1 X-Received: by 10.52.180.229 with SMTP id dr5mr3003227vdc.20.1375977863722; Thu, 08 Aug 2013 09:04:23 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp23540vcz; Thu, 8 Aug 2013 09:04:23 -0700 (PDT) X-Received: by 10.60.117.34 with SMTP id kb2mr4776502oeb.54.1375977860224; Thu, 08 Aug 2013 09:04:20 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id s9si4754623oem.42.2013.08.08.09.04.19 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:19 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1V7ShF-0006Wc-0k; Thu, 08 Aug 2013 17:04:17 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH 03/14] hw/arm/exynos4210: Don't use arm_pic_init_cpu() Date: Thu, 8 Aug 2013 17:04:05 +0100 Message-Id: <1375977856-25046-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1375977856-25046-1-git-send-email-peter.maydell@linaro.org> References: <1375977856-25046-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Drop the now-deprecated arm_pic_init_cpu() in favour of directly getting the IRQ line from the ARMCPU object. Signed-off-by: Peter Maydell --- hw/arm/exynos4210.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 216b9b7..4ebb938 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -137,10 +137,8 @@ void exynos4210_write_secondary(ARMCPU *cpu, Exynos4210State *exynos4210_init(MemoryRegion *system_mem, unsigned long ram_size) { - qemu_irq cpu_irq[EXYNOS4210_NCPUS]; int i, n; Exynos4210State *s = g_new(Exynos4210State, 1); - qemu_irq *irqp; qemu_irq gate_irq[EXYNOS4210_NCPUS][EXYNOS4210_IRQ_GATE_NINPUTS]; unsigned long mem_size; DeviceState *dev; @@ -152,15 +150,6 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, fprintf(stderr, "Unable to find CPU %d definition\n", n); exit(1); } - - /* Create PIC controller for each processor instance */ - irqp = arm_pic_init_cpu(s->cpu[n]); - - /* - * Get GICs gpio_in cpu_irq to connect a combiner to them later. - * Use only IRQ for a while. - */ - cpu_irq[n] = irqp[ARM_PIC_CPU_IRQ]; } /*** IRQs ***/ @@ -178,8 +167,9 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, } busdev = SYS_BUS_DEVICE(dev); - /* Connect IRQ Gate output to cpu_irq */ - sysbus_connect_irq(busdev, 0, cpu_irq[i]); + /* Connect IRQ Gate output to CPU's IRQ line */ + sysbus_connect_irq(busdev, 0, + qdev_get_gpio_in(DEVICE(s->cpu[i]), ARM_CPU_IRQ)); } /* Private memory region and Internal GIC */