Message ID | 1504527967-29248-3-git-send-email-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 0e2845689ebdb4ea7174f96f6797e2d8942bd114 |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp1467154qge; Mon, 4 Sep 2017 05:32:56 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7K8K8p3hfvnSKrC7/BfHZ6mF3+T1UHJ6cggVv3qgjUQI6A54HYWsRiyBYJl49yssmbiwfg X-Received: by 10.237.63.100 with SMTP id q33mr452836qtf.114.1504528376863; Mon, 04 Sep 2017 05:32:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504528376; cv=none; d=google.com; s=arc-20160816; b=06KSyIytfA8JML0iVLHJibzqTOmI4aLHAxr+zx72CDGZYtXSIws+jz8/bbIM87+lTG TIKys6K35vO0teVusRLYZPCBTUHAvJV71sy22cON7PUzChT7ZbmapO6iNoVpfq+k4J8A PQrjThigGT5GM6dudgXesQnHilT8WVw3dzz4RZliour26ltaJ2T4wOK21OunVvefN7Rp P+IwPG2Piyo95Y/y+yVyBYeALOZJ7E0FBYnoRHPj9HPv4LW3L/+nv7zf2V34FqmE9ank hDGrnt6HF0H1g2PuCY2cvVeTOFSf4es7Ymt8OzfDuE3JwwTmx9mYEeA0RoB3x9ux4LoH AgYg== 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:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=S2Odfl2i25A6dOMMsAtTTwgqIEYd+LErxn3LYfN4HJI=; b=yYm2Cf2wJAP08P3dXfB6LUWQogAS+FU0/Yx6DgO9NRpThX5wx5fzvdGwHh4kJy8IGz vrm6qD9VjmX2yl6fQc7kf00kCL9nxoSCDuXdnL60rhoUdQsrWcaDBzF/+vWv7BPqdnxF Otj3oVofVkMRFEmiNMa3tWJBoPH9hidq5JsDn5tnMq/23YTCvG/8vjwHmHI483Tlra+z c9/WXTyZIfaNbMqn1TYY/D/xOqWIVeKOvlLVBymtWX6tkmGEbAUxUwCcdl1KWxOQuYjb M6AFm0VTUPED1uaZ4D7D5MBSewQcnPzRim+fuvM8yaulTu6vyd5D7zJmPWCqrL5cKlf2 +2Fw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p31si6687429qtd.105.2017.09.04.05.32.56 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 04 Sep 2017 05:32:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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 ([::1]:59563 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1doqYg-0001Pg-6m for patch@linaro.org; Mon, 04 Sep 2017 08:32:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1doqSD-0004qS-CC for qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1doqS3-0004cb-IL for qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:13 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37106) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1doqS3-0004Yp-BM for qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:03 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1doqRt-0005Pu-Rz for qemu-devel@nongnu.org; Mon, 04 Sep 2017 13:25:53 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Mon, 4 Sep 2017 13:25:33 +0100 Message-Id: <1504527967-29248-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504527967-29248-1-git-send-email-peter.maydell@linaro.org> References: <1504527967-29248-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 02/36] target/arm: Don't trap WFI/WFE for M profile X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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: <http://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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index 2a85666..5a94a5f 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -370,6 +370,11 @@ static inline int check_wfx_trap(CPUARMState *env, bool is_wfe) int cur_el = arm_current_el(env); uint64_t mask; + if (arm_feature(env, ARM_FEATURE_M)) { + /* M profile cores can never trap WFI/WFE. */ + return 0; + } + /* If we are currently in EL0 then we need to check if SCTLR is set up for * WFx instructions being trapped to EL1. These trap bits don't exist in v7. */