From patchwork Fri Feb 24 03:27:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 142736 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0D8DEB6FA8 for ; Fri, 24 Feb 2012 14:28:40 +1100 (EST) Received: from localhost ([::1]:34265 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0lpg-0001kg-Qg for incoming@patchwork.ozlabs.org; Thu, 23 Feb 2012 22:28:32 -0500 Received: from eggs.gnu.org ([140.186.70.92]:41249) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0lpN-0001QR-DD for qemu-devel@nongnu.org; Thu, 23 Feb 2012 22:28:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S0lpH-0001HN-A6 for qemu-devel@nongnu.org; Thu, 23 Feb 2012 22:28:13 -0500 Received: from ozlabs.org ([203.10.76.45]:47138) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0lpG-0001Go-DA for qemu-devel@nongnu.org; Thu, 23 Feb 2012 22:28:07 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 562D4B6FA8; Fri, 24 Feb 2012 14:28:03 +1100 (EST) From: David Gibson To: anthony@codemonkey.ws Date: Fri, 24 Feb 2012 14:27:37 +1100 Message-Id: <1330054063-16860-3-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1330054063-16860-1-git-send-email-david@gibson.dropbear.id.au> References: <1330054063-16860-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 203.10.76.45 Cc: qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH 2/8] Better support for dma_addr_t variables 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 A while back, we introduced the dma_addr_t type, which is supposed to be used for bus visible memory addresses. At present, this is an alias for target_phys_addr_t, but this will change when we eventually add support for guest visible IOMMUs. There are some instances of target_phys_addr_t in the code now which should really be dma_addr_t, but can't be trivially converted due to missing features which this patch corrects. * We add DMA_ADDR_BITS analagous to TARGET_PHYS_ADDR_BITS. This is important where we need to make a compile-time (#if) based on the size of dma_addr_t. * We add a new helper macro to create device properties which take a dma_addr_t. This lets us correctly convert code which cuurrently has DEFINE_PROP_TADDR() for variables which should be dma_addr_t instead of target_phys_addr_t. Signed-off-by: David Gibson --- Makefile.objs | 2 +- dma.h | 1 + hw/qdev-dma.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/qdev-dma.h | 7 +++++ 4 files changed, 85 insertions(+), 1 deletions(-) create mode 100644 hw/qdev-dma.c create mode 100644 hw/qdev-dma.h diff --git a/Makefile.objs b/Makefile.objs index 67ee3df..1d643bb 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -287,7 +287,7 @@ hw-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o hw-obj-$(CONFIG_ESP) += esp.o hw-obj-y += dma-helpers.o sysbus.o isa-bus.o -hw-obj-y += qdev-addr.o +hw-obj-y += qdev-addr.o qdev-dma.o # VGA hw-obj-$(CONFIG_VGA_PCI) += vga-pci.o diff --git a/dma.h b/dma.h index 0847b42..79be131 100644 --- a/dma.h +++ b/dma.h @@ -20,6 +20,7 @@ typedef struct ScatterGatherEntry ScatterGatherEntry; #if defined(TARGET_PHYS_ADDR_BITS) typedef target_phys_addr_t dma_addr_t; +#define DMA_ADDR_BITS TARGET_PHYS_ADDR_BITS #define DMA_ADDR_FMT TARGET_FMT_plx typedef enum { diff --git a/hw/qdev-dma.c b/hw/qdev-dma.c new file mode 100644 index 0000000..63c9768 --- /dev/null +++ b/hw/qdev-dma.c @@ -0,0 +1,76 @@ +#include "qdev.h" +#include "qdev-dma.h" +#include "dma.h" + +/* --- target physical address --- */ + +static int parse_dmaaddr(DeviceState *dev, Property *prop, const char *str) +{ + dma_addr_t *ptr = qdev_get_prop_ptr(dev, prop); + + *ptr = strtoull(str, NULL, 16); + return 0; +} + +static int print_dmaaddr(DeviceState *dev, Property *prop, char *dest, size_t len) +{ + dma_addr_t *ptr = qdev_get_prop_ptr(dev, prop); + return snprintf(dest, len, "0x" DMA_ADDR_FMT, *ptr); +} + +static void get_dmaaddr(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + DeviceState *dev = DEVICE(obj); + Property *prop = opaque; + dma_addr_t *ptr = qdev_get_prop_ptr(dev, prop); + int64_t value; + + value = *ptr; + visit_type_int(v, &value, name, errp); +} + +static void set_dmaaddr(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + DeviceState *dev = DEVICE(obj); + Property *prop = opaque; + dma_addr_t *ptr = qdev_get_prop_ptr(dev, prop); + Error *local_err = NULL; + int64_t value; + + if (dev->state != DEV_STATE_CREATED) { + error_set(errp, QERR_PERMISSION_DENIED); + return; + } + + visit_type_int(v, &value, name, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + if ((uint64_t)value <= (uint64_t) ~(dma_addr_t)0) { + *ptr = value; + } else { + error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, + dev->id?:"", name, value, (uint64_t) 0, + (uint64_t) ~(dma_addr_t)0); + } +} + + +PropertyInfo qdev_prop_dmaaddr = { + .name = "dmaaddr", + .parse = parse_dmaaddr, + .print = print_dmaaddr, + .get = get_dmaaddr, + .set = set_dmaaddr, +}; + +void qdev_prop_set_dmaaddr(DeviceState *dev, const char *name, dma_addr_t value) +{ + Error *errp = NULL; + object_property_set_int(OBJECT(dev), value, name, &errp); + assert(!errp); + +} diff --git a/hw/qdev-dma.h b/hw/qdev-dma.h new file mode 100644 index 0000000..1390a8d --- /dev/null +++ b/hw/qdev-dma.h @@ -0,0 +1,7 @@ +#include "dma.h" + +#define DEFINE_PROP_DMAADDR(_n, _s, _f, _d) \ + DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_dmaaddr, dma_addr_t) + +extern PropertyInfo qdev_prop_dmaaddr; +void qdev_prop_set_dmaaddr(DeviceState *dev, const char *name, dma_addr_t value);