From patchwork Thu May 3 09:19:02 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: 10377415 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 C47406037D for ; Thu, 3 May 2018 09:23:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B26AE29073 for ; Thu, 3 May 2018 09:23:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A68F829081; Thu, 3 May 2018 09:23:57 +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=-3.9 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 2672B29070 for ; Thu, 3 May 2018 09:23:56 +0000 (UTC) Received: from localhost ([::1]:54854 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEASx-0004HR-S8 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 03 May 2018 05:23:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEAOs-0000pa-9l for qemu-devel@nongnu.org; Thu, 03 May 2018 05:19:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEAOr-00051p-H0 for qemu-devel@nongnu.org; Thu, 03 May 2018 05:19:42 -0400 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:40829) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fEAOr-00051Y-9F for qemu-devel@nongnu.org; Thu, 03 May 2018 05:19:41 -0400 Received: by mail-lf0-x241.google.com with SMTP id j16-v6so24916468lfb.7 for ; Thu, 03 May 2018 02:19:41 -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=7QVzDAk59BSyILmOSlP/UWfbzmlHc05XqZjtgOmduyY=; b=NeDrEna4GZyzV8HcpJVus/xPyU9ZLob/fASl4inR9i5m2sN3/Thr5I8kylKq4OsSGn o7KFBDxGF4+0RTTdg3VJjIN5a6bDil6igC3IKeCVUwQ5iq9Y+QG6vyqc2n7m+dqOLvDm h0WbDLAxzmHFy1sVDh7Qe2oTKfF45hod7QP4me96jo+lgoIYjAh3izGlnKLlOo/EvKjy vsgtQ3GdySZWHWCqnInOB6AQntdV8m4OQlSdoXiB+wNASRRaQZAU8T5LBbI3Y4kUQFV6 /pkxx/av/+BN7F9lKhhp9PjjMh/o1+PKMCYg/JlcQu9ghjyvURIK3jAz/R3G+eSY2Vou Lw8Q== 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=7QVzDAk59BSyILmOSlP/UWfbzmlHc05XqZjtgOmduyY=; b=URfo8nQEJCeEqjR8LiS2f5hNXXjugZeYtZN7cYnaI1g9yqkvITS/7RN2Rzjmkhqmip 07lVXwo/NByDu3j4DTJC/Beb6KpzIAmRDIv0iK/lwpjAZYewMKB6Ep36NQ7ikPAhYKJW QjWuZXd+lWIFcvByc6Fruwxsx/2r6npVJxKNXEaJfX00tNu31cnlUL9sI+tEN2y0GX8f OrFeL++8O8/1hPcsz66o+F3BhFyZbri6qSqTjlJK4OJzjBEOxoC9oqkCdYKoIulx9Rdl QmwHSX5Q4Ibi30TuZ5of6zrZPfamLF3ltBcTmfAIb30LhU7fCONgWzlFdZ8IkOLr5X9p q49w== X-Gm-Message-State: ALQs6tBXu+In+QLmxwPEB2RMLtZisS7ZW9qTzOGdHsMvyhoedTrFtS/B k4gHv00lHWR5ncHl9WzNLKOsuA== X-Google-Smtp-Source: AB8JxZqEvxd//Of+DRwrgBz+kpfYyAxhZLbXBZwtUcZxkzMcM/lmYSINI1Li5s3AjpPcYzFQ+uJLJw== X-Received: by 2002:a19:c457:: with SMTP id u84-v6mr14834751lff.109.1525339179819; Thu, 03 May 2018 02:19:39 -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 t83-v6sm2735562lff.71.2018.05.03.02.19.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 May 2018 02:19:38 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Thu, 3 May 2018 11:19:02 +0200 Message-Id: <20180503091922.28733-10-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180503091922.28733-1-edgar.iglesias@gmail.com> References: <20180503091922.28733-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::241 Subject: [Qemu-devel] [PATCH v1 09/29] target-microblaze: Conditionalize setting of PVR11_USE_MMU 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 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" Conditionalize setting of PVR11_USE_MMU on the use_mmu CPU property, otherwise we may incorrectly advertise an MMU via PVR when the core in fact has none. Signed-off-by: Edgar E. Iglesias Reviewed-by: Alistair Francis --- target/microblaze/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 06476f6efc..6fdf0fd223 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -201,7 +201,8 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp) PVR5_DCACHE_WRITEBACK_MASK : 0; env->pvr.regs[10] = 0x0c000000; /* Default to spartan 3a dsp family. */ - env->pvr.regs[11] = PVR11_USE_MMU | (16 << 17); + env->pvr.regs[11] = cpu->cfg.use_mmu ? PVR11_USE_MMU : 0 | + 16 << 17; mcc->parent_realize(dev, errp); }