From patchwork Sun Apr 23 17:08:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9694995 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B15F96037F for ; Sun, 23 Apr 2017 17:12:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99F6A20564 for ; Sun, 23 Apr 2017 17:12:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8ECCA212BE; Sun, 23 Apr 2017 17:12:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 29343205AB for ; Sun, 23 Apr 2017 17:12:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=0pFuDCY1r9cUhtF/AkFCRZCkhFdCfwkifP8Afz4/CcE=; b=g0fagykyCxq4yvt6YbMuNyM1Xr KuVyB+BVczOmn8w/egcYwn3tifer9JvcKhIg41rBaaU/kaIjG1WzT4x0KOYeY8lGywqVN4lwUworo JCC+P1ywKC1guTDaBx5m+Tm3QKFqqSMEauA+JIthBOtLNDb+JeJcA59n72n4tncfQUaHEovGkEtP+ zfsNHqvzhHSpQlxdGyzTNq5iDZhQxHnUkRxr+HoSw3zXw1yPtpGpf/i6z7ACAaF10UvM/j5P3WQW4 pwpTtpTrun64yN1qbOv5QyWf5Ls8oXqG9npnnImFqc33OVujZv4PVmfeRkuelN5SqrqciWWWZvPPt eL0+gaBg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d2L3Q-0008Oi-Lz; Sun, 23 Apr 2017 17:12:08 +0000 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d2L1Q-0004SM-Cj for linux-arm-kernel@lists.infradead.org; Sun, 23 Apr 2017 17:10:12 +0000 Received: by mail-wm0-x233.google.com with SMTP id r190so50446026wme.1 for ; Sun, 23 Apr 2017 10:09:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nV35kEsOtSfVBPUXmQ1nngjB9/6pclM1y/MINPSL5Fc=; b=IdzIWUz2o0Y0VAcfhpAj+JmYKu8TtxP985VJJgctvGy7D381q4XA4T3liyixuFYls4 cdCEq6tmPW3DHm+zRxYk2UMPmo0Oo9GOs7RPnaYWh7XmRKyhjNlmt6ccGfOmdyYCbgXf cx86D9xQT+zEzAUKu6PAt+wIG4ImhO7tKQT3Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nV35kEsOtSfVBPUXmQ1nngjB9/6pclM1y/MINPSL5Fc=; b=Zr3OIuoBH/E+TF6OhfSgFnauAzxd3z02zee9UEqIAqzob/LpvBqsBRkzXQRi6+E/jL jaMBib+bQ1HHpA3YGAabj+COLzFYj0yIcyAKkEFz6mmOrvb5IBBIOu2KeG1Eld+z5+rQ Y6t+m1GCfh4AY90ER9cYQCMd45gGKWE/1fh3YmC9hY1ls3fElseJrt3gQCUZe1qhc3BP SY1Zje8FswskZENZPeBEaXewiLIpxGqDfQyhZQUnYcM4bPas+Bmsh/LAohHz+kue3bSa UT4wvEmklfisNkstM8UZfF0VRqrwsbwWci48MwAqlqIp5b4XRimg34GRompDj168jih3 R8oA== X-Gm-Message-State: AN3rC/5VaAWvHTIXW/deCxyM2sEv1KOwmXVjCZpRsH8L3j9vBsNziTwv 9hD4W2ZQ3W1FcZEp X-Received: by 10.80.147.89 with SMTP id n25mr121163eda.69.1492967382598; Sun, 23 Apr 2017 10:09:42 -0700 (PDT) Received: from localhost.localdomain (xd93ddc2d.cust.hiper.dk. [217.61.220.45]) by smtp.gmail.com with ESMTPSA id 58sm2803521edz.2.2017.04.23.10.09.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Apr 2017 10:09:41 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PULL 11/79] KVM: arm64: Use common GICv3 sysreg definitions Date: Sun, 23 Apr 2017 19:08:21 +0200 Message-Id: <20170423170929.27334-12-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170423170929.27334-1-cdall@linaro.org> References: <20170423170929.27334-1-cdall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170423_101005_229418_6708F15E X-CRM114-Status: GOOD ( 10.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Mark Rutland , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Mark Rutland Now that we have common definitions for the GICv3 register encodings, make the KVM code use these, simplifying the sys_reg_descs table. Signed-off-by: Mark Rutland Acked-by: Christoffer Dall Cc: Marc Zyngier Cc: kvmarm@lists.cs.columbia.edu --- arch/arm64/kvm/sys_regs.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 63b0785..1f3062b 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -973,12 +973,8 @@ static const struct sys_reg_desc sys_reg_descs[] = { { Op0(0b11), Op1(0b000), CRn(0b1100), CRm(0b0000), Op2(0b000), NULL, reset_val, VBAR_EL1, 0 }, - /* ICC_SGI1R_EL1 */ - { Op0(0b11), Op1(0b000), CRn(0b1100), CRm(0b1011), Op2(0b101), - access_gic_sgi }, - /* ICC_SRE_EL1 */ - { Op0(0b11), Op1(0b000), CRn(0b1100), CRm(0b1100), Op2(0b101), - access_gic_sre }, + { SYS_DESC(SYS_ICC_SGI1R_EL1), access_gic_sgi }, + { SYS_DESC(SYS_ICC_SRE_EL1), access_gic_sre }, /* CONTEXTIDR_EL1 */ { Op0(0b11), Op1(0b000), CRn(0b1101), CRm(0b0000), Op2(0b001),