From patchwork Thu Jan 26 14:20:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijay Kilari X-Patchwork-Id: 9539311 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 66533601D7 for ; Thu, 26 Jan 2017 14:24:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 546B82818E for ; Thu, 26 Jan 2017 14:24:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 49120282EC; Thu, 26 Jan 2017 14:24:34 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=no 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 AB9252818E for ; Thu, 26 Jan 2017 14:24:33 +0000 (UTC) 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 1cWkyW-0008E7-B2; Thu, 26 Jan 2017 14:24:32 +0000 Received: from mail-pf0-f194.google.com ([209.85.192.194]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cWkx6-0006qj-2p for linux-arm-kernel@lists.infradead.org; Thu, 26 Jan 2017 14:23:05 +0000 Received: by mail-pf0-f194.google.com with SMTP id y143so16578753pfb.1 for ; Thu, 26 Jan 2017 06:22:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Iu9OYsSJE1FKnO9AomSUk1FvfV29xvWzv81xDY2ttU0=; b=nc7XqIIYSyYSVMdeO9Aqm+2MnN4IU3Gyt8igvdh4VILvtUV2K0Cty3Bf4Jf5G1zskp wefx9v4JZd850ypbcp/erTzchrjMQ3Ud2nEdDlTN5DhkY35fzcGhAfuTgqLwjiuJEZIr //3JRaGYR1xoRcBQuNO1rogmqfw9wyAXAJSLFDVFAP6JPtGNnKsJqSYPjq1Tlc44EzEb VDn9uBKxGGt+iRq1gGUA0fdpEaQuJxS2jJZ3CNu+sRRuFATZu5BAWvQDIzLKzbSQLroI urpIYvYZA7IHDLhkcF8K+FhWRM0Jx/Lk0sySFOGHHBRlFiJ+QtpKjsAZRhR05BRwRGRT chOw== 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=Iu9OYsSJE1FKnO9AomSUk1FvfV29xvWzv81xDY2ttU0=; b=bld46fjRR6wuwsauxhgtkjydzgn1rKYjpv2WhXr8S9JSSsd8GiO+j8DiSJFT49tESV ZuXrlaxzP4NZ/n2WDqaEGAeFSAYePNHHJD35K5bL8GAAXnbioLjtryOo1bvgTt0uiIuC u2sbqygfD6vnr5aeUXLhTCoIsCCKp5o2s72R9MsU5Nb5gOwjK8eoxa93AcBt8K5yoYX/ Py7xVKEXB8u0CbbcoxLJK7BuMQ/12mDwO8z+DhQYOP28WVVJd7nAAhQC8aWbuz38rTYk QgrFTH8w3lzvypGwXXZmb77xNxY0lX6yUf5hyDAyy72miECcK4LHr3lOX51HLbVtUFtd gsSg== X-Gm-Message-State: AIkVDXIn2rkjpzVftlAq01Itrs4n7L1kLW89fZRylXhFbQGSgXZi9ty0DBWUZYMgHnnwOw== X-Received: by 10.99.147.12 with SMTP id b12mr3342032pge.158.1485440503316; Thu, 26 Jan 2017 06:21:43 -0800 (PST) Received: from localhost.localdomain ([14.140.2.178]) by smtp.gmail.com with ESMTPSA id j28sm4031922pfj.2.2017.01.26.06.21.40 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jan 2017 06:21:42 -0800 (PST) From: vijay.kilari@gmail.com To: marc.zyngier@arm.com, christoffer.dall@linaro.org, eric.auger@redhat.com, peter.maydell@linaro.org Subject: [PATCH v11 3/8] arm/arm64: vgic: Introduce find_reg_by_id() Date: Thu, 26 Jan 2017 19:50:48 +0530 Message-Id: <1485440453-10597-4-git-send-email-vijay.kilari@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1485440453-10597-1-git-send-email-vijay.kilari@gmail.com> References: <1485440453-10597-1-git-send-email-vijay.kilari@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170126_062304_167520_F3C59C60 X-CRM114-Status: GOOD ( 13.01 ) 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: 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 Reviewed-by: Eric Auger Acked-by: Christoffer Dall --- arch/arm64/kvm/sys_regs.c | 27 ++++++++++++++++----------- arch/arm64/kvm/sys_regs.h | 4 ++++ 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 87e7e66..caa47ce 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1795,6 +1795,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) @@ -1807,11 +1818,8 @@ static const struct sys_reg_desc *index_to_sys_reg_desc(struct kvm_vcpu *vcpu, if ((id & KVM_REG_ARM_COPROC_MASK) != KVM_REG_ARM64_SYSREG) return NULL; - if (!index_to_params(id, ¶ms)) - return NULL; - table = get_target_table(vcpu->arch.target, true, &num); - r = find_reg(¶ms, table, num); + r = find_reg_by_id(id, ¶ms, table, num); if (!r) r = find_reg(¶ms, sys_reg_descs, ARRAY_SIZE(sys_reg_descs)); @@ -1918,10 +1926,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; @@ -1935,9 +1941,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