From patchwork Fri Jun 24 19:05:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Aravamudan X-Patchwork-Id: 101870 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 95D52B7A57 for ; Sat, 25 Jun 2011 05:06:40 +1000 (EST) Received: from e39.co.us.ibm.com (e39.co.us.ibm.com [32.97.110.160]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e39.co.us.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id A0149B6F88 for ; Sat, 25 Jun 2011 05:06:00 +1000 (EST) Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e39.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p5OIpJhK025078 for ; Fri, 24 Jun 2011 12:51:19 -0600 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p5OJ5bwn039912 for ; Fri, 24 Jun 2011 13:05:38 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p5OD5VTj016754 for ; Fri, 24 Jun 2011 07:05:33 -0600 Received: from arkanoid.localdomain (sig-9-65-161-248.mts.ibm.com [9.65.161.248]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p5OD5UWA016691; Fri, 24 Jun 2011 07:05:30 -0600 Received: by arkanoid.localdomain (Postfix, from userid 1000) id 009D7F363B; Fri, 24 Jun 2011 12:05:27 -0700 (PDT) From: Nishanth Aravamudan To: Milton Miller Subject: [PATCH 2/4] dma-mapping: add get_required_mask if arch overrides default Date: Fri, 24 Jun 2011 12:05:23 -0700 Message-Id: <1308942325-4813-3-git-send-email-nacc@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1308942325-4813-1-git-send-email-nacc@us.ibm.com> References: <1308942325-4813-1-git-send-email-nacc@us.ibm.com> Cc: Vinod Koul , Dan Williams , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org From: Milton Miller If an architecture sets ARCH_HAS_DMA_GET_REQUIRED_MASK and has settable dma_map_ops, the required mask may change by the ops implementation. For example, a system that always has an mmu inline may only require 32 bits while a swiotlb would desire bits to cover all of memory. Therefore add the field if the architecture does not use the generic definition of dma_get_required_mask. The first use will by by powerpc. Note that this does add some dependency on the order in which files are visible here. Signed-off-by: Milton Miller Signed-off-by: Nishanth Aravamudan Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Cc: benh@kernel.crashing.org --- include/linux/dma-mapping.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index ba8319a..d0e023b 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -49,6 +49,9 @@ struct dma_map_ops { int (*mapping_error)(struct device *dev, dma_addr_t dma_addr); int (*dma_supported)(struct device *dev, u64 mask); int (*set_dma_mask)(struct device *dev, u64 mask); +#ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK + u64 (*get_required_mask)(struct device *dev); +#endif int is_phys; };