From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C086C11F64 for ; Thu, 1 Jul 2021 13:10:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 50DAE601FC for ; Thu, 1 Jul 2021 13:10:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 50DAE601FC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5qFiKJau71CoY11X57LpT4F6n2W8a4AJcqAQRDddMf8=; b=3PcAaxnQtiPUmt TCbnu6IbdWONhdCHoTz9JINg4SgKQbiPoUZ/q/5DUiqR03+3/vv8PG55anZtBJaFtunsn/lMvjodj wm6Ztkh/AZJ8Yc5vSBvIG1rbWQj1vTe5VWgiCdHWsyAIC25bSPk6zzd/cxnG0kJaqOLKIjlmE84VP wBteZAOObeMaOTwIfxG44I9BlPzxp5/Us5hkN+4NAXAH1L5n/QMMhL3K4jMILMFFP7HjXgAPA/GUR XD5jyCKNFvZgPgkMKTamNVs6HvtdJnd6JJHiKxrXYDIGjtqfx/isfbm0Pkh3DmuRZiqV9hHKGXQJD KswJAHxf1iMQcYyLYjFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lywRe-00HNN0-Eg; Thu, 01 Jul 2021 13:09:30 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lywRX-00HNM0-HV for linux-arm-kernel@lists.infradead.org; Thu, 01 Jul 2021 13:09:28 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id CDA7161409; Thu, 1 Jul 2021 13:09:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625144963; bh=qrilNYhpZ8LEHXuIhCayQjjeFyN6ko8qjsn3aCbPrDg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=lf7X2EFnNud+je98QD9F+//v3CQOcPKQldnJoaGHAs3B/dQKhQons4e5BTTCCujE9 bZKCe26rniqAhUMljMCtwtfDZTC+VTvvksnBLp+12Er5nfWraKWPyRL+/pLXSi9v9g va7M5Lc5pcYOqJ19gRlzo9qjuDA23O9U0VUwXHJ3MgwMQtkQbmZFwjOETT7vtjqauT acHqpw2FybV36CYPbtzXR4BY5sIrMjrQAqlm0P4VmOSVOkNm7e1WfTVLbTbABE0sNW jkbMV5UTKRxGq18pJqCvWkNsApJfWAKNGMU4YaQIFQlnxzecPsXgBN9yqBQvi9gKPK zAPm/MWfJ82zQ== Date: Thu, 1 Jul 2021 14:09:17 +0100 From: Will Deacon To: Fuad Tabba Cc: kvmarm@lists.cs.columbia.edu, maz@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, mark.rutland@arm.com, christoffer.dall@arm.com, pbonzini@redhat.com, drjones@redhat.com, qperret@google.com, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel-team@android.com Subject: Re: [PATCH v2 04/13] KVM: arm64: Refactor sys_regs.h, c for nVHE reuse Message-ID: <20210701130917.GD9757@willie-the-truck> References: <20210615133950.693489-1-tabba@google.com> <20210615133950.693489-5-tabba@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210615133950.693489-5-tabba@google.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210701_060923_640197_F38EBB2E X-CRM114-Status: GOOD ( 19.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Jun 15, 2021 at 02:39:41PM +0100, Fuad Tabba wrote: > Refactor sys_regs.h and sys_regs.c to make it easier to reuse > common code. It will be used in nVHE in a later patch. > > No functional change intended. > > Signed-off-by: Fuad Tabba > --- > arch/arm64/kvm/sys_regs.c | 30 +----------------------------- > arch/arm64/kvm/sys_regs.h | 35 +++++++++++++++++++++++++++++++++++ > 2 files changed, 36 insertions(+), 29 deletions(-) [...] > diff --git a/arch/arm64/kvm/sys_regs.h b/arch/arm64/kvm/sys_regs.h > index 9d0621417c2a..b8e2a4dd830f 100644 > --- a/arch/arm64/kvm/sys_regs.h > +++ b/arch/arm64/kvm/sys_regs.h > @@ -11,6 +11,12 @@ > #ifndef __ARM64_KVM_SYS_REGS_LOCAL_H__ > #define __ARM64_KVM_SYS_REGS_LOCAL_H__ > > +#include > + > +#define reg_to_encoding(x) \ > + sys_reg((u32)(x)->Op0, (u32)(x)->Op1, \ > + (u32)(x)->CRn, (u32)(x)->CRm, (u32)(x)->Op2) > + > struct sys_reg_params { > u8 Op0; > u8 Op1; > @@ -21,6 +27,14 @@ struct sys_reg_params { > bool is_write; > }; > > +#define esr_sys64_to_params(esr) \ > + ((struct sys_reg_params){ .Op0 = ((esr) >> 20) & 3, \ > + .Op1 = ((esr) >> 14) & 0x7, \ > + .CRn = ((esr) >> 10) & 0xf, \ > + .CRm = ((esr) >> 1) & 0xf, \ > + .Op2 = ((esr) >> 17) & 0x7, \ > + .is_write = !((esr)&1) }) Formatting has gone funny here (need spaces around the '&' in that last entry). > + > struct sys_reg_desc { > /* Sysreg string for debug */ > const char *name; > @@ -152,6 +166,24 @@ static inline int cmp_sys_reg(const struct sys_reg_desc *i1, > return i1->Op2 - i2->Op2; > } > > +static inline int match_sys_reg(const void *key, const void *elt) > +{ > + const unsigned long pval = (unsigned long)key; > + const struct sys_reg_desc *r = elt; > + > + return pval - reg_to_encoding(r); > +} > + > +static inline const struct sys_reg_desc * > +find_reg(const struct sys_reg_params *params, const struct sys_reg_desc table[], > + unsigned int num) > +{ > + unsigned long pval = reg_to_encoding(params); > + > + return __inline_bsearch((void *)pval, table, num, sizeof(table[0]), > + match_sys_reg); You don't mention why you change bsearch() to __inline_bsearch(). Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel