Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756171Ab1FXTGM (ORCPT ); Fri, 24 Jun 2011 15:06:12 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:43726 "EHLO e34.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755841Ab1FXTGJ (ORCPT ); Fri, 24 Jun 2011 15:06:09 -0400 From: Nishanth Aravamudan To: Milton Miller Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, benh@kernel.crashing.org, Vinod Koul , Dan Williams 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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1589 Lines: 43 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; }; -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/