From patchwork Thu Mar 7 17:04:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1053079 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="xYyRjz3D"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44FcZF1d2dz9sNB for ; Fri, 8 Mar 2019 04:09:57 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1wWo-00013c-P9 for incoming@patchwork.ozlabs.org; Thu, 07 Mar 2019 12:09:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1wS8-0006Jd-7q for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:05:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1wRz-0004SS-Vf for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:04:56 -0500 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:36977) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1wRx-0004Kv-1o for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:04:54 -0500 Received: by mail-pf1-x443.google.com with SMTP id s22so11895406pfh.4 for ; Thu, 07 Mar 2019 09:04:46 -0800 (PST) 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=G3hGr7nsLX8r/HzFuX2/VbjTSq7xNhp+OIN31NWN5vY=; b=xYyRjz3DwkjwfnMZP+v8b/jHxN66byGSRz30w/rmDQWrcOkitAvYSR1c8Lj69dwg2z scMorXjaq6YPRJyx007SqcOQn6tCN8izEJwXebXyAREQ/KMheFe6R/mI5k4HOceZICYu XBH/K3JHFPGXoHbftE1EYyhChzXFEnEEfxAUW/bSr2TZvkgv3rseHT1550s/saZ4LuH8 vDC9UAAl1JfmFfwlV/ctqBJrNAsF10yayhpuerXQYXpDtDgNug7pk2qeh2VZnK+0cNKU DHefCNs/f2Lwri29rg2a5xLyuvUN5zS5cM7DbPBr+4w0sORl6Y46BOCwKKRmzC2VSoo1 hMsw== 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=G3hGr7nsLX8r/HzFuX2/VbjTSq7xNhp+OIN31NWN5vY=; b=XTcSIDvg7RjrkZj+z2lOVf1ezv+9uGq3TF6aUkbWNyeg93iOSNUEUL2D1dJAJ1KVvD PYY0kfGccxo2uYOgiF4L8d+yamyQznaBkNbOlttqVYfNsxYzeXdEmIz/ji8+hUboIwpY Hl/l1A5oqA0g+acw0yx8w92MFHk1/wJEHkrRATILThkq/viV0vP5nI5/sYxks8BFLi71 g7ctKm7LBKu9lHWYQb5WHOB2u3WpRh/Ti3DlRwOrv3onY6I6xggdFUJdG7RpdyIrnMDV SKvvM0ISz3AyEVAtObBGgsftgNMiHdZkQGcoLMUcSl6JGR3KYoWpFrhlK0YedUeuBEN/ UJZA== X-Gm-Message-State: APjAAAVNPOKzBaHUAkO6QKglgEL0gdJLd8F147MGBbtFC3NAMCsDGSB6 NeISRsy6g/+6SZo8TT1ts3t30aewOHY= X-Google-Smtp-Source: APXvYqxtxzGQXLyCNvcFgTb8CzwLqBCIJ9J6WD4P2/6dTQZZGetCukPc9+IBZMSRznv6jUw/C8IziA== X-Received: by 2002:a63:4652:: with SMTP id v18mr11998193pgk.356.1551978284955; Thu, 07 Mar 2019 09:04:44 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id r82sm10040562pfa.161.2019.03.07.09.04.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Mar 2019 09:04:43 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 09:04:20 -0800 Message-Id: <20190307170440.3113-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190307170440.3113-1-richard.henderson@linaro.org> References: <20190307170440.3113-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::443 Subject: [Qemu-devel] [PATCH v4 02/22] target/arm: Extract TCMA with ARMVAParameters 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/internals.h | 1 + target/arm/helper.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 6c018e773c..2922324f63 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -959,6 +959,7 @@ typedef struct ARMVAParameters { bool tbid : 1; bool epd : 1; bool hpd : 1; + bool tcma : 1; bool using16k : 1; bool using64k : 1; } ARMVAParameters; diff --git a/target/arm/helper.c b/target/arm/helper.c index 90d15578ca..ab8006291b 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10599,7 +10599,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, tbid, epd, hpd, using16k, using64k; + bool tbi, tbid, epd, hpd, tcma, using16k, using64k; int select, tsz; /* @@ -10614,11 +10614,12 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState *env, uint64_t va, using16k = extract32(tcr, 15, 1); if (mmu_idx == ARMMMUIdx_S2NS) { /* VTCR_EL2 */ - tbi = tbid = hpd = false; + tbi = tbid = hpd = tcma = false; } else { tbi = extract32(tcr, 20, 1); hpd = extract32(tcr, 24, 1); tbid = extract32(tcr, 29, 1); + tcma = extract32(tcr, 30, 1); } epd = false; } else if (!select) { @@ -10629,6 +10630,7 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState *env, uint64_t va, tbi = extract64(tcr, 37, 1); hpd = extract64(tcr, 41, 1); tbid = extract64(tcr, 51, 1); + tcma = extract64(tcr, 57, 1); } else { int tg = extract32(tcr, 30, 2); using16k = tg == 1; @@ -10638,6 +10640,7 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState *env, uint64_t va, tbi = extract64(tcr, 38, 1); hpd = extract64(tcr, 42, 1); tbid = extract64(tcr, 52, 1); + tcma = extract64(tcr, 58, 1); } tsz = MIN(tsz, 39); /* TODO: ARMv8.4-TTST */ tsz = MAX(tsz, 16); /* TODO: ARMv8.2-LVA */ @@ -10649,6 +10652,7 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState *env, uint64_t va, .tbid = tbid, .epd = epd, .hpd = hpd, + .tcma = tcma, .using16k = using16k, .using64k = using64k, };