From patchwork Tue Apr 16 12:57:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 162328 Delivered-To: patch@linaro.org Received: by 2002:ac9:2a84:0:0:0:0:0 with SMTP id p4csp4023371oca; Tue, 16 Apr 2019 06:10:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqw65zGBwzVi/v8bQ1V52mVK6ZH0I0SFDWxVZsYC3BqKg+EdnSW6yg7BMzVfWmCMG3YbBmcA X-Received: by 2002:adf:f48d:: with SMTP id l13mr46521424wro.2.1555420211630; Tue, 16 Apr 2019 06:10:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555420211; cv=none; d=google.com; s=arc-20160816; b=O2Nuju17U9RP+H18g2cPYbHj9iYL2fRV4zFfLQSNK7gXvgF14vZQE9jLurXr6udXFY mnvGKvqHbmf/6JZFPIX7LU6cF07olmKr+/qWnoXRdnqrWcnusgW4ePZ3vuiAEwhCLhfP fzOIr6dhliLHwTCM71Gd4H/Pe8QBlvk9splT9n2P6mUfgSJZHoq3i+4PCZmyuCGDtKrt MN1zLVjnoqT6X2MAQPlmqueFjkHkgWwgcNM/r5xMZ3rPGafkqnOOmSMYuQGoTiRKue8m +u7s7j3UO1IN8ObxC4AfUXIWpnmLCIctpsMz917sb46VNmzUC1kqJ4PAG+956j7qTpny CLmA== 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=bCGhrFJCaebvft5wSyxUMGmlJpa7UGyDkhV61Ort2ak=; b=mrkw+gCTR+m1+k2UwzliICWZClfc8Z4x2Ng1vlU0rRLDCDbANiIsEqTftRUW7c5DtG n0E6YZu8RmOijDuO+pLVekeZtbEDA+7R2WPH/AUOhNWj+MkfKLzmuN2OBm3PHGEQcz+8 OSr0V0UcwdfehiKhXJpcFzreSXo54PQNlorinISW9rXMVTOrckVkIDaitcGSckqXFjWg 80Aj2OXJoUcQSKmv3nJthJH+JXSC5uiTpGrbEUfAxtTYMTyjxTvbxOU5ZkSerQRIWlOv fmNqvUYeP/eKZsk4yhJTDxgG6KP7c1mtiLc3SVxzVN4b4jVF95aCgisl8W066EGFKteO li0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qjaG4u+B; 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 l8si34667974wrx.104.2019.04.16.06.10.11 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 16 Apr 2019 06:10:11 -0700 (PDT) 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=qjaG4u+B; 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]:36467 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGNqk-0006OL-GJ for patch@linaro.org; Tue, 16 Apr 2019 09:10:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGNfH-0004p0-Ox for qemu-devel@nongnu.org; Tue, 16 Apr 2019 08:58:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hGNfF-0001KM-Re for qemu-devel@nongnu.org; Tue, 16 Apr 2019 08:58:19 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:52376) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hGNfE-0001Gi-0u for qemu-devel@nongnu.org; Tue, 16 Apr 2019 08:58:16 -0400 Received: by mail-wm1-x342.google.com with SMTP id a184so25245569wma.2 for ; Tue, 16 Apr 2019 05:58:14 -0700 (PDT) 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=bCGhrFJCaebvft5wSyxUMGmlJpa7UGyDkhV61Ort2ak=; b=qjaG4u+B8c572MSbsULByl5VX/0zRQ+L52wPypDWoh1Eot99rfJMr61cOKpUAK59QS bwjjitRG4nUQjKKpavAIdNay8oW9nJ5TiFZGhiNz9ysU6w7S4xoxPgQTPrMGIEqMdoWK fmErIhKS9Si8MDYGH5vgobYEVwBpw71GXF9OTnNCTioy/1X68id2BXNrhhUhjh00+QB1 g/WN1IuJavxstMeU/A5mDHp3ri9XPvARlUYGyeKO6rn/LmauxuE/C1wG3z1Ms5V3IYhk OdnMH46OKDVsKsx1HI1OZgGlLlfAmjB3R/JhSQF0gv8uqAuBmbi+xKE9yyFRpwiPi1EI pusA== 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=bCGhrFJCaebvft5wSyxUMGmlJpa7UGyDkhV61Ort2ak=; b=aLqWW+WJ9wiq36rvKfIUblBiJwnFKbJAO2LaSn06AKQrfckiW7PUDWeyagnUzfOSie yWlgxxOz+sNHPU0GTI/04QlYECe/ne+xc7c4ue5Orvt6wf1WDTjMGwm/SNP4x3COkvGK aWSu74o3iAf7So1Rs7q96LnwHeINmxLKtwLzSryFbspLTkNUyOUuczGzNVrjoMuFzkCy BJP5qK/QbwPItUsBl8NziXJ8dVOF9G7PrkzgCECRWGvGb1oT4AcNrXtBMmjYoRQH6HpA FsljueztQuAAmsqBQPEr1mSUklPpze0ZhchjOopoYS1SPmB5GLn9nvo+H1ySszonWE01 5Y1A== X-Gm-Message-State: APjAAAXPoQ00j4OyQXt1oI8oUJG5qLn9nHdXXv1FDj+NHT840wmbEKbv csitrjFJnlxwHUARPjmt2WnquvFNP1g= X-Received: by 2002:a1c:c8:: with SMTP id 191mr25804221wma.44.1555419493999; Tue, 16 Apr 2019 05:58:13 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id v184sm39476572wma.6.2019.04.16.05.58.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 05:58:12 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Tue, 16 Apr 2019 13:57:30 +0100 Message-Id: <20190416125744.27770-13-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190416125744.27770-1-peter.maydell@linaro.org> References: <20190416125744.27770-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::342 Subject: [Qemu-devel] [PATCH 12/26] target/arm: Clear CONTROL.SFPA in BXNS and BLXNS 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" For v8M floating point support, transitions from Secure to Non-secure state via BLNS and BLXNS must clear the CONTROL.SFPA bit. (This corresponds to the pseudocode BranchToNS() function.) Signed-off-by: Peter Maydell --- target/arm/helper.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/target/arm/helper.c b/target/arm/helper.c index 7298f9de735..8e72e1097ce 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7824,6 +7824,9 @@ void HELPER(v7m_bxns)(CPUARMState *env, uint32_t dest) /* translate.c should have made BXNS UNDEF unless we're secure */ assert(env->v7m.secure); + if (!(dest & 1)) { + env->v7m.control[M_REG_S] &= ~R_V7M_CONTROL_SFPA_MASK; + } switch_v7m_security_state(env, dest & 1); env->thumb = 1; env->regs[15] = dest & ~1; @@ -7881,6 +7884,7 @@ void HELPER(v7m_blxns)(CPUARMState *env, uint32_t dest) */ write_v7m_exception(env, 1); } + env->v7m.control[M_REG_S] &= ~R_V7M_CONTROL_SFPA_MASK; switch_v7m_security_state(env, 0); env->thumb = 1; env->regs[15] = dest;