From patchwork Mon Dec 13 21:24:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 407622 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBDLOgas029597 for ; Mon, 13 Dec 2010 21:24:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756611Ab0LMVYi (ORCPT ); Mon, 13 Dec 2010 16:24:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6900 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755498Ab0LMVYi (ORCPT ); Mon, 13 Dec 2010 16:24:38 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBDLOVVD001488 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 13 Dec 2010 16:24:31 -0500 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oBDLOUmR023183; Mon, 13 Dec 2010 16:24:30 -0500 From: Alex Williamson Subject: [PATCH v4 1/2] Minimal RAM API support To: qemu-devel@nongnu.org, anthony@codemonkey.ws, blauwirbel@gmail.com Cc: kvm@vger.kernel.org, alex.williamson@redhat.com Date: Mon, 13 Dec 2010 14:24:30 -0700 Message-ID: <20101213212430.2472.23807.stgit@s20.home> In-Reply-To: <20101213212059.2472.17879.stgit@s20.home> References: <20101213212059.2472.17879.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 13 Dec 2010 21:24:42 +0000 (UTC) diff --git a/Makefile.objs b/Makefile.objs index cebb945..47f3c3a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -172,6 +172,7 @@ hw-obj-y += pci.o pci_bridge.o msix.o msi.o hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o hw-obj-y += watchdog.o +hw-obj-y += memory.o hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o hw-obj-$(CONFIG_ECC) += ecc.o hw-obj-$(CONFIG_NAND) += nand.o diff --git a/cpu-common.h b/cpu-common.h index 6d4a898..f08f93b 100644 --- a/cpu-common.h +++ b/cpu-common.h @@ -29,6 +29,8 @@ enum device_endian { /* address in the RAM (different from a physical address) */ typedef unsigned long ram_addr_t; +#include "memory.h" + /* memory API */ typedef void CPUWriteMemoryFunc(void *opaque, target_phys_addr_t addr, uint32_t value); diff --git a/memory.c b/memory.c new file mode 100644 index 0000000..07cb020 --- /dev/null +++ b/memory.c @@ -0,0 +1,94 @@ +/* + * RAM API + * + * Copyright Red Hat, Inc. 2010 + * + * Authors: + * Alex Williamson + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ +#include "memory.h" +#include "range.h" + +typedef struct RamSlot { + target_phys_addr_t start_addr; + ram_addr_t size; + ram_addr_t offset; + QLIST_ENTRY(RamSlot) next; +} RamSlot; + +static QLIST_HEAD(ram_slot_list, RamSlot) ram_slot_list = + QLIST_HEAD_INITIALIZER(ram_slot_list); + +static RamSlot *ram_find_slot(target_phys_addr_t start_addr, ram_addr_t size) +{ + RamSlot *slot; + + QLIST_FOREACH(slot, &ram_slot_list, next) { + if (slot->start_addr == start_addr && slot->size == size) { + return slot; + } + + if (ranges_overlap(start_addr, size, slot->start_addr, slot->size)) { + hw_error("Ram range overlaps existing slot\n"); + } + } + + return NULL; +} + +int ram_register(target_phys_addr_t start_addr, ram_addr_t size, + ram_addr_t phys_offset) +{ + RamSlot *slot; + + if (!size) { + return -EINVAL; + } + + assert(!ram_find_slot(start_addr, size)); + + slot = qemu_malloc(sizeof(RamSlot)); + + slot->start_addr = start_addr; + slot->size = size; + slot->offset = phys_offset; + + QLIST_INSERT_HEAD(&ram_slot_list, slot, next); + + cpu_register_physical_memory(slot->start_addr, slot->size, slot->offset); + + return 0; +} + +void ram_unregister(target_phys_addr_t start_addr, ram_addr_t size) +{ + RamSlot *slot; + + if (!size) { + return; + } + + slot = ram_find_slot(start_addr, size); + assert(slot != NULL); + + QLIST_REMOVE(slot, next); + qemu_free(slot); + cpu_register_physical_memory(start_addr, size, IO_MEM_UNASSIGNED); +} + +int ram_for_each_slot(void *opaque, ram_for_each_slot_fn fn) +{ + RamSlot *slot; + + QLIST_FOREACH(slot, &ram_slot_list, next) { + int ret = fn(opaque, slot->start_addr, slot->size, slot->offset); + if (ret) { + return ret; + } + } + return 0; +} diff --git a/memory.h b/memory.h new file mode 100644 index 0000000..98c85ea --- /dev/null +++ b/memory.h @@ -0,0 +1,44 @@ +#ifndef QEMU_MEMORY_H +#define QEMU_MEMORY_H +/* + * RAM API + * + * Copyright Red Hat, Inc. 2010 + * + * Authors: + * Alex Williamson + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ + +#include "qemu-common.h" +#include "cpu-common.h" + +typedef int (*ram_for_each_slot_fn)(void *opaque, + target_phys_addr_t start_addr, + ram_addr_t size, + ram_addr_t phys_offset); + +/** + * ram_register() : Register a region of guest physical memory + * + * The new region must not overlap an existing region. + */ +int ram_register(target_phys_addr_t start_addr, ram_addr_t size, + ram_addr_t phys_offset); + +/** + * ram_unregister() : Unregister a region of guest physical memory + */ +void ram_unregister(target_phys_addr_t start_addr, ram_addr_t size); + +/** + * ram_for_each_slot() : Call fn() on each registered region + * + * Stop on non-zero return from fn(). + */ +int ram_for_each_slot(void *opaque, ram_for_each_slot_fn fn); + +#endif /* QEMU_MEMORY_H */