From patchwork Fri Jan 18 14:57:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 155967 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3375911jaa; Fri, 18 Jan 2019 07:20:14 -0800 (PST) X-Google-Smtp-Source: ALg8bN7C5DZtY9UTd9d0s1B6rUryJAZjR6gMBu6Q959w61/LPkMdBWnvvkBDQgaCJHzrz+XpKlDl X-Received: by 2002:a5d:4512:: with SMTP id s18mr17647027wrq.182.1547824814812; Fri, 18 Jan 2019 07:20:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547824814; cv=none; d=google.com; s=arc-20160816; b=put2PD307+gjtD/a5z9uxOXEhE8IVzaYljHRm6UMl0Rl8lVhg/S+X2ozkrDnE/kgxc E2yjft/NCFCcgIkQSSbNxizYCvWlFG/O/2K6P2mno0w5tRf2L4WAjbIYk9lXiEKWqLGl VQVb2YlWaIO5drinx9Z4C8LvNaOkJ3mmvqpfCgcv1EGJ5bGRIah5bRpDr/BaRCdZfmis 3PfXkWI2UL8OTc2A/LdGirinC0sIvBVCcpggZ2EWHThAbXUFRQ3C9cmoGSrB3Nt7OHhU XgZW5m9btpiAdn6VovIp194D7WFat6/CWbnl1vbqZ1qKWuEzNRXYE8TJ/68OOvbLLOV0 uibA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=CeCIuIzkkfvHcPe9JOcoH8qQdntn7uLbMtVtm8CcIkk=; b=PnMOg7AOgsNGRCkavd713wopFn7/h02rWWOse4EOSxOTn01hyzfivMHGpQmop/NwNF +er2eslSOonaEDDQ1bXrEFeanPkzpU12gqV973v2L+GuToexSVUeDyVAjBQjdtpRWhKh fne5RIU2/kH/reJ4Or+jEQlxA9zZBTDrf23mCb7owMeYbeaAc+bz6P6Vsqj/OODF6qvX 8kt8rAcuLPBvtist6cgNPURNDltf7n+GsAeleBOd4YzB7X8wuDE9X4UvosuugIIoJLEq ULaa65LLh0IUZOFHCyQcpRSPREplB5+aRgZYsSh8W1rxZhGU+se8VA/5gebYmrbKTgQ3 /TBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GZsBBbmX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id m6si38955441wrp.29.2019.01.18.07.20.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 18 Jan 2019 07:20:14 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GZsBBbmX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:41286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkVwL-0003cu-OA for patch@linaro.org; Fri, 18 Jan 2019 10:20:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkVbV-0002mV-Gt for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkVbS-0007NB-OW for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:41 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:38098) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gkVbS-0007L6-Ha for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:38 -0500 Received: by mail-wm1-x32d.google.com with SMTP id m22so4809794wml.3 for ; Fri, 18 Jan 2019 06:58:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=CeCIuIzkkfvHcPe9JOcoH8qQdntn7uLbMtVtm8CcIkk=; b=GZsBBbmXcdsZmz4VT5ev0ZmONb+n9nIvmBeoVEgbBJWN44sUvrve8UlvnzLZ/wg3Lw iHtltlOEtHiHBtZnGsuwJ5tr9YcGldu3kVcKhD4WHRAGbkQTU2Xs2S0zPhuxw+ObvZZu FMV4+bxJwAaHkrY0xbbNw25J+lg42YNSy94kg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CeCIuIzkkfvHcPe9JOcoH8qQdntn7uLbMtVtm8CcIkk=; b=NINhvWBx6h0A28osjGKWgDqvF9EC4OJC8UTvjN8Hxe+IskiBgN9PmUFeGxc3Bup+mv aLUZcrqLagXsDUCp5g/wxFDRQMrcXt3yuq2Xjjrr4d+b8sCqCSar+ziccQLUwiIAQL0m 7JfTyDZF/vF9g+Fa/22tCJzNp+D6OHQNS0GsVhvQA95emEIhLHTUWd1XTZen5C0G2Tf+ ly8D0n9m24N8qyWrZdUxpuDWl20XzwzwdfjmIJ6nn//4FikPjds27SUzld2zySHlY0VD 8v5BYFD79DMbwq9N7La1TWs8mJ8V+2JKRuz9Dk+aZFFBvHVIdH3OMAHYLrCoeih+dYiv 4atg== X-Gm-Message-State: AJcUukcU9gSoCxEcZV04wZ+WQ8ZcPvR/MA1UIqVOb4tviPfcxgGUoOmK 1xXR7zBqvunOQia/J+IGdmjOE7wceWkquA== X-Received: by 2002:a1c:8acf:: with SMTP id m198mr16891048wmd.143.1547823517272; Fri, 18 Jan 2019 06:58:37 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e27sm92094561wra.67.2019.01.18.06.58.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Jan 2019 06:58:36 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 18 Jan 2019 14:57:42 +0000 Message-Id: <20190118145805.6852-27-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118145805.6852-1-peter.maydell@linaro.org> References: <20190118145805.6852-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32d Subject: [Qemu-devel] [PULL 26/49] target/arm: Decode TBID from TCR 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Use TBID in aa64_va_parameters depending on the data parameter. This automatically updates all existing users of the function. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Message-id: 20190108223129.5570-23-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/internals.h | 1 + target/arm/helper.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/target/arm/internals.h b/target/arm/internals.h index acd99b579cd..a6fd4582b2b 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -950,6 +950,7 @@ typedef struct ARMVAParameters { unsigned tsz : 8; unsigned select : 1; bool tbi : 1; + bool tbid : 1; bool epd : 1; bool hpd : 1; bool using16k : 1; diff --git a/target/arm/helper.c b/target/arm/helper.c index 75a6004decd..d9b580e3316 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9749,7 +9749,7 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState *env, uint64_t va, { uint64_t tcr = regime_tcr(env, mmu_idx)->raw_tcr; uint32_t el = regime_el(env, mmu_idx); - bool tbi, epd, hpd, using16k, using64k; + bool tbi, tbid, epd, hpd, using16k, using64k; int select, tsz; /* @@ -9764,10 +9764,11 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState *env, uint64_t va, using16k = extract32(tcr, 15, 1); if (mmu_idx == ARMMMUIdx_S2NS) { /* VTCR_EL2 */ - tbi = hpd = false; + tbi = tbid = hpd = false; } else { tbi = extract32(tcr, 20, 1); hpd = extract32(tcr, 24, 1); + tbid = extract32(tcr, 29, 1); } epd = false; } else if (!select) { @@ -9777,6 +9778,7 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState *env, uint64_t va, using16k = extract32(tcr, 15, 1); tbi = extract64(tcr, 37, 1); hpd = extract64(tcr, 41, 1); + tbid = extract64(tcr, 51, 1); } else { int tg = extract32(tcr, 30, 2); using16k = tg == 1; @@ -9785,6 +9787,7 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState *env, uint64_t va, epd = extract32(tcr, 23, 1); tbi = extract64(tcr, 38, 1); hpd = extract64(tcr, 42, 1); + tbid = extract64(tcr, 52, 1); } tsz = MIN(tsz, 39); /* TODO: ARMv8.4-TTST */ tsz = MAX(tsz, 16); /* TODO: ARMv8.2-LVA */ @@ -9793,6 +9796,7 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState *env, uint64_t va, .tsz = tsz, .select = select, .tbi = tbi, + .tbid = tbid, .epd = epd, .hpd = hpd, .using16k = using16k, @@ -9803,7 +9807,11 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState *env, uint64_t va, ARMVAParameters aa64_va_parameters(CPUARMState *env, uint64_t va, ARMMMUIdx mmu_idx, bool data) { - return aa64_va_parameters_both(env, va, mmu_idx); + ARMVAParameters ret = aa64_va_parameters_both(env, va, mmu_idx); + + /* Present TBI as a composite with TBID. */ + ret.tbi &= (data || !ret.tbid); + return ret; } static ARMVAParameters aa32_va_parameters(CPUARMState *env, uint32_t va,