From nobody Fri Dec 19 06:56:52 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563570430; cv=none; d=zoho.com; s=zohoarc; b=BYZW+oAWnSLDnKRp9s/z0fxSr0ADVATt4Y7epedFCfibtI5Aeb5Yj/GZcGZdWHeFqbMd3tnnnmDnUVstnpmHv3aWteuSpJP5ZcbMRbH7NYSSlSRn6LiMGFGxg2akkoVW+9CUvKXC1FwEJTx1A8ukFq0vyFGwYhYIZMSAgOUuCic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563570430; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=OcsEJOTB78UGcdvycEnpdFbtKzZSWFgFYymdrWCmqJI=; b=kCHF6Usyy2POR4AwVqlaYVHMEkf1eqbUD2toJiQ3c4W15uLdN6ekP1li96YeEL0WC0xMi8c+VN1uSzKb+FGG9EXuJP28hBMD1K85pZy5qVOHHnoyHMrYibCfrhtZvRsP76NieSL1Un7GwjOpVQB051dmuDtROvbXE0sGLKd3Zhc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563570430801893.5154534906904; Fri, 19 Jul 2019 14:07:10 -0700 (PDT) Received: from localhost ([::1]:48276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoa5t-000879-Ji for importer@patchew.org; Fri, 19 Jul 2019 17:07:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55179) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoa3Y-00084E-Ri for qemu-devel@nongnu.org; Fri, 19 Jul 2019 17:04:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hoa3V-0005XY-Ig for qemu-devel@nongnu.org; Fri, 19 Jul 2019 17:04:43 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:41756) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hoa3T-00058S-AG for qemu-devel@nongnu.org; Fri, 19 Jul 2019 17:04:41 -0400 Received: by mail-pl1-x642.google.com with SMTP id m9so16102967pls.8 for ; Fri, 19 Jul 2019 14:03:40 -0700 (PDT) Received: from localhost.localdomain (97-126-117-207.tukw.qwest.net. [97.126.117.207]) by smtp.gmail.com with ESMTPSA id i6sm32724751pgi.40.2019.07.19.14.03.38 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 19 Jul 2019 14:03:38 -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=OcsEJOTB78UGcdvycEnpdFbtKzZSWFgFYymdrWCmqJI=; b=HSYCYLmdDzbD3ZUpLDiHLF66nlPHVr/TiC8xuH1MpvktCb6nbDOlXaOj1lyWC3jR+7 GcguiHBi22gG+FfxpGhqrxDm4v1g8DjSH6UQPODbM0SRIXKnPSgOrGRguwL8seX+UiO9 AEFI8hA018qRB4hYFu76NrWopd8PI+Rbl77WL88jL3nNw03nzHqAjszUMO57RVW3Al+H mQzWSTnYFBPG8NfTz0Kut+fBXuWvjiZr8QToveTsVvV5kL5AuL6ppoDPCR3yF01YGXZf QbVOPAhfLrUroSu+czU0jsy1jgJ9FMDp9n9yPNE/dRC89iWnjw78nwNdD8QB5z0+cnvO vkyQ== 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=OcsEJOTB78UGcdvycEnpdFbtKzZSWFgFYymdrWCmqJI=; b=YDqwtinEOBC+k24mfuVyY0v3kl+yqWd2Wss5HJ2jK529ys6iDueEIAnoPKyPdlFD3+ XPHcjAAhzTyLaNQAZancLhPKWEoiKwXg87hApmnhdyb60YP+rWmLceNfgkpBn7lkTwEo PHZQd+7se3YQTQh480StgMTp38w3EcWSJRN/3NaiAAV6CHQcNnnivP9tgU7tAH8I4cnp ZSMvnPp2sdiiits0daSQUBBL/7gXpvXCw7anTj2NzbzYjcK0shqRdQLAzomdoxxOC3ki YG7S/KvzTltRJBmAk87ifT4kDY4LvLS+yz4XCGoLyIQu+SGM2bHMBjEmLF2cXaWzQbr5 4afQ== X-Gm-Message-State: APjAAAVXsXCevRXOgzmiqgJ5v7yveSPsWO1ftw/6woKFxULrNzXfw108 6k0cR+5k4g2nDE5M6SJdqk5fKLcs4Is= X-Google-Smtp-Source: APXvYqyK8Z1c20y4Z1QGPMAV+bqWW27bCiIncSBLokblh/xv7O06luzZr+NszvbJnDj6V8JFxgZDQQ== X-Received: by 2002:a17:902:a417:: with SMTP id p23mr58208281plq.136.1563570219317; Fri, 19 Jul 2019 14:03:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 19 Jul 2019 14:03:11 -0700 Message-Id: <20190719210326.15466-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190719210326.15466-1-richard.henderson@linaro.org> References: <20190719210326.15466-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::642 Subject: [Qemu-devel] [PATCH for-4.2 09/24] target/arm: Add TTBR1_EL2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, beata.michalska@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" At the same time, add writefn to TTBR0_EL2 and TCR_EL2. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- target/arm/helper.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index d1bf31ab74..da2e0627b2 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -3449,6 +3449,15 @@ static void vmsa_ttbr_el1_write(CPUARMState *env, co= nst ARMCPRegInfo *ri, } } =20 +static void vmsa_tcr_ttbr_el2_write(CPUARMState *env, const ARMCPRegInfo *= ri, + uint64_t value) +{ + raw_write(env, ri, value); + if (arm_hcr_el2_eff(env) & HCR_E2H) { + /* The ASID field is active. */ + } +} + static void vttbr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { @@ -4844,10 +4853,8 @@ static const ARMCPRegInfo el2_cp_reginfo[] =3D { .resetvalue =3D 0 }, { .name =3D "TCR_EL2", .state =3D ARM_CP_STATE_BOTH, .opc0 =3D 3, .opc1 =3D 4, .crn =3D 2, .crm =3D 0, .opc2 =3D 2, - .access =3D PL2_RW, - /* no .writefn needed as this can't cause an ASID change; - * no .raw_writefn or .resetfn needed as we never use mask/base_mask - */ + .access =3D PL2_RW, .writefn =3D vmsa_tcr_ttbr_el2_write, + /* no .raw_writefn or .resetfn needed as we never use mask/base_mask= */ .fieldoffset =3D offsetof(CPUARMState, cp15.tcr_el[2]) }, { .name =3D "VTCR", .state =3D ARM_CP_STATE_AA32, .cp =3D 15, .opc1 =3D 4, .crn =3D 2, .crm =3D 1, .opc2 =3D 2, @@ -4881,7 +4888,7 @@ static const ARMCPRegInfo el2_cp_reginfo[] =3D { .fieldoffset =3D offsetof(CPUARMState, cp15.tpidr_el[2]) }, { .name =3D "TTBR0_EL2", .state =3D ARM_CP_STATE_AA64, .opc0 =3D 3, .opc1 =3D 4, .crn =3D 2, .crm =3D 0, .opc2 =3D 0, - .access =3D PL2_RW, .resetvalue =3D 0, + .access =3D PL2_RW, .resetvalue =3D 0, .writefn =3D vmsa_tcr_ttbr_el= 2_write, .fieldoffset =3D offsetof(CPUARMState, cp15.ttbr0_el[2]) }, { .name =3D "HTTBR", .cp =3D 15, .opc1 =3D 4, .crm =3D 2, .access =3D PL2_RW, .type =3D ARM_CP_64BIT | ARM_CP_ALIAS, @@ -6807,6 +6814,10 @@ void register_cp_regs_for_features(ARMCPU *cpu) .opc0 =3D 3, .opc1 =3D 4, .crn =3D 13, .crm =3D 0, .opc2 =3D= 1, .access =3D PL2_RW, .fieldoffset =3D offsetof(CPUARMState, cp15.contextidr_el[2]= ) }, + { .name =3D "TTBR1_EL2", .state =3D ARM_CP_STATE_AA64, + .opc0 =3D 3, .opc1 =3D 4, .crn =3D 2, .crm =3D 0, .opc2 =3D = 1, + .access =3D PL2_RW, .writefn =3D vmsa_tcr_ttbr_el2_write, + .fieldoffset =3D offsetof(CPUARMState, cp15.ttbr1_el[2]) }, REGINFO_SENTINEL }; define_arm_cp_regs(cpu, vhe_reginfo); --=20 2.17.1