From nobody Sun May 5 16:23:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539914301740204.6201888569375; Thu, 18 Oct 2018 18:58:21 -0700 (PDT) Received: from localhost ([::1]:46257 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDK3L-0007y1-Et for importer@patchew.org; Thu, 18 Oct 2018 21:58:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDK1m-0006Uv-Ji for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:56:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDK1i-0003wE-Gn for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:56:38 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:40372) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gDK1i-0003kU-4R for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:56:34 -0400 Received: by mail-pg1-x541.google.com with SMTP id n31-v6so15052474pgm.7 for ; Thu, 18 Oct 2018 18:56:22 -0700 (PDT) Received: from cloudburst.twiddle.net (174-21-9-133.tukw.qwest.net. [174.21.9.133]) by smtp.gmail.com with ESMTPSA id p62-v6sm33170892pfp.111.2018.10.18.18.56.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Oct 2018 18:56:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2rYUpwFMdqLRhJkf9zenkRS6T7M+r4Z28gefTS144y4=; b=FA7rgWfJWMV9lrY8pcOU1tPFjd00znnfF8V+Miz5D4u9zAWjYby6BuRshoRmXXG4O/ q4UyofYNJcxC9nIfqXLmQK/P/M2jb2n1rlmLNLAVmplCkNZBdEFfEp/n9LqwKn68SUxr QRGCW9B7O0X33vYYeuJw2JHg7DicfQwk/aEHQ= 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=2rYUpwFMdqLRhJkf9zenkRS6T7M+r4Z28gefTS144y4=; b=BzHuRZdc1PwCvM6GciCpvi8wLd918hUh0hFNbC7drpwIiCJHbXvXWAiYj7wAhkTG03 CCRW9Y9XufpbJXOnmOsscPtcSsIdYVkQNEVrICLYE7e4g5YSsKjITQDARCNkr8q+kDkA a8LcnNVkT5EX4Ct2iEhwsDV5VS28pzank71RpmGkhG++SO1t3yp4oQpjs0tJJtxQg8f2 oVzn2RMQZt58RPN5yUamG9Eoky8OKnryMHAZ3dOnlM6weNhy6XutiC3W9VtSc1g1mhoh LYZBjl5I2iJ2/NEREBlZ5h4tx/OrJRTjM1W5nv06iSz1I2a/0ZqBcIJtrdJ8+kITOk5g xvzg== X-Gm-Message-State: ABuFfoh9NvTYOwJYEmlc5esjuLPKEZBBYkdd5WPjvn1FDBrCMMz7I6ZR uTqvwRvshxU9T33sQNFjOEXCJYSlv6c= X-Google-Smtp-Source: ACcGV60Hxz3CmFqGGd19bTtJiFbHFqq30EwdigUyutLcfZgP1FjKAs65K6OfozuJ1iYEw9hRyBa5dA== X-Received: by 2002:a63:f050:: with SMTP id s16-v6mr30761350pgj.403.1539914181558; Thu, 18 Oct 2018 18:56:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 18:56:15 -0700 Message-Id: <20181019015617.22583-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181019015617.22583-1-richard.henderson@linaro.org> References: <20181019015617.22583-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 Subject: [Qemu-devel] [PATCH v2 1/3] target/arm: Remove writefn from TTBR0_EL3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The EL3 version of this register does not include an ASID, and so the tlb_flush performed by vmsa_ttbr_write is not needed. Reviewed-by: Aaron Lindsay Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index e3946562aa..24bbde4f76 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4214,7 +4214,7 @@ static const ARMCPRegInfo el3_cp_reginfo[] =3D { .fieldoffset =3D offsetof(CPUARMState, cp15.mvbar) }, { .name =3D "TTBR0_EL3", .state =3D ARM_CP_STATE_AA64, .opc0 =3D 3, .opc1 =3D 6, .crn =3D 2, .crm =3D 0, .opc2 =3D 0, - .access =3D PL3_RW, .writefn =3D vmsa_ttbr_write, .resetvalue =3D 0, + .access =3D PL3_RW, .resetvalue =3D 0, .fieldoffset =3D offsetof(CPUARMState, cp15.ttbr0_el[3]) }, { .name =3D "TCR_EL3", .state =3D ARM_CP_STATE_AA64, .opc0 =3D 3, .opc1 =3D 6, .crn =3D 2, .crm =3D 0, .opc2 =3D 2, --=20 2.17.2 From nobody Sun May 5 16:23:59 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539914301569614.9557694886905; Thu, 18 Oct 2018 18:58:21 -0700 (PDT) Received: from localhost ([::1]:46258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDK3M-000802-Gy for importer@patchew.org; Thu, 18 Oct 2018 21:58:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDK1m-0006Us-Ij for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:56:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDK1j-0003y7-C9 for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:56:38 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:42196) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gDK1i-0003lc-Pt for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:56:35 -0400 Received: by mail-pl1-x641.google.com with SMTP id c8-v6so15121173plo.9 for ; Thu, 18 Oct 2018 18:56:24 -0700 (PDT) Received: from cloudburst.twiddle.net (174-21-9-133.tukw.qwest.net. [174.21.9.133]) by smtp.gmail.com with ESMTPSA id p62-v6sm33170892pfp.111.2018.10.18.18.56.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Oct 2018 18:56:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7EO8aWpIPQTssuS56XDHtv1ElZWc/DQfneu/cFYaDcY=; b=XmIHtobmPVmEkpp3HdrI0QZGyITwgJMIauW6Mb6nXq9/DNvW8Bge0NJh6Nn5BmGka/ VzC8DlUHs73fBrb5UrKY9bZkogHm8z2jvqG7oz+jw54EbW30bVUej7MyuYKcuEFHW8FL kQCa7Ld3U2vZnGaJgSJXhtNnea4aga82jl0uM= 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=7EO8aWpIPQTssuS56XDHtv1ElZWc/DQfneu/cFYaDcY=; b=aF7aMBaHLb1itX/r0lKNYXzDtDzc6J6xAHxOZf9HzrnP/8kJJaHAqRx9TV92UlZU6+ vt3GXsmmRL82TWVRq7cQduZlGuJ4/SRCuad1uJe9QNqURN/4u2nE7cyw16Qe6N51c0mz 3niYZWHOBoOMIyIQ4N7FulfXjZ5/stFEpijlRDET9lraEWpI5c2+rcGJj48XgDhbH6zr C8Cw9Xf5yqX019MQp1NUwFspWpeUlrrdylJeGvP9tgGbbbd+oMk5RllPjhZPr8oBSrV4 rWxndbuUV9w8fS4JxA57AegoJ9ZXU2WYMnFvHK0ylFlXXNaRe8GE+zJn6Qu15nBJIMGJ zXqQ== X-Gm-Message-State: ABuFfohnd/wsOB2wL4WxWB9RaZ96V0hTNuqhVpzGNMl2AilJD8JmUkhA 4ZVGHGoR0PIzD+UGkuO1DsaZATUaNBc= X-Google-Smtp-Source: ACcGV626/i6ofKzCvr8tvlDUa26vml2NImJ0F4YyjwRDlhlqtjLijjiYqga6qUB1k+NI8oEtC543/w== X-Received: by 2002:a17:902:ac89:: with SMTP id h9-v6mr31354407plr.174.1539914183006; Thu, 18 Oct 2018 18:56:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 18:56:16 -0700 Message-Id: <20181019015617.22583-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181019015617.22583-1-richard.henderson@linaro.org> References: <20181019015617.22583-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::641 Subject: [Qemu-devel] [PATCH v2 2/3] target/arm: Only flush tlb if ASID changes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Since QEMU does not implement ASIDs, changes to the ASID must flush the tlb. However, if the ASID does not change there is no reason to flush. In testing a boot of the Ubuntu installer to the first menu, this reduces the number of flushes by 30%, or nearly 600k instances. Reviewed-by: Aaron Lindsay Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/helper.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 24bbde4f76..ed70ac645e 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2709,12 +2709,10 @@ static void vmsa_tcr_el1_write(CPUARMState *env, co= nst ARMCPRegInfo *ri, static void vmsa_ttbr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { - /* 64 bit accesses to the TTBRs can change the ASID and so we - * must flush the TLB. - */ - if (cpreg_field_is_64bit(ri)) { + /* If the ASID changes (with a 64-bit write), we must flush the TLB. = */ + if (cpreg_field_is_64bit(ri) && + extract64(raw_read(env, ri) ^ value, 48, 16) !=3D 0) { ARMCPU *cpu =3D arm_env_get_cpu(env); - tlb_flush(CPU(cpu)); } raw_write(env, ri, value); --=20 2.17.2 From nobody Sun May 5 16:23:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539914303811703.2798232150608; Thu, 18 Oct 2018 18:58:23 -0700 (PDT) Received: from localhost ([::1]:46259 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDK3N-00080L-In for importer@patchew.org; Thu, 18 Oct 2018 21:58:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57565) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDK1m-0006Ur-J9 for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:56:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDK1i-0003w0-Fi for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:56:38 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:46180) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gDK1h-0003mk-N2 for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:56:34 -0400 Received: by mail-pg1-x541.google.com with SMTP id r190-v6so3425915pgr.13 for ; Thu, 18 Oct 2018 18:56:25 -0700 (PDT) Received: from cloudburst.twiddle.net (174-21-9-133.tukw.qwest.net. [174.21.9.133]) by smtp.gmail.com with ESMTPSA id p62-v6sm33170892pfp.111.2018.10.18.18.56.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Oct 2018 18:56:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TTyR7xzj+PHD0K1CpzmCfsJOcm4+gyZaOYvrOzDqHOk=; b=Ur3D5KVOArDHnTltp5LUYGWt/ZgIi4veW0Z/25r99dmNsARdzSXsivr/7hPOZvmcod 8MIsMOAGSlsxszHGMKrvL+e457nG94IGEs9l7cAiMYojO51ahUBCPEssAxw1fk8IezCF kX/MXTdkaZxuJT3VwFXrIG9je/WCQt9dhlsjM= 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=TTyR7xzj+PHD0K1CpzmCfsJOcm4+gyZaOYvrOzDqHOk=; b=ED1CSg7n2oKzELxuDaMzBlRlRgUnAgab8prl8i4OqE8Z7FnaAxAtzXD26iqWEyiCLr YOQ7pIOTZS0F7+ilgcf89jCs/raYsz08/K5ExnDgHEhWN0EfbLL/wMqM3m8AXZBjOE6Z j9jMwteEiHq8CH7MNr53+IBrwR67USXKI4NSBQZbpAeOJY9GScwfBft8m42oZEE57PVU 2bZzMvV3qc3ClXHe5RJsvIAVkQmwFwKJAB3L27Xy3z6ZrD/HvBPzVA0YaAaBXzGFS2li Tum8o2HfpH5ECpIa4aagxuLwmvQ2TIGskB4xU5LlZxI5RliKBijEu0Khky9L3L9uWISE S5hw== X-Gm-Message-State: ABuFfogV4AGJSkZmROjFp7hTr/M6fbMvJWL+44a6iTY/C3CSnipOLp9X RZCXEpzRbL2IYltuS/9jspZxwczvLHE= X-Google-Smtp-Source: ACcGV60pmkqMOZK9TLSlj88QcVU80US8NNA7E/wybM4DmgIOw1T7bZkpOSwOuqIWXzyQpTr92onetQ== X-Received: by 2002:a65:4783:: with SMTP id e3-v6mr30119517pgs.12.1539914184460; Thu, 18 Oct 2018 18:56:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 18:56:17 -0700 Message-Id: <20181019015617.22583-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181019015617.22583-1-richard.henderson@linaro.org> References: <20181019015617.22583-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 Subject: [Qemu-devel] [PATCH v2 3/3] target/arm: Flush only the TLBs affected by TTBR*_EL1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Only the EL0 and EL1 TLBs are affected by the EL1 register, so flush only 2 of the 8 TLBs. In testing a boot of the Ubuntu installer to the first menu, this accounts for nearly all of the full tlb flushes: all but 11k of the 1.2M instances without the patch. Signed-off-by: Richard Henderson --- target/arm/helper.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index ed70ac645e..3ba8e66487 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2706,14 +2706,16 @@ static void vmsa_tcr_el1_write(CPUARMState *env, co= nst ARMCPRegInfo *ri, tcr->raw_tcr =3D value; } =20 -static void vmsa_ttbr_write(CPUARMState *env, const ARMCPRegInfo *ri, - uint64_t value) +static void vmsa_ttbr_el1_write(CPUARMState *env, const ARMCPRegInfo *ri, + uint64_t value) { /* If the ASID changes (with a 64-bit write), we must flush the TLB. = */ if (cpreg_field_is_64bit(ri) && extract64(raw_read(env, ri) ^ value, 48, 16) !=3D 0) { ARMCPU *cpu =3D arm_env_get_cpu(env); - tlb_flush(CPU(cpu)); + tlb_flush_by_mmuidx(CPU(cpu), + ARMMMUIdxBit_S12NSE1 | + ARMMMUIdxBit_S12NSE0); } raw_write(env, ri, value); } @@ -2761,12 +2763,12 @@ static const ARMCPRegInfo vmsa_cp_reginfo[] =3D { .fieldoffset =3D offsetof(CPUARMState, cp15.esr_el[1]), .resetvalue = =3D 0, }, { .name =3D "TTBR0_EL1", .state =3D ARM_CP_STATE_BOTH, .opc0 =3D 3, .opc1 =3D 0, .crn =3D 2, .crm =3D 0, .opc2 =3D 0, - .access =3D PL1_RW, .writefn =3D vmsa_ttbr_write, .resetvalue =3D 0, + .access =3D PL1_RW, .writefn =3D vmsa_ttbr_el1_write, .resetvalue = =3D 0, .bank_fieldoffsets =3D { offsetof(CPUARMState, cp15.ttbr0_s), offsetof(CPUARMState, cp15.ttbr0_ns) } }, { .name =3D "TTBR1_EL1", .state =3D ARM_CP_STATE_BOTH, .opc0 =3D 3, .opc1 =3D 0, .crn =3D 2, .crm =3D 0, .opc2 =3D 1, - .access =3D PL1_RW, .writefn =3D vmsa_ttbr_write, .resetvalue =3D 0, + .access =3D PL1_RW, .writefn =3D vmsa_ttbr_el1_write, .resetvalue = =3D 0, .bank_fieldoffsets =3D { offsetof(CPUARMState, cp15.ttbr1_s), offsetof(CPUARMState, cp15.ttbr1_ns) } }, { .name =3D "TCR_EL1", .state =3D ARM_CP_STATE_AA64, @@ -3018,12 +3020,12 @@ static const ARMCPRegInfo lpae_cp_reginfo[] =3D { .access =3D PL1_RW, .type =3D ARM_CP_64BIT | ARM_CP_ALIAS, .bank_fieldoffsets =3D { offsetof(CPUARMState, cp15.ttbr0_s), offsetof(CPUARMState, cp15.ttbr0_ns) }, - .writefn =3D vmsa_ttbr_write, }, + .writefn =3D vmsa_ttbr_el1_write, }, { .name =3D "TTBR1", .cp =3D 15, .crm =3D 2, .opc1 =3D 1, .access =3D PL1_RW, .type =3D ARM_CP_64BIT | ARM_CP_ALIAS, .bank_fieldoffsets =3D { offsetof(CPUARMState, cp15.ttbr1_s), offsetof(CPUARMState, cp15.ttbr1_ns) }, - .writefn =3D vmsa_ttbr_write, }, + .writefn =3D vmsa_ttbr_el1_write, }, REGINFO_SENTINEL }; =20 --=20 2.17.2