From patchwork Sun May 25 16:02:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 892460 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp839895wrz; Sun, 25 May 2025 09:03:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVmcOTtAgLepPmAZykpHD1BetIoBTMi4L77K+fTPDq4xGKn05Nbx854/BlR8leyTC3NS44iqQ==@linaro.org X-Google-Smtp-Source: AGHT+IGO+dYd/ARbtyuDuMmUuVj3dzfnnA52kFkXBmMuGHAQgwyalPbE3iei0+zXnwtznARGabrn X-Received: by 2002:a05:6e02:3c04:b0:3dc:76c6:4391 with SMTP id e9e14a558f8ab-3dc9b71b666mr48002335ab.20.1748189009803; Sun, 25 May 2025 09:03:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748189009; cv=none; d=google.com; s=arc-20240605; b=iRQ+6bdwJd3P/e68gD9LoFFWof80e0J60xxQiEcmNN/PkfpMtvE7KlAHh2k7f4xnqW gtlZxPPRVYAXRSJcsDXUX+zB0ZMdp1yxtWb3aqgCSQPNkxVcDQtoCVmS5on4eR0/HY/4 aFq9YlTr5L7VoAVIFd1qnyRcN7fFqL5qC86PFB0Lx5aTKP1Z4Bc2mtZcr6AKkYFYZ/TN zgg4zxS/OT9m/giqZRkGcmPbT3tJQwVIjkBMvnyuHoFFndEryhytqtDEF+CWWbDnBIe0 Tb/AZQPI2lcaSQU+HT/KFkneO1d7aLF2KqGSJnIJIO/h9HCqe/PIbZ3rxdAhlZTZ0U8B 9gjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=v030sQXn38icJSu8ncIHv/E3f08VdnZ+xSGEfzy3HLE=; fh=8mBO+FwhNjUD9ALhUxcYEwIlwc/hLQI6+6+QuDX34lg=; b=B1M/yEcLdpsgYltbG7+VIhit6vd1x/7yQB0xFy33wvhw7it0uUVFJ1Q6T70oUCMPde Y4+ahk+V/qFWTP1d9tTA4DYSRxpE5IHGnCy1KcgNWn5jUF3bd7YSQ9fks7xIEZx5s/ej dysTpbFGPGU60teBPV+5VhtlZRk9FYMq4jsPQRvnRl1M0L/UiNnJERt0C3kjcX2VzuS+ m3DObUUY+16S2NNjj+LZLO1L89PmlsOqP5qHVqINQ/oVvI+YN81Q9+G16iimX5/qCbFo bU8wilz458Ze/oPbkLmy25F2C14dfX0YEtJfW4rCMm5vWS1g50X5NKiY8tv2oXOT3SEM q9Ig==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dEDEB7XR; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 8926c6da1cb9f-4fbcc48efe9si2703137173.84.2025.05.25.09.03.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 May 2025 09:03:29 -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=pass header.i=@linaro.org header.s=google header.b=dEDEB7XR; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJDoB-0001sm-97; Sun, 25 May 2025 12:02:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uJDo1-0001kl-SN for qemu-devel@nongnu.org; Sun, 25 May 2025 12:02:36 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uJDny-000360-To for qemu-devel@nongnu.org; Sun, 25 May 2025 12:02:33 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43ce71582e9so12783395e9.1 for ; Sun, 25 May 2025 09:02:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748188949; x=1748793749; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v030sQXn38icJSu8ncIHv/E3f08VdnZ+xSGEfzy3HLE=; b=dEDEB7XRshpxYX22MZngR2WOz0n6DQbR8MrWJDqUWGJ90lIwaE5W1Ql8tAFRrTO1hI dbz2XpUXNMQXHXxbG0gERIHZTeQRBItpu1tnLf2YgA/3LmKQAn76XIFE/SWIPSTAZAae 4A7Sz3J5i7Mzd9/f4oJCzyg0QnM8WcyXzb2+Jv75mTkD9emge+xBhOEZxPgt69k69x79 YYBWqjLEa5WplI+R9UuLvhDPkRbkyyiTOosBuBgJXnhbSo0Jk68yQW77n0jBqHwMMMHS PlCobZpk5AaO7+vwZTJ9z1Ls12Q4hcfigYhoX5A/Y5+xk4a3oUhUzbFmFgDgy3rA0iAH wf8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748188949; x=1748793749; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v030sQXn38icJSu8ncIHv/E3f08VdnZ+xSGEfzy3HLE=; b=EA8Vsrsdnijm0G7mKmvSzIYxKLBsUsk+J01QLc5acM3HHvCFcVWZtZEdBU8eqV7kK1 RAyLq41KtI7QoVJMxIBf3sfMHXPSqL+a8TS6ke1YXeZXXrMd5ihAf+mIzrKJPgqaH68h gKXYePThYDiYgGTcO0wr4OCIHfIrKNYzTCMj1bXgN76cDW/CeW0CK3QlGxMkJi2jKpwr pvzgyFghgL91z8enPX/iHYnG/8P5nCL3bWkKRwaOu+oaYlNRDwKjEm64qxlyERoyhmT4 kD3HE05RRRoSPbGF/Fj+isMW/u5QhEDhRLySxOc69kexOQ1RZw43Zv2yNgDGYTv8le2e 61sQ== X-Gm-Message-State: AOJu0YzkasayV8vfELU/oZbjziPi1JIP1dwwymYE71Uu2g8PX705ljQM mdesAGQxZ5aRGLPh62MadVahPT1j/YBB5NRlMhJtEo/dt9WFv7b2BT6NNWql4imGZuOOZEntdrX WZtdNWiI= X-Gm-Gg: ASbGncsqdChEjLtcrDLpoOSBAA1W/FuqGLtGoCnpHclP6rOJ6IhOxAy0SJoRBNGBRWS UkYnzZb5ALDy4UkZvx2kwWwZNMgGB2F1Y8XGEzew/M7bMJXom37+ZQRwk+pNZNms1isaJ+d57yl B1LXoNgEheKwGG4JPovy59OMRZdmP9vO8mj2a4xGezIzsT7/8EsSwoi4+gRHoHvO4c19Fj1Hiii yQt2KnMLYn7rX+iGSG4IlGO42oqJts6HBf1cm5Tg64buFr37AuEuqY/o5lP52dBCZ68ZAFYh+AL ZUfx0zDgf0YZYR6MDL7pkxocdIPoCZr9MlGHgfaiiMZOGDV2R7JGMHB2cxBA+KQ2twU= X-Received: by 2002:a05:600c:1da6:b0:44a:4874:bdde with SMTP id 5b1f17b1804b1-44c8ed8f474mr57832085e9.0.1748188948925; Sun, 25 May 2025 09:02:28 -0700 (PDT) Received: from stoup.. ([195.53.115.74]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-447f73d4a3csm215772545e9.22.2025.05.25.09.02.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 May 2025 09:02:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: edgar.iglesias@gmail.com, philmd@linaro.org Subject: [PATCH v2 03/10] target/microblaze: Split out mb_transaction_failed_internal Date: Sun, 25 May 2025 17:02:13 +0100 Message-ID: <20250525160220.222154-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250525160220.222154-1-richard.henderson@linaro.org> References: <20250525160220.222154-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32b.google.com 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.29 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-bounces+patch=linaro.org@nongnu.org Use an explicit 64-bit type for the address to store in EAR. Signed-off-by: Richard Henderson Reviewed-by: Edgar E. Iglesias --- target/microblaze/op_helper.c | 70 +++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 28 deletions(-) diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c index 9e838dfa15..4c39207a55 100644 --- a/target/microblaze/op_helper.c +++ b/target/microblaze/op_helper.c @@ -393,38 +393,52 @@ void helper_mmu_write(CPUMBState *env, uint32_t ext, uint32_t rn, uint32_t v) mmu_write(env, ext, rn, v); } +static void mb_transaction_failed_internal(CPUState *cs, hwaddr physaddr, + uint64_t addr, unsigned size, + MMUAccessType access_type, + uintptr_t retaddr) +{ + CPUMBState *env = cpu_env(cs); + MicroBlazeCPU *cpu = env_archcpu(env); + const char *access_name = "INVALID"; + bool take = env->msr & MSR_EE; + uint32_t esr = ESR_EC_DATA_BUS; + + switch (access_type) { + case MMU_INST_FETCH: + access_name = "INST_FETCH"; + esr = ESR_EC_INSN_BUS; + take &= cpu->cfg.iopb_bus_exception; + break; + case MMU_DATA_LOAD: + access_name = "DATA_LOAD"; + take &= cpu->cfg.dopb_bus_exception; + break; + case MMU_DATA_STORE: + access_name = "DATA_STORE"; + take &= cpu->cfg.dopb_bus_exception; + break; + } + + qemu_log_mask(CPU_LOG_INT, "Transaction failed: addr 0x%" PRIx64 + "physaddr 0x" HWADDR_FMT_plx " size %d access-type %s (%s)\n", + addr, physaddr, size, access_name, + take ? "TAKEN" : "DROPPED"); + + if (take) { + env->esr = esr; + env->ear = addr; + cs->exception_index = EXCP_HW_EXCP; + cpu_loop_exit_restore(cs, retaddr); + } +} + void mb_cpu_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, unsigned size, MMUAccessType access_type, int mmu_idx, MemTxAttrs attrs, MemTxResult response, uintptr_t retaddr) { - MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs); - CPUMBState *env = &cpu->env; - - qemu_log_mask(CPU_LOG_INT, "Transaction failed: vaddr 0x%" VADDR_PRIx - " physaddr 0x" HWADDR_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")); - - if (!(env->msr & MSR_EE)) { - return; - } - - if (access_type == MMU_INST_FETCH) { - if (!cpu->cfg.iopb_bus_exception) { - return; - } - env->esr = ESR_EC_INSN_BUS; - } else { - 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); + mb_transaction_failed_internal(cs, physaddr, addr, size, + access_type, retaddr); } #endif