From patchwork Wed Aug 24 11:20:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijay Kilari X-Patchwork-Id: 9297549 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 84D0960757 for ; Wed, 24 Aug 2016 11:23:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7599128A6A for ; Wed, 24 Aug 2016 11:23:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A61C28D1D; Wed, 24 Aug 2016 11:23:25 +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=-2.0 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_BL_SPAMCOP_NET,RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EE99928A6A for ; Wed, 24 Aug 2016 11:23:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bcWFv-0005WV-P7; Wed, 24 Aug 2016 11:22:03 +0000 Received: from mail-pa0-x244.google.com ([2607:f8b0:400e:c03::244]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bcWEu-0005Dt-Jc for linux-arm-kernel@lists.infradead.org; Wed, 24 Aug 2016 11:21:02 +0000 Received: by mail-pa0-x244.google.com with SMTP id cf3so1030801pad.2 for ; Wed, 24 Aug 2016 04:20:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rLV3tQ56sTvIgr40G3ThMKTaHIeIzTq4pPfkRaDcaWM=; b=ZQQgG4SSu3NY1ckfEAWQBbA/wiDd1D7/60RCGyfwNeoTDu6KLdPrCxe/LGlS6jWd8b vNEB57Q+PGDMQoiR2I4P+XO3D4M3MzsiAKz+6aE59K2NQKGYusLMUfCTJgU+Zb2Nh2eW dcceiSEcDK0eEk/doY2UzJqxRe9jp4snNhU0r/yr+oArWY9ZwZhJrSItQ2o57o56oKKs x23nh/z/SbYyw8b+6qe2arKsslMXRkPdX6lC6ALv4tajdvlbAuXo21cxsesDuILsB/AM QcpFItPj3H1yPvORnE/3VkVYLvc8VuSVE0J5fOuAlGOpOm2KZTvTgZyOZMo9xuDWI01i QaXA== 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=rLV3tQ56sTvIgr40G3ThMKTaHIeIzTq4pPfkRaDcaWM=; b=SWBhUa5eKLpDBrVcCyCH44d7fKxa6+5YQE6HA8Wbm4U7j0uoWNB7BTkNGTbKaxF9i9 K1O8BAZLl/PApSygKPw1rkqnd9qLjyw4UsIFTLr7O0+I6Qmb5vrL5KzF2s7okePEb/wG of9MxLweTOrdwWsJ4vMBeKPV8uK9Qv6YZTgh6glKploRHKXtCW8t1Yi0hrw8zcA9KxcH yMQW6s8XT0AMBqTGLHXXD0++CtLqT7cBd2Sz/tVMpl6ZS5/XdAsWGN5AePYjbjCc1ZIu mMbVx9S0UEAh9dwFBbIAubx01rC+XTSsQ4GKwYbRVjBRJpMdAZhVg7oyMdK0jUpZiCJ0 NPbQ== X-Gm-Message-State: AE9vXwOYt8V+KD8McOLeVj/psj811snt1EHc6gtwmAW1yIJdfTIHnw6IOuN0LA0CVFKdCQ== X-Received: by 10.66.159.195 with SMTP id xe3mr4584860pab.159.1472037639553; Wed, 24 Aug 2016 04:20:39 -0700 (PDT) Received: from cavium-Vostro-2520.caveonetworks.com ([111.93.218.67]) by smtp.gmail.com with ESMTPSA id a5sm12834644pfc.89.2016.08.24.04.20.37 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Aug 2016 04:20:39 -0700 (PDT) From: vijay.kilari@gmail.com To: marc.zyngier@arm.com, christoffer.dall@linaro.org, peter.maydell@linaro.org Subject: [RFC PATCH v3 3/5] arm/arm64: vgic-new: Introduce find_reg_by_id() Date: Wed, 24 Aug 2016 16:50:07 +0530 Message-Id: <1472037609-4164-4-git-send-email-vijay.kilari@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1472037609-4164-1-git-send-email-vijay.kilari@gmail.com> References: <1472037609-4164-1-git-send-email-vijay.kilari@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160824_042100_778350_2BF079CC X-CRM114-Status: GOOD ( 12.43 ) 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: p.fedin@samsung.com, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Vijaya Kumar K 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: Vijaya Kumar K In order to implement vGICv3 CPU interface access, we will need to perform table lookup of system registers. We would need both index_to_params() and find_reg() exported for that purpose, but instead we export a single function which combines them both. Signed-off-by: Pavel Fedin Reviewed-by: Andre Przywara Signed-off-by: Vijaya Kumar K Acked-by: Christoffer Dall --- arch/arm64/kvm/sys_regs.c | 22 +++++++++++++++------- arch/arm64/kvm/sys_regs.h | 4 ++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index b0b225c..2c9bd52 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1802,6 +1802,17 @@ static bool index_to_params(u64 id, struct sys_reg_params *params) } } +const struct sys_reg_desc *find_reg_by_id(u64 id, + struct sys_reg_params *params, + const struct sys_reg_desc table[], + unsigned int num) +{ + if (!index_to_params(id, params)) + return NULL; + + return find_reg(params, table, num); +} + /* Decode an index value, and find the sys_reg_desc entry. */ static const struct sys_reg_desc *index_to_sys_reg_desc(struct kvm_vcpu *vcpu, u64 id) @@ -1929,10 +1940,8 @@ static int get_invariant_sys_reg(u64 id, void __user *uaddr) struct sys_reg_params params; const struct sys_reg_desc *r; - if (!index_to_params(id, ¶ms)) - return -ENOENT; - - r = find_reg(¶ms, invariant_sys_regs, ARRAY_SIZE(invariant_sys_regs)); + r = find_reg_by_id(id, ¶ms, invariant_sys_regs, + ARRAY_SIZE(invariant_sys_regs)); if (!r) return -ENOENT; @@ -1946,9 +1955,8 @@ static int set_invariant_sys_reg(u64 id, void __user *uaddr) int err; u64 val = 0; /* Make sure high bits are 0 for 32-bit regs */ - if (!index_to_params(id, ¶ms)) - return -ENOENT; - r = find_reg(¶ms, invariant_sys_regs, ARRAY_SIZE(invariant_sys_regs)); + r = find_reg_by_id(id, ¶ms, invariant_sys_regs, + ARRAY_SIZE(invariant_sys_regs)); if (!r) return -ENOENT; diff --git a/arch/arm64/kvm/sys_regs.h b/arch/arm64/kvm/sys_regs.h index dbbb01c..9c6ffd0 100644 --- a/arch/arm64/kvm/sys_regs.h +++ b/arch/arm64/kvm/sys_regs.h @@ -136,6 +136,10 @@ static inline int cmp_sys_reg(const struct sys_reg_desc *i1, return i1->Op2 - i2->Op2; } +const struct sys_reg_desc *find_reg_by_id(u64 id, + struct sys_reg_params *params, + const struct sys_reg_desc table[], + unsigned int num); #define Op0(_x) .Op0 = _x #define Op1(_x) .Op1 = _x