From patchwork Tue Jan 19 15:10:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 366178 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp855402jam; Tue, 19 Jan 2021 07:24:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJzNC+RDFkJmYvJe+caPKQ+1RpnHQZ9netq6sCubfXSsIyJNrSmIB+6hGjR5ynxq4GxKvo9z X-Received: by 2002:a25:da16:: with SMTP id n22mr6503868ybf.111.1611069879884; Tue, 19 Jan 2021 07:24:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611069879; cv=none; d=google.com; s=arc-20160816; b=zEXMW80gRTIk8E8sans8Hg0nYtJmeIvqMzlxt3WJoYwiIXnYaRZrdo1pqcrnMVZQa6 TamVBJBYew4axN/KGj7+s80qtRBr2QmrNfttKpbwbIIadh6I3XeQcoy1cOsy1bl/dc2x F+GALeWv38gL3t8/W1J98pm14uzwbSi1/GCrODvjmGOAZ7GB+3s2g9RiF+tzcSMVpAYu Ke6aj/pg/WfuEG4mbKgz4sSXfoEJgRGAyFmFsIXO859TOX1y+2m6vVjRBxyIcH5qiV9W Xlf38igMqyHvcEyy5tNVHh+rhOYWDKQ0XnyJMHf9pVDxVS3VhGPPJ/6PO0cQIfslAgYq wJbw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Bgw0IoVQc5jfS/jOJVPouYGj93maDzWFb/0klbk3tEY=; b=sBDDsmzqUxWHSZj3AUe7bFHQNLrGU9A5Ya90+mIbalC2Bj+ZKnre9b3v9m2XDVu2z9 K431jdad/4gaDqjjPmFieVymtJ58brePcIyyc0hu01ZLQoWDfo7L/49kUyX4SK+0j8Pk Q8/KZaLrG4o5xdjgk11Gsraga/6r3Ry+eapp5KU3CvXFrszSC+Wmed77m5X64M0YuWgf OzNDU/YUquhUcpcifAQvDEqcvBK8msGpNTiwALEtVXkHkjWPdoN04xvCr09mXu/fC+6j foYNGUuutJt07v4Uz2ivxisN4aP3L3xBbKlanHb8x+CETzXWalzzKAUEnYvrW1oei8n2 tyrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PyP0Ldp9; 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=pass (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 s13si9785024ybk.0.2021.01.19.07.24.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jan 2021 07:24:39 -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=pass header.i=@linaro.org header.s=google header.b=PyP0Ldp9; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1ss3-0000Ee-Az for patch@linaro.org; Tue, 19 Jan 2021 10:24:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1sfH-0007ht-FZ for qemu-devel@nongnu.org; Tue, 19 Jan 2021 10:11:27 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:54970) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1sfA-0001Ft-FJ for qemu-devel@nongnu.org; Tue, 19 Jan 2021 10:11:27 -0500 Received: by mail-wm1-x333.google.com with SMTP id i63so63390wma.4 for ; Tue, 19 Jan 2021 07:11:19 -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=Bgw0IoVQc5jfS/jOJVPouYGj93maDzWFb/0klbk3tEY=; b=PyP0Ldp93N9Gp0L0A+H1BR4O6+p4e9QfDCUOWmKRMlc+kDgYGa9ks/3UIyG4esWELU v0XyQp0ad7MptycjDzmOPerQ6W/E8jtlcWXURE+HilIqiNjaWNodPQtog3DAxO9NdXqF rStTY9oBoz5aDIvVDJ+Xk0MqUCw3J9FmCH3goJh/oOStY+PATPk0+lBVIfHq9Wy0iURY YrLEf+t7+jDjiGXI0igWVS7WxFJADTr0J5btftD/QlnWDFNoo0PBZq6KdB8W/j3Sd3ni Bbw70u8tBoQK8fuyJt755IlAocASC9tS4sdfsjleMC1J3vXJmbVI1WRK1//SdN10bqQD jRZQ== 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=Bgw0IoVQc5jfS/jOJVPouYGj93maDzWFb/0klbk3tEY=; b=Vo9YrryypfZrDrsrKo7qhEbFE9/XIuNK4eJ6bAgI3WE78dxeM8y+5ueG5GZLib4TMg sAn/BjrAi25G7sSbQUwRTpwVWu1HprDVln7mH+bh8VCkzsl7+lv8wdit8XmyQj56XH8D Tqlcb4pb0ObjbSZ9g4b2Yxk2NCZNuxG40OK8+7lFibHzdIxnwjDOFsC7YikBOufmkWA7 uLRrEqiZzvk+4hKB7aNklI3QQEZVMBS4y6UXgS02berdXhqfd1MIHpBPUD5SNB1fApRt nQoyQtxuzv2llpSmAA10n5gHjKAQD3Fsbz2ZMrCZoKTuboqG8DSqENh6+0J0kPYI5ojf yMGw== X-Gm-Message-State: AOAM532s6jfjBCsrD48CIf1KifghkX+K8E/y+AHeU2DNtmiR9lPwi7Bi 0uUeWrN/3UktG5+AhC+EZvnlsRzc3E31xw== X-Received: by 2002:a7b:cd90:: with SMTP id y16mr73271wmj.115.1611069078895; Tue, 19 Jan 2021 07:11:18 -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.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 07:11:18 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 15/33] target/arm: translate NS bit in page-walks Date: Tue, 19 Jan 2021 15:10:46 +0000 Message-Id: <20210119151104.16264-16-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 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Rémi Denis-Courmont Signed-off-by: Rémi Denis-Courmont Reviewed-by: Richard Henderson Message-id: 20210112104511.36576-12-remi.denis.courmont@huawei.com Signed-off-by: Peter Maydell --- target/arm/helper.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -- 2.20.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index ae0ccf72f58..521f85a695a 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10430,6 +10430,18 @@ static hwaddr S1_ptw_translate(CPUARMState *env, ARMMMUIdx mmu_idx, fi->s1ptw = true; return ~0; } + + if (arm_is_secure_below_el3(env)) { + /* Check if page table walk is to secure or non-secure PA space. */ + if (*is_secure) { + *is_secure = !(env->cp15.vstcr_el2.raw_tcr & VSTCR_SW); + } else { + *is_secure = !(env->cp15.vtcr_el2.raw_tcr & VTCR_NSW); + } + } else { + assert(!*is_secure); + } + addr = s2pa; } return addr;