Message ID | 20180814181815.23348-34-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 2ccf0fef632f3d54b2cc9ea08f1e6904ff1f8df4 |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4746776ljj; Tue, 14 Aug 2018 12:17:51 -0700 (PDT) X-Google-Smtp-Source: AA+uWPzKF9UPuySm0WgPPgXy3Ei7u/0PRYGeoicMOkKeeWx0gslmtyfjUZ0gw9+/f3rhMciCY7zy X-Received: by 2002:aed:3534:: with SMTP id a49-v6mr22197585qte.195.1534274271560; Tue, 14 Aug 2018 12:17:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534274271; cv=none; d=google.com; s=arc-20160816; b=eaN1hrxoinoiMoC5E1vtogoblIIa6gUP1pYN8H2Zm+6Q3iSB93BvzGOQh3lpfH6sne McP5PlIUI6lCQpZapyL5PWzuqLEJ23ZYORvNQ9HaYicBS35HEA8vbp5t939BUl/76VH6 KxBWfM4boEXsDUqI5pmMnZAfZhYPR8Tx5z0abgYO2D0rd8YOnnWoA0qoC3xQJdagAcgn M8gwLnx/Y7iqd7Ko3JV42PW+JIlGUBJ7ptTpC1YN/T7hGcBzQzgA3Oh6Q258IWhDaghy dM3PYcjedSt5WVt43HrL579xnoIpFQmZj2Yb0ty4fmGdprmviHDUPOZtsqmdqUgw50Ba dIRw== 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=fxHL9tkUNgpYIpkBzCENYKpNrcm5bu1U8h1wCky5s0U=; b=Xn7V3Ef+AHW3v/7QwIhT8cwaywn9YsciXCnON3m/sIVyIh6LUaaReIPJ8gU/J/IsbU zWptWuODeTFSeKX2yl/smzpTwMCrMiBANATpGrcsKfsyPdVPR+g61JyqOz5zavzT2bBr KG9UA0daEZ+dv2GVxPS5kJp17Ib2bsUnNMfHq835Y7jh+CLr5CyeVujwCun5wC4HHZhU HmEmR9mX0etcN/Axare/8VSxsc89VWQdES3Ps884KfrGeC47UwMOVlhpikpbr6/M9G1A tpO3gVQ2tfOR6aDj6ngWNsQmHyxnemc1hqPTx+G6uyCbK2Rk6EnFGaAmLdJcISrmd3lv 5vWg== 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 x10-v6si12413934qta.285.2018.08.14.12.17.51 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Aug 2018 12:17:51 -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]:45959 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1fpepD-000294-1s for patch@linaro.org; Tue, 14 Aug 2018 15:17:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52771) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1fpdvg-00053r-IM for qemu-devel@nongnu.org; Tue, 14 Aug 2018 14:22:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1fpduD-0006nG-A2 for qemu-devel@nongnu.org; Tue, 14 Aug 2018 14:20:28 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:44426) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1fpduC-0006mZ-QT for qemu-devel@nongnu.org; Tue, 14 Aug 2018 14:18:57 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1fpduB-0007M0-Gt for qemu-devel@nongnu.org; Tue, 14 Aug 2018 19:18:55 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Tue, 14 Aug 2018 19:18:03 +0100 Message-Id: <20180814181815.23348-34-peter.maydell@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180814181815.23348-1-peter.maydell@linaro.org> References: <20180814181815.23348-1-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 33/45] target/arm: Mask virtual interrupts if HCR_EL2.TGE is set 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/cpu.h b/target/arm/cpu.h index e310ffc29d2..efb2a8d3f3d 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2261,13 +2261,15 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx, break; case EXCP_VFIQ: - if (secure || !(env->cp15.hcr_el2 & HCR_FMO)) { + if (secure || !(env->cp15.hcr_el2 & HCR_FMO) + || (env->cp15.hcr_el2 & HCR_TGE)) { /* VFIQs are only taken when hypervized and non-secure. */ return false; } return !(env->daif & PSTATE_F); case EXCP_VIRQ: - if (secure || !(env->cp15.hcr_el2 & HCR_IMO)) { + if (secure || !(env->cp15.hcr_el2 & HCR_IMO) + || (env->cp15.hcr_el2 & HCR_TGE)) { /* VIRQs are only taken when hypervized and non-secure. */ return false; }