From patchwork Mon Feb 3 09:44:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 316115 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 BF8732C0096 for ; Mon, 3 Feb 2014 21:02:36 +1100 (EST) Received: from localhost ([::1]:45324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAGMM-0007tW-D8 for incoming@patchwork.ozlabs.org; Mon, 03 Feb 2014 05:02:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAGIU-0002rp-5w for qemu-devel@nongnu.org; Mon, 03 Feb 2014 04:58:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WAGIN-0003CL-Hq for qemu-devel@nongnu.org; Mon, 03 Feb 2014 04:58:34 -0500 Received: from mail-qa0-x22f.google.com ([2607:f8b0:400d:c00::22f]:37155) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAGIN-0003C9-Db for qemu-devel@nongnu.org; Mon, 03 Feb 2014 04:58:27 -0500 Received: by mail-qa0-f47.google.com with SMTP id j5so9518807qaq.6 for ; Mon, 03 Feb 2014 01:58:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7Y+GCzSvFpJlrjLamZgJ0ZNToLktVcjHkDEOCkrd/J8=; b=RQZaQuC5eXt7hKWLUSxj1hjj3jEAuLT1FzIUmEDyfwKjKMTrHeMK6eGL2hR3/K87lT +0erAPRsuSCvUz/XB8PuBtMBj3htfg6JooFDBSMkMh3J0LxQzcCtOZLLUVNNNBrZxugW ADXxMzyOVM/YpCe+5R403yGwP+7WSPEy1cDRZ+/Wf/Cr/4NPKIR5iIKXhcsb0r39EmNY yG+zEEsuLBs4GhdYapPQzA+iIB8ESw4rGeWGbJkNK+Rsw6ef3BrJ2Sh3ne8Nr0QSnKir c6PKXYnPNhbPYTlRhYDZgJ8JoUqkA7RMRP7W1oISkNh4+B7Z29hL0DtbZH934Wiu5nIm mKFQ== X-Received: by 10.140.40.5 with SMTP id w5mr51557924qgw.65.1391421506973; Mon, 03 Feb 2014 01:58:26 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id v33sm26423879qgd.10.2014.02.03.01.58.25 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 03 Feb 2014 01:58:26 -0800 (PST) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Mon, 3 Feb 2014 19:44:50 +1000 Message-Id: <1391420690-23745-23-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1391420690-23745-1-git-send-email-edgar.iglesias@gmail.com> References: <1391420690-23745-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c00::22f Cc: peter.maydell@linaro.org, blauwirbel@gmail.com, aliguori@amazon.com, pcrost@xilinx.com, pbonzini@redhat.com, afaerber@suse.de, aurelien@aurel32.net, rth@twiddle.net Subject: [Qemu-devel] [PATCH v4 22/22] petalogix-ml605: Make the LMB visible only to the CPU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias --- hw/microblaze/petalogix_ml605_mmu.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index 37cbbfd..d1acbff 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -86,16 +86,31 @@ petalogix_ml605_init(QEMUMachineInitArgs *args) MemoryRegion *phys_lmb_bram = g_new(MemoryRegion, 1); MemoryRegion *phys_ram = g_new(MemoryRegion, 1); qemu_irq irq[32]; + MemoryRegion *sysmem_alias = g_new(MemoryRegion, 1); + MemoryRegion *mr_cpu_root = g_new(MemoryRegion, 1); + AddressSpace *as_cpu = g_malloc0(sizeof(*as_cpu)); + + /* Setup the CPU specific address-space. */ + memory_region_init(mr_cpu_root, NULL, "as-cpu-root", INT64_MAX); + address_space_init(as_cpu, mr_cpu_root, "as/cpu"); /* init CPUs */ cpu = MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU)); + qdev_prop_set_address_space(DEVICE(cpu), "address-space", as_cpu); object_property_set_bool(OBJECT(cpu), true, "realized", &error_abort); + /* Populate the CPU AS with the LMB only visible to the CPU. */ + memory_region_init_alias(sysmem_alias, NULL, "sysmem_alias", + address_space_mem, 0, + memory_region_size(address_space_mem)); + memory_region_add_subregion(mr_cpu_root, 0x00000000, sysmem_alias); + /* Attach emulated BRAM through the LMB. */ memory_region_init_ram(phys_lmb_bram, NULL, "petalogix_ml605.lmb_bram", LMB_BRAM_SIZE); vmstate_register_ram_global(phys_lmb_bram); - memory_region_add_subregion(address_space_mem, 0x00000000, phys_lmb_bram); + memory_region_add_subregion_overlap(mr_cpu_root, 0x00000000, + phys_lmb_bram, 2); memory_region_init_ram(phys_ram, NULL, "petalogix_ml605.ram", ram_size); vmstate_register_ram_global(phys_ram);