From patchwork Tue Sep 20 06:12:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijay Kilari X-Patchwork-Id: 9341053 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 60D7A607EE for ; Tue, 20 Sep 2016 06:17:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E7FA29629 for ; Tue, 20 Sep 2016 06:17:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42C3429C25; Tue, 20 Sep 2016 06:17:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Flag: YES X-Spam-Level: **** X-Spam-Status: Yes, score=4.7 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_SBL_CSS,RCVD_IN_SORBS_SPAM,RCVD_IN_SORBS_WEB,T_DKIM_INVALID autolearn=no version=3.3.1 X-Spam-Report: * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, * medium trust * [198.137.202.9 listed in list.dnswl.org] * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider * (vijay.kilari[at]gmail.com) * 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is * CUSTOM_MED * 3.6 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server * [111.93.218.67 listed in dnsbl.sorbs.net] * 0.5 RCVD_IN_SORBS_SPAM RBL: SORBS: sender is a spam source * 1.3 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net * [Blocked - see ] * -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 * 3.3 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS * [111.93.218.67 listed in zen.spamhaus.org] * 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid 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 8B45529629 for ; Tue, 20 Sep 2016 06:17:26 +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 1bmEKW-0008EE-Vl; Tue, 20 Sep 2016 06:14:57 +0000 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bmEJq-00081G-Jp for linux-arm-kernel@lists.infradead.org; Tue, 20 Sep 2016 06:14:16 +0000 Received: by mail-pf0-x242.google.com with SMTP id n24so455312pfb.3 for ; Mon, 19 Sep 2016 23:13:53 -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=MMTC/XxF5nDGB/dp3A6Q47VaDw8XBH3uae907nJBy9I=; b=JqLOQEHDiWEghDLVUaaPMYgy+Ses07xi735XsgX99l0LIIjUJfxUDZb31spZL84UkO FujA4c/CCYeljbVcSqnn4YIENtFHlv9/Tg03FjtoaJ+6ZDIvUQgn7KtFiFt0rCLhuel4 ggu35610Lq7/ie/RkdEIOYHhIh3amKKGL6jUAw3kTo4c7ASaZBtScPr2p++PisdgrJxn sxJNmL+tXxwuOGTxay/gjVE9zRFi3ZGbm+k2c2tzK5vDM62xj/kbq+db0GNHlmp5RsZf K54GNTN2jcG/AeCiqU+I7OELx6LmPpzhX4mOH6uI0WyUcCM1pAyhXJWIAsHMCk9nr8ij zIDQ== 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=MMTC/XxF5nDGB/dp3A6Q47VaDw8XBH3uae907nJBy9I=; b=dJbnxwAM7c8wxfrR0xXD1StYTujfo853DA4Ytcd/COJmT8LzEB3GHLLsyg5ikEsEAB IUvQ/QXK0k8INQUKc+FcCZZoVbI9UxZb7WQTOdQe2AvGgJcqHur2E90iMkLFzH+CjXal kddYvrsDRObBmVyMuDF11NfkyoItncNWE2oluwr0Q68v8kxNxXRyf/hIJhUIMxBNldTX gPBr5DYOzGywHbNu/oRddD6OTJ4OnVa25B+4gETeOyUmWxkCfZnOIesQNdtXQNaQT3fo TwGfCi/UnQqmcscfSRMPLjyzV9oDsVNI5oW9Thx1keHjF8zOj+dQviVnlKih5e1GVLzy XiMA== X-Gm-Message-State: AE9vXwMsz9TORycATxaPtiXhMNkQz+Yctwaqjemq0iXT5DYwLKZH5Pa+R9eERgputJzGRg== X-Received: by 10.98.54.199 with SMTP id d190mr52695566pfa.121.1474352033581; Mon, 19 Sep 2016 23:13:53 -0700 (PDT) Received: from cavium-Vostro-2520.caveonetworks.com ([111.93.218.67]) by smtp.gmail.com with ESMTPSA id ya6sm35787386pab.14.2016.09.19.23.13.51 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Sep 2016 23:13:53 -0700 (PDT) From: vijay.kilari@gmail.com To: marc.zyngier@arm.com, christoffer.dall@linaro.org, peter.maydell@linaro.org Subject: [PATCH v6 3/7] arm/arm64: vgic-new: Introduce find_reg_by_id() Date: Tue, 20 Sep 2016 11:42:41 +0530 Message-Id: <1474351965-11586-4-git-send-email-vijay.kilari@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1474351965-11586-1-git-send-email-vijay.kilari@gmail.com> References: <1474351965-11586-1-git-send-email-vijay.kilari@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160919_231414_759753_41B013BC X-CRM114-Status: GOOD ( 12.47 ) 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 Signed-off-by: Vijaya Kumar K Reviewed-by: Andre Przywara 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 e51367d..87ebe35 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1794,6 +1794,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) @@ -1921,10 +1932,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; @@ -1938,9 +1947,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