Message ID | 20180814181815.23348-36-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 7556edfb4d7bf0583c852c8cfc49ef494c41dd8a |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4733107ljj; Tue, 14 Aug 2018 12:03:51 -0700 (PDT) X-Google-Smtp-Source: AA+uWPzudoKZVzfpqQJ2ia9beD0sBgReW1rbPJj8WrNl61LJRFJYrzDYeiLsc28zvQ+1VJvedbqh X-Received: by 2002:a0c:86b3:: with SMTP id 48-v6mr19929567qvf.64.1534273431406; Tue, 14 Aug 2018 12:03:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534273431; cv=none; d=google.com; s=arc-20160816; b=GSgLe9RZ/zaW7cUpQJYYcyxP55WLK7Oml2aOK4Z8TeTgjMipBH5kic8xUrO9UVIDun 5MKB4wW79kpvSp4jFrWEsNBV4kzg9UvzjJ52FLBVC4r9Y9x/7iSm0jQrJ8zd0v+8v93F ZqUEtdFMNoWkLCQP56T9auzTwXcPfirXspmMklGLd8Xv2B8L4bijsf9YvpRf41Z2VDPN swBFy/C+KNAb82zlHsrjCRuVc3MqcYcj0TebdvBHGBBPWIhwji9D8nGAEKLUia5IoHnw ErGttIhunqJeChEnBwc0dyhVVr8UrFMoKLeuO5gr+zUEqHqllhQj5KJQEpZ5lWlsvHa3 JrmQ== 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=/VEttaAeOhoDOOwhK/DNTaHefzvoVlIUWlPVhDD2TpM=; b=ZxX8B5YgesvD3FdTuyldvtNMhe3EG3CjBdvotSaqM5/66uOzYk2s+3vnvuTGfum+Lh 1b7WK1p78XPVx4aCiaCSf+2zppEzuGPab1JYZ8N9m5wnxivPHVfwk7sxARl0S+do5OLm uKU/IkGqrs31xP03kXYg0/PlLmkZdrgAgGdMy334KOuKtCp6YyBcsrd4O4vDJjFwACWK 4vfYIpFQFOgIAjMwsayDxU8U05YuypeIvWSpl75QtCRsCwvYSnXK0cWpDyJUjjyJrKMq jRz4AqRjC2JVdDSes1MalJ2OhMjbshkm35znnCxTVnrHZWZHE+l+AtO/64WgETw03gmB sTwg== 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 f129-v6si20097676qkb.232.2018.08.14.12.03.51 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Aug 2018 12:03: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]:45849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1fpebe-0006ef-SW for patch@linaro.org; Tue, 14 Aug 2018 15:03:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1fpdvj-000581-ID for qemu-devel@nongnu.org; Tue, 14 Aug 2018 14:22:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1fpduF-0006o9-CY for qemu-devel@nongnu.org; Tue, 14 Aug 2018 14:20:31 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:44428) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1fpduF-0006nb-2C for qemu-devel@nongnu.org; Tue, 14 Aug 2018 14:18:59 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1fpduD-0007Me-Ch for qemu-devel@nongnu.org; Tue, 14 Aug 2018 19:18:57 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Tue, 14 Aug 2018 19:18:05 +0100 Message-Id: <20180814181815.23348-36-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 35/45] target/arm: Honour HCR_EL2.TGE when raising synchronous exceptions 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 f728f25e4bf..d550978b5b9 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -33,6 +33,20 @@ static void raise_exception(CPUARMState *env, uint32_t excp, { CPUState *cs = CPU(arm_env_get_cpu(env)); + if ((env->cp15.hcr_el2 & HCR_TGE) && + target_el == 1 && !arm_is_secure(env)) { + /* + * Redirect NS EL1 exceptions to NS EL2. These are reported with + * their original syndrome register value, with the exception of + * SIMD/FP access traps, which are reported as uncategorized + * (see DDI0478C.a D1.10.4) + */ + target_el = 2; + if (syndrome >> ARM_EL_EC_SHIFT == EC_ADVSIMDFPACCESSTRAP) { + syndrome = syn_uncategorized(); + } + } + assert(!excp_is_internal(excp)); cs->exception_index = excp; env->exception.syndrome = syndrome;