From patchwork Sun Apr 23 17:08:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9695111 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 857AF60245 for ; Sun, 23 Apr 2017 17:20:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7518126530 for ; Sun, 23 Apr 2017 17:20:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 69A5627D4A; Sun, 23 Apr 2017 17:20:41 +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 E9CFD2833C for ; Sun, 23 Apr 2017 17:20:40 +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=qPK1j7YqaW3axwpCpjKbSidCYtiUwk3vyMy6OG2ItJE=; b=MNzy/hyWqKKUZpBhnA9nKg1nOW Gngq8ZNl9AqqMLh5R1QwZbIabB+lQV60Tz1YuNYox9bDb9TPgI9VRhTlFgJ3Uahi+Mwth1VH67+ms NPCXIhNR+UmLrhTJK7HNtKRF3iE37AWCsEFzp2DK10FF3NbYcEwYzQImiWzatjVZ18flblNnwZiq5 REg3+ECd6Hwj1Q/V4BSyyzU7BDTo3D4Crd+NV35KY6v8GxONiCqCE4sd7EoRIL9PespdFX1RK65/U H9PBKKuKFZ/63eoY9HwLj5uBZEXKxgAhjPUo6OEWdqM7Sm4of/rbiaiuUoT43N8RErlN2kDfaL+So XJJSoLZg==; 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 1d2LBf-0002pG-3J; Sun, 23 Apr 2017 17:20:39 +0000 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d2L1R-0004Tc-DF for linux-arm-kernel@lists.infradead.org; Sun, 23 Apr 2017 17:10:12 +0000 Received: by mail-wm0-x234.google.com with SMTP id u65so7500744wmu.1 for ; Sun, 23 Apr 2017 10:09:44 -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=K/yrLyddTrHVYfHJ1s13TPHZ1XuXINsPoQyc93UDkgI=; b=C59caWLzHoUhkOxWJYJ8rX+tzW1+kv2bqmTyZyyhaZM8smr7syKyUlNZNm2UAOWnPe XUWxsQERh1UFxnu35GAru31Hbb6uhtl3p1slLl029vyCCbHmPc1v9EENL6gY9pmZRHHw 5VaUzzjrThwiUj7j5jQNoF8RL5ADuYuPSiUwY= 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=K/yrLyddTrHVYfHJ1s13TPHZ1XuXINsPoQyc93UDkgI=; b=HpSZDxkoCkX2LLtYeHi9S7TYsYwoXlqyk+3u00gFoi/im8SxAOop+XXO89KOfSwnMq RGfQZYwpqSEYZrG1yTzwDpdHbVn7qPzScZdd4O/G3+Xq9FdbIkXDxHxBP83S28trR0PH QiTLngQ/rI9T2LhVy0p8hPVTKCIt/HXbOLiX3qZhU2npx1m7ljZwwL5YJ+PWZEwIXu4I XiANdlL736ENdbM2rin2Xvz4egZ0jU/RWe8Q8DN9hkb+GFKGJepHUBIwNz6ROjdY/6c0 j7wjuiloTqzJCJ+EyxV7SQKMlHZx7IYhHjJeLR59egszQlS8cgVbCwOY1DRqSy4dP0Qb fwBQ== X-Gm-Message-State: AN3rC/6tDu260kMkosUSkYdI/f6AEx/G5Aj0u9sB9M7MntLaHZ0oBOTM rHPohmhCtZUfTXwL X-Received: by 10.80.152.69 with SMTP id h5mr121252edb.66.1492967383590; Sun, 23 Apr 2017 10:09:43 -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.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Apr 2017 10:09:43 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PULL 12/79] KVM: arm64: Use common physical timer sysreg definitions Date: Sun, 23 Apr 2017 19:08:22 +0200 Message-Id: <20170423170929.27334-13-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_101006_045502_787E08D0 X-CRM114-Status: UNSURE ( 9.95 ) X-CRM114-Notice: Please train this message. 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 physical timer control registers, 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 | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 1f3062b..860707f 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1016,15 +1016,9 @@ static const struct sys_reg_desc sys_reg_descs[] = { { Op0(0b11), Op1(0b011), CRn(0b1101), CRm(0b0000), Op2(0b011), NULL, reset_unknown, TPIDRRO_EL0 }, - /* CNTP_TVAL_EL0 */ - { Op0(0b11), Op1(0b011), CRn(0b1110), CRm(0b0010), Op2(0b000), - access_cntp_tval }, - /* CNTP_CTL_EL0 */ - { Op0(0b11), Op1(0b011), CRn(0b1110), CRm(0b0010), Op2(0b001), - access_cntp_ctl }, - /* CNTP_CVAL_EL0 */ - { Op0(0b11), Op1(0b011), CRn(0b1110), CRm(0b0010), Op2(0b010), - access_cntp_cval }, + { SYS_DESC(SYS_CNTP_TVAL_EL0), access_cntp_tval }, + { SYS_DESC(SYS_CNTP_CTL_EL0), access_cntp_ctl }, + { SYS_DESC(SYS_CNTP_CVAL_EL0), access_cntp_cval }, /* PMEVCNTRn_EL0 */ PMU_PMEVCNTR_EL0(0),