From nobody Fri May 9 21:33:28 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1611070130; cv=none;
d=zohomail.com; s=zohoarc;
b=hkl9ZTOvoWU7UtNMXIJCH3hBqU9Oln5qZC45D+HMp68UymPsTdBbukt5jCrRW2ujjCdpU2P5tcoFTdqruSmTevQVfJ1KLEJ+qsWWRIB9wwLQHtXjnYFR3KpgreLXC2HllpAkHBBuq3coNC349007NiwFErWZwuRjpSvsPKvcoRY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1611070130;
h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=x+fvMvunQsXDRY9AdxkBS0U4eAYaH50cOCjSDwUSzns=;
b=WgyaUpthPoorOe12229dJLICw1LYWnFzw0U+3b5rUs/ymg6kCrI0kZKvfdyIR+WdqbkUS0JcIeUF1SJl5GIGIwHYpLHKiROAOsveEZU6O40Oaj6E4nZVlcUK6b9LJQsKje35W8czechQWT3eq3Sj6eejIEbiaLH0jr8Pa/HNxZI=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
header.from=<peter.maydell@linaro.org>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1611070130838946.2833851033781;
Tue, 19 Jan 2021 07:28:50 -0800 (PST)
Received: from localhost ([::1]:45122 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1l1sw3-0004XN-WD
for importer@patchew.org; Tue, 19 Jan 2021 10:28:48 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:53542)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1l1sfG-0007f8-72
for qemu-devel@nongnu.org; Tue, 19 Jan 2021 10:11:26 -0500
Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:39576)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1l1sf9-0001FJ-G4
for qemu-devel@nongnu.org; Tue, 19 Jan 2021 10:11:25 -0500
Received: by mail-wm1-x32f.google.com with SMTP id u14so56497wmq.4
for <qemu-devel@nongnu.org>; Tue, 19 Jan 2021 07:11:19 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
by smtp.gmail.com with ESMTPSA id a184sm4843699wme.35.2021.01.19.07.11.17
for <qemu-devel@nongnu.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 19 Jan 2021 07:11:17 -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=x+fvMvunQsXDRY9AdxkBS0U4eAYaH50cOCjSDwUSzns=;
b=VDOtQr/356DVqz98MBRDBaZtewQNoZi4FNJfgcVjUsOsNIZ57bzVgA5nW+EZqOubT+
qmzsKeC2DxUtPb7qWRytFuDgcHt04Wb5eiRzYz2Ah8orrp01ICmrsqm+zsbaCgxrX9Wa
lPMeUhLuFr2rUoDu8v5TAzsec1gTD3HwLvvACHcfjgx6SLLby0M86EWNa2WLpyGNsMLt
57iygYpSeabirH3aZxSydLCC9vxhaM8N4EmFUxBuseav5yPwIq2l30/FQkbCRU1mtHPX
wV1pbi0pNrcwxPW30+IR0hrnjYcrZWAxsh/CsSh8iuhpy17Dfx5YMsKtiBP3zuiimHlD
eomA==
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=x+fvMvunQsXDRY9AdxkBS0U4eAYaH50cOCjSDwUSzns=;
b=Bldv5i/xSzjriUJxY+V1NwJkFhzNztRUOQDf4nGPfkF/7kPuvr0vR13JcWfbkIGGm2
Uaj2QlSC4ZKoOyBdefEmMW8+DqwrLolsXtKDNpwFeCTevwpdk3OekG9Opnr/qZDpnSvr
v6Bgr1E7Rjk+h63HyANwHst3Zw9o8feUihDgJE/6gwnZFnluKtPQL2m6M8OrGvgzvWZC
6FQlvQAZb7GjYSC/vRUfzJhLydpWCDhQaClkQ3mzeMyImId7+rjd29iC+QD9cMOhmvK1
IPps+S/oYoSj1F3j4tcpqygrJcSO45dNlt9mokwhoV4hoTCTDglw+xiI7tHLsnKK3f50
d1mg==
X-Gm-Message-State: AOAM5302Ur88nDpTHf2mYEkqIcdiZCmyT5D7jNck8dzLEMLRq5u2fT7p
A3XoKhtQHUx1ZymgCNKpQynUG4j8p8Ee1w==
X-Google-Smtp-Source:
ABdhPJw0VxJOIBsa1mY61YBDLEOOu42KmHDWZFquNVDN2nlNh31RabQFyQKqMuvS9+7xzrB9OWSr5A==
X-Received: by 2002:a1c:398a:: with SMTP id g132mr119391wma.38.1611069078034;
Tue, 19 Jan 2021 07:11:18 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 14/33] target/arm: do S1_ptw_translate() before address space
lookup
Date: Tue, 19 Jan 2021 15:10:45 +0000
Message-Id: <20210119151104.16264-15-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20210119151104.16264-1-peter.maydell@linaro.org>
References: <20210119151104.16264-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.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;
Received-SPF: pass client-ip=2a00:1450:4864:20::32f;
envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @linaro.org)
From: R=C3=A9mi Denis-Courmont <remi.denis.courmont@huawei.com>
In the secure stage 2 translation regime, the VSTCR.SW and VTCR.NSW
bits can invert the secure flag for pagetable walks. This patchset
allows S1_ptw_translate() to change the non-secure bit.
Signed-off-by: R=C3=A9mi Denis-Courmont <remi.denis.courmont@huawei.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210112104511.36576-11-remi.denis.courmont@huawei.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/helper.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index f8c18ab6c05..ae0ccf72f58 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -10393,7 +10393,7 @@ static bool get_level1_table_address(CPUARMState *e=
nv, ARMMMUIdx mmu_idx,
=20
/* Translate a S1 pagetable walk through S2 if needed. */
static hwaddr S1_ptw_translate(CPUARMState *env, ARMMMUIdx mmu_idx,
- hwaddr addr, MemTxAttrs txattrs,
+ hwaddr addr, bool *is_secure,
ARMMMUFaultInfo *fi)
{
if (arm_mmu_idx_is_stage1_of_2(mmu_idx) &&
@@ -10403,6 +10403,9 @@ static hwaddr S1_ptw_translate(CPUARMState *env, AR=
MMMUIdx mmu_idx,
int s2prot;
int ret;
ARMCacheAttrs cacheattrs =3D {};
+ MemTxAttrs txattrs =3D {};
+
+ assert(!*is_secure); /* TODO: S-EL2 */
=20
ret =3D get_phys_addr_lpae(env, addr, MMU_DATA_LOAD, ARMMMUIdx_Sta=
ge2,
false,
@@ -10443,9 +10446,9 @@ static uint32_t arm_ldl_ptw(CPUState *cs, hwaddr ad=
dr, bool is_secure,
AddressSpace *as;
uint32_t data;
=20
+ addr =3D S1_ptw_translate(env, mmu_idx, addr, &is_secure, fi);
attrs.secure =3D is_secure;
as =3D arm_addressspace(cs, attrs);
- addr =3D S1_ptw_translate(env, mmu_idx, addr, attrs, fi);
if (fi->s1ptw) {
return 0;
}
@@ -10472,9 +10475,9 @@ static uint64_t arm_ldq_ptw(CPUState *cs, hwaddr ad=
dr, bool is_secure,
AddressSpace *as;
uint64_t data;
=20
+ addr =3D S1_ptw_translate(env, mmu_idx, addr, &is_secure, fi);
attrs.secure =3D is_secure;
as =3D arm_addressspace(cs, attrs);
- addr =3D S1_ptw_translate(env, mmu_idx, addr, attrs, fi);
if (fi->s1ptw) {
return 0;
}
--=20
2.20.1