From patchwork Thu Feb 13 14:41:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 183354 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp613219ile; Thu, 13 Feb 2020 06:46:33 -0800 (PST) X-Google-Smtp-Source: APXvYqzfcida8hrRANC82VvuCKFaa96CTQL5oIqUT+QM3R0qzXNscghj1q6Ftasx5zoWLntMC11q X-Received: by 2002:a37:3d5:: with SMTP id 204mr7413649qkd.279.1581605193064; Thu, 13 Feb 2020 06:46:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581605193; cv=none; d=google.com; s=arc-20160816; b=vNUr3jkZeR4JB+Zh5T6Jjks41FxFxce7AZM7DsKGWvfHVuIPu++ljewpnaSFN6CkUi 4sxbXA3u2pR6Im2fm7tsxMBWQTV/EH42XK05O5Ac8UmhS51qDkzbma2Ua8qnWdz0wFjT qGCHqrmNFTYxeLL0kQxvAaUa12FKQ1U09E9angaN47AV5pQx3FGqAEBUvOvR4yHQCCnu dMQudB/A6DGTjggJvJpvf2d+rEdlyhEUmExgBtdgKVt8PFK+ryHuJufEy21dav4jJWbN +KG90BLQT6+QOXQFh6ow1McsbBABVGoM5DHC7KiZf0bJJ8BFIvfi7UD9qaaIWSwrXpdZ SdFg== 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=MuoGNQ1y1csIjVqqiEVAeH53kp1R5V2ytgxq6qNEfRw=; b=UsK9krb1lUnnGqBIwZ5bGGUfR8OPe+xRy1MXVh2qwoStBAUfkTmMFmtFLuW0rWIaBn dhvuh6E71J+YAqgDKPvMQRoaqL6DU8a/FGHTHCgOvM1Jk9YClpz1/CPOh/vg0t4OYtf/ QuBZriBJzP8jr+mHOlpQs2BifcjpOQ5U6IOj+MLdbuGEGkVkxvF8IuHEiLAue40hY0kE s8gbalh8os1j91EUFK5g57syGMvBjpz2l8Ku0lxBzO7dN9CjCivgEf71OlaqVfQuXr91 ph06FN6ogEK72ooX3aSuoPQg9N6Ul3CJU9yIahuXdAl/JuDeMGLoIawSYyxeKwAZJ0M4 FA0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EG5xJ7LB; 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 u27si1280462qtb.355.2020.02.13.06.46.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Feb 2020 06:46:33 -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=EG5xJ7LB; 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]:53804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2FlA-0000th-GP for patch@linaro.org; Thu, 13 Feb 2020 09:46:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60215) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Fgw-0004LP-N7 for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2Fgs-0001oK-KS for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:08 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:39381) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2Fgo-0001eN-Ue for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:06 -0500 Received: by mail-wr1-x432.google.com with SMTP id y11so6975307wrt.6 for ; Thu, 13 Feb 2020 06:42:01 -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=MuoGNQ1y1csIjVqqiEVAeH53kp1R5V2ytgxq6qNEfRw=; b=EG5xJ7LBOxGtm66SVjhh7FUJ7mY6XDSOHwAGMwbn3/NwfEwB+35k28W48VOuLMpHpE 6fOo16IaYtxOw9p+e9lZxh9uVTJuKbRlrAORwKNXfaFHlTERgVcnOfvbP79adStfOYfb gQVKIwwEisA+h40/GBwpi980MbcNAv+oyNmf00mkmcTNsBbrV53sO53i0aWsbUcsPI1W aPNMF341VFYfhKoCL11QMswyKadS/Nm7zpxnsg3/DBlrGvaJ88lQ6Yv+9SPYX/gaL6FC z40bSUDJGpQFgAJ4ajjRzcVMYLOGfB9XrMt4h5+LrPPKOYZc/EzwXTF5cB2vLTZ/ELCx U4fg== 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=MuoGNQ1y1csIjVqqiEVAeH53kp1R5V2ytgxq6qNEfRw=; b=P7BWsIXyvVIld2oCjySLIXIpzMbzvDHFmCYtvsk37QA/aVWjVFzTKoNEGgQVrPNdKX e2OfwWkQ8ysNh2/PDDG5EnRgJiQzxPnoYlU1KmiDte5C8tx/5lcOqiPxWjT77Ev0VfZJ Cc3ICC233PVITv8Ou0BQQ17Lotc5RcSta2yGtViF09F8FrX9OMzX6sW5nN2GOK58zTYY cyv6SRSBOpAb40BhXDF0+3YDAY9puYsCL66sfI/MpPRiadqQSb1qDn9xf8uAILbchHWM P0ojGm40ITxL8cCn7HuUaxJKVMOPyQ7yesgU6PmRhIyk96uxekHoU+vhjndGSHGoXbQm DAmA== X-Gm-Message-State: APjAAAVJ1iHIbfXS3kuOi/JGz2SixMCyH9jUHnhYqMeFZKM1EiZvowoI 6P3utyAAX8TaWCNi+WyMdXEnpwGO7ug= X-Received: by 2002:adf:f28c:: with SMTP id k12mr23005679wro.360.1581604920726; Thu, 13 Feb 2020 06:42:00 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e22sm3362454wme.45.2020.02.13.06.41.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 06:41:59 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 10/46] target/arm: Add arm_mmu_idx_is_stage1_of_2 Date: Thu, 13 Feb 2020 14:41:09 +0000 Message-Id: <20200213144145.818-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200213144145.818-1-peter.maydell@linaro.org> References: <20200213144145.818-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::432 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: Richard Henderson Use a common predicate for querying stage1-ness. Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Message-id: 20200208125816.14954-2-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/internals.h | 18 ++++++++++++++++++ target/arm/helper.c | 8 +++----- 2 files changed, 21 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/target/arm/internals.h b/target/arm/internals.h index 6d4a942bde4..1f8ee5f573e 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1034,6 +1034,24 @@ static inline ARMMMUIdx arm_stage1_mmu_idx(CPUARMState *env) ARMMMUIdx arm_stage1_mmu_idx(CPUARMState *env); #endif +/** + * arm_mmu_idx_is_stage1_of_2: + * @mmu_idx: The ARMMMUIdx to test + * + * Return true if @mmu_idx is a NOTLB mmu_idx that is the + * first stage of a two stage regime. + */ +static inline bool arm_mmu_idx_is_stage1_of_2(ARMMMUIdx mmu_idx) +{ + switch (mmu_idx) { + case ARMMMUIdx_Stage1_E0: + case ARMMMUIdx_Stage1_E1: + return true; + default: + return false; + } +} + /* * Parameters of a given virtual address, as extracted from the * translation control register (TCR) for a given regime. diff --git a/target/arm/helper.c b/target/arm/helper.c index 7d15d5c933c..57dc7a307c0 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -3261,8 +3261,7 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t value, bool take_exc = false; if (fi.s1ptw && current_el == 1 && !arm_is_secure(env) - && (mmu_idx == ARMMMUIdx_Stage1_E1 || - mmu_idx == ARMMMUIdx_Stage1_E0)) { + && arm_mmu_idx_is_stage1_of_2(mmu_idx)) { /* * Synchronous stage 2 fault on an access made as part of the * translation table walk for AT S1E0* or AT S1E1* insn @@ -9285,8 +9284,7 @@ static inline bool regime_translation_disabled(CPUARMState *env, } } - if ((env->cp15.hcr_el2 & HCR_DC) && - (mmu_idx == ARMMMUIdx_Stage1_E0 || mmu_idx == ARMMMUIdx_Stage1_E1)) { + if ((env->cp15.hcr_el2 & HCR_DC) && arm_mmu_idx_is_stage1_of_2(mmu_idx)) { /* HCR.DC means SCTLR_EL1.M behaves as 0 */ return true; } @@ -9595,7 +9593,7 @@ static hwaddr S1_ptw_translate(CPUARMState *env, ARMMMUIdx mmu_idx, hwaddr addr, MemTxAttrs txattrs, ARMMMUFaultInfo *fi) { - if ((mmu_idx == ARMMMUIdx_Stage1_E0 || mmu_idx == ARMMMUIdx_Stage1_E1) && + if (arm_mmu_idx_is_stage1_of_2(mmu_idx) && !regime_translation_disabled(env, ARMMMUIdx_Stage2)) { target_ulong s2size; hwaddr s2pa;