From patchwork Fri Sep 4 19:40:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 53141 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by patches.linaro.org (Postfix) with ESMTPS id 7D7692159E for ; Fri, 4 Sep 2015 19:41:46 +0000 (UTC) Received: by laeb10 with SMTP id b10sf10953199lae.1 for ; Fri, 04 Sep 2015 12:41:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:cc:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=Lj51+t/SwvmErGwS4OD4+XJFFkXKziFBm62JJBPDL8c=; b=BLWnfPA6GpK6RZ7mkmEJCx3N0yFHT1ixHgZv4XnNImjho9zXSiwFDZGqKk2t+QTYle Ql+tI2Z+yNHYu6rCib4GpTHkXxDEsKYJ6aOFCkwXSkhgtEJ8QsH2Pv3nQt9LQ5isGrBS Nm06UbUricTevQIi35CJToUx0eWw7RQuVTrBrRfnQcrq6d1c5QJW81Dd+4KDXJ7lnBlX vcAV72IW2aCnjDYrcvBnUV8gmg3dosss40WCxG6ogXhdodTdHMXpiLBa7xGEF5FmLHNE N4vodoFa2HqREqEmoMJ08o3lHDr8tcW2JBdZzo5tb2kJ0wcVd/amPDNVCJIKGNXIGWNM 6B7g== X-Gm-Message-State: ALoCoQnu1eb8s7B1beUobGsAKcZiGOdaupFMXhbRw94MkyEPmw+T5snDZxkKC1EUYoC0ZR28S+oP X-Received: by 10.180.79.66 with SMTP id h2mr1535832wix.3.1441395705564; Fri, 04 Sep 2015 12:41:45 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.105 with SMTP id r9ls355376lar.15.gmail; Fri, 04 Sep 2015 12:41:45 -0700 (PDT) X-Received: by 10.152.36.138 with SMTP id q10mr5072964laj.109.1441395705399; Fri, 04 Sep 2015 12:41:45 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id sj10si3086451lac.117.2015.09.04.12.41.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Sep 2015 12:41:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by lbpo4 with SMTP id o4so16799408lbp.2 for ; Fri, 04 Sep 2015 12:41:45 -0700 (PDT) X-Received: by 10.112.235.130 with SMTP id um2mr5145243lbc.72.1441395705300; Fri, 04 Sep 2015 12:41:45 -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.164.42 with SMTP id yn10csp121081lbb; Fri, 4 Sep 2015 12:41:44 -0700 (PDT) X-Received: by 10.68.136.138 with SMTP id qa10mr11749011pbb.8.1441395701788; Fri, 04 Sep 2015 12:41:41 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id vs4si5738080pbc.134.2015.09.04.12.41.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Sep 2015 12:41:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZXwqh-00080N-SX; Fri, 04 Sep 2015 19:40:35 +0000 Received: from mail-lb0-f175.google.com ([209.85.217.175]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZXwq4-0006WS-52 for linux-arm-kernel@lists.infradead.org; Fri, 04 Sep 2015 19:39:57 +0000 Received: by lbbmp1 with SMTP id mp1so16798548lbb.1 for ; Fri, 04 Sep 2015 12:39:34 -0700 (PDT) X-Received: by 10.112.205.6 with SMTP id lc6mr4966576lbc.95.1441395574379; Fri, 04 Sep 2015 12:39:34 -0700 (PDT) Received: from localhost.localdomain (0187900153.0.fullrate.dk. [2.110.55.193]) by smtp.gmail.com with ESMTPSA id nz4sm798299lbb.38.2015.09.04.12.39.33 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Sep 2015 12:39:33 -0700 (PDT) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 5/8] arm/arm64: KVM: Use appropriate define in VGIC reset code Date: Fri, 4 Sep 2015 21:40:47 +0200 Message-Id: <1441395650-19663-6-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty In-Reply-To: <1441395650-19663-1-git-send-email-christoffer.dall@linaro.org> References: <1441395650-19663-1-git-send-email-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150904_123956_493055_9988CFD9 X-CRM114-Status: GOOD ( 12.41 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.217.175 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.217.175 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Cc: Marc Zyngier , Christoffer Dall , kvm@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: christoffer.dall@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.176 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 We currently initialize the SGIs to be enabled in the VGIC code, but we use the VGIC_NR_PPIS define for this purpose, instead of the the more natural VGIC_NR_SGIS. Change this slightly confusing use of the defines. Note: This should have no functional change, as both names are defined to the number 16. Acked-by: Marc Zyngier Signed-off-by: Christoffer Dall --- virt/kvm/arm/vgic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index e606f78..9ed8d53 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -2109,7 +2109,7 @@ int vgic_init(struct kvm *kvm) } for (i = 0; i < dist->nr_irqs; i++) { - if (i < VGIC_NR_PPIS) + if (i < VGIC_NR_SGIS) vgic_bitmap_set_irq_val(&dist->irq_enabled, vcpu->vcpu_id, i, 1); if (i < VGIC_NR_PRIVATE_IRQS)