From patchwork Tue May 8 17:31:43 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: 910388 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZQJKZpbU"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gRxR2DYmz9rxs for ; Wed, 9 May 2018 03:56:11 +1000 (AEST) Received: from localhost ([::1]:52690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG6qP-0007dm-06 for incoming@patchwork.ozlabs.org; Tue, 08 May 2018 13:56:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG6Te-0000BP-L7 for qemu-devel@nongnu.org; Tue, 08 May 2018 13:32:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fG6Td-0005Z0-NY for qemu-devel@nongnu.org; Tue, 08 May 2018 13:32:38 -0400 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:33007) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fG6Td-0005Yb-GK for qemu-devel@nongnu.org; Tue, 08 May 2018 13:32:37 -0400 Received: by mail-lf0-x241.google.com with SMTP id m18-v6so47060288lfb.0 for ; Tue, 08 May 2018 10:32:37 -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=TZ/gza14CICN5LEXCtKtWWs0Qzvmwl3IOFny349OJao=; b=ZQJKZpbUPV/6EQPYhUbT4Nbf6DvaO8fz0AneX9n5/9MSSZC00tSHxuXApGfdKH/4G/ rekZlZj7FJ8aX/K6wJKvJn6HQc0dsj2nAZlFBo8D7Mt0jo+UfZHvtk1EQ9kthjVjVUyX Ujr8nuvzvbPmpDlTYvvkO9Wz0pOOv/MJoi3+uvgNjrgGV3JXVZeQeLv1sfH3wG+6qQ2B uDa01yqUlKg4aGVKv5Cu2/ML7ocf769YEqlXHlUShNCeV+no4z5HmwQycRI8ic+U7+2A 8gGMkp0AORaxgEwYWbWn34B3IjrAwYO0RvQC/pSi5kqzN2dgodxxurBxhRhE/4towQ2N uvPw== 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=TZ/gza14CICN5LEXCtKtWWs0Qzvmwl3IOFny349OJao=; b=NPIWG0DfNa6i2eAlralHeyiMxJ47UbGzsbRsQC7+t7cTPsVOrhLaoqMyEPYUe3EBGp CcuJAJTW1cfORvGKM9Kzo6GDUHX/5BNJgX0rvuqHY7Gsiz/+JXRhJp9xiRKmRGBL4zig hvuNRSPcB7CR0TW98nc3KtzryFyMuQDoFV7MR67tZWVZmNDWN7VtOR3YUdC5rPF04YNp vkB1LjPmYF75gZbnZAIG+6WP0JxFHJFLiWr/nEja7wNASb52AgnrF2mphzXZW2/WheoJ 5Jz8S6pZz530tEqGY5uBlUkG0ZedbPUO+SlyK/CsXLySsarpNYh90QxE9ounG20LoEH/ l+ag== X-Gm-Message-State: ALQs6tBV8tC4yZmlnuuWaJ0TeG4XCC0VjZ3mltX+JCqsy3UwXwpOSHkF 1zolIEahxGilHqsdH4mq4BvGmA== X-Google-Smtp-Source: AB8JxZqX/OfVzcXmDlUPK4EhzTNVEeksAXkTGX+zmUzQb34GVarwZUHr8kE/HJ23zQ9OmD/LcImwwQ== X-Received: by 2002:a2e:1055:: with SMTP id j82-v6mr29798860lje.94.1525800756013; Tue, 08 May 2018 10:32:36 -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 a70-v6sm4809938ljb.78.2018.05.08.10.32.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 May 2018 10:32:35 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Tue, 8 May 2018 19:31:43 +0200 Message-Id: <20180508173152.29327-28-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::241 Subject: [Qemu-devel] [PATCH v2 27/36] target-microblaze: mmu: Add a configurable output address mask 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: "Edgar E. Iglesias" Add a configurable output address mask, used to mimic the configurable physical address bit width. Reviewed-by: Alistair Francis Signed-off-by: Edgar E. Iglesias Reviewed-by: Richard Henderson --- target/microblaze/cpu.c | 1 + target/microblaze/mmu.c | 1 + target/microblaze/mmu.h | 1 + 3 files changed, 3 insertions(+) diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 2b3f8fa374..d0649fdaaa 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -128,6 +128,7 @@ static void mb_cpu_reset(CPUState *s) env->mmu.c_mmu = 3; env->mmu.c_mmu_tlb_access = 3; env->mmu.c_mmu_zones = 16; + env->mmu.c_addr_mask = MAKE_64BIT_MASK(0, cpu->cfg.addr_size); #endif } diff --git a/target/microblaze/mmu.c b/target/microblaze/mmu.c index a379968618..166c79908c 100644 --- a/target/microblaze/mmu.c +++ b/target/microblaze/mmu.c @@ -164,6 +164,7 @@ unsigned int mmu_translate(struct microblaze_mmu *mmu, tlb_rpn = d & TLB_RPN_MASK; lu->vaddr = tlb_tag; + lu->paddr = tlb_rpn & mmu->c_addr_mask; lu->paddr = tlb_rpn; lu->size = tlb_size; lu->err = ERR_HIT; diff --git a/target/microblaze/mmu.h b/target/microblaze/mmu.h index 1714caf82e..9fbdf38f36 100644 --- a/target/microblaze/mmu.h +++ b/target/microblaze/mmu.h @@ -72,6 +72,7 @@ struct microblaze_mmu int c_mmu; int c_mmu_tlb_access; int c_mmu_zones; + uint64_t c_addr_mask; /* Mask to apply to physical addresses. */ }; struct microblaze_mmu_lookup