From patchwork Tue May 29 10:49:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 10435019 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 6EFAF603B5 for ; Tue, 29 May 2018 11:20:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57B6D286FD for ; Tue, 29 May 2018 11:20:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5623028706; Tue, 29 May 2018 11:20:05 +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.8 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 5C470286FD for ; Tue, 29 May 2018 11:20:04 +0000 (UTC) Received: from localhost ([::1]:60246 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNcfb-0006zN-AC for patchwork-qemu-devel@patchwork.kernel.org; Tue, 29 May 2018 07:20:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37073) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNcDR-0001gr-MJ for qemu-devel@nongnu.org; Tue, 29 May 2018 06:50:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNcDQ-0004Aj-TY for qemu-devel@nongnu.org; Tue, 29 May 2018 06:50:57 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:53882) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fNcDQ-0004AT-Mn for qemu-devel@nongnu.org; Tue, 29 May 2018 06:50:56 -0400 Received: by mail-wm0-x22d.google.com with SMTP id a67-v6so39051780wmf.3 for ; Tue, 29 May 2018 03:50:56 -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 :mime-version:content-transfer-encoding; bh=rlntQFPuALqAogiNUQHM/vA4JB+rnCtH9f/W9D2BGzM=; b=hokdvz402+2PLfYX6GSSuL5dam0mLZD3N1ysjBKo9nsSuIIziFmRogpgB+Ml788J0/ ld2lb/2ZJ63ct9AOV5fvagEM4JFCtKBarD8wNEaSISAnn+MSpujkQrBbRTFvtVEg2IGD H9wdRnlxfFJ09B6DzkuU8VX//qDPfE0GFwZshifPYM5P0W1GOyCitCOOLbNQgb3R8Sya rC3f3DaDTxqDM8CG27muNdqskhKeA47eUETyh10wg5ZBp3WUyPjG/YYlf/drAsLDGXYH KS5pa0CztDfkJQRgN9/faQP4nuc2QVsoHrZEGZ/9tL9EqANzaHrJqKmsavcw7G/fjXU2 pXUw== 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=rlntQFPuALqAogiNUQHM/vA4JB+rnCtH9f/W9D2BGzM=; b=c5edEdDv9wZKtfpdKIqgZg00p2cEXV4Qr/CMwx3xLV9peMuosunf5vq7p3Tf9jeY7R 3iFv0HFQCXWH2emUpiMhuRHQGLVOYmimIq0y2p1UvCInLr8nsveK57u7ZBCvFoLsPxEd L8p57zJExXfj3Pc3Am/F5dYTWmikKg4O/opMq9PfgZ4dTF/e4gug4fhvtiBq2G9fZqV2 6BmFHsBX6+AhDEl8e1dcYL7R2DSFc6+Fogt0J7zGGccEoSfwPJnvsBqMsvl6LYDaG2Pq 9FGYGJTIB4scuPMqD2trPQzV/EXK8LUGM9IEZ3m6bWkiPo/qjliXoBiQycWUzkU+0L1a pB5w== X-Gm-Message-State: ALKqPwemswZuyLyvBDABoQop2kULzr5ZE32aCR25f3xQZg/k3O9sEDPQ OZb5jBSrHRlf3zUpjkv3Wqv20w== X-Google-Smtp-Source: ADUXVKJvT7AEGx047DLUcLvESRFOz895EsoGYX5o8Efg9v304url4NEPldCaTj3DL78YXsYkKiCDcg== X-Received: by 2002:a2e:1947:: with SMTP id p68-v6mr10726991lje.114.1527591055364; Tue, 29 May 2018 03:50:55 -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 u2-v6sm6408510lji.4.2018.05.29.03.50.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 May 2018 03:50:54 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Tue, 29 May 2018 12:49:58 +0200 Message-Id: <20180529105011.1914-26-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180529105011.1914-1-edgar.iglesias@gmail.com> References: <20180529105011.1914-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22d Subject: [Qemu-devel] [PULL v1 25/38] target-microblaze: mmu: Remove unused register state 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 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" Add explicit handling for MMU_R_TLBX and log accesses to invalid MMU registers. We can now remove the state for all regs but PID, ZPR and TLBX (0 - 2). Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Edgar E. Iglesias --- target/microblaze/mmu.c | 7 +++++-- target/microblaze/mmu.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/target/microblaze/mmu.c b/target/microblaze/mmu.c index f4a4c339c9..231803ceea 100644 --- a/target/microblaze/mmu.c +++ b/target/microblaze/mmu.c @@ -211,11 +211,14 @@ uint32_t mmu_read(CPUMBState *env, uint32_t rn) } r = env->mmu.regs[rn]; break; + case MMU_R_TLBX: + r = env->mmu.regs[rn]; + break; case MMU_R_TLBSX: qemu_log_mask(LOG_GUEST_ERROR, "TLBSX is write-only.\n"); break; default: - r = env->mmu.regs[rn]; + qemu_log_mask(LOG_GUEST_ERROR, "Invalid MMU register %d.\n", rn); break; } D(qemu_log("%s rn=%d=%x\n", __func__, rn, r)); @@ -298,7 +301,7 @@ void mmu_write(CPUMBState *env, uint32_t rn, uint32_t v) break; } default: - env->mmu.regs[rn] = v; + qemu_log_mask(LOG_GUEST_ERROR, "Invalid MMU register %d.\n", rn); break; } } diff --git a/target/microblaze/mmu.h b/target/microblaze/mmu.h index 113539c6e9..624becfded 100644 --- a/target/microblaze/mmu.h +++ b/target/microblaze/mmu.h @@ -67,7 +67,7 @@ struct microblaze_mmu /* We keep a separate ram for the tids to avoid the 48 bit tag width. */ uint8_t tids[TLB_ENTRIES]; /* Control flops. */ - uint32_t regs[8]; + uint32_t regs[3]; int c_mmu; int c_mmu_tlb_access;