From patchwork Mon Oct 29 15:53:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 149679 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4339044ljp; Mon, 29 Oct 2018 09:15:57 -0700 (PDT) X-Google-Smtp-Source: AJdET5fz0ILCAr6i+3NCMv7qg2ByFJr5nbGubfBz6y/lUUDtGO2hoxp8/JA8+Q5KZ59E2ffIRVJS X-Received: by 2002:aed:2f81:: with SMTP id m1-v6mr7441968qtd.4.1540829757051; Mon, 29 Oct 2018 09:15:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540829757; cv=none; d=google.com; s=arc-20160816; b=rkI7Us1TNmZaXfEN20rCDvVRkc10RnG4ua0GDR3azD/t/nHVQwr/nmMiR9zhFFUZlu BvAMOLoSDjuJL+A7CT1/rSHwfmY0mzJmS9l30ah55tLP6LFwyWbZsoKpaWntdR50eac2 fRbgqW4UQYpTyXPl+9qNNF8TGhZu2rmTGNwIdt7rv/Hgf6trzCQKLEpBN1euimoU+ZLq 5YQmp0tXZj/tXaoHFoV86TB/+qlqzw24/PGSaF72ScWZ0pXfgmQy/cg+/R4yo4qW+tMp Gl797Wh+FEM27YHPZnRBszgy7zO/K3cyw8qiWgUqnzPcP2yDsrAl7VtdNreHlO++3Sf3 AlCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=LZQNZ6rcVxWOWRYJTTswlGPMH894sJFeWGghPgY04yI=; b=bsQh4hryf1RPP+iHijcpA5Yp42gvOutvCE5VB+TluS2dHefheT9xSWyvUm1TziRepM tPHMnLDeGLlk40e0veLf0rAYJapI8alZMsQqouBy+1BUKT7eSHbPJYX/bNw/Xf9BzMkw 9ek5nmfMXo0a7eNFyzxKO6/bAXWl9vT90RT5lLskCSXxaNZDMXNzoqozeXtJmwzDR5oM qLd6C54eJIPG37cg1wwkGLRFO3iCLUw19gw6eqzZbIZQjBagO1+P7V1oyGxc3RcIl34s O28CAj0NJMGMllEF/bOcCnofD1kwKMl88BDJas3IEJfOgHJmh7UTWacMulDSmfV/EXAo 3qEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hqhWDH5b; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c9si1961817qve.184.2018.10.29.09.15.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 29 Oct 2018 09:15:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hqhWDH5b; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHACq-0003Cq-1t for patch@linaro.org; Mon, 29 Oct 2018 12:15:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gH9rk-0000gH-TO for qemu-devel@nongnu.org; Mon, 29 Oct 2018 11:54:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gH9rb-0000gK-Ga for qemu-devel@nongnu.org; Mon, 29 Oct 2018 11:54:05 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34100) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gH9rV-0000Yg-QH for qemu-devel@nongnu.org; Mon, 29 Oct 2018 11:53:55 -0400 Received: by mail-wr1-x444.google.com with SMTP id l6-v6so9278733wrt.1 for ; Mon, 29 Oct 2018 08:53:51 -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=LZQNZ6rcVxWOWRYJTTswlGPMH894sJFeWGghPgY04yI=; b=hqhWDH5bd9BtnniyXouzhL/u9ulvDM23+tT3KBJelBICF3HTKQIl+fZvjEqT+MhNeN jSHwNkw95O1PMakzAETobdzPQGLb5bPwR5CjdLQ8noAcsM1/gwUDq13zCABEi2vNkx69 hS0iL0lDwgBMlEfBHyX4VeKWjjl4uwILRERBM= 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=LZQNZ6rcVxWOWRYJTTswlGPMH894sJFeWGghPgY04yI=; b=r8638DRvlqbibedO96j2mr0xTKXmhqTtNkTENeYBo1RbKOTq6FHTzCz0gWtngmCYkl KKfN7Rww3e07q2Z6V8wwxZajsq5SYNyhpuXk+yKTASRbOvSt17FAfvvsi/6y91dorTmm 9ucXATp0gTzg9EwAWh8FfXVzLBaCUqiroLYJRYPfvl+m3fpOFWTmpnnrY04Z7nMDttgF fSjwZsEsIQD5bGhiPpgkJttbs0BAfmemsPX7CHteH0czosW4byFe/stJXvr/BeCPtdjB u9Z1syKVfzDXeZ07DtQgfCo1Jxo2XOqSrxoyZ9WR6jAI+F2dvyFrcXo2C9rjrsD1TGhz fxEg== X-Gm-Message-State: AGRZ1gKRD01zOwRMEzz/mokKX21n0DDhBjmI4n7Xh7f8hhFjxpmvmbGa 12A3dDZXkn1X51Ol1CycaGq/Ia5vSQM= X-Received: by 2002:adf:bf10:: with SMTP id p16-v6mr14431007wrh.235.1540828429538; Mon, 29 Oct 2018 08:53:49 -0700 (PDT) Received: from cloudburst.twiddle.net ([5.148.65.242]) by smtp.gmail.com with ESMTPSA id p3-v6sm4700517wre.47.2018.10.29.08.53.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Oct 2018 08:53:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 29 Oct 2018 15:53:39 +0000 Message-Id: <20181029155339.15280-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181029155339.15280-1-richard.henderson@linaro.org> References: <20181029155339.15280-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH 4/4] target/arm: Install ASIDs for EL2 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The VMID is the ASID for the 2nd stage page lookup. Signed-off-by: Richard Henderson --- target/arm/helper.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) -- 2.17.2 Reviewed-by: Peter Maydell diff --git a/target/arm/helper.c b/target/arm/helper.c index f767467dcf..4b14f2c05b 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2805,17 +2805,23 @@ static void vmsa_ttbr_el1_write(CPUARMState *env, const ARMCPRegInfo *ri, static void vttbr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { - ARMCPU *cpu = arm_env_get_cpu(env); - CPUState *cs = CPU(cpu); + CPUState *cs = CPU(arm_env_get_cpu(env)); + int vmid; - /* Accesses to VTTBR may change the VMID so we must flush the TLB. */ - if (raw_read(env, ri) != value) { - tlb_flush_by_mmuidx(cs, - ARMMMUIdxBit_S12NSE1 | - ARMMMUIdxBit_S12NSE0 | - ARMMMUIdxBit_S2NS); - raw_write(env, ri, value); - } + raw_write(env, ri, value); + + /* + * TODO: with ARMv8.1-VMID16, aarch64 must examine VTCR.VS + * (re-evaluating with changes to VTCR) then use bits [63:48]. + */ + vmid = extract64(value, 48, 8); + + /* + * A change in VMID to the stage2 page table (S2NS) invalidates + * the combined stage 1&2 tlbs (S12NSE1 and S12NSE0). + */ + tlb_set_asid_for_mmuidx(cs, vmid, ARMMMUIdxBit_S2NS, + ARMMMUIdxBit_S12NSE1 | ARMMMUIdxBit_S12NSE0); } static const ARMCPRegInfo vmsa_pmsa_cp_reginfo[] = {