From patchwork Thu Sep 7 13:28:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 111947 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp121621qge; Thu, 7 Sep 2017 06:51:17 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCNbcQNYv6oyD5aVwbxI+1iHkw1ihezxVnWHeG9j5dqtUMlZqZ6zRCKoe6flo2KExLEUuSq X-Received: by 10.55.76.134 with SMTP id z128mr3859316qka.183.1504792277706; Thu, 07 Sep 2017 06:51:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504792277; cv=none; d=google.com; s=arc-20160816; b=by6MLM1SZQMP/z4HmUff0XGq3fkLogVCYtlHW8adf7UDjqZbusDBO0wHTMgOxvMBSE AzGhAOlLsF4KzkFVEoZY++GPoykaDVogoBRX2sDhlL81VX6me2ItFC5/i5ur3DMS0ALm OfgQd9umHaS2kX37as35sNpS4WjvfaIvuONDca4tXNNHIyMSvEclWD4cZN56R1nijTSl qNZNZIIhHaXYScWhLbWxNyCAFRLA67xZ5DoPc3oxoc2mS1x/zvxv3Z/vcDCPyVaergeq W+0lBTmQcz/FVzb/PHXioMvwvoN7e14XsfY0hxkqJ6HCVnXr+k9Y8Vh9l4dfwCLMOeg3 95Fw== 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=UiSotj0sezDiJQv2VP2QjD8j5ClzZxtaOFOLu2N5Ujk=; b=szvV7jb2avzXLSsBa9TzQyAO/L6+7hr7gtJZAiufhWdFVjiGCOGaL+OceOy/v1oRCx Ea/AA0ui/MnbTywROViEWetHRfpxATkgQWp6tXBrlDy7oACLwo/QkYiT+iVGWbt8OyBn Mc2Jdt4ZNn4vXPVCcrR27sW9jM0g2oZL4REQT/xDsODdLuloQ8zVWsVD2OL0AFdl3ZmP yuzTTTGIV8mWBOZg5alDq23DGALBfsCOheCdMB4U5jTdBsmcO73PCcQxD6n5BCnCJkym lFmb71WXjISUXrn4gWmU85GD2iZtoNO8vm6FZe3VHZvNJ7DebxtfcJEV4qEC1FcdKn0G Otzw== 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: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f129si2907996qke.18.2017.09.07.06.51.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Sep 2017 06:51:17 -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]:40580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpxD9-0004Iz-LD for patch@linaro.org; Thu, 07 Sep 2017 09:51:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpwrI-0001Ei-0o for qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:28:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpwr3-0007ie-Ir for qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:28:40 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37200) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpwr3-0007gC-BL for qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:28:25 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1dpwr2-0001ia-99 for qemu-devel@nongnu.org; Thu, 07 Sep 2017 14:28:24 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 7 Sep 2017 14:28:23 +0100 Message-Id: <1504790904-17018-31-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504790904-17018-1-git-send-email-peter.maydell@linaro.org> References: <1504790904-17018-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 30/31] target/arm: Implement new do_transaction_failed hook 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" Implement the new do_transaction_failed hook for ARM, which should cause the CPU to take a prefetch abort or data abort. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Edgar E. Iglesias Message-id: 1504626814-23124-4-git-send-email-peter.maydell@linaro.org --- target/arm/internals.h | 10 ++++++++++ target/arm/cpu.c | 1 + target/arm/op_helper.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+) -- 2.7.4 diff --git a/target/arm/internals.h b/target/arm/internals.h index 4afebd9..5d7f24c 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -472,6 +472,16 @@ void arm_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr, MMUAccessType access_type, int mmu_idx, uintptr_t retaddr); +/* arm_cpu_do_transaction_failed: handle a memory system error response + * (eg "no device/memory present at address") by raising an external abort + * exception + */ +void arm_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, + vaddr addr, unsigned size, + MMUAccessType access_type, + int mmu_idx, MemTxAttrs attrs, + MemTxResult response, uintptr_t retaddr); + /* Call the EL change hook if one has been registered */ static inline void arm_call_el_change_hook(ARMCPU *cpu) { diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 116b567..f8b2fdb 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1707,6 +1707,7 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) #else cc->do_interrupt = arm_cpu_do_interrupt; cc->do_unaligned_access = arm_cpu_do_unaligned_access; + cc->do_transaction_failed = arm_cpu_do_transaction_failed; cc->get_phys_page_attrs_debug = arm_cpu_get_phys_page_attrs_debug; cc->asidx_from_attrs = arm_asidx_from_attrs; cc->vmsd = &vmstate_arm_cpu; diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index 8f6db80..d1bca46 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -229,6 +229,49 @@ void arm_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr, deliver_fault(cpu, vaddr, access_type, fsr, fsc, &fi); } +/* arm_cpu_do_transaction_failed: handle a memory system error response + * (eg "no device/memory present at address") by raising an external abort + * exception + */ +void arm_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, + vaddr addr, unsigned size, + MMUAccessType access_type, + int mmu_idx, MemTxAttrs attrs, + MemTxResult response, uintptr_t retaddr) +{ + ARMCPU *cpu = ARM_CPU(cs); + CPUARMState *env = &cpu->env; + uint32_t fsr, fsc; + ARMMMUFaultInfo fi = {}; + ARMMMUIdx arm_mmu_idx = core_to_arm_mmu_idx(env, mmu_idx); + + if (retaddr) { + /* now we have a real cpu fault */ + cpu_restore_state(cs, retaddr); + } + + /* The EA bit in syndromes and fault status registers is an + * IMPDEF classification of external aborts. ARM implementations + * usually use this to indicate AXI bus Decode error (0) or + * Slave error (1); in QEMU we follow that. + */ + fi.ea = (response != MEMTX_DECODE_ERROR); + + /* The fault status register format depends on whether we're using + * the LPAE long descriptor format, or the short descriptor format. + */ + if (arm_s1_regime_using_lpae_format(env, arm_mmu_idx)) { + /* long descriptor form, STATUS 0b010000: synchronous ext abort */ + fsr = (fi.ea << 12) | (1 << 9) | 0x10; + } else { + /* short descriptor form, FSR 0b01000 : synchronous ext abort */ + fsr = (fi.ea << 12) | 0x8; + } + fsc = 0x10; + + deliver_fault(cpu, addr, access_type, fsr, fsc, &fi); +} + #endif /* !defined(CONFIG_USER_ONLY) */ uint32_t HELPER(add_setq)(CPUARMState *env, uint32_t a, uint32_t b)