From patchwork Wed Nov 4 14:49:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 55981 Delivered-To: patch@linaro.org Received: by 10.112.61.134 with SMTP id p6csp2460512lbr; Wed, 4 Nov 2015 06:55:50 -0800 (PST) X-Received: by 10.68.224.72 with SMTP id ra8mr2372023pbc.72.1446648949992; Wed, 04 Nov 2015 06:55:49 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [198.137.202.9]) by mx.google.com with ESMTPS id wk3si2684062pab.93.2015.11.04.06.55.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Nov 2015 06:55:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 198.137.202.9 as permitted sender) client-ip=198.137.202.9; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 198.137.202.9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro_org.20150623.gappssmtp.com 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 1ZtzSP-0005zR-TK; Wed, 04 Nov 2015 14:54:37 +0000 Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZtzRF-00057E-6K for linux-arm-kernel@lists.infradead.org; Wed, 04 Nov 2015 14:53:28 +0000 Received: by wicfx6 with SMTP id fx6so90992159wic.1 for ; Wed, 04 Nov 2015 06:53:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=j9Qv9aHPpMXYPDupyYKO4Vi4cp9Yh+3c/F89e5Zs20E=; b=CzW6KGRb8osJpMSJ9T4u8IDZwc9NuiIwEkfpXLmW10wFkWVovSVm3gyuz9dCpOELqf U2gc6Cmwy3YYyUAa2UcIKTog6UiiO0aNq3azq1YkVQ0v7zhwF+mU2LigfnVb2OgLCMfV nFd57BwT33YC9qHps2k/lMekjB33JlTRmz1rhDAa9SevO/pd+08FfVReDunkEI8J5whl lx76AZjv7LMnfYw+2KX7eW7cmRkxqmMnMOIofkDHJ+cQ1QD6pIkasUALoH2Kh7psORGi FdYZnTFxu63+3vjd3A4+eFT2ahwOnygfb/HY8T9euJv4DnS9r1QX2RYP0uM2KqFdDyI+ eFag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=j9Qv9aHPpMXYPDupyYKO4Vi4cp9Yh+3c/F89e5Zs20E=; b=H7403wvbZbPmsmgMP/6dWFnsDP0ghe9FNoB9Jp/GMZe3h8uEsjBPkrSWrKus5Zf5Xu ZXmDabURHlJzuBXoYr2Gb0uYmc3ajeVdKne0ydfz6l9fh2KeODxiPG7H0n8RMVytZC+2 VtbdMnbRojTR+khxZYycYEZhJ4htp/3wWt51N5phhwa4gles0gAbNM7O04ZWNBz7ePlk aayvuMkyOOTZOwGCa7Rq4pUODPC5ZrvaukmefkEo90zaROYTybmP91QYCEF8arOhfj0Q nZwo7RiRhst6SCtZTstRqHIjJ68KfYL6/YH0G471ITcMc/rOn0WyE/ScvAv6VH+EfRzy ENlA== X-Gm-Message-State: ALoCoQmvn8zzcTuhSQQiprkVJmMDdd9UL9zC1vtoKhCDWKLLXl9dWYWCyn9SqDvPt8YCfZGAo9KB X-Received: by 10.194.184.44 with SMTP id er12mr2467792wjc.58.1446648783487; Wed, 04 Nov 2015 06:53:03 -0800 (PST) Received: from localhost.localdomain ([94.18.191.146]) by smtp.gmail.com with ESMTPSA id e9sm1985081wjw.8.2015.11.04.06.53.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Nov 2015 06:53:02 -0800 (PST) From: Christoffer Dall To: Paolo Bonzini , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PULL 05/21] arm/arm64: KVM: Use appropriate define in VGIC reset code Date: Wed, 4 Nov 2015 15:49:44 +0100 Message-Id: <1446648600-27297-6-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty In-Reply-To: <1446648600-27297-1-git-send-email-christoffer.dall@linaro.org> References: <1446648600-27297-1-git-send-email-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151104_065325_663294_7F4ED791 X-CRM114-Status: GOOD ( 13.08 ) 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 [2a00:1450:400c:c05:0:0:0:233 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.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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 MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org 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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 2.1.2.330.g565301e.dirty _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index f8ca2e9..a44ecf9 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -2128,8 +2128,12 @@ int vgic_init(struct kvm *kvm) break; } - for (i = 0; i < dist->nr_irqs; i++) { - if (i < VGIC_NR_PPIS) + /* + * Enable all SGIs and configure all private IRQs as + * edge-triggered. + */ + for (i = 0; i < VGIC_NR_PRIVATE_IRQS; i++) { + if (i < VGIC_NR_SGIS) vgic_bitmap_set_irq_val(&dist->irq_enabled, vcpu->vcpu_id, i, 1); if (i < VGIC_NR_PRIVATE_IRQS)