From patchwork Fri Aug 29 14:37:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 36305 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 07CCE2054D for ; Fri, 29 Aug 2014 14:48:11 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id w7sf8829638qcr.7 for ; Fri, 29 Aug 2014 07:48:10 -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=s8S2kIodcV/90OX1u2BntOc8fqSt1Swi/T+0IbaBV/M=; b=gisvkznhjRvN61qUH2qxJhCvD2xOP+IS2V9vf/LQADXSgSMbhUWS+qSIEpwL9OK8tk N5ClFJgBzWOB98g22Ss65/Q/Zo9tf+I41oP8oFp0v6Hax/XxB1tp91qnX/55lfStnKvy Trk6m0dV89hIjnTv2MbjMJ07pvYFbZ2BwKjewn2jDl8VPB7iMBKE/NtzLp4NQyALGA2y 7jojs2F8NMINRt0ADF8apPyPdGE4qNeneb5R5nIw4udI4+03Fnig4hdywJsUL1egKRr3 hi0/1xeK7BcpNb5VY6h9PZKUxfGDyZYD3EKLzs74jbGsYN2tzKJcxwSvvw0X+tMvDuuV TLcQ== X-Gm-Message-State: ALoCoQn/xnHjdjUAaMWaeoKxROnMruxG5oImVKoJxpiY7okkbBSCYuDSDqp+IXecs9aTEoU3v35y X-Received: by 10.224.21.129 with SMTP id j1mr6029366qab.7.1409323690894; Fri, 29 Aug 2014 07:48:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.230 with SMTP id j93ls997240qgf.31.gmail; Fri, 29 Aug 2014 07:48:10 -0700 (PDT) X-Received: by 10.220.5.1 with SMTP id 1mr302034vct.73.1409323690799; Fri, 29 Aug 2014 07:48:10 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id bs11si241624vdb.76.2014.08.29.07.48.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 29 Aug 2014 07:48:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id id10so2567469vcb.16 for ; Fri, 29 Aug 2014 07:48:10 -0700 (PDT) X-Received: by 10.220.118.136 with SMTP id v8mr1665680vcq.50.1409323690724; Fri, 29 Aug 2014 07:48:10 -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.221.45.67 with SMTP id uj3csp28162vcb; Fri, 29 Aug 2014 07:48:10 -0700 (PDT) X-Received: by 10.220.77.65 with SMTP id f1mr2064677vck.48.1409323690140; Fri, 29 Aug 2014 07:48:10 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s4si440836qcc.17.2014.08.29.07.48.09 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 29 Aug 2014 07:48: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]:42425 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNNTF-0006at-Hn for patch@linaro.org; Fri, 29 Aug 2014 10:48:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNNJ6-00077m-Ae for qemu-devel@nongnu.org; Fri, 29 Aug 2014 10:37:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNNIz-00086x-QA for qemu-devel@nongnu.org; Fri, 29 Aug 2014 10:37:40 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:46762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNNIz-000805-JY for qemu-devel@nongnu.org; Fri, 29 Aug 2014 10:37:33 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1XNNIv-00051L-7A for qemu-devel@nongnu.org; Fri, 29 Aug 2014 15:37:29 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 29 Aug 2014 15:37:16 +0100 Message-Id: <1409323049-19255-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1409323049-19255-1-git-send-email-peter.maydell@linaro.org> References: <1409323049-19255-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 81.2.115.146 Subject: [Qemu-devel] [PULL 04/16] arm_gic: Fix read of GICD_ICFGR 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.220.171 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 From: Adam Lackorzynski The GICD_ICFGR register covers 4 interrupts per byte. Acked-by: Christoffer Dall Signed-off-by: Adam Lackorzynski Message-id: 1408372255-12358-2-git-send-email-adam@os.inf.tu-dresden.de Signed-off-by: Peter Maydell --- hw/intc/arm_gic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index 1532ef9..d2b1aaf 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -372,7 +372,7 @@ static uint32_t gic_dist_readb(void *opaque, hwaddr offset) } } else if (offset < 0xf00) { /* Interrupt Configuration. */ - irq = (offset - 0xc00) * 2 + GIC_BASE_IRQ; + irq = (offset - 0xc00) * 4 + GIC_BASE_IRQ; if (irq >= s->num_irq) goto bad_reg; res = 0;