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=-7.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 659D7C388F7 for ; Tue, 10 Nov 2020 10:28:24 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 E72A02065E for ; Tue, 10 Nov 2020 10:28:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="3WKXyGsm"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="Hj26FxjU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E72A02065E 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=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-ID:References:In-Reply-To:Subject:To:From: Date:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=AFzdt5B48Izh21tCgW6aTAdyJjv1uIlqfaHpwYg8ExA=; b=3WKXyGsmpvia7CLD6yHUVWyOu DAJeSgTq4aC5kKpgIzunPWclVXUNiyVcvZCyIpdqZ8miFcTnQWPRLq/wTb9lrRM26NqgxQcUIel0p ljHavVNQObbAF5r16dCoLoaLolXJZRYm1oH72YCORi4aXXJaG4AQEQPn0h2NPQguuO9zoIBcvKHqi bU7nNW5xfrysG6fq53NzfjF2+QNVJsauuD2zsx3jIzSJVd+w3Jte6a6jowFKVrPwwlK2oCyXM4Ydr /oHI9JPypcXudhteHRI700rL7L33pTEXS8iQyN0skpTn5HkiQeWo/aZ2s0mnQ8ECgE6oHwJMj5s9r GW+T0hVsg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcQsa-0004I5-Ei; Tue, 10 Nov 2020 10:28:00 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcQsX-0004H0-5a for linux-arm-kernel@lists.infradead.org; Tue, 10 Nov 2020 10:27:57 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3C2DB2065E; Tue, 10 Nov 2020 10:27:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605004076; bh=D3N2w77caH1nYigrEDNdwjkhF7FpCY8XFDb/gocrMa8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Hj26FxjUNkLRi3cKIBD4rWIWjygPQlwedqys+fCn298MmcaTG8DOu2B6UTAwegBnL yU9tXavYxFEWLIG/IwxKkTwvUIaYyIuA+BIL9cn8GUgxRC6HEjJMrM+UN4hJBumC/v xyDNwz7//3R+a8O1v6PxPxDkeLFCl8sUqjzvnPuY= Received: from disco-boy.misterjones.org ([51.254.78.96] helo=www.loen.fr) by disco-boy.misterjones.org with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94) (envelope-from ) id 1kcQsU-009PvQ-37; Tue, 10 Nov 2020 10:27:54 +0000 MIME-Version: 1.0 Date: Tue, 10 Nov 2020 10:27:54 +0000 From: Marc Zyngier To: James Morse Subject: Re: [PATCH 4/8] KVM: arm64: Map AArch32 cp14 register to AArch64 sysregs In-Reply-To: <1830d62e-ac47-9b84-6375-baed62f8486e@arm.com> References: <20201102191609.265711-1-maz@kernel.org> <20201102191609.265711-5-maz@kernel.org> <1830d62e-ac47-9b84-6375-baed62f8486e@arm.com> User-Agent: Roundcube Webmail/1.4.9 Message-ID: <3a8a34dc2aa45c5cb6acbc9debd65691@kernel.org> X-Sender: maz@kernel.org X-SA-Exim-Connect-IP: 51.254.78.96 X-SA-Exim-Rcpt-To: james.morse@arm.com, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201110_052757_371335_629D6E62 X-CRM114-Status: GOOD ( 19.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kvm@vger.kernel.org, Suzuki K Poulose , Julien Thierry , kernel-team@android.com, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2020-11-03 18:29, James Morse wrote: > Hi Marc, > > On 02/11/2020 19:16, Marc Zyngier wrote: >> Similarly to what has been done on the cp15 front, repaint the >> debug registers to use their AArch64 counterparts. This results >> in some simplification as we can remove the 32bit-specific >> accessors. > >> diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c >> index 137818793a4a..c41e7ca60c8c 100644 >> --- a/arch/arm64/kvm/sys_regs.c >> +++ b/arch/arm64/kvm/sys_regs.c >> @@ -361,26 +361,30 @@ static bool trap_debug_regs(struct kvm_vcpu >> *vcpu, >> -#define DBGBXVR(n) \ >> - { Op1( 0), CRn( 1), CRm((n)), Op2( 1), trap_xvr, NULL, n } >> +#define DBG_BCR_BVR_WCR_WVR(n) \ >> + /* DBGBVRn */ \ >> + { AA32(LO), Op1( 0), CRn( 0), CRm((n)), Op2( 4), trap_bvr, NULL, n >> }, \ > > Just to check I understand what is going on here: This BVR AA32(LO) is > needed because the > dbg_bvr array is shared with the DBGBXVR registers... > > >> + /* DBGBCRn */ \ >> + { AA32(LO), Op1( 0), CRn( 0), CRm((n)), Op2( 5), trap_bcr, NULL, n >> }, \ >> + /* DBGWVRn */ \ >> + { AA32(LO), Op1( 0), CRn( 0), CRm((n)), Op2( 6), trap_wvr, NULL, n >> }, \ >> + /* DBGWCRn */ \ >> + { AA32(LO), Op1( 0), CRn( 0), CRm((n)), Op2( 7), trap_wcr, NULL, n } > > ... these don't have an alias, but its harmless. This is a bug-for-bug translation of the original code. I guess I'll drop that altogether. > > [...] > >> @@ -1931,7 +1896,9 @@ static const struct sys_reg_desc cp15_regs[] = { >> /* DFSR */ >> { Op1( 0), CRn( 5), CRm( 0), Op2( 0), access_vm_reg, NULL, ESR_EL1 >> }, >> { Op1( 0), CRn( 5), CRm( 0), Op2( 1), access_vm_reg, NULL, >> IFSR32_EL2 }, >> + /* ADFSR */ >> { Op1( 0), CRn( 5), CRm( 1), Op2( 0), access_vm_reg, NULL, AFSR0_EL1 >> }, >> + /* AIFSR */ >> { Op1( 0), CRn( 5), CRm( 1), Op2( 1), access_vm_reg, NULL, AFSR1_EL1 >> }, >> /* DFAR */ >> { AA32(LO), Op1( 0), CRn( 6), CRm( 0), Op2( 0), access_vm_reg, NULL, >> FAR_EL1 }, > > I guess these were meant for the previous patch. Yup, I'll move that. Thanks, M. -- Jazz is not dead. It just smells funny... _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel