From patchwork Mon Dec 3 20:38:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 152739 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp7270402ljp; Mon, 3 Dec 2018 12:41:44 -0800 (PST) X-Google-Smtp-Source: AFSGD/VxJfdV+widCMwKHVV6l4MZvfGVDy1c9kkTAMMOmZjyOpWW4LHjJ321O5aMlZPNt1PXo84Z X-Received: by 2002:a37:a884:: with SMTP id r126mr15471283qke.143.1543869704881; Mon, 03 Dec 2018 12:41:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543869704; cv=none; d=google.com; s=arc-20160816; b=QQMLiBMKjdii4REHhDTGh11r+461TR3aYkofUdIq9EBa4WoyoRqrTthTA9q1ufC+XG ZwqXQ0j5/2wh4DrAOwiEAVKjo1DV6F+YDNqHkqkFLuMgsvajErakSBT40S/PhvhRizzn tad2drSVdvMPfqwf2fVmZb+t+6j5khz0xP648c3wW/BY4wSa5FxJIKqzIfzILWClaeHH fNj5xi2nrl2cvZfr4E0TauxvmDioF0nqfPhDmY6lDwLYBxqOzfwJEPwroJn81Qa3qUL8 XMEoXNejEgHMG8HD/CejK/jH7GoIv6IAnLgOqKc6+oTrkpqarp+sepQtc4PT8UE+9rli 3+Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=TCX2H7S6T0GKan665ryQqRgHdROtacoqe/v4hfXwa1s=; b=htTBCithJK7bJRkS7mqIResc7sTnTyZj46KyrulnePCcj/6FPyCyMcCxMEYtNO+CaJ FV7PcZG8VULF1old/M6L3Dbc1Oy2pFlYL4sej0Dp8Ua3yG9pGIwiPJLilILJ+hQtegfw aQlwDlS5JHdDMy/gJdG/BWSynWiFW7my/r6PV+49HiFUm3w4Q3aZVvY7T358J2zDuH3e OMEAv7X1tlI81CD/393026Rildqprr1BJJF7uldAAgFU/SbLcX4tNKLZSVJ/fJhstjH/ 7w5MbNlXaRuwmYwK8nYn/INfXeFNepy9j795t11pib5JlcFQYhSo3d6rp9YCh7ZDzhPp cyOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gkduhK9W; 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: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c11si3900527qvd.92.2018.12.03.12.41.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 03 Dec 2018 12:41:44 -0800 (PST) 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; dkim=fail header.i=@linaro.org header.s=google header.b=gkduhK9W; 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]:52364 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTv2G-0007E3-AC for patch@linaro.org; Mon, 03 Dec 2018 15:41:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTuzT-0005zb-8i for qemu-devel@nongnu.org; Mon, 03 Dec 2018 15:38:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gTuzS-0005gv-LW for qemu-devel@nongnu.org; Mon, 03 Dec 2018 15:38:51 -0500 Received: from mail-ot1-x342.google.com ([2607:f8b0:4864:20::342]:37339) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gTuzS-0005fM-E1 for qemu-devel@nongnu.org; Mon, 03 Dec 2018 15:38:50 -0500 Received: by mail-ot1-x342.google.com with SMTP id 40so12971746oth.4 for ; Mon, 03 Dec 2018 12:38:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TCX2H7S6T0GKan665ryQqRgHdROtacoqe/v4hfXwa1s=; b=gkduhK9WE0JwEwuxYXGu3xv6j4DkPQEdxK5gTekT4qVUPe/VA6a0A5VPEFAxCBOk9q 7AqpIhMkmS7CvrhvGxPu3vs2Z9jVyyZIAdKkl6O4JTd1kMHugBGn0DPnGErqhO08rfZy X/by8tJ8N9X7G1wTkRSwZUXHSE1vG8wlKURSk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TCX2H7S6T0GKan665ryQqRgHdROtacoqe/v4hfXwa1s=; b=F9LGWg2z4eqKpqBkIOQSbw01jChoTvw75LxroqpaUSTZ9pXrfkN5NZVz8CPYAKGuXl ip8lTm0M/fLadMOEZ8EZtpGBYQfkcSXaEgMBe8n+svjJOTPIOaI3PTRWfkajwpi3T6kP h48l4PhPumvY9gz6yvfmWgOT95jGoLAzkCpQX5op8/3jDJetBZXPUM6H98nBbXGBZUkf fPRZLai9rPT5UHgRLQ0f5rJwjFU9WInI9tTs6dSYRQWaHtKZ8X+632qABHpWZPBogcKo GVtw5SBKgwPN/kngbqHPItexMUmQQ1i118oev9DC365Q4jLufRlgFQajJj4NewMi7xMq C23Q== X-Gm-Message-State: AA+aEWYbocAIW64hNqjB7Z7fUPYDTDqyK2Q3PXX5zPyVBCogRNzecV8G m+7rLa/PzVHYIvUOoNGRBjYltoKzvAE= X-Received: by 2002:a9d:64c8:: with SMTP id n8mr11687264otl.115.1543869528987; Mon, 03 Dec 2018 12:38:48 -0800 (PST) Received: from cloudburst.twiddle.net (172.189-204-159.bestel.com.mx. [189.204.159.172]) by smtp.gmail.com with ESMTPSA id m133sm6330063oib.52.2018.12.03.12.38.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Dec 2018 12:38:48 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 3 Dec 2018 14:38:33 -0600 Message-Id: <20181203203839.757-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181203203839.757-1-richard.henderson@linaro.org> References: <20181203203839.757-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::342 Subject: [Qemu-devel] [PATCH v2 04/10] target/arm: Fix HCR_EL2.TGE check in arm_phys_excp_target_el 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: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The enable for TGE has already occurred within arm_hcr_el2_amo and friends. Moreover, when E2H is also set, the sense is supposed to be reversed, which has also already occurred within the helpers. Signed-off-by: Richard Henderson --- target/arm/helper.c | 3 --- 1 file changed, 3 deletions(-) -- 2.17.2 Reviewed-by: Peter Maydell diff --git a/target/arm/helper.c b/target/arm/helper.c index 04c4a91b04..bf020364e1 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6537,9 +6537,6 @@ uint32_t arm_phys_excp_target_el(CPUState *cs, uint32_t excp_idx, break; }; - /* If HCR.TGE is set then HCR is treated as being 1 */ - hcr |= ((env->cp15.hcr_el2 & HCR_TGE) == HCR_TGE); - /* Perform a table-lookup for the target EL given the current state */ target_el = target_el_table[is64][scr][rw][hcr][secure][cur_el];