From patchwork Wed May 16 04:27:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Herrenschmidt X-Patchwork-Id: 159499 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A2786B6FD7 for ; Wed, 16 May 2012 14:29:26 +1000 (EST) Received: from localhost ([::1]:53335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUVrY-0003q1-Ck for incoming@patchwork.ozlabs.org; Wed, 16 May 2012 00:29:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUVr1-0002qA-Si for qemu-devel@nongnu.org; Wed, 16 May 2012 00:28:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SUVqz-0002b3-4x for qemu-devel@nongnu.org; Wed, 16 May 2012 00:28:51 -0400 Received: from gate.crashing.org ([63.228.1.57]:34140) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUVqy-0002ax-Sv for qemu-devel@nongnu.org; Wed, 16 May 2012 00:28:49 -0400 Received: from pasglop.ozlabs.ibm.com (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.13.8) with ESMTP id q4G4SXoP007463; Tue, 15 May 2012 23:28:35 -0500 From: Benjamin Herrenschmidt To: qemu-devel@nongnu.org Date: Wed, 16 May 2012 14:27:14 +1000 Message-Id: <1337142445-26548-2-git-send-email-benh@kernel.crashing.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1337142445-26548-1-git-send-email-benh@kernel.crashing.org> References: <1337142445-26548-1-git-send-email-benh@kernel.crashing.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 63.228.1.57 Cc: David Gibson Subject: [Qemu-devel] [PATCH 01/12] 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 From: David Gibson 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, currently an alias to DEFINE_PROP_TADDR(). Signed-off-by: David Gibson Signed-off-by: Benjamin Herrenschmidt --- dma.h | 1 + hw/qdev-dma.h | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 hw/qdev-dma.h diff --git a/dma.h b/dma.h index 8c1ec8f..fe08b72 100644 --- a/dma.h +++ b/dma.h @@ -31,6 +31,7 @@ struct QEMUSGList { #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 struct ScatterGatherEntry { diff --git a/hw/qdev-dma.h b/hw/qdev-dma.h new file mode 100644 index 0000000..f0ff558 --- /dev/null +++ b/hw/qdev-dma.h @@ -0,0 +1,12 @@ +/* + * Support for dma_addr_t typed properties + * + * Copyright (C) 2012 David Gibson, IBM Corporation. + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#include "qdev-addr.h" + +#define DEFINE_PROP_DMAADDR(_n, _s, _f, _d) \ + DEFINE_PROP_TADDR(_n, _s, _f, _d)