From nobody Wed Nov 12 06:49:37 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1568762938; cv=none; d=zoho.com; s=zohoarc; b=Gz9cVCHujLbnm+yxFz8IgXqkdBYQgaQ4KkRLYQuBGZTGhFjETwOTYLaWWeLrSY3/am1HdVcRWQt83AInMGEEAo8Gm3rOLUHIlIWvfYdCLbRyB6hrGpNejn4WIQlCskXAyEz8EJHb4uSQCgDfbFt1+7SN9n0OjUq2cWVWVvGBpsU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568762938; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=h1Bj3xh4DkX6+/+qWIx3cAcoQYsV7H74LULJx3oMGTM=; b=fnS6zaRiwB4H7pr5t9lBDNrVcoHQ01ZbwQ8Y46bsVYr11/51arlKz6I2brzjyqt7Fk6rdFwzW6W+pK4BzP1VWSkgkLjsnT7C7AMlNJW4AXxDyyEp1R5w3wxj6/cLLeIJxzCLK5pH4YVMHduC2nVQkkKzyzG8bYVAryeh/6HkgZY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568762938112397.8226751565852; Tue, 17 Sep 2019 16:28:58 -0700 (PDT) Received: from localhost ([::1]:53426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAMtw-00057B-Io for importer@patchew.org; Tue, 17 Sep 2019 19:28:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50825) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAMsN-0004DJ-WD for qemu-devel@nongnu.org; Tue, 17 Sep 2019 19:27:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAMsM-0002kq-FU for qemu-devel@nongnu.org; Tue, 17 Sep 2019 19:27:15 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:35336) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iAMsK-0002d5-Ng; Tue, 17 Sep 2019 19:27:12 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 18 Sep 2019 07:27:08 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2019 16:23:43 -0700 Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.157.58]) by uls-op-cesaip01.wdc.com with ESMTP; 17 Sep 2019 16:27:08 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1568762832; x=1600298832; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GHkKx2iMe0DVDnMz2PJlSqovsjWMq6y8Tg7I8i9Imdc=; b=aFOM+UNDeZ5XFZSsxnYpLSrzLbgkpGoTlqb2qo64jO+CXZIDjvqHb0Jc 1jmZ76ZWMjXvdvG6TXPcLVak0BVkWS/+D8GQWTrVqJE4a7TMJoleHSjX4 5H2IVGpP2qMExiKs5halHCCRtWdKavqtw/2x1X8AIdJ60rEMR5ImnBiV3 +h9WLyVdBn+STSd7PAoLfo610LAG/XqxUjS1qg8+12xmht4KWtg6FPIBt sx1ZcAAoAnVnwi0BKesiQNCotXClErYQcCVZ+7btXUYUI4Nsl/1YHZYIs 9pFTgQUFYh3Y8M24SLTCncsDkUYDYKIZXrhcRAzvf1PTfVtv2MzFTb3YT A==; IronPort-SDR: kIbapOoMffOtUumA58cu41O4MYlIcY7fUmYKnJj40k1IDXsRxdCOnEy8xNkKPNGNSLhg36MyqC oklrwuPycYqoX5j3M0pVZx0p12s1hyP552a1LtK9zxgDxD/J0zy/PUH046Atex5bgKK4n70/f8 VW3VwvqeMFRvH98y/+qlZT3aWpH6h2JWOdo6y0JE5l8FINpucW9VFDpl0169wiotIrFDpX1HH4 mFCv420RQvEjRNQ4YA8AOmgK3A5kWaXc009/59ugo9opPbPurkQGftCfuNJoXGb4L0mDKnWNAa wDM= X-IronPort-AV: E=Sophos;i="5.64,518,1559491200"; d="scan'208";a="225302175" IronPort-SDR: pnUYMrM0ok7UQohTcLTCXu1N5PSQGjrxmhqO462jOgnb1yWto2tx0pVx96elGkePVn3vyTIwAn c86xzk1K3LDcgvvVX2NKyrrO14+zsIvi7l9dyMuPldjKh6QYO+Dr4FstsRfT0+YK6BEl9h1l3S ZZwEcvaxXzld/n7iQrNxX/XZxT9I7nym4EysJVBie5w3PJTCtj7PqniIkuSaoAdxTFoXWn1kcc h6AD7Vb0O0wCoRoGmlW16tXRkyPHYfXzIjNn6xvqiJVUQlkHhSrfAHIOzDXqH5ymVzVRFw+Drs NxRj0imcs1wUmAtUGGM64zh3 IronPort-SDR: nAfKiDgCf864YPlYhHl7EN80oO7bjpo3CEQLTOwzayDBs+fZEwekKXNYZGNjWtlWTgV/UX/jnI jjxb2o7/S9c8zK2Me9iie3pjTDj+q3njRkOrUCGwNZX6GydvJyEq+1zEjZma1PuZsGxY9xrKbE xWsyORH0PdjSFvt2Z9azEq0tDC4f5DU1z6p1NRkq3+crVkME/MeAs2jflrusWqkOUhLMAJQ9Jq 2qB4vDjrUQ/i1v4qS3o3iZRj4K0DUCnTfP/kbECnFxs9cPwvT30sZopJQ2xFNZzivRPUgLuetK 0iY= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Date: Tue, 17 Sep 2019 16:23:02 -0700 Message-Id: <62b87f2ee604c437cc59e82b84853c6f02a83372.1568762497.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PATCH v1 2/2] RISC-V: Implement cpu_do_transaction_failed 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: peter.maydell@linaro.org, palmer@sifive.com, alistair.francis@wdc.com, alistair23@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Palmer Dabbelt This converts our port over from cpu_do_unassigned_access to cpu_do_transaction_failed, as cpu_do_unassigned_access has been deprecated. Signed-off-by: Palmer Dabbelt Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/riscv/cpu.c | 2 +- target/riscv/cpu.h | 7 +++++-- target/riscv/cpu_helper.c | 11 +++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index f13e298a36..3939963b71 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -484,7 +484,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *= data) cc->gdb_stop_before_watchpoint =3D true; cc->disas_set_info =3D riscv_cpu_disas_set_info; #ifndef CONFIG_USER_ONLY - cc->do_unassigned_access =3D riscv_cpu_unassigned_access; + cc->do_transaction_failed =3D riscv_cpu_do_transaction_failed; cc->do_unaligned_access =3D riscv_cpu_do_unaligned_access; cc->get_phys_page_debug =3D riscv_cpu_get_phys_page_debug; #endif diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 124ed33ee4..8c64c68538 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -264,8 +264,11 @@ void riscv_cpu_do_unaligned_access(CPUState *cs, vadd= r addr, bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); -void riscv_cpu_unassigned_access(CPUState *cpu, hwaddr addr, bool is_write, - bool is_exec, int unused, unsigned size); +void riscv_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, + vaddr addr, unsigned size, + MMUAccessType access_type, + int mmu_idx, MemTxAttrs attrs, + MemTxResult response, uintptr_t retad= dr); char *riscv_isa_string(RISCVCPU *cpu); void riscv_cpu_list(void); =20 diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index c82e7ed52b..917252f71b 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -408,20 +408,23 @@ hwaddr riscv_cpu_get_phys_page_debug(CPUState *cs, va= ddr addr) return phys_addr; } =20 -void riscv_cpu_unassigned_access(CPUState *cs, hwaddr addr, bool is_write, - bool is_exec, int unused, unsigned size) +void riscv_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, + vaddr addr, unsigned size, + MMUAccessType access_type, + int mmu_idx, MemTxAttrs attrs, + MemTxResult response, uintptr_t retad= dr) { RISCVCPU *cpu =3D RISCV_CPU(cs); CPURISCVState *env =3D &cpu->env; =20 - if (is_write) { + if (access_type =3D=3D MMU_DATA_STORE) { cs->exception_index =3D RISCV_EXCP_STORE_AMO_ACCESS_FAULT; } else { cs->exception_index =3D RISCV_EXCP_LOAD_ACCESS_FAULT; } =20 env->badaddr =3D addr; - riscv_raise_exception(&cpu->env, cs->exception_index, GETPC()); + riscv_raise_exception(&cpu->env, cs->exception_index, retaddr); } =20 void riscv_cpu_do_unaligned_access(CPUState *cs, vaddr addr, --=20 2.23.0