From patchwork Mon Aug 31 16:05:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 248791 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp3453973ilg; Mon, 31 Aug 2020 09:23:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzueirjrVuBrvVPXTCCVv/n7bRhbYo8SVKdcdu1VCRD+/ifhklHqOU2/3tVKtik7gzdZPnj X-Received: by 2002:a25:317:: with SMTP id 23mr3275200ybd.297.1598891020285; Mon, 31 Aug 2020 09:23:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598891020; cv=none; d=google.com; s=arc-20160816; b=AvA6qqwvwDIbZUHzz1VJZfYzunr76kQS7S93b1mL1ypR139Cs5xpdFVdQOa4aIplEY Yd8b4njF0e0OmrqwXKa2bd+lp4OhLGby3N2HgUem1uzPIxS3svXF10DeLcuJYkOrbmrz OdnS2H1pEAHtisNbYsMvauu2p3Ku4zOZOo0ZFdyf19OvkRQo1ObmSrADWWgnLfjXmxZj HH+sNuj9mX+NH4d3D3rGHhTKNnObZ8izHCLZpuUHdaNh6/KHuy4Kb8mFd/ArCnWpKWcT Uaq+VytcTGQzFRm84AKz7pu7EnKpfGPW9WwI6RfN4pq2SeeUltAqXbbByaSvItePFEYw oBdg== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=vu1hIGTjP3FaAqDu3kt28iRiwFfoFLPJO2tReGgCbQ0=; b=ICGLysI/NCJ7si+YDeB5sAUVSYPE2x5SFBkSLcoSVu9Gw76v9kFWekju4nR0iZ4NSy DsNmBX6dds0XqrFD/eTqJ3je7URE7Vrc5m0uSWN1P0FUWSS6AU8YGqoWUx0s0Fj6ZINE MIchidhtrgg1O7Z/4MzYgObPuIXzYuTFRjhk0dBymSF+FJ3j+1E4M0dcHnXtBejzL68h b9zVJfjbHI8a8FkHtFmVleTV/s/jGb64ad0iTilC1vfRPm9WpnkFRYhEeNIGrgqSd+PK nIox/HB8Um8LIC9g6BfejkTTAGx2Xf608tyRXo+SjmixjsvZ0PEFiyEK4CPSgEZpcsKc fRGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vf4684yX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id h6si3788226ybj.471.2020.08.31.09.23.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Aug 2020 09:23:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vf4684yX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:53620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCmap-00058H-Oa for patch@linaro.org; Mon, 31 Aug 2020 12:23:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCmL5-00064A-4n for qemu-devel@nongnu.org; Mon, 31 Aug 2020 12:07:23 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:42313) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kCmL3-00067s-7E for qemu-devel@nongnu.org; Mon, 31 Aug 2020 12:07:22 -0400 Received: by mail-pf1-x431.google.com with SMTP id 17so805031pfw.9 for ; Mon, 31 Aug 2020 09:07:20 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=vu1hIGTjP3FaAqDu3kt28iRiwFfoFLPJO2tReGgCbQ0=; b=vf4684yXjoEp4Rlw8+sEjTEpJrsRipmc1z+DNoK+eV+7SaJ/aPM6NTNnwir3KHGHm0 Zv/EWJ93sQ2irWqjDr2fV1kyVXI5mIGgogcunhAbQtJqWOM+uGB4emzzjgcOKWQUcn18 iLJg+kkgBT2fP6xWj9Kr3vTZ2WncjWZznapYRgNiPFmuHm8b38M5KCLJRLSCl2r12/C1 5dhHJua8lDuQStUPiXu+1bxehSOTL34iscMx8GP3H7Eyk9ilMM/R/OXbaSo8o9UZaiB6 CbHO54RbFmK4o2LbVOyHmQmpaTIT0tKDhy/AQFID5JC0lnS+fMZpk+pE9OZGYOcEz9uQ v3Zg== 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:mime-version:content-transfer-encoding; bh=vu1hIGTjP3FaAqDu3kt28iRiwFfoFLPJO2tReGgCbQ0=; b=qyW9E7WTTuDZXU3XpS7rMlVoE8/a3fhlGdxc2Gr6/VpB/xECnfuKM0EA8nq2bSHH5T d+KVPZXxpW5gwhKHUgQZw+J1CpNP/eJ6YHUE9ROTuEHe0wd54/jTjeWoXnULApkc6pPI Smy+A65G/EmBpTfFA2BU3JUSA9TkJ0lCZlpUrH0qwvI42ErPK2k2ePXdA+XEFqaNi6az 0Ob0776YQm9XTy/dBcuc1VZML3c1lLXXIpio0hYYgbduBb/GOAHteNfHa2esQG1ecqlJ SOg9vapgMl3CT0tFG27HORIyomVUknD5cVEBsbcKI5X/Kc6BzxOqo7W4j+4pxlvZIIfK KxXg== X-Gm-Message-State: AOAM530mgXjKpn2PjVU3PLPBHST7JiXCU8NLLGoDp9KnhhwKaiK+JxGl LP4ogReeVKMqHI7FfBsjrZPJqhwDJNdwCA== X-Received: by 2002:a05:6a00:1509:: with SMTP id q9mr1819413pfu.24.1598890039557; Mon, 31 Aug 2020 09:07:19 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id gt13sm17218pjb.43.2020.08.31.09.07.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2020 09:07:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 56/76] target/microblaze: Fix no-op mb_cpu_transaction_failed Date: Mon, 31 Aug 2020 09:05:41 -0700 Message-Id: <20200831160601.833692-57-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200831160601.833692-1-richard.henderson@linaro.org> References: <20200831160601.833692-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , peter.maydell@linaro.org, "Edgar E . Iglesias" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Do not call cpu_restore_state when no exception will be delivered. This can lead to inconsistent cpu state. Tested-by: Edgar E. Iglesias Reviewed-by: Edgar E. Iglesias Reported-by: Edgar E. Iglesias Signed-off-by: Richard Henderson --- target/microblaze/op_helper.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) -- 2.25.1 diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c index a99c467364..e6dcc79243 100644 --- a/target/microblaze/op_helper.c +++ b/target/microblaze/op_helper.c @@ -419,32 +419,33 @@ void mb_cpu_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, int mmu_idx, MemTxAttrs attrs, MemTxResult response, uintptr_t retaddr) { - MicroBlazeCPU *cpu; - CPUMBState *env; + MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs); + CPUMBState *env = &cpu->env; + qemu_log_mask(CPU_LOG_INT, "Transaction failed: vaddr 0x%" VADDR_PRIx " physaddr 0x" TARGET_FMT_plx " size %d access type %s\n", addr, physaddr, size, access_type == MMU_INST_FETCH ? "INST_FETCH" : (access_type == MMU_DATA_LOAD ? "DATA_LOAD" : "DATA_STORE")); - cpu = MICROBLAZE_CPU(cs); - env = &cpu->env; - cpu_restore_state(cs, retaddr, true); if (!(env->msr & MSR_EE)) { return; } - env->ear = addr; if (access_type == MMU_INST_FETCH) { - if ((env->pvr.regs[2] & PVR2_IOPB_BUS_EXC_MASK)) { - env->esr = ESR_EC_INSN_BUS; - helper_raise_exception(env, EXCP_HW_EXCP); + if (!cpu->cfg.iopb_bus_exception) { + return; } + env->esr = ESR_EC_INSN_BUS; } else { - if ((env->pvr.regs[2] & PVR2_DOPB_BUS_EXC_MASK)) { - env->esr = ESR_EC_DATA_BUS; - helper_raise_exception(env, EXCP_HW_EXCP); + if (!cpu->cfg.dopb_bus_exception) { + return; } + env->esr = ESR_EC_DATA_BUS; } + + env->ear = addr; + cs->exception_index = EXCP_HW_EXCP; + cpu_loop_exit_restore(cs, retaddr); } #endif