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: 9694911 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 2AAC660245 for ; Sun, 23 Apr 2017 17:10:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1202826530 for ; Sun, 23 Apr 2017 17:10:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 06CE4265B9; Sun, 23 Apr 2017 17:10: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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89B3226530 for ; Sun, 23 Apr 2017 17:10:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162614AbdDWRKG (ORCPT ); Sun, 23 Apr 2017 13:10:06 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:38552 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162376AbdDWRJo (ORCPT ); Sun, 23 Apr 2017 13:09:44 -0400 Received: by mail-wm0-f41.google.com with SMTP id r190so50446023wme.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=oIqfcKqxtKFhS5pO5u1+uwQsvGkj5uGJGlCRS7G93YcSExKNpjiwj0jCiaxhPw9AUH goSoOR6LeTDxxmz6xtFn/P7yVyLlVwUjgorUZ2zN5GbC/DI2gMWBB4eMS9WSC0mPIZUv MEBno0ytCmuMu1mKoXY3uy5L5QvmOOd2EheF34FFmVBcpLLH1ysxDrkMutmq92exZjT2 1L0yvyX+msL+k4ZSuy4wo2/N68glmzjPm63tcJ4kZ0AnGj/gHTKsrnuR7TdtvyylJqDf m9jar0SietBZnugeIKU+ZXNr9Z58Dine0FpVI4daWwqFJ7ELQxVm+EUIyLFam0mTt570 Sx9w== X-Gm-Message-State: AN3rC/5vNkFEEg9RdvRXu8celG5xsQe2iEF7CHd59PRmZ29IwZo3Hfze glwOJXv5DPdgtqqj 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?= Cc: Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Rutland 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> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.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),