From patchwork Sun Aug 30 13:54:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 52861 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id 388A72127E for ; Sun, 30 Aug 2015 13:55:45 +0000 (UTC) Received: by wicne3 with SMTP id ne3sf22113917wic.1 for ; Sun, 30 Aug 2015 06:55:44 -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=ZONRnvSj2aTXKdM1/XM8bvGhDSDbwzqFZ9QF5p2eqEk=; b=PU6WD3uYVu9yyF2ADulZVZBQrZHpCRh9vZDRYzlkeRsSPBRSB0IdgsnkUoPDtwV+vC C8hgUwZBYUM4fgXu53ARUEXMQlVUvb7w45mzxy561OHb6BmwCz9tfLVWNFj0zhVJUAHy RXwK8VipmB2PRfuUOtTvlaUI4ZkMVd1OWX71VoqfXayT8mME9UynCJwCXbjHmo5+fEz4 PPkwDqQMSQwKHmUzlaLbW8DXYdLdEtL+zmReKrYYRGS9+TIhnCrWf7EJ7fiPMd+do9+j 3RBhR6pP7Fmh6uDyndvuYRgnYgbSbVOZl9QzAPgcgsf4Jteus1Ldit86fGyVqEqQWpFz JP3w== X-Gm-Message-State: ALoCoQmaNI4GzEuR9x/O7inwYV5o2VWxtPr/nYZTY7QfBoFlnDjpFjV6h3r6iImwuyno4B/dMEFl X-Received: by 10.194.173.3 with SMTP id bg3mr5075104wjc.5.1440942944553; Sun, 30 Aug 2015 06:55:44 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.30.10 with SMTP id o10ls381827lah.22.gmail; Sun, 30 Aug 2015 06:55:44 -0700 (PDT) X-Received: by 10.112.159.1 with SMTP id wy1mr8645733lbb.55.1440942944406; Sun, 30 Aug 2015 06:55:44 -0700 (PDT) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id y17si10912077lbn.98.2015.08.30.06.55.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Aug 2015 06:55:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by lanb10 with SMTP id b10so21927168lan.2 for ; Sun, 30 Aug 2015 06:55:44 -0700 (PDT) X-Received: by 10.112.77.10 with SMTP id o10mr8573314lbw.73.1440942944273; Sun, 30 Aug 2015 06:55:44 -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.151.194 with SMTP id us2csp1078840lbb; Sun, 30 Aug 2015 06:55:43 -0700 (PDT) X-Received: by 10.68.169.69 with SMTP id ac5mr30776863pbc.14.1440942943292; Sun, 30 Aug 2015 06:55:43 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id m2si19630791pdd.173.2015.08.30.06.55.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Aug 2015 06:55:43 -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 1ZW343-0003hm-W9; Sun, 30 Aug 2015 13:54:32 +0000 Received: from mail-lb0-f170.google.com ([209.85.217.170]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZW33J-0003Gd-8X for linux-arm-kernel@lists.infradead.org; Sun, 30 Aug 2015 13:53:45 +0000 Received: by lbbtg9 with SMTP id tg9so48775220lbb.1 for ; Sun, 30 Aug 2015 06:53:23 -0700 (PDT) X-Received: by 10.152.5.135 with SMTP id s7mr8214235las.75.1440942803341; Sun, 30 Aug 2015 06:53:23 -0700 (PDT) Received: from localhost.localdomain (0187900153.0.fullrate.dk. [2.110.55.193]) by smtp.gmail.com with ESMTPSA id qm6sm3069212lbb.23.2015.08.30.06.53.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 30 Aug 2015 06:53:22 -0700 (PDT) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Subject: [PATCH 5/9] arm/arm64: KVM: Use appropriate define in VGIC reset code Date: Sun, 30 Aug 2015 15:54:22 +0200 Message-Id: <1440942866-23802-6-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty In-Reply-To: <1440942866-23802-1-git-send-email-christoffer.dall@linaro.org> References: <1440942866-23802-1-git-send-email-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150830_065345_488216_B252900C X-CRM114-Status: GOOD ( 12.16 ) 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.170 listed in list.dnswl.org] -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_H3 RBL: Good reputation (+3) [209.85.217.170 listed in wl.mailspike.net] -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: Christoffer Dall 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.48 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. Signed-off-by: Christoffer Dall Acked-by: Marc Zyngier --- 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 0ba92d3..8299c24 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -2099,7 +2099,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)