From patchwork Tue May 8 17:31:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 10386717 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B04CE6037F for ; Tue, 8 May 2018 17:39:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A00322903D for ; Tue, 8 May 2018 17:39:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9497A290B3; Tue, 8 May 2018 17:39:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.0 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, FSL_HELO_FAKE, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 410422903D for ; Tue, 8 May 2018 17:39:33 +0000 (UTC) Received: from localhost ([::1]:52593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG6aK-0006L3-Dx for patchwork-qemu-devel@patchwork.kernel.org; Tue, 08 May 2018 13:39:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG6TE-0008CB-Fo for qemu-devel@nongnu.org; Tue, 08 May 2018 13:32:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fG6TD-0005LC-Jn for qemu-devel@nongnu.org; Tue, 08 May 2018 13:32:12 -0400 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]:46692) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fG6TD-0005Kg-BW for qemu-devel@nongnu.org; Tue, 08 May 2018 13:32:11 -0400 Received: by mail-lf0-x242.google.com with SMTP id x7-v6so12045996lff.13 for ; Tue, 08 May 2018 10:32:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XcaBif2G1gHZNdGnfBcVzRnLzbEc47vn/TGeNHdxtBc=; b=QJ4n6gJNtqXaI3HZpd8vgIKUuV/zhJhYyqKdRP9DguMgXCRd58uYar2IrrKZJLv25n 0ItF6DHjMVIXDhkdYt3bXdOnOc54/FBjRbFCK4AaDQ5OZw4Z0pqwZ/CMQ9fTQBWT+/1J r5Tmf9+Z/LtrVuz8Asl/kYhQXVRHtRdujOow64Q+k94PbVy1z3/Kw1sk0gK46HJWucM6 o11OFZwEZ4/4ukJnh37u8IqBQE0Vyj/tEwx/d5yEv7Ou3/+7BK4y5kY4/5JWA8gn/P6t Q2zQeO6HnEQMAwYMpAoDcWR/sK0BO6khPgffvrWZn0mvB9xAL5/m3zKc5xy41M47eBPg b8bA== 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; bh=XcaBif2G1gHZNdGnfBcVzRnLzbEc47vn/TGeNHdxtBc=; b=NA7ebU3DSYGs0IGUZB4mD+fbKBF4hxDo38krBUmyFtD4UJx0iaSF9os/yfvqqydbC5 CWQLznozengdtk6aH4bK8DuqBmzesE3GoCs09cprU5HXNCKN+EwzwfIvYPKo8GNcyTVW mCzJr1KcnvAJfvVhe4Vl5wi9fqkcOOqtUHr+uk1SU1QS+1WYSrW0sXSuPm5z4NrVuw6H NdO7k1Xlzr05ahPGiOEPDkqE+BM/EtTGT7F928MXj+PrnKPy3zaIJHox4kgKxqo8qxVw bpua8pnxU2PLILuAjizTQstccziSeQ0Sztjk62kbiHMgdBHo44fDmB3m7vJNoCtm7/UF OQCw== X-Gm-Message-State: ALKqPwe7rPKf6WMn+cwUNu6N7G1KGhloEjuEXkXPgcdvLQu0+0Ovc2OS 8Hww34DMo17LUscn83E96W8dnQ== X-Google-Smtp-Source: AB8JxZrvWbm3PgDTckSV+t5InXFUz3texajvUe/p7qrAPEMZr86PAmLFwwAXzd7qOLdI1TNqtvC0TA== X-Received: by 2002:a2e:958e:: with SMTP id w14-v6mr300733ljh.75.1525800729837; Tue, 08 May 2018 10:32:09 -0700 (PDT) Received: from gmail.com (81-231-232-130-no39.tbcn.telia.com. [81.231.232.130]) by smtp.gmail.com with ESMTPSA id v3-v6sm4870615ljj.71.2018.05.08.10.32.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 May 2018 10:32:08 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Tue, 8 May 2018 19:31:26 +0200 Message-Id: <20180508173152.29327-11-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180508173152.29327-1-edgar.iglesias@gmail.com> References: <20180508173152.29327-1-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::242 Subject: [Qemu-devel] [PATCH v2 10/36] target-microblaze: Bypass MMU with MMU_NOMMU_IDX 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: , Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, sai.pavan.boddu@xilinx.com, frasse.iglesias@gmail.com, alistair@alistair23.me, richard.henderson@linaro.org, frederic.konrad@adacore.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Edgar E. Iglesias" Bypass MMU translation when mmu-index MMU_NOMMU_IDX is used. Reviewed-by: Alistair Francis Reviewed-by: Richard Henderson Signed-off-by: Edgar E. Iglesias --- target/microblaze/helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/microblaze/helper.c b/target/microblaze/helper.c index a9f4ca93e3..261dcc74c7 100644 --- a/target/microblaze/helper.c +++ b/target/microblaze/helper.c @@ -58,7 +58,8 @@ int mb_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, int prot; /* Translate if the MMU is available and enabled. */ - if (cpu->cfg.use_mmu && (env->sregs[SR_MSR] & MSR_VM)) { + if (cpu->cfg.use_mmu && (env->sregs[SR_MSR] & MSR_VM) + && mmu_idx != MMU_NOMMU_IDX) { uint32_t vaddr, paddr; struct microblaze_mmu_lookup lu;