From patchwork Tue Sep 29 14:49:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 54231 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id CD32C22B1E for ; Tue, 29 Sep 2015 14:57:02 +0000 (UTC) Received: by labnm6 with SMTP id nm6sf5795971lab.1 for ; Tue, 29 Sep 2015 07:57:01 -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=hc2cify0Eg2I50yoPF1CNUKe7vmcLuv7eDATSGpEDxh2OZaeI8S93ezNNk4mJ/I1tD hEDqAmLHK8udXRoOI3Xb2QOtWrjJOmpL4ABT9N4y3UhITm2fQESiAV3SpQ+0BwtdCfkB 9lnuKBeSw7+YcgPdRccnw//RZJsKbVGWlQsmTI2T06C3YjWici6jHufMqwJ9Wyinro7s +X1/JMA+i6OvdNGFtnI/9AGpN5MkrLko43mFLqJ35dc1j9+O+Fwv1n34CuBZbXxQ13iR N07InyV2zsHoA3cloXYC4H6RQkYKzCgI5vLpOBGXsZE0kDw2Hp344ArouweHGxqr6+Qh Czlg== X-Gm-Message-State: ALoCoQkZqX3cDTNfzfA9N9Uoehxr4Nfkk9EYSybupVqLZNn66+ZXpdtVWBCkhG2NAaePExCaF78O X-Received: by 10.112.169.34 with SMTP id ab2mr4367642lbc.23.1443538621656; Tue, 29 Sep 2015 07:57:01 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.121.4 with SMTP id lg4ls191038lab.75.gmail; Tue, 29 Sep 2015 07:57:01 -0700 (PDT) X-Received: by 10.25.154.5 with SMTP id c5mr4947819lfe.103.1443538621393; Tue, 29 Sep 2015 07:57:01 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id h6si11079686lfg.153.2015.09.29.07.57.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 07:57:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by laer8 with SMTP id r8so11906400lae.2 for ; Tue, 29 Sep 2015 07:57:01 -0700 (PDT) X-Received: by 10.152.23.199 with SMTP id o7mr6163849laf.76.1443538621140; Tue, 29 Sep 2015 07:57:01 -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.59.35 with SMTP id w3csp2193580lbq; Tue, 29 Sep 2015 07:57:00 -0700 (PDT) X-Received: by 10.68.254.7 with SMTP id ae7mr34097449pbd.131.1443538618170; Tue, 29 Sep 2015 07:56:58 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id u2si30326085pbs.213.2015.09.29.07.56.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 07:56:58 -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 1ZgwJz-00036J-0K; Tue, 29 Sep 2015 14:55:59 +0000 Received: from mail-la0-f47.google.com ([209.85.215.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZgwDl-0005Bo-TJ for linux-arm-kernel@lists.infradead.org; Tue, 29 Sep 2015 14:49:34 +0000 Received: by laclj5 with SMTP id lj5so11602928lac.3 for ; Tue, 29 Sep 2015 07:49:12 -0700 (PDT) X-Received: by 10.152.170.135 with SMTP id am7mr7596020lac.78.1443538152086; Tue, 29 Sep 2015 07:49:12 -0700 (PDT) Received: from localhost.localdomain (0187900153.0.fullrate.dk. [2.110.55.193]) by smtp.gmail.com with ESMTPSA id zx7sm2749559lbb.15.2015.09.29.07.49.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Sep 2015 07:49:11 -0700 (PDT) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Subject: [PATCH v3 5/8] arm/arm64: KVM: Use appropriate define in VGIC reset code Date: Tue, 29 Sep 2015 16:49:02 +0200 Message-Id: <1443538145-11990-6-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty In-Reply-To: <1443538145-11990-1-git-send-email-christoffer.dall@linaro.org> References: <1443538145-11990-1-git-send-email-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150929_074934_227188_F5F4A6D3 X-CRM114-Status: GOOD ( 12.78 ) 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.215.47 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.47 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] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 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 , Andre Przywara , Christoffer Dall , Eric Auger 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.215.51 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)